From dbd2f09ec2c8513061411a096fc422d28591a5f2 Mon Sep 17 00:00:00 2001 From: Guillaume DOTT Date: Mon, 9 Sep 2013 15:48:36 +0200 Subject: [PATCH] Return length in encode method for gsm7bit and ucs2 --- lib/biju/pdu/gsm7bit.rb | 28 ++++++++++++++++++++-------- lib/biju/pdu/ucs2.rb | 5 ++++- spec/biju/pdu/gsm7bit_spec.rb | 10 +++++----- spec/biju/pdu/ucs2_spec.rb | 4 ++-- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/lib/biju/pdu/gsm7bit.rb b/lib/biju/pdu/gsm7bit.rb index 76914a5..bd325bf 100644 --- a/lib/biju/pdu/gsm7bit.rb +++ b/lib/biju/pdu/gsm7bit.rb @@ -4,12 +4,12 @@ module Biju BASIC_7BIT_CHARACTER_SET = [ '@', '£', '$', '¥', 'è', 'é', 'ù', 'ì', 'ò', 'Ç', "\n", 'Ø', 'ø', "\r", 'Å', 'å', "\u0394", '_', "\u03a6", "\u0393", "\u039b", "\u03a9", "\u03a0","\u03a8", "\u03a3", "\u0398", "\u039e", "\e", 'Æ', 'æ', 'ß', 'É', - ' ', '!', '"', '#', '¤', '%', '&', '\'', '(', ')','*', '+', ',', '-', '.', '/', - '0', '1', '2', '3', '4', '5', '6', '7','8', '9', ':', ';', '<', '=', '>', '?', - '¡', 'A', 'B', 'C', 'D', 'E','F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', - 'P', 'Q', 'R', 'S','T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ä', 'Ö', 'Ñ', 'Ü', '§', - '¿', 'a','b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'ä', 'ö', 'ñ','ü', 'à' + ' ', '!', '"', '#', '¤', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', + '¡', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', + 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ä', 'Ö', 'Ñ', 'Ü', '§', + '¿', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'ä', 'ö', 'ñ', 'ü', 'à' ] BASIC_7BIT_CHARACTER_SET_EXTENSION = { @@ -30,36 +30,48 @@ module Biju def self.decode(string, length: 0) res = '' next_char = 0 + current_length = 0 string.scan(/../).map(&:hex).each_with_index do |octet, i| index = i % 7 current = ((octet & (2 ** (7 - index) - 1)) << index) | next_char res = add_char(res, current) + current_length += 1 + + break if length > 0 && current_length >= length next_char = octet >> (7 - index) if index == 6 res = add_char(res, next_char) + current_length += 1 next_char = 0 end end - res[0..(length - 1)] + res end def self.encode(string) res = '' + length = 0 + string.chars.each do |char| if get_septet(char) res << get_septet(char).reverse + length += 1 elsif get_septet(char, escape: true) res << get_septet("\e").reverse res << get_septet(char, escape: true).reverse + length += 2 end end res << ("0" * (8 - (res.length % 8))) unless res.length % 8 == 0 - res.scan(/.{8}/).map { |octet| "%02x" % octet.reverse.to_i(2) }.join + [ + res.scan(/.{8}/).map { |octet| "%02x" % octet.reverse.to_i(2) }.join, + length: length, + ] end private diff --git a/lib/biju/pdu/ucs2.rb b/lib/biju/pdu/ucs2.rb index a7f5fd8..e8ff757 100644 --- a/lib/biju/pdu/ucs2.rb +++ b/lib/biju/pdu/ucs2.rb @@ -7,7 +7,10 @@ module Biju end def self.encode(string) - string.encode('UCS-2BE').chars.map { |char| "%04x" % char.ord }.join + [ + string.encode('UCS-2BE').chars.map { |char| "%04x" % char.ord }.join, + length: string.length * 2, + ] end end end diff --git a/spec/biju/pdu/gsm7bit_spec.rb b/spec/biju/pdu/gsm7bit_spec.rb index d10eaa5..b888f58 100644 --- a/spec/biju/pdu/gsm7bit_spec.rb +++ b/spec/biju/pdu/gsm7bit_spec.rb @@ -8,7 +8,7 @@ describe Biju::PDU::GSM7Bit do end it "decodes character from extension set" do - expect(Biju::PDU::GSM7Bit.decode('9B32', length: 1)).to eq('€') + expect(Biju::PDU::GSM7Bit.decode('9B32', length: 2)).to eq('€') end it "decodes character with a length of 7" do @@ -18,15 +18,15 @@ describe Biju::PDU::GSM7Bit do describe '::encode' do it "encodes string" do - expect(Biju::PDU::GSM7Bit.encode('Test').upcase).to eq('D4F29C0E') + expect(Biju::PDU::GSM7Bit.encode('Test').first.upcase).to eq('D4F29C0E') end it "encodes character from extension set" do - expect(Biju::PDU::GSM7Bit.encode('€').upcase).to eq('9B32') + expect(Biju::PDU::GSM7Bit.encode('€').first.upcase).to eq('9B32') end it "encodes character with a length of 7" do - expect(Biju::PDU::GSM7Bit.encode('a' * 7).upcase).to eq('E170381C0E8701') + expect(Biju::PDU::GSM7Bit.encode('a' * 7).first.upcase).to eq('E170381C0E8701') end end @@ -40,7 +40,7 @@ describe Biju::PDU::GSM7Bit do strings.each do |string| expect(Biju::PDU::GSM7Bit.decode( - Biju::PDU::GSM7Bit.encode(string), length: string.length)).to eq(string) + *Biju::PDU::GSM7Bit.encode(string))).to eq(string) end end end diff --git a/spec/biju/pdu/ucs2_spec.rb b/spec/biju/pdu/ucs2_spec.rb index aa696a0..45325a5 100644 --- a/spec/biju/pdu/ucs2_spec.rb +++ b/spec/biju/pdu/ucs2_spec.rb @@ -10,7 +10,7 @@ describe Biju::PDU::UCS2 do describe '::encode' do it "encodes string" do - expect(Biju::PDU::UCS2.encode('Ççâãåäūøœ').upcase).to eq('00C700E700E200E300E500E4016B00F80153') + expect(Biju::PDU::UCS2.encode('Ççâãåäūøœ').first.upcase).to eq('00C700E700E200E300E500E4016B00F80153') end end @@ -24,7 +24,7 @@ describe Biju::PDU::UCS2 do strings.each do |string| expect(Biju::PDU::UCS2.decode( - Biju::PDU::UCS2.encode(string), length: string.length)).to eq(string) + *Biju::PDU::UCS2.encode(string))).to eq(string) end end end