due_sms_counter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cb339df92ef2bdff40d993a12e65e2a67656f78
-  data.tar.gz: 0100c83eb042f7e8e3c01c773e877c8ea4a9d752
+  metadata.gz: f9d439f08dab4143302f15bef065ef403d62b8c8
+  data.tar.gz: ab583904aba1e38bedf5bb3428e7b0c0c1c86ec3
 SHA512:
-  metadata.gz: 6a537ba047dee4ca72e3e4e9e1875a89d8cb0d71ed1eb4ac0307024d052d0c2ab23a505226d3b5c8724d075719d608ccd63752f1d7d6c63e480163ee3e01228f
-  data.tar.gz: f32d1c18b22a4ad2b94a59569fd55f6ec7ca3803e8f7cbe09589c621cce21fe40a53c6354a76ce5e453fb11bae18a9a2557bb0e953bb353ece1430586bf24563
+  metadata.gz: e236f1620e84b6ff6763732c2aa07dc160dab45ffe190738c2821bfe9ada59d1670c216eca50e052eb722ef0ff0933ef546e43c24f0baa66285a26f6f10b2aab
+  data.tar.gz: 6401f7e897e902d9ede77296ab761c9eefbf0f85bd84c6c07f0a5d1b5f754a3d8e09d605ebdd6741b96e48c6c9d1a7cc3328496c1b3bd38c504782d4ff1e8988

data/lib/due_sms_counter/version.rb

@@ -1,3 +1,3 @@
 module DueSmsCounter
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/due_sms_counter.rb

@@ -7,43 +7,61 @@ B7_2SIZED_CHARS, B7_BASE_CHARS, B7_SMS_COUNT, UNICODE_SMS_COUNT = CONSTS.values_
 B7_CHARS = B7_BASE_CHARS + B7_2SIZED_CHARS
 
 module DueSmsCounter
+  class << self
 
-  def self.can_be_sent?(sms, max_sms)
-    char_count = calc_char_count(sms)
-    max_char   = calc_max_char_count(max_sms)
-    is_unicode = char_count[:is_unicode]
+    def can_be_sent?(sms, max_sms)
+      char_count = calc_char_count(sms)
+      max_char   = calc_max_char_count(max_sms)
+      is_unicode = char_count[:is_unicode]
 
-    char_count[:char_count] <= max_char[is_unicode ? :unicode : :gsm7]
-  end
+      char_count[:char_count] <= max_char[is_unicode ? :unicode : :gsm7]
+    end
 
-  def self.calc_char_count(sms)
-    sms = (sms || '').split('')
-    is_7_bits = (sms + B7_CHARS).uniq.length == B7_CHARS.length
-    if is_7_bits
-      { char_count: sms.length + count_2chars_sized(sms),
-        is_unicode: false }
-    else
-      { char_count: sms.length,
-        is_unicode: true }
+    def calc_char_count(sms)
+      sms = (sms || '').split('')
+      is_7_bits = (sms + B7_CHARS).uniq.length == B7_CHARS.length
+      if is_7_bits
+        { char_count: sms.length + count_2chars_sized(sms),
+          is_unicode: false }
+      else
+        { char_count: sms.length,
+          is_unicode: true }
+      end
     end
-  end
 
-  def self.calc_max_char_count(sms_count)
-    {
-      gsm7: (
-        B7_SMS_COUNT[sms_count.to_s] ||
-        B7_SMS_COUNT['max']
-      )[1],
-      unicode: (
-        UNICODE_SMS_COUNT[sms_count.to_s] ||
-        UNICODE_SMS_COUNT['max']
-      )[1]
-    }
-  end
+    def calc_max_char_count(sms_count)
+      {
+        gsm7: (
+          B7_SMS_COUNT[sms_count.to_s] ||
+          B7_SMS_COUNT['max']
+        )[1],
+        unicode: (
+          UNICODE_SMS_COUNT[sms_count.to_s] ||
+          UNICODE_SMS_COUNT['max']
+        )[1]
+      }
+    end
+
+    def calc_sms_count(char_count, is_unicode)
+      base = is_unicode ? UNICODE_SMS_COUNT : B7_SMS_COUNT
+      sms_count = 0
+      while 42 do
+        break if !base[sms_count.to_s] || (base[sms_count.to_s][1] >= char_count)
+        sms_count += 1
+      end
+      sms_count
+    end
+
+    def calc_char_and_sms_count(sms)
+      result = calc_char_count(sms)
+      result[:sms_count] = calc_sms_count(result[:char_count], result[:is_unicode])
+      result
+    end
 
-  def self.count_2chars_sized(sms)
-    sms.reduce(0) do |count, letter|
-      count + (B7_2SIZED_CHARS.include?(letter) ? 1 : 0)
+    def count_2chars_sized(sms)
+      sms.reduce(0) do |count, letter|
+        count + (B7_2SIZED_CHARS.include?(letter) ? 1 : 0)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: due_sms_counter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ngouy