pdu_tools 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1d29b2c325be277c56302810bf5ff2d670bc0c
-  data.tar.gz: da0a05535d770d5f9d6001f72b6b9cec8f04dd7a
+  metadata.gz: 2ab44edb2f04fb1f0a5072462e58031132ad9029
+  data.tar.gz: 19aa54ad9e78d2777562f6b42dce17b0ba2c9650
 SHA512:
-  metadata.gz: f59b736743430da53b80d70dd663a0af00af5b3005ef0e6e58b50ca26f8966bbd87f5ced99516ea721da690e8f6f7f4861b862c52d944ba1dd245e6d875e7f57
-  data.tar.gz: 3a0fcdee326d45a9947cfc1b3fab4bcefdbcd39131b701543d5c95e214efc91881196d62d5829ad17febbc8c81d6021aaeac3c531630b6c811bb7477b647940b
+  metadata.gz: cb4ce42a5f8ce1f126b3dbc1a3c55cb5597aa7340c693a1cbba075148e585bea3e7523499609fba908c110a3a99816a9b3f119bcf2d348c32be13110be4faeab
+  data.tar.gz: df3bcd1ecd21777b1c3eb422a92b163f8d74f37591e6511306197c76d4a970fbe2257085661025501a229d8f52ecfa641f07cee2da1b6a1bbdd7ee7937ae2b2a

data/lib/pdu_tools/decoder.rb

@@ -18,9 +18,7 @@ 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, :a7bit].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_length = @address_length.odd? ? @address_length + 1 : @address_length # Always take byte aligned - hexdecimal F is added when odd number
       @address = parse_address take(@address_length), @address_type, @address_length
       @pid = take(2)
       @data_coding_scheme = parse_data_coding_scheme take(2, :binary)
@@ -65,16 +63,18 @@ module PDUTools
     end
 
     def parse_address_type type
-      case type.to_i(16).to_s(2)[1,3]
-      when "001"
-        :international
-      when "010", "100", "000"
-        :national
-      when "101"
-        :a7bit
-      else
-        raise DecodeError, "unknown address type: #{type}"
-      end
+      map = {
+        "000" => :unknown,
+        "001" => :international,
+        "010" => :national,
+        "011" => :network_specific,
+        "100" => :subscriber,
+        "101" => :a7bit,
+        "110" => :abbreviated,
+        "111" => :reserved
+      }
+      bin_type = type.to_i(16).to_s(2)[1,3]
+      map[bin_type]
     end
 
     def parse_address address, type, length
@@ -193,7 +193,7 @@ module PDUTools
           reference = take 2, :integer, iei_data
           parts = take 2, :integer, iei_data
           part_number = take 2, :integer, iei_data
-          ret[:multipart] = { reference: reference, parts: parts, part_number: part_number }
+          ret[:multipart] = { reference: reference, parts: parts, part_number: part_number, iei_type: iei_type }
           @offset_7bit = 0
         when '05'
           dest_port = take 4, :integer, iei_data
@@ -203,8 +203,8 @@ module PDUTools
           reference = take 4, :integer, iei_data
           parts = take 2, :integer, iei_data
           part_number = take 2, :integer, iei_data
-          ret[:multipart] = { reference: reference, parts: parts, part_number: part_number }
-          @offset_7bit += 1
+          ret[:multipart] = { reference: reference, parts: parts, part_number: part_number, iei_type: iei_type }
+          @offset_7bit = 1
         else
           ret[:unknown] ||= {}
           ret[:unknown][iei_type] = iei_data.dup
@@ -219,4 +219,4 @@ module PDUTools
 
     DecodeError = Class.new(StandardError)
   end
-end
+end

data/spec/decoder_spec.rb

@@ -79,14 +79,6 @@ describe PDUTools::Decoder do
     end
   end
 
-  context "Raise DecodeError when cannot decode" do
-    let(:pdu) { "07912491500000410403F055F542F14101124175208030CD30BD0C8A81DC6F7B1EF426AFC37A17C8FA6687D5F432E84D5E87F56F7B1D3467D7F5E23AA856ABB940" }
-
-    it do
-      expect{ decoder.decode }.to raise_error(PDUTools::Decoder::DecodeError)
-    end
-  end
-
   context "Decode UTF-16 / UCS2 data" do
     let(:pdu) { "0791249194099990040C9124910408426100087101303182438004D83DDC4D" }
     let(:utf16_data) { "D83DDC4D" } # thumbs up smiley in UTF-16 / UCS2
@@ -99,4 +91,4 @@ describe PDUTools::Decoder do
     end
   end
 
-end
+end

data/test.rb

@@ -0,0 +1,24 @@
+require_relative('lib/pdu_tools')
+
+pdus_db = Marshal.load(File.read('sms_pdu.marshal'));
+
+found = []
+errors = []
+
+pdus_db.each do |pdu_data|
+  id, pdus = pdu_data
+
+  pdus.split(/\n/).each do |pdu|
+    begin
+      decoder = PDUTools::Decoder.new(pdu)
+      decoder.decode
+      udh = decoder.instance_eval{ @user_data_header }
+      mp = udh and udh[:multipart]
+      if mp and mp[:iei_type] == '08'
+        found << id
+      end
+    rescue => e
+      errors << [e, id, pdu]
+    end
+  end
+end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: pdu_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Filip Zachar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: Tools for encoding and decoding GSM SMS PDUs.
@@ -44,15 +44,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/pdu_tools.rb
 - lib/pdu_tools/decoder.rb
 - lib/pdu_tools/encoder.rb
 - lib/pdu_tools/helpers.rb
 - lib/pdu_tools/message_part.rb
 - lib/pdu_tools/pdu.rb
-- lib/pdu_tools.rb
 - spec/decoder_spec.rb
 - spec/encoder_spec.rb
 - spec/spec_helper.rb
+- test.rb
 homepage: https://github.com/tulak/pdu_tools
 licenses:
 - MIT
@@ -63,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Tools for encoding and decoding GSM SMS PDUs.