bulksms 0.5.0 → 0.5.1

data/README.rdoc

@@ -85,4 +85,5 @@ Modifications include:
 * simple helper module for direct access to classes
 * DRYer support libraries
 * Railtie support for configuration
+* Encoding messages correctly
 

data/examples/client.rb

@@ -22,6 +22,7 @@ Bulksms.config do |c|
   c.username = username
   c.password = password
   c.country = country
+  c.routing_group = 3 # Normally 2!
 end
 
 begin
@@ -42,7 +43,7 @@ message = gets.strip
 
 puts "\nThank you. Processing...\n\n"
 
-response = Bulksms.send(:message => message, :recipient => recipient, :test_always_success => 1)
+response = Bulksms.deliver(:message => message, :recipient => recipient)
 
 if response.success?
   puts "Your SMS was sent successfully.\n\n"
@@ -50,7 +51,7 @@ if response.success?
   puts "Goodbye!"
 else
   puts "Sorry, but your SMS was not sent this time. The service returned the error:"
-  puts "\n\t#{response.code}: #{response.description}\n\n"
+  puts "\n\t#{response.code}: #{response.result}\n\n"
   puts "Please try again later. Goodbye."
 end
 

data/lib/bulksms/account.rb

@@ -1,3 +1,6 @@
+
+require 'cgi'
+
 module Bulksms
 
   class AccountError < Exception; end
@@ -51,7 +54,7 @@ module Bulksms
     end
 
     def params_to_query_string(params)
-      URI.encode(params.collect{|x,y| "#{x}=#{y}"}.join('&'))
+      params.collect{|k,v| "#{k}=#{CGI.escape(v.to_s)}"}.join('&')
     end
 
   end

data/lib/bulksms/configuration.rb

@@ -2,15 +2,30 @@ module Bulksms
 
   class Configuration
 
+    # Standard connection details
     attr_accessor :username
     attr_accessor :password
-    attr_accessor :country
     attr_accessor :host
     attr_accessor :port
+
+    # Set the country code when no host has been provided. Should be
+    # one of:
+    #  :uk, :usa, :safrica, :spain, :international (default)
+    attr_accessor :country
+
+    # Path added to host to send a message
+    # Known as send_sms method in BulkSMS API.
     attr_accessor :message_path
+
+    # Path added to host to request credits
     attr_accessor :credits_path
+
+    # Message Class, 0 (Flash SMS), 1, 2 (default, normal SMS, stored to SIM card), 3.
     attr_accessor :message_class
 
+    # Routing group, possible values are 1, 2, 3
+    attr_accessor :routing_group
+
     def initialize
       # Prepare default options
       self.country = :international
@@ -18,6 +33,7 @@ module Bulksms
       self.message_path = "/eapi/submission/send_sms/2/2.0"
       self.credits_path = "/eapi/user/get_credits/1/1.1"
       self.message_class = 2
+      self.routing_group = 2
     end
 
     # Overide the default host config so that a short name will be converted

data/lib/bulksms/message.rb

@@ -15,9 +15,9 @@ module Bulksms
     def initialize(opts = {})
       @message = opts[:message]
       @recipient = opts[:recipient]
-      @msg_class = Bulksms.config.message_class
+      @msg_class = opts[:message_class] || Bulksms.config.message_class
       @want_report = 0
-      @routing_group = 2
+      @routing_group = opts[:routing_group] || Bulksms.config.routing_group
       @source_id = ''
       @test_always_succeed = opts[:test_always_succeed] || 0
       @test_always_fail = opts[:test_always_fail] || 0

data/lib/bulksms/version.rb

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

data/spec/account_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 require 'spec_helper'
 
@@ -81,6 +82,15 @@ 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")
+        txt.should include("%2B34123")
+        txt.should include("some=symbol")
+      end
+    end
+
   end
 
 end

data/spec/configuration_spec.rb

@@ -9,7 +9,7 @@ describe Bulksms::Configuration do
   describe "accessors" do
     it "should be provided" do
       [:username, :password, :country, :host, :port, :message_path,
-        :credits_path, :message_class].each do |accessor|
+        :credits_path, :message_class, :routing_group].each do |accessor|
         @config.should respond_to accessor
       end
     end
@@ -23,6 +23,7 @@ describe Bulksms::Configuration do
       @config.message_path.should_not be_empty
       @config.credits_path.should_not be_empty
       @config.message_class.should eql(2)
+      @config.routing_group.should eql(2)
     end
 
   end

data/spec/message_spec.rb

@@ -15,6 +15,14 @@ describe Bulksms::Message do
       @msg.recipient.should eql("1234")
     end
 
+    it "should allow overrides" do
+      @msg = Bulksms::Message.new :message => "foo", :recipient => '1234', :routing_group => 3,
+        :test_always_succeed => 1, :message_class => 1
+      @msg.routing_group.should eql(3)
+      @msg.msg_class.should eql(1)
+      @msg.test_always_succeed.should eql(1)
+    end
+
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulksms
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21179040 !ruby/object:Gem::Requirement
+  requirement: &14000900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21179040
+  version_requirements: *14000900
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &21178380 !ruby/object:Gem::Requirement
+  requirement: &13999120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21178380
+  version_requirements: *13999120
 description: Send SMS text messages via the BulkSMS API.
 email:
 - me@samlown.com