pdu_sms 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ded42593826dc1cbc98a727b805f371c2b9e93c1
-  data.tar.gz: d56f79ae6822211b218d1f663c1b80c45c82efbd
+SHA256:
+  metadata.gz: 0b004f0aac97f63ae4f480ede59c3bb19f963f64f22676615e75aedd389e9415
+  data.tar.gz: 3a870a2ba498b2388e41ad6d99341da77d76a32510b234ca567f16fcb5f71f3b
 SHA512:
-  metadata.gz: b59ac288164c2506df1fa4921c9f8c14154d17d042bd0ea00c36e9fa8c7c2792cf28232b0e86d808067c6abbbb21dfb72e1297f2d26a32e3f4c8b9dce74d60e6
-  data.tar.gz: 78503d67c94631edfcd13110c80c82b908571b4f2da247323f76b29d9c51405ebce03362af85404857b935c3fce80dc7c88d8d273f5a69454bceb7e6a2a43af2
+  metadata.gz: '086a47442278f7511e434626227b2533e1d5a5f18b2d96bad89f193aaada6be63b23aa4458a8654a2baf3f3a39d43280f1c744ad35e7580c72f989b33ef219fc'
+  data.tar.gz: bd7755153864fb6d814a8ed073f6c303f774d3831395330e635ec63b0f464bf7f3266c8af4f8ae6035bf0eacc4a560a11f2c01b46ab03964c8140b36ae73d4e6

data/lib/pdu_sms/data_coding_scheme.rb

@@ -36,7 +36,7 @@ module PduSms
 
     def DataCodingScheme.decode_sc(pdu_str)
       pdu = '%08b' % DataCodingScheme.cut_off_pdu(pdu_str, :current, :sc).to_i(16)
-      message_class = (pdu[1].to_i == MESSAGE_CLASS_ON) ? pdu[6..7].to_i(2) : false
+      message_class = (pdu[3].to_i == MESSAGE_CLASS_ON) ? pdu[6..7].to_i(2) : false
       new(:decode_sc, compressed:pdu[2].to_i(2), message_class:message_class, alphabet:pdu[4..5].to_i(2)).freeze
     end
 

data/lib/pdu_sms/helpers.rb

@@ -55,6 +55,28 @@ module PduSms
       text
     end
 
+    def self.decode_7bit_fill_bits(string, udhl)
+      message = ''
+      if udhl.to_i(16) == UDHL_SIZE_5
+        message << ("0%08b" % string[0..1].to_i(16))[0..-2].to_i(2).chr
+        message << self.decode_7bit(string[2..-1])
+      else
+        message << self.decode_7bit(string)
+      end
+      message
+    end
+
+    def self.encode_7bit_fill_bits(string, udhl)
+      message = ''
+      if udhl.to_i(16) == UDHL_SIZE_5
+        message << '%02X' % ('%07b0' % string[0].ord).to_i(2)
+        message << self.encode_7bit(string[1..-1])
+      else
+        message << self.encode_7bit(string)
+      end
+      message
+    end
+
     def self.encode_8bit(string)
       string.chars.to_a.collect {|char| '%02X' % char.ord }.join
     end
@@ -66,3 +88,4 @@ module PduSms
   end
 end
 
+

data/lib/pdu_sms/user_data.rb

@@ -3,13 +3,13 @@ module PduSms
 
     def initialize(message, coding, ied1: false, ied2: false, ied3: false, udhl: false, iei: false, iedl: false)
       @coding = _check_coding coding
-      @message = _check_message message, coding, ied1
-      @ied1 = _check_ied1 ied1, coding
+      @ied1 = _check_ied1 ied1
       @ied2 = _check_ied2 ied2
       @ied3 = _check_ied3 ied3
-      @udhl = udhl ? udhl : _check_udhl(coding, ied1)
-      @iei = iei ? iei : _check_iei(coding, ied1)
-      @iedl = iedl ? iedl : _check_iedl(coding, ied1)
+      @udhl = udhl ? udhl : _check_udhl(ied1)
+      @iei = iei ? iei : _check_iei(ied1)
+      @iedl = iedl ? iedl : _check_iedl(ied1)
+      @message = _check_message message, coding, ied1
     end
 
     def UserData.encode_ms(message, coding=:auto)
@@ -18,21 +18,19 @@ module PduSms
       if coding == ALPHABET_7BIT
         if message.length > 160
           message_array = message.scan(/.{1,152}/)
-          ied1 = rand(65536)
         end
       elsif coding == ALPHABET_8BIT
         if message.length > 140
           message_array = message.scan(/.{1,133}/)
-          ied1 = rand(65536)
         end
       elsif coding == ALPHABET_16BIT
         if message.length > 70
           message_array = message.scan(/.{1,67}/)
-          ied1 = rand(256)
         end
       else
         raise ArgumentError, 'The "coding" is incorrect'
       end
+      ied1 = '%02X' % rand(255)
       message_array.collect.each_with_index do |mess, current_message|
         if message_array.length > 1
           new(mess, coding, ied1:ied1, ied2:message_array.length, ied3:current_message+1).freeze
@@ -47,7 +45,11 @@ module PduSms
       dcs = DataCodingScheme.decode_ms(pdu_str)
       if dcs.alphabet_7bit?
         coding = dcs.get_alphabet.to_i(2)
-        message = Helpers.decode_7bit(message)
+        if header.empty?
+          message = Helpers.decode_7bit(message)
+        else
+          message = Helpers.decode_7bit_fill_bits(message, header[0..1])
+        end
       elsif dcs.alphabet_8bit?
         coding = dcs.get_alphabet.to_i(2)
         message = Helpers.decode_8bit(message)
@@ -60,10 +62,12 @@ module PduSms
       if header.empty?
         new(message, coding).freeze
       else
-        if header[4..5].to_i(16) == 4
-          new(message, coding, udhl: header[0..1].to_i(16), iei: header[2..3].to_i(16), iedl: header[4..5].to_i(16), ied1: header[6..9].to_i(16), ied2: header[10..11].to_i(16), ied3: header[12..13].to_i(16)).freeze
-        elsif header[4..5].to_i(16) == 3
-          new(message, coding, udhl: header[0..1].to_i(16), iei: header[2..3].to_i(16), iedl: header[4..5].to_i(16), ied1: header[6..7].to_i(16), ied2: header[8..9].to_i(16), ied3: header[10..11].to_i(16)).freeze
+        if header[0..1].to_i(16) == UDHL_SIZE_6
+          new(message, coding, udhl: header[0..1].to_i(16), iei: header[2..3].to_i(16), iedl: header[4..5].to_i(16), ied1: header[6..9], ied2: header[10..11].to_i(16), ied3: header[12..13].to_i(16)).freeze
+        elsif header[0..1].to_i(16) == UDHL_SIZE_5
+          new(message, coding, udhl: header[0..1].to_i(16), iei: header[2..3].to_i(16), iedl: header[4..5].to_i(16), ied1: header[6..7], ied2: header[8..9].to_i(16), ied3: header[10..11].to_i(16)).freeze
+        else
+          new(message, coding).freeze
         end
       end
     end
@@ -77,7 +81,11 @@ module PduSms
       dcs = DataCodingScheme.decode_sc(pdu_str)
       if dcs.alphabet_7bit?
         coding = dcs.get_alphabet.to_i(2)
-        message = Helpers.decode_7bit(message)
+        if header.empty?
+          message = Helpers.decode_7bit(message)
+        else
+          message = Helpers.decode_7bit_fill_bits(message, header[0..1])
+        end
       elsif dcs.alphabet_8bit?
         coding = dcs.get_alphabet.to_i(2)
         message = Helpers.decode_8bit(message)
@@ -90,10 +98,12 @@ module PduSms
       if header.empty?
         new(message, coding).freeze
       else
-        if header[4..5].to_i(16) == 4
-          new(message, coding, udhl: header[0..1].to_i(16), iei: header[2..3].to_i(16), iedl: header[4..5].to_i(16), ied1: header[6..9].to_i(16), ied2: header[10..11].to_i(16), ied3: header[12..13].to_i(16)).freeze
-        elsif header[4..5].to_i(16) == 3
-          new(message, coding, udhl: header[0..1].to_i(16), iei: header[2..3].to_i(16), iedl: header[4..5].to_i(16), ied1: header[6..7].to_i(16), ied2: header[8..9].to_i(16), ied3: header[10..11].to_i(16)).freeze
+        if header[0..1].to_i(16) == UDHL_SIZE_6
+          new(message, coding, udhl: header[0..1].to_i(16), iei: header[2..3].to_i(16), iedl: header[4..5].to_i(16), ied1: header[6..9], ied2: header[10..11].to_i(16), ied3: header[12..13].to_i(16)).freeze
+        elsif header[0..1].to_i(16) == UDHL_SIZE_5
+          new(message, coding, udhl: header[0..1].to_i(16), iei: header[2..3].to_i(16), iedl: header[4..5].to_i(16), ied1: header[6..7], ied2: header[8..9].to_i(16), ied3: header[10..11].to_i(16)).freeze
+        else
+          new(message, coding).freeze
         end
       end
     end
@@ -138,12 +148,7 @@ module PduSms
 
     def get_ied1
       return '' unless @ied1
-      case @coding
-        when ALPHABET_7BIT then '%04X' % @ied1
-        when ALPHABET_8BIT then '%04X' % @ied1
-        when ALPHABET_16BIT then '%02X' % @ied1
-        else raise 'unknown encoding'
-      end
+      @ied1
     end
 
     def get_ied2
@@ -172,13 +177,12 @@ module PduSms
     end
 
     def get_hex
-      message = case @coding
-        when ALPHABET_7BIT
-          Helpers.encode_7bit(@message)
-        when ALPHABET_8BIT
-          Helpers.encode_8bit(@message)
-        when ALPHABET_16BIT
-          Helpers.encode_ucs2(@message)
+      if @coding == ALPHABET_7BIT
+        message =Helpers.encode_7bit_fill_bits(@message, get_udhl)
+      elsif @coding == ALPHABET_8BIT
+        message =Helpers.encode_8bit(@message)
+      else
+        message =Helpers.encode_ucs2(@message)
       end
       '%s%s%s%s%s%s%s' % [get_udhl, get_iei, get_iedl, get_ied1, get_ied2, get_ied3, message]
     end
@@ -205,18 +209,9 @@ module PduSms
       coding
     end
 
-    def _check_ied1(ied1, coding)
+    def _check_ied1(ied1)
       return false unless ied1
-      case coding
-        when ALPHABET_7BIT
-          raise ArgumentError, 'The message is too long'  unless (0..65535).include?(ied1)
-        when ALPHABET_8BIT
-          raise ArgumentError, 'The message is too long'  unless (0..65535).include?(ied1)
-        when ALPHABET_16BIT
-          raise ArgumentError, 'The message is too long'  unless (0..255).include?(ied1)
-        else
-          false
-      end
+      raise ArgumentError, 'The message is too long'  unless (0..65535).include?(ied1.to_i(16))
       ied1
     end
 
@@ -230,47 +225,38 @@ module PduSms
       ied3
     end
 
-    def _check_udhl(coding, ied1)
+    def _check_udhl(ied1)
       return false unless ied1
-      case coding
-        when ALPHABET_7BIT
-          0x06
-        when ALPHABET_8BIT
-          0x06
-        when ALPHABET_16BIT
-          0x05
-        else
-          false
+      if ied1.length == 2
+        UDHL_SIZE_5
+      elsif ied1.length == 4
+        UDHL_SIZE_6
+      else
+        false
       end
     end
 
-    def _check_iei(coding, ied1)
+    def _check_iei(ied1)
       return false unless ied1
-      case coding
-        when ALPHABET_7BIT
-          0x08
-        when ALPHABET_8BIT
-          0x08
-        when ALPHABET_16BIT
-          0x00
-        else
-          false
+      if ied1.length == 2
+        0x00
+      elsif ied1.length == 4
+        0x08
+      else
+        false
       end
     end
 
-    def _check_iedl(coding, ied1)
+    def _check_iedl(ied1)
       return false unless ied1
-      case coding
-        when ALPHABET_7BIT
-          0x04
-        when ALPHABET_8BIT
-          0x04
-        when ALPHABET_16BIT
-          0x03
-        else
-          false
+      if ied1.length == 2
+        0x03
+      elsif ied1.length == 4
+        0x04
+      else
+        false
       end
     end
 
   end
-end
+end

data/lib/pdu_sms/version.rb

@@ -1,3 +1,3 @@
 module PduSms
-  VERSION = "1.0.4"
+  VERSION = "1.1.1"
 end

data/lib/pdu_sms.rb

@@ -93,6 +93,9 @@ module PduSms
   STATUS_REPORT_INDICATION_0 = 0b0      # A status report will not be returned to the SME
   STATUS_REPORT_INDICATION_1 = 0b1      # A status report will be returned to the SME
 
+  UDHL_SIZE_5 = 0b0000101
+  UDHL_SIZE_6 = 0b0000110
+
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdu_sms
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - Mikhail Stolyarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: PDU SMS coding and decoding library