gsm_encoder 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8528761bc6678e5796d054214f545f5df324a43b
-  data.tar.gz: 02ef6f2bbac3cadeba4623fb82f8f0b531236b5a
+  metadata.gz: 91c1a1004a76bf14885a1d182f059f9f57164318
+  data.tar.gz: fa5f8d73b4105406725dcc346794cf02e44097ff
 SHA512:
-  metadata.gz: 883a895ea777489a58d96118f9029a46f1c21c0d4bf0b381a3d11c64f0fadc1e7361be0d65bdc3ef029ed7605a3093456038d7acc4530160724342e67f3e36c5
-  data.tar.gz: 5d2255dc35d094c44c59c8d8123d1490cb6f1af5e4c67509d6253aadd77595b2b9291709bf3e7eae3c5ae61ac9602ab58ff0c6b85f37cd2f4d1d362ce96f29b6
+  metadata.gz: 0d1722f6afc1a458bbc52d9ad7f07b04c84cb4a4be69563bfe8db67563f0c93a41e69aac997fce83b5e47e75c3371f2813667014d5056f96db76adfb9a24e09b
+  data.tar.gz: 0e0e21460277b77fe888c62ef7ac7a21dab7790cf38398c36f7b891db56da1995a94e16dbcfe09fba5dcd184c828eb253b4e059b266c97823965c4ddd62ffdde

data/README.md

@@ -39,7 +39,11 @@ Added support for Spanish shift
 
 Fixed bug when encoding line feed & carriage return
 
-## 0.1.3
+### 0.1.3
 
 Adds the ability to provide the character used when encoding
 unsupported strings
+
+### 0.1.4
+
+Code cleanup and speedup

data/lib/gsm_encoder.rb

@@ -18,7 +18,7 @@ module GSMEncoder
     '@', '£', '$', '¥', 'è', 'é', 'ù', 'ì',
     'ò', 'Ç',  NL, 'Ø', 'ø', CR , 'Å', 'å',
     'Δ', '_', 'Φ', 'Γ', 'Λ', 'Ω', 'Π', 'Ψ',
-    'Σ', 'Θ', 'Ξ', " ", 'Æ', 'æ', 'ß', 'É',
+    'Σ', 'Θ', 'Ξ', " ", 'Æ', 'æ', 'ß', 'É', # 0x1B is actually an escape which we'll encode to a space char
     " ", '!', '"', '#', '¤', '%', '&', "'",
     '(', ')', '*', '+', ',', '-', '.', '/',
     '0', '1', '2', '3', '4', '5', '6', '7',
@@ -31,7 +31,7 @@ module GSMEncoder
     'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o',
     'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
     'x', 'y', 'z', 'ä', 'ö', 'ñ', 'ü', 'à',
-  ]
+  ].join # make it string to speedup lookup
 
   # Extended character table. Characters in this table are accessed by the
   # 'escape' character in the base table. It is important that none of the
@@ -48,6 +48,8 @@ module GSMEncoder
     0,   0,   0, 0, 0,   'ú', 0, 0, 0,   0,   0, 0, 0,   0,   0,   0,
   ]
 
+  CHARS = CHAR_TABLE + EXT_CHAR_TABLE.select {|c| c != 0}.join
+
   # Verifies that this charset can represent every character in the Ruby
   # String.
   # @param str The String to verfiy
@@ -57,25 +59,12 @@ module GSMEncoder
     return true if !str
 
     str.each_char do |c|
-      # a very easy check a-z, A-Z, and 0-9 are always valid
-      if c >= ?A && c <= ?Z || c >= ?a && c <= ?z || c >= ?0 && c <= ?9
-        next
-      else
-        # search both charmaps (if char is in either, we're good!)
-        found = false
-        j = 0
-        while j < CHAR_TABLE.length
-          if c == CHAR_TABLE[j] || c == EXT_CHAR_TABLE[j]
-            found = true
-            break
-          end
-          j += 1
-        end
-        # if we searched both charmaps and didn't find it, then its bad
-        return false if !found
+      # simple range checks for most common characters (' '..'_') or ('a'..'~')
+      b = c.getbyte(0)
+      unless b >= 0x20 && b <= 0x5F || b >= 0x61 && b <= 0x7E || CHARS.index(c)
+        return false
       end
     end
-
     true
   end
 
@@ -88,24 +77,12 @@ module GSMEncoder
 
     begin
       str.each_char do |c|
-        search = 0
-        while search < CHAR_TABLE.length
-          if search == EXTENDED_ESCAPE
-            search += 1
-            next
-          end
-          if c == CHAR_TABLE[search]
-            buffer << search
-            break
-          end
-          if c == EXT_CHAR_TABLE[search]
-            buffer << EXTENDED_ESCAPE
-            buffer << search
-            break
-          end
-          search += 1
-        end
-        if search == CHAR_TABLE.length
+        if index = EXT_CHAR_TABLE.index(c)
+          buffer << EXTENDED_ESCAPE
+          buffer << index
+        elsif index = CHAR_TABLE.rindex(c)
+          buffer << index
+        else
           buffer << replace_char
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gsm_encoder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Yury Korolev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies: []
 description: GSMEncoder encodes and decodes Ruby Strings to and from the SMS default
   alphabet. It also supports the default extension table. The default alphabet and