pdu_sms 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf84e22c49490abd41166d067c8b9dfb1288e41
-  data.tar.gz: 9f6de0e1f636f2eaabec8ab45a7d209d92d38f6d
+  metadata.gz: a560cefebc50cea65ac1fa3e2d2c8806157500d8
+  data.tar.gz: b181a063478093c3e5d190188ca1872ef873f040
 SHA512:
-  metadata.gz: b374086654b20ba8c55808b9471b81d4708274300db72e25c95655c753b5d2ec71f4efa74bae7426a52bc88495a5d9745cb3b2a0fae6148358fc6714986cd8a5
-  data.tar.gz: 6b6ca69db57b58398c98937b8965816cc9afff8785dcb71b3b19b7739d0e8c51b07b5317747a7ed5a15e5265024bf470a6f6a2b0d34df5cfa2c3731d10fd43a9
+  metadata.gz: 5c9c5745bc04b440abdf1d1b7768c1e10720366dc51c5bbe810768c1ff14e04d88ae51dc0916a54f954c6b28f5a1a542760b62c004af8b753162f7d752c69e1c
+  data.tar.gz: d965d612c272ebfade71dd99df18bd34b8b40c8d161b3422515d5159a09c36e2e8a85ed5f4d1c2e9795637d4dcba25761625d713c4cc81d8bfbd8c24b20fa2ad

data/bin/console

@@ -4,5 +4,5 @@ require "bundler/setup"
 require "pdu_sms"
 require "irb"
 
-include PduSms
+#include PduSms
 IRB.start

data/lib/pdu_sms/helpers.rb

@@ -1,7 +1,8 @@
 module PduSms
+
   module Helpers
 
-    def encode_bcd(str)
+    def self.encode_bcd(str)
       if String == str.class and str.length % 2 == 0
         str.split('').enum_for(:each_slice, 2).to_a.collect{|array| array[0], array[1] = array[1], array[0]}.join
       else
@@ -9,23 +10,23 @@ module PduSms
       end
     end
 
-    def decode_bcd(str)
+    def self.decode_bcd(str)
       encode_bcd(str)
     end
 
-    def decode_ucs2(message)
+    def self.decode_ucs2(message)
       message.split('').enum_for(:each_slice,4).to_a.collect(&:join).collect {|o| o.to_i(16).chr(Encoding::UTF_8)}.join
     end
 
-    def encode_ucs2(message)
+    def self.encode_ucs2(message)
       message.chars.to_a.collect {|char| '%04X' % char.ord}.join
     end
 
-    def is_7bit?(message)
+    def self.is_7bit?(message)
       /^[A-Za-z0-9\@£\$¥èéùìòÇØøÅåΔ_ΦΓΛΩΠΨΣΘΞÆæßÉ\!\"#¤\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?¡¿ÄÖÑܧäöñüà\^\{\}\\\[~\]\|€]*$/ === message
     end
 
-    def encode_7bit(string)
+    def self.encode_7bit(string)
       string_encode = []
       string.chars.each_slice(8).each do |chars|
         chars.each_with_index do |char, i|
@@ -41,7 +42,7 @@ module PduSms
       string_encode.collect {|x| '%02X' % x.to_i(2)}.join.upcase
     end
 
-    def decode_7bit(string)
+    def self.decode_7bit(string)
       text = ''
       string.split('').each_slice(2).collect {|s| '%08b' % s.join.to_i(16)}.each_slice(7) do |bytes|
         ending = ''
@@ -54,11 +55,11 @@ module PduSms
       text
     end
 
-    def encode_8bit(string)
+    def self.encode_8bit(string)
       string.chars.to_a.collect {|char| '%02X' % char.ord }.join
     end
 
-    def decode_8bit(string)
+    def self.decode_8bit(string)
       string.split('').enum_for(:each_slice, 2).to_a.collect(&:join).collect {|char| char.to_i(16).chr}.join
     end
 

data/lib/pdu_sms/phone.rb

@@ -2,8 +2,6 @@ module PduSms
 
   class Phone
 
-    include Helpers
-
     attr_reader(:number_plan_identifier, :type_number)
 
     @phone_number = ''
@@ -27,7 +25,7 @@ module PduSms
       elsif /^\d+$/ === phone_number
         @number_plan_identifier = ID_UNKNOWN
         @type_number = TP_ISDN
-      elsif is_7bit?(phone_number)
+      elsif Helpers.is_7bit?(phone_number)
         @number_plan_identifier = ID_ALPHANUMERIC
         @type_number = TP_UNKNOWN
       else
@@ -38,7 +36,7 @@ module PduSms
 
     def _check_phone?
       if @number_plan_identifier == ID_ALPHANUMERIC
-        is_7bit?(@phone_number)
+        Helpers.is_7bit?(@phone_number)
       else
         /^\d+$/ === @phone_number
       end
@@ -46,7 +44,7 @@ module PduSms
 
     def _get_hex_type_and_phone
       if @number_plan_identifier == ID_ALPHANUMERIC
-        '%s%s' % [_type_of_address_hex, encode_7bit(@phone_number)]
+        '%s%s' % [_type_of_address_hex, Helpers.encode_7bit(@phone_number)]
       else
         '%s%s' % [_type_of_address_hex, _convert_to_bcd_format]
       end
@@ -95,7 +93,7 @@ module PduSms
       if clear_phone.length % 2 != 0
         clear_phone += 'F'
       end
-      encode_bcd(clear_phone)
+      Helpers.encode_bcd(clear_phone)
     end
 
     def _convert_to_normal_format(bcd)
@@ -108,9 +106,9 @@ module PduSms
       @number_plan_identifier = number_type[1..3].to_i(2)
       @type_number = number_type[4..7].to_i(2)
       if @number_plan_identifier == ID_ALPHANUMERIC
-        @phone_number = decode_7bit(bcd[2..-1])
+        @phone_number = Helpers.decode_7bit(bcd[2..-1])
       else
-        @phone_number = decode_bcd(bcd[2..-1])[/[fF]$/] ? decode_bcd(bcd[2..-1])[0..-2] : decode_bcd(bcd[2..-1])
+        @phone_number = Helpers.decode_bcd(bcd[2..-1])[/[fF]$/] ? Helpers.decode_bcd(bcd[2..-1])[0..-2] : Helpers.decode_bcd(bcd[2..-1])
       end
       self
     end

data/lib/pdu_sms/service_center_time_stamp.rb

@@ -4,8 +4,6 @@ module PduSms
 
   class ServiceCenterTimeStamp
 
-    include Helpers
-
     def initialize(type, data)
       if type == :encode_sc
         @scts = _absolute_timestamp data
@@ -57,11 +55,11 @@ module PduSms
         tz[0] = ?1
         date_time += '%02X' % tz.to_i(2)
       end
-      @scts = encode_bcd(date_time)
+      @scts = Helpers.encode_bcd(date_time)
     end
 
     def _absolute_pdu(vp)
-      ss = decode_bcd(vp)
+      ss = Helpers.decode_bcd(vp)
       year, month, day, hours, minutes, seconds, zone_quarter = Time.now.year.to_s[0..1] + ss[0..1], ss[2..3], ss[4..5], ss[6..7], ss[8..9], ss[10..11], ss[12..13]
       tz = '%08b' % zone_quarter
       if tz[0] == '1'

data/lib/pdu_sms/user_data.rb

@@ -1,8 +1,6 @@
 module PduSms
   class UserData
 
-    include Helpers
-
     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
@@ -16,7 +14,7 @@ module PduSms
 
     def UserData.encode_ms(message, coding=:auto)
       message_array = [message]
-      coding = is_7bit?(message) ? ALPHABET_7BIT : ALPHABET_16BIT if coding == :auto
+      coding = Helpers.is_7bit?(message) ? ALPHABET_7BIT : ALPHABET_16BIT if coding == :auto
       if coding == ALPHABET_7BIT
         if message.length > 160
           message_array = message.scan(/.{1,152}/)
@@ -49,13 +47,13 @@ module PduSms
       dcs = DataCodingScheme.decode_ms(pdu_str)
       if dcs.alphabet_7bit?
         coding = dcs.get_alphabet.to_i(2)
-        message = decode_7bit(message)
+        message = Helpers.decode_7bit(message)
       elsif dcs.alphabet_8bit?
         coding = dcs.get_alphabet.to_i(2)
-        message = decode_8bit(message)
+        message = Helpers.decode_8bit(message)
       elsif dcs.alphabet_16bit?
         coding = dcs.get_alphabet.to_i(2)
-        message = decode_ucs2(message)
+        message = Helpers.decode_ucs2(message)
       else
         raise ArgumentError, 'The "pdu_str" is incorrect'
       end
@@ -79,13 +77,13 @@ module PduSms
       dcs = DataCodingScheme.decode_sc(pdu_str)
       if dcs.alphabet_7bit?
         coding = dcs.get_alphabet.to_i(2)
-        message = decode_7bit(message)
+        message = Helpers.decode_7bit(message)
       elsif dcs.alphabet_8bit?
         coding = dcs.get_alphabet.to_i(2)
-        message = decode_8bit(message)
+        message = Helpers.decode_8bit(message)
       elsif dcs.alphabet_16bit?
         coding = dcs.get_alphabet.to_i(2)
-        message = decode_ucs2(message)
+        message = Helpers.decode_ucs2(message)
       else
         raise ArgumentError, 'The "pdu_str" is incorrect'
       end
@@ -176,11 +174,11 @@ module PduSms
     def get_hex
       message = case @coding
         when ALPHABET_7BIT
-          encode_7bit(@message)
+          Helpers.encode_7bit(@message)
         when ALPHABET_8BIT
-          encode_8bit(@message)
+          Helpers.encode_8bit(@message)
         when ALPHABET_16BIT
-          encode_ucs2(@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

data/lib/pdu_sms/validity_period.rb

@@ -3,7 +3,6 @@ require 'date'
 module PduSms
   class ValidityPeriod
 
-    include Helpers
 
     def initialize(type, times, type_time=false)
       @type_time = type_time
@@ -145,11 +144,11 @@ module PduSms
         tz[0] = ?1
         date_time += '%02X' % tz.to_i(2)
       end
-      @vp = encode_bcd(date_time)
+      @vp = Helpers.encode_bcd(date_time)
     end
 
     def _absolute_pdu(vp)
-      ss = decode_bcd(vp)
+      ss = Helpers.decode_bcd(vp)
       year, month, day, hours, minutes, seconds, zone_quarter = Time.now.year.to_s[0..1] + ss[0..1], ss[2..3], ss[4..5], ss[6..7], ss[8..9], ss[10..11], ss[12..13]
       tz = '%08b' % zone_quarter
       if tz[0] == '1'

data/lib/pdu_sms/version.rb

@@ -1,3 +1,3 @@
 module PduSms
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/pdu_sms.rb

@@ -17,7 +17,6 @@ require 'pdu_sms/version'
 
 module PduSms
 
-  include Helpers
   ##
   # Type of number (TON):
   ID_UNKNOWN = 0b000                    # Unknown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdu_sms
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mikhail Stolyarov