Merge pull request #2 from sjkatz/master

Iconv and Ruby 2.0 compatibility.
samlown · Apr 14, 2014 · 3221a84 · 3221a84
2 parents 6aedd6a + 595a669
commit 3221a84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/bulksms/account.rb b/lib/bulksms/account.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'cgi'
-require 'iconv'
+#require 'iconv'
 
 module Bulksms
 
@@ -61,7 +61,8 @@ def params_to_query_string(params)
     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|
+      #CGI.escape(Iconv.iconv('ISO-8859-15//ignore', 'UTF-8', string)[0]).gsub(/%[0-9A-F]{2}/) do |match|
+      CGI.escape(string.encode('ISO-8859-15')).gsub(/%[0-9A-F]{2}/) do |match|
         code = GSM0338_EXTENDED_MAP[match]
         code ? "%BB%#{code}" : match
       end

diff --git a/lib/bulksms/configuration.rb b/lib/bulksms/configuration.rb
@@ -47,6 +47,8 @@ def host
         'usa.bulksms.com'
       when :safrica
         'bulksms.2way.co.za'
+      when :community
+        'community.bulksms.com'
       when :spain
         'bulksms.com.es'
       else # :international