smstools 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df6410b78260b2fc62e716c889ca5502bd91c477
-  data.tar.gz: 57b8f13df3b6453e168eac420e51d4ef959ebf71
+  metadata.gz: 09a075d7c0f5acd2105e5a361cda66d81926f2bf
+  data.tar.gz: 24febc16536d2174a802876034baee4533cb1512
 SHA512:
-  metadata.gz: d0ca45861515b43a9a4d9bec38479af3e6c92f080d1307d2e8399477647382ac37e2019041830ad236a0934298e0ca9b70292af5362ba572e22b34d4faed3951
-  data.tar.gz: 0f0a5874e6b5fe3367fe32969b7376c274ec22183b9edbed4f7baf79877034dc3c8f9ac619e88951bc0d5c206bc6615d37bc2ca720af6300e4bca90bdeb1cd23
+  metadata.gz: 934a838ced26fa606f876deb6720e15082de09c5c845a5672a28bae2fc390e4c471b9ce18b5cf1cc43db833f5941169db182b329f3cf94e1a4b7bafff163b44d
+  data.tar.gz: f2f826aff33b5806db30a4d1882c694bb71deba907b4e75d27a6fb146937ea8603f3f38e48ab980cc44c26fbe3756ed6ebdd391e4e6ba581cb34199dde72b072

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.0 (2 March 2017)
+
+* The non-breaking space character (0x00A0 in Unicode and "\xC2\xA0" in UTF-8) is no longer regarded as a valid GSM 7-bit symbol. [#4](https://github.com/livebg/smstools/issues/4)
+* GsmEncoding.to_utf8 will now raise errors in case the provided argument is not a valid GSM 7-bit text.
+
 ## 0.1.1 (18 April 2016)
 
 * Replaces small c with cedilla to capital one, as per the GSM 03.38 standard (by @skliask)

data/Rakefile

@@ -1,11 +1,10 @@
 require 'bundler/gem_tasks'
+require 'rake/testtask'
 
-task :test do
-  test_files = Dir[File.expand_path('../spec/**/*_spec.rb', __FILE__)]
-  command    = "ruby -Ispec #{test_files.join ' '}"
+task default: :test
 
-  puts "Running #{command}"
-  system command
+Rake::TestTask.new do |t|
+  t.libs << 'spec'
+  t.test_files = FileList['spec/**/*_spec.rb']
+  t.verbose = true
 end
-
-task default: :test

data/lib/sms_tools/gsm_encoding.rb

@@ -4,6 +4,8 @@ module SmsTools
   module GsmEncoding
     extend self
 
+    GSM_EXTENSION_TABLE_ESCAPE_CODE = "\x1B".freeze
+
     UTF8_TO_GSM_BASE_TABLE = {
       0x0040 => "\x00", # COMMERCIAL AT
       0x00A3 => "\x01", # POUND SIGN
@@ -32,7 +34,7 @@ module SmsTools
       0x03A3 => "\x18", # GREEK CAPITAL LETTER SIGMA
       0x0398 => "\x19", # GREEK CAPITAL LETTER THETA
       0x039E => "\x1A", # GREEK CAPITAL LETTER XI
-      0x00A0 => "\x1B", # ESCAPE TO EXTENSION TABLE
+      nil    => "\x1B", # ESCAPE TO EXTENSION TABLE or NON-BREAKING SPACE
       0x00C6 => "\x1C", # LATIN CAPITAL LETTER AE
       0x00E6 => "\x1D", # LATIN SMALL LETTER AE
       0x00DF => "\x1E", # LATIN SMALL LETTER SHARP S (German)
@@ -176,20 +178,25 @@ module SmsTools
     def to_utf8(gsm_encoded_string)
       utf8_encoded_string = ''
       escape              = false
-      escape_code         = "\e".freeze
 
       gsm_encoded_string.each_char do |char|
-        if char == escape_code
+        if char == GSM_EXTENSION_TABLE_ESCAPE_CODE
           escape = true
         elsif escape
           escape = false
-          utf8_encoded_string << [GSM_TO_UTF8[escape_code + char]].pack('U')
+          utf8_encoded_string << [fetch_utf8_char(GSM_EXTENSION_TABLE_ESCAPE_CODE + char)].pack('U')
         else
-          utf8_encoded_string << [GSM_TO_UTF8[char]].pack('U')
+          utf8_encoded_string << [fetch_utf8_char(char)].pack('U')
         end
       end
 
       utf8_encoded_string
     end
+
+    private
+
+    def fetch_utf8_char(char)
+      GSM_TO_UTF8.fetch(char) { raise "Unsupported symbol in GSM-7 encoding: #{char}" }
+    end
   end
 end

data/lib/sms_tools/version.rb

@@ -1,3 +1,3 @@
 module SmsTools
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/sms_tools/encoding_detection_spec.rb

@@ -29,6 +29,12 @@ describe SmsTools::EncodingDetection do
       detection_for('∞').encoding.must_equal :unicode
     end
 
+    it 'considers the non-breaking space character as a non-GSM Unicode symbol' do
+      non_breaking_space = "\xC2\xA0"
+
+      detection_for(non_breaking_space).encoding.must_equal :unicode
+    end
+
     describe 'with SmsTools.use_gsm_encoding = false' do
       before do
         SmsTools.use_gsm_encoding = false

data/spec/sms_tools/gsm_encoding_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'sms_tools'
+
+describe SmsTools::GsmEncoding do
+  describe 'from_utf8' do
+    it 'converts simple UTF-8 text to GSM 03.38' do
+      SmsTools::GsmEncoding.from_utf8('simple').must_equal 'simple'
+    end
+
+    it 'converts UTF-8 text with double-byte chars to GSM 03.38' do
+      SmsTools::GsmEncoding.from_utf8('foo []').must_equal "foo \e<\e>"
+    end
+
+    it 'raises an exception if the UTF-8 text contains chars outside of GSM 03.38' do
+      -> { SmsTools::GsmEncoding.from_utf8('баба') }.must_raise RuntimeError, /Unsupported symbol in GSM-7 encoding/
+    end
+  end
+
+  describe 'to_utf8' do
+    it 'converts simple GSM 03.38 to UTF-8' do
+      SmsTools::GsmEncoding.to_utf8('simple').must_equal 'simple'
+    end
+
+    it 'converts UTF-8 text with double-byte chars to GSM 03.38' do
+      SmsTools::GsmEncoding.to_utf8("GSM \e<\e>").must_equal 'GSM []'
+    end
+
+    it 'raises an exception if the UTF-8 text contains chars outside of GSM 03.38' do
+      -> { SmsTools::GsmEncoding.to_utf8('баба') }.must_raise RuntimeError, /Unsupported symbol in GSM-7 encoding/
+    end
+
+    it 'ignores single occurrences of the GSM-7 extension table escape code' do
+      SmsTools::GsmEncoding.to_utf8("\x1B").must_equal ''
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smstools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Dimitar Dimitrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,7 @@ files:
 - lib/smstools.rb
 - smstools.gemspec
 - spec/sms_tools/encoding_detection_spec.rb
+- spec/sms_tools/gsm_encoding_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mitio/smstools
 licenses:
@@ -111,10 +112,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Small library of classes for common SMS-related functionality.
 test_files:
 - spec/sms_tools/encoding_detection_spec.rb
+- spec/sms_tools/gsm_encoding_spec.rb
 - spec/spec_helper.rb