pdu_tools 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 6225fad4da69e410d036d30768c0505b4c8b8e98
-  data.tar.gz: 3e4dcfdf46d80c94c9eee50a7911217b6d553f4c
+  metadata.gz: 06ded51dcb3fdfb9d87daaef9a8c02ef5e19de63
+  data.tar.gz: 3efee7cc8d604557a5fa21a1d4df903d91a4d530
 SHA512: 
-  metadata.gz: d1a190e95d0316c6fda4734a583b09cb5fce298a8778647282422afb6680fb18baa88559fd6286de7a35024de26548e2d5c776a4b4a94ba32d417202648e6f69
-  data.tar.gz: e7e81536dbce8028fca9a5f8e4b176e0e54f7b87b93e0b562be6caa70e17a01e882ec5082f12155d4c5dff8eac96ef7e717fc293580f4b1abc5fc12153cca13d
+  metadata.gz: fb25dcbe8ac3bdb520903503e76b2fe6737e1440cc3ba4b9db71afed3047c3307ba7aa84b8cbba4155d12a01c142d673fc7156a8977416183d761105a725b0db
+  data.tar.gz: ed46a7682758a220c4b26ce19611b2f93327f7b4d04768faabeea086b38b51d7c4380abd36d785bc96a2168755ddbe10d6100558d0536a7831a016863efcc469

data/lib/pdu_tools/decoder.rb

@@ -12,16 +12,16 @@ module PDUTools
       @sca_length = take(2, :integer) * 2                # Service center address length
       if @sca_length > 0
         @sca_type = parse_address_type take(2)            # Service center address type
-        @sca = parse_address take(@sca_length - 2), @sca_type          # Service center address
+        @sca = parse_address take(@sca_length - 2), @sca_type, @sca_length # Service center address
       end
       @pdu_type = parse_pdu_type take(2, :binary)   # PDU type octet
       @message_reference = take(2) if @pdu_type[:mti] == :sms_submit
       @address_length = take(2, :integer)
       @address_type = parse_address_type take(2)
-      @address = parse_address take(@address_length), @address_type
+      @address = parse_address take(@address_length), @address_type, @address_length
       @pid = take(2)
       @data_coding_scheme = parse_data_coding_scheme take(2, :binary)
-      @sc_timestamp = parse_7byte_timestamp take(14) if @pdu_type[:mti] == :sms_deliver
+      @sc_timestamp = parse_7byte_timestamp take(14) if [:sms_deliver, :sms_deliver_report].include? @pdu_type[:mti]
       case @pdu_type[:vpf]
       when :absolute
         @validity_period = parse_7byte_timestamp take(14)
@@ -68,14 +68,22 @@ module PDUTools
       when "81"
         :national
       else
-        raise StandardError, "unknown address type"
+        if type.to_i(16).to_s(2)[1,3] == "101"
+          :a7bit
+        else
+          raise StandardError, "unknown address type: #{type}"
+        end
       end
     end
 
-    def parse_address address, type
-      address = swapped2normal address
-      if type == :international
-        address.prepend "+"
+    def parse_address address, type, length
+      if type == :a7bit
+        address = decode7bit address, length
+      else
+        address = swapped2normal address
+        if type == :international
+          address.prepend "+"
+        end
       end
       address
     end

data/lib/pdu_tools/encoder.rb

@@ -101,7 +101,6 @@ module PDUTools
 
     def prepare_recipient recipient
       Phoner::Phone.default_country_code ||= "421"
-
       address_type = "91" # International
       address = Phoner::Phone.parse(recipient).format("%c%a%n")
       address_length = "%02X" % address.length

data/spec/decoder_spec.rb

@@ -32,4 +32,14 @@ describe PDUTools::Decoder do
       expect(message_part.user_data_header[:part_number]).to eq 1
     end
   end
+
+  context "GSM PLMNS address type" do
+    let(:pdu) { "07912491500030592414D044241354C4C3E5E5F91C00004190200180108095D6B0BEECCE83F4E17558EF4EAF5920B2BB3C0759C36D10485C27D741E4B7BC3E7EDBC3EE32481F9EA7CBEC751E0485324132980D0793C96EB7196E0792C16C38984C76BBCD6E3B900C66C3C164B2DB6D666381C86F71BA2C5F8741319A2CC7CA818A75B90BB47CBBE9E1351D0482E568B4D94D768BDD5C202292092AE2E1F2F27C0E02" }
+    it do
+      message_part = decoder.decode
+      expect(message_part.address).to eq("DHL Express")
+      expect(message_part.body).to match /^Vazeny zakaznik/
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -1 +1,6 @@
-require 'pdu_tools'
+require 'pdu_tools'
+require 'pry'
+RSpec.configure do |config|
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pdu_tools
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Filip Zachar