clickatell 0.8.1 → 0.8.2

data/History.txt

@@ -1,3 +1,6 @@
+== 0.8.2
+* Allow numbers to have a leading + when using the CLI
+
 == 0.8.1
 * Updated the sms utility error message
 

data/clickatell.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clickatell}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Luke Redpath"]
-  s.date = %q{2010-08-13}
+  s.date = %q{2010-09-09}
   s.default_executable = %q{sms}
   s.email = %q{luke@lukeredpath.co.uk}
   s.executables = ["sms"]
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
      "lib/core-ext/hash.rb",
      "scripts/txt2html",
      "spec/api_spec.rb",
-     "spec/cli_options_test.rb",
+     "spec/cli_options_spec.rb",
      "spec/command_executor_spec.rb",
      "spec/hash_ext_spec.rb",
      "spec/response_spec.rb",
@@ -63,12 +63,11 @@ Gem::Specification.new do |s|
   s.summary = %q{Ruby interface to the Clickatell SMS gateway service.}
   s.test_files = [
     "spec/api_spec.rb",
-     "spec/cli_options_test.rb",
+     "spec/cli_options_spec.rb",
      "spec/command_executor_spec.rb",
      "spec/hash_ext_spec.rb",
      "spec/response_spec.rb",
-     "spec/spec_helper.rb",
-     "test/clickatell_api_test.rb"
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/clickatell/utility/options.rb

@@ -65,7 +65,7 @@ module Clickatell
             end
           end
           
-          @options.recipient = args[-2].split(',') rescue nil
+          @options.recipient = args[-2].split(',').map { |r| r.gsub(/^\+/, '') } rescue nil
           @options.message   = args[-1]
           
           parser.parse!(args)

data/lib/clickatell/version.rb

@@ -2,7 +2,7 @@ module Clickatell #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     

data/spec/cli_options_spec.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../lib/clickatell/utility'
+
+describe "CLI options" do
+
+  context "when sending a message" do
+    it "should allow single recipients" do
+      options = Clickatell::Utility::Options.parse(%w{07944123456 testing})
+      options.recipient.should include("07944123456")
+    end
+
+    it "should allow multiple, comma-separated recipients" do
+      options = Clickatell::Utility::Options.parse(%w{07944123456,07944123457 testing})
+      options.recipient.should include(*%w{07944123456 07944123457})
+    end
+
+    it "should strip + symbols from the beginning of numbers" do
+      options = Clickatell::Utility::Options.parse(%w{+447944123456 testing})
+      options.recipient.should include("447944123456")
+    end
+  end
+
+  context "when checking balance" do
+    it "should not require a recipient" do
+      options = Clickatell::Utility::Options.parse(%w{-b})
+      options.recipient.should be_nil
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clickatell
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Luke Redpath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +01:00
+date: 2010-09-09 00:00:00 +01:00
 default_executable: sms
 dependencies: []
 
@@ -51,7 +51,7 @@ files:
 - lib/core-ext/hash.rb
 - scripts/txt2html
 - spec/api_spec.rb
-- spec/cli_options_test.rb
+- spec/cli_options_spec.rb
 - spec/command_executor_spec.rb
 - spec/hash_ext_spec.rb
 - spec/response_spec.rb
@@ -66,7 +66,6 @@ files:
 - website/stylesheets/rdoc.css
 - website/stylesheets/screen.css
 - website/template.rhtml
-- test/clickatell_api_test.rb
 has_rdoc: true
 homepage: http://clickatell.rubyforge.org
 licenses: []
@@ -104,9 +103,8 @@ specification_version: 3
 summary: Ruby interface to the Clickatell SMS gateway service.
 test_files: 
 - spec/api_spec.rb
-- spec/cli_options_test.rb
+- spec/cli_options_spec.rb
 - spec/command_executor_spec.rb
 - spec/hash_ext_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
-- test/clickatell_api_test.rb

data/spec/cli_options_test.rb

@@ -1,26 +0,0 @@
-require 'test/unit'
-require 'shoulda'
-require File.join(File.dirname(__FILE__), *%w[.. lib clickatell utility])
-
-class CliOptionsTest < Test::Unit::TestCase
-  
-  context "Sending a message" do
-    should "allow single recipients" do
-      options = Clickatell::Utility::Options.parse(%w{07944123456 testing})
-      assert_equal %w{07944123456}, options.recipient
-    end
-    
-    should "allow multiple, comma-separated recipients" do
-      options = Clickatell::Utility::Options.parse(%w{07944123456,07944123457 testing})
-      assert_equal %w{07944123456 07944123457}, options.recipient
-    end
-  end
-  
-  context "Checking balance" do
-    should "not require a recipient" do
-      options = Clickatell::Utility::Options.parse(%w{-b})
-      assert_nil options.recipient
-    end  
-  end
-  
-end

data/test/clickatell_api_test.rb

@@ -1,94 +0,0 @@
-require 'test_helper'
-require 'clickatell/api'
-
-class ClickatellApiTest < Test::Unit::TestCase
-
-  context "Clickatell::API" do
-    setup do
-      @client = mock('client')
-      @client.stubs(:session_id).returns('dummy_session_id')
-      
-      @api = Clickatell::API.new(@client)
-    end
-    
-    context "#ping" do
-      should "perform the ping command with the current session id" do
-        @client.expects(:perform_command).with('ping', 
-          has_entry(:session_id => 'dummy_session_id')).returns(stub_response)
-        @api.ping
-      end
-      
-      should "return true when successful" do
-        @client.stubs(:perform_command).with('ping', anything).returns(stub_response("OK:"))
-        assert @api.ping
-      end
-      
-      should "return false when failed" do
-        @client.stubs(:perform_command).with('ping', anything).returns(stub_response("ERR:"))
-        assert !@api.ping
-      end
-    end
-  
-    context "#send_message with a single recipient" do
-      should "perform the sendmsg command with the correct options" do
-        @client.expects(:perform_command).with('sendmsg', 
-          has_entries(:to => '07999000000', :text => 'testing')).returns(stub_response)
-          
-        @api.send_message('07999000000', 'testing')
-      end
-      
-      should "allow a custom sender to be set" do
-        @client.expects(:perform_command).with('sendmsg', 
-          has_entry(:from => 'SENDER')).returns(stub_response)
-          
-        @api.send_message('07999000000', 'testing', :from => 'SENDER')
-      end
-      
-      should "set the req_feat parameter when specifying a custom sender" do
-        @client.expects(:perform_command).with('sendmsg', 
-          has_entry(:req_feat => '48')).returns(stub_response)
-
-        @api.send_message('07999000000', 'testing', :from => 'SENDER')
-      end
-      
-      should "set the mobile originated flag if specified" do
-        @client.expects(:perform_command).with('sendmsg', 
-          has_entry(:mo => '1')).returns(stub_response)
-
-        @api.send_message('07999000000', 'testing', :set_mobile_originated => true)
-      end
-      
-      should "return a single message ID" do
-        @client.stubs(:perform_command).returns(stub_response(%{
-          ID: 99999123
-        }))
-        assert_equal %w{99999123}, @api.send_message('07999000000', 'testing')
-      end
-    end
-    
-    context "#send_message with multiple recipients" do
-      should "perform the sendmsg command with a comma-separated list of recipients" do
-        @client.expects(:perform_command).with('sendmsg', 
-          has_entry(:to => '07999000000,07999000001,07999000002')).returns(stub_response)
-          
-        @api.send_message(%w{07999000000 07999000001 07999000002}, 'testing')
-      end
-      
-      should "return an array of message IDs" do
-        @client.stubs(:perform_command).returns(stub_response(%{
-          ID: 0000001
-          ID: 0000002
-          ID: 0000003
-        }))
-        expected = %w{0000001 0000002 0000003}
-        assert_equal expected, @api.send_message(%w{07999000000 07999000001 07999000002}, 'testing')
-      end
-    end
-  end
-  
-  private
-  
-  def stub_response(body = '', code = 200)
-    stub('Net::HTTP::Response', :code => 200, :body => body)
-  end
-end