pdu_tools 0.0.10 → 0.0.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 690cdec3a163cbd9fff055805df869c6775dee04
+  data.tar.gz: c606392f2548459453516d0d4117d06a0db93e94
+SHA512:
+  metadata.gz: 66f929ea3c8a23f344479a418a9a29fb10606eb7e70c901236aade26565a82a27f466938a2537282537927e61dd81200633fdccdd64261bb6751ce83df942949
+  data.tar.gz: 9dfbb96261462bea76962f25610fbf219b928c8632b0be8b13d36f38fb6850337bb329532592d726bbbad26977f20a8ea258757f2a9e066705ef6669fdfdf369

data/lib/pdu_tools/decoder.rb

@@ -174,7 +174,7 @@ module PDUTools
       end
       case @data_coding_scheme[:alphabet]
       when :a7bit
-        @message = gsm0338_to_utf8 decode7bit(@pdu_hex, @offset_7bit)
+        @message = gsm0338_to_utf8 decode7bit(@pdu_hex, data_length, @offset_7bit)
       when :a8bit
         @message = gsm0338_to_utf8 decode8bit(@pdu_hex, data_length)
       when :a16bit
@@ -183,25 +183,38 @@ module PDUTools
     end
 
     def parse_user_data_header header
-      iei = take 2, :string, header
-      header_length = take 2, :integer, header
-      case iei
-      when "00"
-        reference = take 2, :integer, header
-        @offset_7bit = 0
-      when "08"
-        reference = take 4, :integer, header
-        @offset_7bit = 1
-      else
-        raise DecodeError, "unsupported Information Element Identifier in User Data Header: #{iei}"
+      ret = {}
+      while header.length > 0
+        iei_type = take 2, :string, header
+        iei_length = take 2, :integer, header
+        iei_data = take iei_length * 2, :string, header
+        case iei_type
+        when "00"
+          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 }
+          @offset_7bit = 0
+        when '05'
+          dest_port = take 4, :integer, iei_data
+          source_port = take 4, :integer, iei_data
+          ret[:addressing] = { source: source_port, destination: dest_port }
+        when "08"
+          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
+        else
+          ret[:unknown] ||= {}
+          ret[:unknown][iei_type] = iei_data.dup
+          iei_data = ''
+        end
+        if iei_data.length != 0
+          raise DecodeError, "Failure to decode: iei length is not correct for type"
+        end
       end
-      parts = take 2, :integer, header
-      part_number = take 2, :integer, header
-      {
-          reference: reference,
-          parts: parts,
-          part_number: part_number
-      }
+      ret
     end
 
     DecodeError = Class.new(StandardError)

data/lib/pdu_tools/encoder.rb

@@ -102,7 +102,11 @@ 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")
+      if @options[:force_recipient]
+        address = recipient
+      else
+        address = Phoner::Phone.parse(recipient).format("%c%a%n")
+      end
       address_length = "%02X" % address.length
       address_encoded = normal2swapped address
       address_length + address_type + address_encoded

data/lib/pdu_tools/helpers.rb

@@ -73,7 +73,7 @@ module PDUTools
       string.scan(/../).collect(&:reverse).join.gsub(/F$/,'')
     end
 
-    def decode7bit textdata, offset=1
+    def decode7bit textdata, length = nil, offset = 1
       ret = ""
       bytes = []
       textdata.split('').each_slice(2) do |s|
@@ -100,7 +100,11 @@ module PDUTools
         end
         next_septet = nil
       end
-      ret
+      if length
+        ret[0..length - 1]
+      else
+        ret
+      end
     end
 
     def decode8bit data, length

data/lib/pdu_tools/message_part.rb

@@ -14,7 +14,8 @@ module PDUTools
 
     def complete?
       return true unless @user_data_header
-      if @user_data_header[:parts] > 1
+      return true unless @user_data_header[:multipart]
+      if @user_data_header[:multipart][:parts] > 1
         false
       else
         true

data/spec/decoder_spec.rb

@@ -28,8 +28,9 @@ describe PDUTools::Decoder do
     it "should decode" do
       message_part = decoder.decode
       expect(message_part.user_data_header).to be_present
-      expect(message_part.user_data_header[:parts]).to eq 2
-      expect(message_part.user_data_header[:part_number]).to eq 1
+      expect(message_part.user_data_header[:multipart]).to be_present
+      expect(message_part.user_data_header[:multipart][:parts]).to eq 2
+      expect(message_part.user_data_header[:multipart][:part_number]).to eq 1
     end
   end
 

data/spec/encoder_spec.rb

@@ -2,41 +2,56 @@
 require 'spec_helper'
 
 describe PDUTools::Encoder do
-  let(:recipient) { "+421 900 100 100" }
-  let(:encoder) { PDUTools::Encoder.new recipient: recipient, message: message }
-  context "short" do
-    context "7bit text" do
-      let(:message) { "This is a test message" }
-      it "should encode pdu" do
-        pdus = encoder.encode
-        expect(pdus.size).to eq(1)
+  context "encoding" do
+    let(:recipient) { "+421 900 100 100" }
+    let(:encoder) { PDUTools::Encoder.new recipient: recipient, message: message }
+    context "short" do
+      context "7bit text" do
+        let(:message) { "This is a test message" }
+        it "should encode pdu" do
+          pdus = encoder.encode
+          expect(pdus.size).to eq(1)
+        end
+      end
+
+      context "16bit text" do
+        let(:message) { "This is diacritics ľščťžýáíäúôň" }
+        it "should encode pdu" do
+          pdus = encoder.encode
+          expect(pdus.size).to eq(1)
+        end
       end
     end
 
-    context "16bit text" do
-      let(:message) { "This is diacritics ľščťžýáíäúôň" }
-      it "should encode pdu" do
-        pdus = encoder.encode
-        expect(pdus.size).to eq(1)
+    context "lonh" do
+      context "7bit text" do
+        let(:message) { "This is a test message" * 10 }
+        it "should encode pdu" do
+          pdus = encoder.encode
+          expect(pdus.size).to eq(2)
+        end
+      end
+
+      context "16bit text" do
+        let(:message) { "This is diacritics ľščťžýáíäúôň" * 3 }
+        it "should encode pdu" do
+          pdus = encoder.encode
+          expect(pdus.size).to eq(2)
+        end
       end
     end
   end
 
-  context "lonh" do
-    context "7bit text" do
-      let(:message) { "This is a test message" * 10 }
-      it "should encode pdu" do
-        pdus = encoder.encode
-        expect(pdus.size).to eq(2)
-      end
+  context "recipient" do
+    it "should fail on 71730 without force" do
+      expect { PDUTools::Encoder.new recipient: "71730", message: "test" }.to raise_error(Phoner::AreaCodeError)
     end
 
-    context "16bit text" do
-      let(:message) { "This is diacritics ľščťžýáíäúôň" * 3 }
-      it "should encode pdu" do
-        pdus = encoder.encode
-        expect(pdus.size).to eq(2)
-      end
+    it "should succeed on 71730 with force" do
+      encoder = PDUTools::Encoder.new recipient: "71730", force_recipient: true, message: "test"
+      pdus = encoder.encode
+      expect(pdus.size).to eq(1)
     end
+
   end
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: pdu_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.0.11
 platform: ruby
 authors:
 - Filip Zachar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phone
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: Tools for encoding and decoding GSM SMS PDUs.
@@ -49,38 +44,37 @@ 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
 homepage: https://github.com/tulak/pdu_tools
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tools for encoding and decoding GSM SMS PDUs.
 test_files: []