bulksms 0.5.1 → 0.5.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+* 0.5.2
+Added mappings for special characters including euro symbol according to Bulksms api.
+
+* 0.5.1
+Fixing issues with encoding.
+
 * 0.5.0
 Completely re-written.
 Simple API via Bulksms module.

data/README.rdoc

@@ -53,6 +53,11 @@ If you prefer more control, the <tt>Service</tt> and <tt>Message</tt> objects ar
   m.want_report = 1
   s.deliver(m)
 
+== Encoding
+
+All messages will be converted to ISO-8859-15 before being sent to the Bulksms servers. Some special characters, including the euro symbol, will be converted and prepended with a special escape character, suitable for GSM-7, so that they will be received correctly. For more details on character encoding, checkout the Bulksms API:
+
+  http://www.bulksms.com/int/docs/eapi/submission/character_encoding/
 
 ==  Checking your account balance
 

data/lib/bulksms/account.rb

@@ -1,10 +1,13 @@
+# encoding: utf-8
 
 require 'cgi'
+require 'iconv'
 
 module Bulksms
 
   class AccountError < Exception; end
 
+
   class Account
 
     attr_reader :username, :password, :host, :port
@@ -54,9 +57,28 @@ module Bulksms
     end
 
     def params_to_query_string(params)
-      params.collect{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
+      params.collect{|k,v| "#{k}=#{encode_cgi_string(v.to_s)}"}.join('&')
     end
 
+    def encode_cgi_string(string)
+      CGI.escape(Iconv.iconv('ISO-8859-15//ignore', 'UTF-8', string)[0]).gsub(/%[0-9A-F]{2}/) do |match|
+        code = GSM0338_EXTENDED_MAP[match]
+        code ? "%BB%#{code}" : match
+      end
+    end
+
+    GSM0338_EXTENDED_MAP = {
+      '%5E' => '14', # ^
+      '%7B' => '28', # {
+      '%7D' => '29', # }
+      '%5C' => '2F', # \
+      '%5B' => '3C', # [
+      '%7E' => '3D', # ~
+      '%5D' => '3E', # ]
+      '%7C' => '40', # |
+      '%A4' => '65', # EURO
+    }
+
   end
 
 end

data/lib/bulksms/version.rb

@@ -1,3 +1,3 @@
 module Bulksms
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/account_spec.rb

@@ -83,12 +83,23 @@ describe Bulksms::Account do
     end
 
     describe "#params_to_query_string" do
-      it "converts params to string" do
-        txt = @account.send(:params_to_query_string, :msg => "Random çharacters -and- symbols +34123123123", :some => :symbol)
-        txt.should include("Random+%C3%A7hara")
+      it "converts normal params to string" do
+        txt = @account.send(:params_to_query_string, :msg => "Random cháráctérs -and- symbols +34123123123", :some => :symbol)
+        txt.should include("Random+ch%E1r%E1ct%E9")
         txt.should include("%2B34123")
         txt.should include("some=symbol")
       end
+
+      it "converts special characters in params to string" do
+        txt = @account.send(:params_to_query_string, :msg => "[special] {characters} tilde~ pipe| hat^ euro€")
+        txt.should include("%BB%3Cspecial%BB%3E")
+        txt.should include("%BB%28characters%BB%29")
+        txt.should include("tilde%BB%3D")
+        txt.should include("pipe%BB%40")
+        txt.should include("hat%BB%14")
+        txt.should include("euro%BB%65")
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulksms
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14000900 !ruby/object:Gem::Requirement
+  requirement: &2164746900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14000900
+  version_requirements: *2164746900
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &13999120 !ruby/object:Gem::Requirement
+  requirement: &2164745660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13999120
+  version_requirements: *2164745660
 description: Send SMS text messages via the BulkSMS API.
 email:
 - me@samlown.com
@@ -88,4 +88,10 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple BulkSMS API
-test_files: []
+test_files:
+- spec/account_spec.rb
+- spec/bulksms_spec.rb
+- spec/configuration_spec.rb
+- spec/message_spec.rb
+- spec/service_spec.rb
+- spec/spec_helper.rb