pdu_tools 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 06ded51dcb3fdfb9d87daaef9a8c02ef5e19de63
-  data.tar.gz: 3efee7cc8d604557a5fa21a1d4df903d91a4d530
+  metadata.gz: 564211a12edbbb42d58ae7a4967ac4c25878de32
+  data.tar.gz: b545e9753a5fa9b8a6202438871bec369eda7e78
 SHA512: 
-  metadata.gz: fb25dcbe8ac3bdb520903503e76b2fe6737e1440cc3ba4b9db71afed3047c3307ba7aa84b8cbba4155d12a01c142d673fc7156a8977416183d761105a725b0db
-  data.tar.gz: ed46a7682758a220c4b26ce19611b2f93327f7b4d04768faabeea086b38b51d7c4380abd36d785bc96a2168755ddbe10d6100558d0536a7831a016863efcc469
+  metadata.gz: a6513a79545ecb47ca44a96c4674df0c31bbef3f7892709e3ad32f4b0f7e9989a2563ee8989212e535cf758bbbf16152c3f6ff87bba58e1fca0dd337703a2907
+  data.tar.gz: fd22e56c43f68f9b5e190542242aa1fe27e6d31fd8777d5d794551f1f26d19c6020bf0d0b41a23167a0555139f6b390c635a3ca93003eb694fb98f4c3cc9b433

data/lib/pdu_tools/decoder.rb

@@ -4,7 +4,7 @@ module PDUTools
     include Helpers
     # http://read.pudn.com/downloads150/sourcecode/embed/646395/Short%20Message%20in%20PDU%20Encoding.pdf
     def initialize pdu_hex, direction=:sc_to_ms
-      @pdu_hex = pdu_hex
+      @pdu_hex = pdu_hex.dup
       @direction = direction
     end
 
@@ -18,6 +18,9 @@ module PDUTools
       @message_reference = take(2) if @pdu_type[:mti] == :sms_submit
       @address_length = take(2, :integer)
       @address_type = parse_address_type take(2)
+      if [:national, :international].include? @address_type
+        @address_length = @address_length.odd? ? @address_length + 1 : @address_length # Always take byte aligned - hexdecimal F is added when odd number
+      end
       @address = parse_address take(@address_length), @address_type, @address_length
       @pid = take(2)
       @data_coding_scheme = parse_data_coding_scheme take(2, :binary)
@@ -78,7 +81,7 @@ module PDUTools
 
     def parse_address address, type, length
       if type == :a7bit
-        address = decode7bit address, length
+        address = decode7bit address
       else
         address = swapped2normal address
         if type == :international
@@ -149,6 +152,8 @@ module PDUTools
       year, month, day, hour, minute, second, zone = swapped2normal(timestamp).split('').in_groups_of(2).collect(&:join)
       d = "#{year}-#{month}-#{day} #{hour}:#{minute}:#{second} +%02d:00" % (zone.to_i / 4)
       Time.parse(d)
+    rescue
+      binding.pry
     end
 
     def parse_validity_period period
@@ -165,6 +170,7 @@ module PDUTools
     end
 
     def parse_user_data data_length
+      @offset_7bit = 1
       if @pdu_type[:udhi]
         @udh_length = take(2, :integer) * 2
         udh = take(@udh_length)
@@ -172,11 +178,11 @@ module PDUTools
       end
       case @data_coding_scheme[:alphabet]
       when :a7bit
-        @message = decode7bit @pdu_hex, data_length
+        @message = gsm0338_to_utf8 decode7bit(@pdu_hex, @offset_7bit)
       when :a8bit
-        @message = decode8bit @pdu_hex, data_length
+        @message = gsm0338_to_utf8 decode8bit(@pdu_hex, data_length)
       when :a16bit
-        @message = decode16bit @pdu_hex, data_length
+        @message = gsm0338_to_utf8 decode16bit(@pdu_hex, data_length)
       end
     end
 
@@ -186,8 +192,10 @@ module PDUTools
       case iei
       when "00"
         reference = take 2, :integer, header
+        @offset_7bit = 0
       when "08"
         reference = take 4, :integer, header
+        @offset_7bit = 1
       else
         binding.pry
         raise StandardError, "unsupported Information Element Identifier in User Data Header: #{iei}"

data/lib/pdu_tools/helpers.rb

@@ -22,6 +22,14 @@ module PDUTools
       string
     end
 
+    def gsm0338_to_utf8 string
+      GSM_03_38_ESCAPES.each do |replace, find|
+        string.gsub! find, replace
+      end
+      string
+    end
+
+
     def dec2hexbyte dec
       "%02X" % dec
     end
@@ -65,33 +73,34 @@ module PDUTools
       string.scan(/../).collect(&:reverse).join.gsub(/F$/,'')
     end
 
-    # def decode7bit data, length
-    #   septets = data.to_i(16).to_s(2).split('').in_groups_of(7).collect(&:join)[0,length]
-    #   septets.collect do |s|
-    #     s.to_i(2).chr
-    #   end.join
-    # end
-
-    def decode7bit textdata, length
+    def decode7bit textdata, offset=1
+      ret = ""
       bytes = []
       textdata.split('').each_slice(2) do |s|
         bytes << "%08b" % s.join.to_i(16)
       end
-      bit = (bytes.size % 7)
-      bytes.reverse!
+
+      cur_septet = ""
+      next_septet = ""
+      last_char = ""
+
       bytes.each_with_index do |byte, index|
-        if bit == 0 or index == 0
-          bytes.insert(index, "")
-          bit = 7 if bit == 0
-          next
+        to_take = ([0,1].include? offset) ? 7 : 8-offset
+        cur_septet.prepend byte[offset, to_take]
+        next_septet = byte[0,offset] if offset > 0
+        ret << cur_septet.to_i(2).chr
+
+        if offset == 7
+          offset = 1
+          ret << next_septet.to_i(2).chr
+          cur_septet = ""
         else
-          bytes[index-1] = "#{bytes[index-1]}#{(bytes[index]||"")[0,bit]}"
-          bytes[index] = bytes[index][bit..-1] if bytes[index]
-          bit -= 1
+          offset += 1
+          cur_septet = next_septet
         end
+        next_septet = nil
       end
-      bytes = bytes.reverse.collect{|b| "0#{b}".to_i(2) }.collect{|b| b.zero? ? nil : b }.compact
-      bytes.collect{|b| b.chr }.join
+      ret
     end
 
     def decode8bit data, length

data/lib/pdu_tools/message_part.rb

@@ -1,6 +1,9 @@
 module PDUTools
   class MessagePart
     attr_reader :address, :body, :timestamp, :validity_period, :user_data_header
+    attr_writer :body
+    attr_accessor :metadata
+
     def initialize address, body, timestamp, validity_period, user_data_header
       @address = address
       @body = body

data/spec/decoder_spec.rb

@@ -42,4 +42,13 @@ describe PDUTools::Decoder do
     end
   end
 
+  context "Odd length of address" do
+    let(:pdu) { "079124915000303904038109F5000041019022257580A0A8D84B960259C3FAB23B0FD287D761BD3BBD6681DC6190353C07955BED709A0D2AAFDFEE771BE02ED3E7F0F0B8EC9AAF41D6701B247EB3C3207D78CE0EBBC3A032BBBCA6CBDFEEF4781D0699C36B7A5D1E06CDE1EC30DD1D06C966AE18CC2583C5682E1008040281402010080402814020100804028140201008040281402010080402814020100804028140" }
+
+    it do
+      message_part = decoder.decode
+      expect(message_part.address).to eq "905"
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pdu_tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Filip Zachar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-06 00:00:00 Z
+date: 2014-10-13 00:00:00 Z
 dependencies: []
 
 description: Tools for encoding and decoding GSM SMS PDUs.