sms-spec 0.1.7 → 0.1.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 92bb43dcaef54a34db7011ca58bc9227438ae052
+  data.tar.gz: 7d9fcdcb6e68944bd80b28ab89b11fe09877ab64
+SHA512:
+  metadata.gz: 2fb64036a095aadd703385b226b352fd0b5b2d8e1143dfec0478f8b1aae87b5da8dc22601380e7b912b97fc431088cd89827b960957170988473ccc5e8d78246
+  data.tar.gz: 0fbd7ac0f99f4e9edbdcb23dbd328a1d8665e2656f1fb8119d5a0908271139850f92d7c0dffb01d16d51c7a6bc0342084507a361650083a2f4b2e42cec796928

data/.ruby-version

@@ -0,0 +1 @@
+2.1.1

data/README.markdown

@@ -4,7 +4,8 @@ An RSpec DSL and Cucumber steps to test SMS interactions with your
 Ruby on Rails application.
 
 Currently this gem only supports testing SMS messageing using the
-[twilio-ruby](https://github.com/twilio/twilio-ruby) gem.
+[twilio-ruby](https://github.com/twilio/twilio-ruby) and
+[lookout-clickatell](https://github.com/lookout/clickatell) gem.
 
 ##Setup
 Add the sms-spec gem to your Gemfile:
@@ -15,36 +16,25 @@ end
 </pre>
 
 ## RSpec
-In your spec\_helper.rb file add the following:
-<pre>
-require 'sms_spec'
-</pre>
+In your spec\_helper.rb file configure a driver and include helper and matcher methods.
 
-If you want to have the helpers available in all of your example groups,
-you can add the following to your spec_helper.rb:
 <pre>
+require 'sms\_spec'
+
 Spec::Runner.configure do |config|
   config.include(SmsSpec::Helpers)
   config.include(SmsSpec::Matchers)
 end
-</pre>
 
-Otherwise you will have to incliude the helpers and matchers in any
-example where you use them:
-
-<pre>
-describe "MyController" do
-  include SmsSpec::Helpers
-  include SmsSpec::Matchers
-end
+SmsSpec.driver = :twilio-ruby #this can be any available sms-spec driver
 </pre>
 
 ## Cucumber
 Add the folloing to you env.rb file:
 
 <pre>
-require 'sms_spec'
-require 'sms_spec/cucumber'
+require 'sms\_spec'
+require 'sms\_spec/cucumber'
 </pre>
 
 This loads the sms\_spec RSpec helpers into your cucumber wold. Then,

data/Rakefile

@@ -1 +1,7 @@
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+

data/lib/generators/sms_spec/steps/templates/sms_steps.rb

@@ -20,11 +20,11 @@ Given /^all text messages have been read$/ do
 end
 
 Then /^"([^"]*)" should receive a text message$/ do |phone_number|
-  messages_for(phone_number).should_not be_empty
+  expect(messages_for(phone_number)).to_not be_empty
 end
 
 Then /^"([^"]*)" should receive no text messages$/ do |phone_number|
-  messages_for(phone_number).should be_empty
+  expect(messages_for(phone_number)).to be_empty
 end
 
 When /^"([^"]*?)" opens? the text message$/ do |mobile_number|
@@ -32,9 +32,9 @@ When /^"([^"]*?)" opens? the text message$/ do |mobile_number|
 end
 
 Then /^I should see "([^"]*)" in the text message body$/ do |content|
-  current_text_message.should have_body(content)
+  expect(current_text_message).to have_body(content)
 end
 
 Then /^I should see the following in the text message body:$/ do |content|
-  current_text_message.should have_body(content)
+  expect(current_text_message).to have_body(content)
 end

data/lib/sms_spec.rb

@@ -12,6 +12,4 @@ module SmsSpec
   def self.driver=(driver_sym)
     require "sms_spec/drivers/#{driver_sym.to_s}"
   end
-
-  SmsSpec.driver = :"twilio-ruby"
 end

data/lib/sms_spec/drivers/clickatell.rb

@@ -0,0 +1,20 @@
+module Clickatell
+  class API
+    include SmsSpec::Helpers
+
+    def self.authenticate(api_key, login, password)
+      new(api_key, login, password)
+    end
+
+    def initialize(api_key, login, password)
+      @api_key = api_key
+      @login = login
+      @password = password
+    end
+
+    def send_message(dest, body, opts={})
+      from = opts[:from]
+      add_message SmsSpec::Message.new(:number => dest, :from => from, :body => body)
+    end
+  end
+end

data/lib/sms_spec/drivers/twilio-ruby.rb

@@ -1,34 +1,39 @@
-class Twilio::REST::Client
+class Twilio
+  class REST
+    class Client
 
-  def initialize(account_sid, auth_token)
-    $account_sid = account_sid
-  end
+      def initialize(account_sid, auth_token)
+        $account_sid = account_sid
+      end
 
-  class Messages
-    include SmsSpec::Helpers
+      class Messages
+        include SmsSpec::Helpers
 
-    def create(opts={})
-      to = opts[:to]
-      body = opts[:body]
-      add_message SmsSpec::Message.new(:number => to, :body => body)
-    end
-  end
+        def create(opts={})
+          to = opts[:to]
+          body = opts[:body]
+          from = opts[:from]
+          add_message SmsSpec::Message.new(:number => to, :from => from, :body => body)
+        end
+      end
 
-  class Sms
-    def messages
-      return Messages.new
-    end
-  end
+      class Sms
+        def messages
+          return Messages.new
+        end
+      end
 
-  class Account
-    def sms
-      return Sms.new
-    end
-  end
+      class Account
+        def sms
+          return Sms.new
+        end
+      end
 
-  def account
-    account = Account.new
-    account.class.send(:define_method, :sid, lambda { $account_sid })
-    account
+      def account
+        account = Account.new
+        account.class.send(:define_method, :sid, lambda { $account_sid })
+        account
+      end
+    end
   end
 end

data/lib/sms_spec/helpers.rb

@@ -36,5 +36,14 @@ module SmsSpec
 
       base_options.merge! opts
     end
+
+    def clkatel_message(from, text, opts={})
+      base_options = {
+        "From"=> from,
+        "Text" => text
+      }
+
+      base_options.merge! opts
+    end
   end
 end

data/lib/sms_spec/matchers.rb

@@ -6,12 +6,22 @@ module SmsSpec
         mobile_device.messages.count > 0
       end
 
-      failure_message_for_should do |mobile_device|
-        "expected the mobile device '#{mobile_device.number}' to have text messages but it did not"
-      end
+      if Gem::Version.new(RSpec::Core::Version::STRING) >= Gem::Version.new("3.0.0.beta2")
+        failure_message do |mobile_device|
+          "expected the mobile device '#{mobile_device.number}' to have text messages but it did not"
+        end
+
+        failure_message_when_negated do |mobile_device|
+          "expected the mobile device '#{mobile_device.number}' to have no text messages but it did"
+        end
+      else
+        failure_message_for_should do |mobile_device|
+          "expected the mobile device '#{mobile_device.number}' to have text messages but it did not"
+        end
 
-      failure_message_for_should_not do |mobile_device|
-        "expected the mobile device '#{mobile_device.number}' to have no text messages but it did"
+        failure_message_for_should_not do |mobile_device|
+          "expected the mobile device '#{mobile_device.number}' to have no text messages but it did"
+        end
       end
     end
 
@@ -19,14 +29,6 @@ module SmsSpec
       match do |message|
         message.body == expected_body
       end
-
-      #failure_message_for_should do |mobile_device|
-        #"expected the mobile device '#{mobile_device.number}' to have text messages but it did not"
-      #end
-
-      #failure_message_for_should_not do |mobile_device|
-        #"expected the mobile device '#{mobile_device.number}' to have no text messages but it did"
-      #end
     end
 
   end

data/lib/sms_spec/message.rb

@@ -2,12 +2,14 @@ module SmsSpec
   class Message
     attr_accessor :number
     attr_accessor :body
+    attr_accessor :from
 
     include SmsSpec::Util
 
     def initialize(opts={})
       @number = sanitize opts[:number]
       @body = opts[:body]
+      @from = opts[:from]
     end
   end
 end

data/lib/sms_spec/version.rb

@@ -1,3 +1,3 @@
 module SmsSpec
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/sms-spec.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = SmsSpec::VERSION
   s.authors     = ["Chris Rittersdorf"]
   s.email       = ["manlycode@gmail.com"]
-  s.homepage    = "https://github.com/mhs/sms-spec"
+  s.homepage    = "https://github.com/manlycode/sms-spec"
   s.summary     = %q{Test SMS interactions with RSpec and Cucumber}
   s.description = %q{SMS Spec gives you an RSpec DSL and Cucumber steps to test SMS interactions.}
 
@@ -18,13 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'rspec'
-
-  s.add_development_dependency "rspec"
+  s.add_dependency 'rspec', "~> 2.11"
   s.add_development_dependency "rake"
-  s.add_development_dependency "twilio-ruby"
-  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "twilio-ruby", "~> 3.0"
+  s.add_development_dependency "lookout-clickatell", "~> 0.8"
   s.add_development_dependency "pry"
-  s.add_development_dependency "rb-fsevent"
-  s.add_development_dependency "growl"
 end

data/spec/drivers/clickatell_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe SmsSpec do
+  include SmsSpec::Helpers
+
+  before do
+    require 'clickatell'
+    SmsSpec.driver = :"clickatell"
+    @to_number   = '27999900001' # TEST NUMBER
+    @from_number = '27999900005' # TEST NUMBER
+    @api = Clickatell::API.authenticate(
+      ENV["CLICKATELL_API_KEY"],
+      ENV["CLICKATELL_LOGIN"],
+      ENV["CLICKATELL_PASSWORD"]
+    )
+
+    SmsSpec::Data.clear_messages
+  end
+
+  describe "the clickatell driver" do
+    it "captures the outgoing message for testing" do
+      @api.send_message(@to_number, 'Hello from clickatell')
+      open_last_text_message_for(@to_number)
+
+      expect(current_text_message).to have_body("Hello from clickatell")
+      expect(current_text_message.number).to eql(@to_number)
+      expect(current_text_message.from).to be_nil
+    end
+
+  end
+end
+

data/spec/{drivers_spec.rb → drivers/twilio_spec.rb}

@@ -1,5 +1,4 @@
-require 'twilio-ruby'
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
+require 'spec_helper'
 
 describe SmsSpec do
   include SmsSpec::Helpers
@@ -25,7 +24,7 @@ describe SmsSpec do
       )
 
       open_last_text_message_for("+16105557069")
-      current_text_message.should_not be_nil
+      expect(current_text_message).to_not be_nil
     end
 
     it "allows for sid method calls on the account object" do
@@ -40,9 +39,24 @@ describe SmsSpec do
       )
 
       open_last_text_message_for("+16105557069")
-      current_text_message.should_not be_nil
-      @client.account.should respond_to(:sid)
-      @client.account.sid.should be(account_sid)
+      expect(current_text_message).to_not be_nil
+      expect(@client.account).to respond_to(:sid)
+      expect(@client.account.sid).to be(account_sid)
+    end
+
+    it "records the from number for a message" do
+      account_sid = 'ACxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+      auth_token = 'yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy'
+
+      @client = Twilio::REST::Client.new account_sid, auth_token
+      @client.account.sms.messages.create(
+        :from => '+14159341234',
+        :to => '+16105557069',
+        :body => 'Hey there!'
+      )
+
+      open_last_text_message_for("+16105557069")
+      expect(current_text_message.from).to eq('+14159341234')
     end
 
   end

data/spec/helpers_spec.rb

@@ -10,15 +10,15 @@ describe SmsSpec::Helpers do
   describe ".messages" do
     describe "before any messages have been sent" do
       it "is empty" do
-        messages.should be_empty
+        expect(messages).to be_empty
       end
     end
 
     describe "after a message has been sent" do
       it "adds a message" do
-        lambda {
+        expect(lambda {
           add_message SmsSpec::Message.new :number => "5555555512", :body => "Hello there"
-        }.should change(messages, :count).by(1)
+        }).to change(messages, :count).by(1)
       end
     end
   end
@@ -26,25 +26,27 @@ describe SmsSpec::Helpers do
   describe ".set_current_number" do
     it "assigns the current number" do
       set_current_number "555551234"
-      current_number.should == "555551234"
+      expect(current_number).to eql("555551234")
     end
 
     it "sanitizes phone nubmers" do
       set_current_number "+1555551234"
-      current_number.should == "555551234"
+      expect(current_number).to eql( "555551234")
 
       set_current_number "1-616-555-2929"
-      current_number.should == "6165552929"
+      expect(current_number).to eql("6165552929")
     end
   end
 
-  describe ".clear_sms_messages" do
+  describe ".clear_messages" do
     it "removes all messages" do
       add_message SmsSpec::Message.new :number => "5555555512", :body => "Hello there"
       add_message SmsSpec::Message.new :number => "5555555512", :body => "Hello there"
       add_message SmsSpec::Message.new :number => "5555555512", :body => "Hello there"
 
-      messages.should have(3).messages
+      expect(messages.count).to eql(3)
+      clear_messages
+      expect(messages.count).to eql(0)
     end
   end
 
@@ -55,7 +57,7 @@ describe SmsSpec::Helpers do
     end
 
       it "returns nil" do
-        current_text_message.should be_nil
+        expect(current_text_message).to be_nil
       end
     end
 
@@ -70,7 +72,7 @@ describe SmsSpec::Helpers do
 
       describe "and no messages have been opened" do
         it "should be nil" do
-          current_text_message.should be_nil
+          expect(current_text_message).to be_nil
         end
       end
 
@@ -80,13 +82,13 @@ describe SmsSpec::Helpers do
         end
 
         it "returns the last open text message" do
-          current_text_message.should == message1
+          expect(current_text_message).to eql(message1)
 
           open_last_text_message_for("5555555513")
-          current_text_message.should be_nil
+          expect(current_text_message).to be_nil
 
           open_last_text_message_for("5555555512")
-          current_text_message.should == message2
+          expect(current_text_message).to eql(message2)
         end
       end
     end
@@ -99,11 +101,11 @@ describe SmsSpec::Helpers do
       }
 
       it "modifies the From attribute" do
-        message["From"].should eql("+16165559982")
+        expect(message["From"]).to eql("+16165559982")
       end
 
       it "Modifies the Body attribute" do
-        message["Body"].should eql("Ahoy!")
+        expect(message["Body"]).to eql("Ahoy!")
       end
     end
 
@@ -113,10 +115,37 @@ describe SmsSpec::Helpers do
       }
 
       it "overrides the specified attributes" do
-        message["ToZip"].should eql("49506")
-        message["ToCity"].should eql("Detroit")
-        message["Body"].should eql("Ahoy!")
-        message["From"].should eql("+16165559982")
+        expect(message["ToZip"]).to eql("49506")
+        expect(message["ToCity"]).to eql("Detroit")
+        expect(message["Body"]).to eql("Ahoy!")
+        expect(message["From"]).to eql("+16165559982")
+      end
+    end
+  end
+
+  describe ".clkatel_message" do
+    context "with defaults" do
+      let(:message) {
+        clkatel_message("+16165559982", "Ahoy!")
+      }
+
+      it "modifies the From attribute" do
+        expect(message["From"]).to eql("+16165559982")
+      end
+
+      it "Modifies the Body attribute" do
+        expect(message["Text"]).to eql("Ahoy!")
+      end
+    end
+
+    describe "Overriding options" do
+      let(:message) {
+        clkatel_message("+16165559982", "Ahoy!")
+      }
+
+      it "overrides the specified attributes" do
+        expect(message["Text"]).to eql("Ahoy!")
+        expect(message["From"]).to eql("+16165559982")
       end
     end
   end

data/spec/matchers_spec.rb

@@ -24,7 +24,7 @@ describe SmsSpec::Matchers do
       "expected #{@matcher.inspect} to match when provided #{@object_to_test_match.inspect}, but it did not"
     end
 
-    def negative_failure_message
+    def failure_message_when_negated
       "expected #{@matcher.inspect} not to match when provided #{@object_to_test_match.inspect}, but it did"
     end
   end
@@ -43,7 +43,7 @@ describe SmsSpec::Matchers do
     describe "when the mobile device has no text messages" do
       it "should not match" do
         device = SmsSpec::MobileDevice.new(:number => mobile_number)
-        have_text_messages.should_not match(device)
+        expect(have_text_messages).to_not match(device)
       end
     end
 
@@ -52,7 +52,7 @@ describe SmsSpec::Matchers do
         add_message SmsSpec::Message.new(:number => mobile_number, :body => "something")
 
         device = SmsSpec::MobileDevice.new(mobile_number)
-        have_text_messages.should match(device)
+        expect(have_text_messages).to match(device)
       end
     end
   end
@@ -62,7 +62,7 @@ describe SmsSpec::Matchers do
       it "matches" do
         message = SmsSpec::Message.new(:number => mobile_number, :body => "something")
 
-        have_body("something").should match(message)
+        expect(have_body("something")).to match(message)
       end
     end
   end

metadata

@@ -1,142 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: sms-spec
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.1.8
 platform: ruby
 authors:
 - Chris Rittersdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: lookout-clickatell
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: growl
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: SMS Spec gives you an RSpec DSL and Cucumber steps to test SMS interactions.
@@ -146,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Guardfile
 - README.markdown
@@ -159,6 +100,7 @@ files:
 - lib/sms_spec.rb
 - lib/sms_spec/cucumber.rb
 - lib/sms_spec/data.rb
+- lib/sms_spec/drivers/clickatell.rb
 - lib/sms_spec/drivers/twilio-ruby.rb
 - lib/sms_spec/helpers.rb
 - lib/sms_spec/matchers.rb
@@ -169,42 +111,37 @@ files:
 - rails_generators/sms_spec/templates/sms_steps.rb
 - rails_generators/sms_spec_generator.rb
 - sms-spec.gemspec
-- spec/drivers_spec.rb
+- spec/drivers/clickatell_spec.rb
+- spec/drivers/twilio_spec.rb
 - spec/helpers_spec.rb
 - spec/matchers_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/mhs/sms-spec
+homepage: https://github.com/manlycode/sms-spec
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2714035201133554291
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2714035201133554291
 requirements: []
 rubyforge_project: sms-spec
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Test SMS interactions with RSpec and Cucumber
 test_files:
-- spec/drivers_spec.rb
+- spec/drivers/clickatell_spec.rb
+- spec/drivers/twilio_spec.rb
 - spec/helpers_spec.rb
 - spec/matchers_spec.rb
 - spec/spec_helper.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create 1.9.3@sms-spec