esendex 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac1d98a5009c85639396fc251b7f1fe73c709321
-  data.tar.gz: 1a38f74ae0ef3da6fc6f98549b9dc5512f7b57d6
+  metadata.gz: 6776e13698bd0f6945a8a47636a60ffc6f15e340
+  data.tar.gz: e1693289ee33e889708f5015a445b600f054e31d
 SHA512:
-  metadata.gz: 375d165b04e43b38e7607d7a077395c3070f99603797249fee0432da43eb48dcedcbc982b3c11c63a195824afa2e6e37e644b8948c05ed2c2d65800352bbee5d
-  data.tar.gz: 70e8d44120d20d906dea4e2102b8024254f2ad1ce530a5bdaefe13b768293cf415e8054b62f86533c80a8f43089d01c2f139f6ea36af83fa90dd519149a01716
+  metadata.gz: 50bb0e389cd685bf85b53908a109e325a8a3203d47fd0bf251223107e21a00cfc51a4e9fb822f86875e3f864f7d2ca554f6e8cf06f6bcfafbd2a4134f069d7a9
+  data.tar.gz: 9b46c9d79326387584c555191794d9529060781c1a73579d1c5285c0d448226749d6cdc9330781be36badbc36f92a5703ff949d1dabf6989aa3b5afbab685a14

data/lib/esendex/version.rb

@@ -1,3 +1,3 @@
 module Esendex
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/readme.md

@@ -96,9 +96,9 @@ Classes are provided in the gem for deserialising the notifications: `MessageDel
 message = InboundMessage.from_xml request.body
 ```
 
-### Rails 3 / Rails 4
+### Rails 4
 
-In order to simplify receipt of push notifications for Rails 3 users, the gem ships with mountable Rails controllers to handle the receipt of these notifications.
+In order to simplify receipt of push notifications for Rails users, the gem ships with mountable Rails controllers to handle the receipt of these notifications.
 
 To mount the end points, add this to `routes.rb`
 
@@ -117,7 +117,7 @@ Esendex.message_delivered_event_handler = lambda { |notification|
 }
 ```
 
-Please be kind to us and don't perform anything potentially long running in this call back as our notifier may timeout the request and pass the notififation to the retry queue. 
+Please be kind to us and don't perform anything potentially long running in this call back as our notifier may timeout the request and pass the notification to the retry queue. 
 
 If you need to perform processing that may run for a longer time then using an async task system like [Resque](https://github.com/defunkt/resque) is recommended.
 
@@ -176,11 +176,11 @@ This project also ships with a `Guardfile` so you can run tests continuously.
 
 ## Contributing
 
-We really welcome any thoughts or guidance on how this gem could best provide the hooks you need to consume our services in your applicaiton. Please fork and raise pull requests for any features you would like us to add or raise an [issue]((https://github.com/esendex/esendex.gem/issues)
+We really welcome any thoughts or guidance on how this gem could best provide the hooks you need to consume our services in your applicaiton. Please fork and raise pull requests for any features you would like us to add or raise an [issue]((https://github.com/esendex/esendex-ruby-sdk/issues)
 
 Customers with more pressing issues should contact our support teams via the usual local phone number or by email: [support@esendex.com](mailto:support@esendex.com).
 
 ## Copyright
 
-Copyright (c) 2011-13 Esendex Ltd. See licence.txt for further details.
+Copyright (c) 2011-18 Esendex Ltd. See licence.txt for further details.
 

data/spec/account_spec.rb

@@ -31,22 +31,22 @@ describe Account do
         </account>
       </accounts>"
   }
-  let(:api_connection) { mock("Connection", :get => mock('Response', :body => account_xml), :post => true )}
+  let(:api_connection) { double("Connection", :get => double('Response', :body => account_xml), :post => true )}
 
   before(:each) do
-    account.stub(:api_connection) { api_connection }
+    allow(account).to receive(:api_connection) { api_connection }
   end
 
   describe "#messages_remaining" do
     subject { account.messages_remaining }
 
     it "should get the account resource" do
-      api_connection.should_receive(:get).with("/v1.0/accounts")
+      expect(api_connection).to receive(:get).with("/v1.0/accounts")
       subject
     end
     
     it "should get the messages remaining from the document" do
-      subject.should eq(messages_remaining)
+      expect(subject).to eq(messages_remaining)
     end
     
     context "with invalid reference" do
@@ -70,26 +70,26 @@ describe Account do
     }
 
     before(:each) do
-      api_connection.stub(:post) { mock('Response', :body => send_response_xml) }
+      allow(api_connection).to receive(:post) { double('Response', :body => send_response_xml) }
     end
 
     subject { account.send_message(to: "447815777555", body: "Hello from the Esendex Ruby Gem") }
 
     it "should post to the message dispatcher resource" do
-      api_connection.should_receive(:post).with("/v1.0/messagedispatcher", anything)
+      expect(api_connection).to receive(:post).with("/v1.0/messagedispatcher", anything)
       subject
     end
     
     it "should return the batch_id when treated as string" do
-      subject.to_s.should eq(batch_id)
+      expect(subject.to_s).to eq(batch_id)
     end
     
     it "should return the batch_id in the result" do
-      subject.batch_id.should eq(batch_id)
+      expect(subject.batch_id).to eq(batch_id)
     end
     
     it "should provide a list of messages with a single message" do
-      subject.messages.should have(1).items
+      expect(subject.messages).to have(1).items
     end
   end
 
@@ -107,45 +107,45 @@ describe Account do
     }
 
     before(:each) do
-      api_connection.stub(:post) { mock('Response', :body => send_response_xml) }
+      allow(api_connection).to receive(:post) { double('Response', :body => send_response_xml) }
     end
 
     subject { account.send_message(to: "447815777555", body: "Hello from the Esendex Ruby Gem") }
 
     it "should post to the message dispatcher resource" do
-      api_connection.should_receive(:post).with("/v1.0/messagedispatcher", anything)
+      expect(api_connection).to receive(:post).with("/v1.0/messagedispatcher", anything)
       subject
     end
     
     it "should provide a list containing two messages" do
-      subject.messages.should have(2).items
+      expect(subject.messages).to have(2).items
     end
     
     it "should have message one in the message list" do
-      subject.messages.should include(id: "#{message_one_id}", uri: "#{uri_prefix}#{message_one_id}")
+      expect(subject.messages).to include(id: "#{message_one_id}", uri: "#{uri_prefix}#{message_one_id}")
     end
     
     it "should have message two in the message list" do
-      subject.messages.should include(id: "#{message_two_id}", uri: "#{uri_prefix}#{message_two_id}")
+      expect(subject.messages).to include(id: "#{message_two_id}", uri: "#{uri_prefix}#{message_two_id}")
     end
   end
 
   describe "#sent_messages" do
-    let(:sent_message_client) { stub("sent_message_client") }
+    let(:sent_message_client) { double("sent_message_client") }
     let(:sent_messages_result) { Class.new }
 
     before(:each) do
       stub_const("Esendex::SentMessageClient", sent_message_client)
-      sent_message_client
-        .should_receive(:new)
+      expect(sent_message_client)
+        .to receive(:new)
         .with(api_connection)
         .and_return(sent_message_client)
     end
 
     context "with no args" do
       before(:each) do
-        sent_message_client
-          .should_receive(:get_messages)
+        expect(sent_message_client)
+          .to receive(:get_messages)
           .with({account_reference: account_reference})
           .and_return(sent_messages_result)
       end
@@ -153,7 +153,7 @@ describe Account do
       subject { account.sent_messages() }
 
       it "should return expected result" do
-        subject.should eq(sent_messages_result)
+        expect(subject).to eq(sent_messages_result)
       end
     end
 
@@ -161,24 +161,24 @@ describe Account do
       it "should pass dates without adjustment" do
         start_date = DateTime.now - 30
         finish_date = DateTime.now - 15
-        sent_message_client
-          .should_receive(:get_messages)
+        expect(sent_message_client)
+          .to receive(:get_messages)
           .with({account_reference: account_reference, start: start_date, finish: finish_date})
           .and_return(sent_messages_result)
 
-        account.sent_messages({start: start_date, finish: finish_date}).should_not be_nil
+        expect(account.sent_messages({start: start_date, finish: finish_date})).to_not be_nil
       end
     end
 
     context "with start date" do
       it "should specify start date and default finish date" do
         start_date = DateTime.now - 1
-        sent_message_client
-          .should_receive(:get_messages)
+        expect(sent_message_client)
+          .to receive(:get_messages)
           .with({account_reference: account_reference, start: start_date})
           .and_return(sent_messages_result)
 
-        account.sent_messages({start: start_date}).should_not be_nil
+        expect(account.sent_messages({start: start_date})).to_not be_nil
       end
     end
 
@@ -186,12 +186,12 @@ describe Account do
       it "should specify default start date and finish date" do
         finish_date = DateTime.now - 1
         start_date = finish_date - 90
-        sent_message_client
-          .should_receive(:get_messages)
+        expect(sent_message_client)
+          .to receive(:get_messages)
           .with({account_reference: account_reference, finish: finish_date})
           .and_return(sent_messages_result)
 
-        account.sent_messages({finish: finish_date}).should_not be_nil
+        expect(account.sent_messages({finish: finish_date})).to_not be_nil
       end
     end
 
@@ -199,12 +199,12 @@ describe Account do
       it "should pass expected arguments" do
         start_index = 3
         count = 35
-        sent_message_client
-          .should_receive(:get_messages)
+        expect(sent_message_client)
+          .to receive(:get_messages)
           .with({account_reference: account_reference, start_index: start_index, count: count})
           .and_return(sent_messages_result)
 
-        account.sent_messages({start_index: start_index, count: count}).should_not be_nil
+        expect(account.sent_messages({start_index: start_index, count: count})).to_not be_nil
       end
     end
   end

data/spec/api_connection_spec.rb

@@ -5,9 +5,9 @@ describe ApiConnection do
 
   before(:each) do
     @connection = Nestful::Connection.new Esendex::API_HOST
-    Nestful::Connection.stub(:new) { @connection }
-    @connection.stub(:get) {}
-    @connection.stub(:post) {}
+    allow(Nestful::Connection).to receive(:new) { @connection }
+    allow(@connection).to receive(:get) {}
+    allow(@connection).to receive(:post) {}
     Esendex.configure do |config|
       config.username = random_string
       config.password = random_string
@@ -19,17 +19,17 @@ describe ApiConnection do
 
     it "should set the username" do
       subject
-      @connection.user.should eq(Esendex.username)
+      expect(@connection.user).to eq(Esendex.username)
     end
     
     it "should set the password" do
       subject
-      @connection.password.should eq(Esendex.password)
+      expect(@connection.password).to eq(Esendex.password)
     end
     
     it "should set the auth to basic" do
       subject
-      @connection.auth_type.should eq(:basic)
+      expect(@connection.auth_type).to eq(:basic)
     end
   end
 
@@ -40,13 +40,13 @@ describe ApiConnection do
     subject { api_connection.get url }
     
     it "should call get with headers" do
-      @connection.should_receive(:get).with(url, api_connection.default_headers)
+      expect(@connection).to receive(:get).with(url, api_connection.default_headers)
       subject
     end
 
     context "when 403 raised" do
       before(:each) do
-        @connection.stub(:get) { raise Nestful::ForbiddenAccess.new(nil) }
+        allow(@connection).to receive(:get) { raise Nestful::ForbiddenAccess.new(nil) }
       end
       
       it "raises an ForbiddenError" do
@@ -62,13 +62,13 @@ describe ApiConnection do
     subject { api_connection.post url, body }
     
     it "should call post with headers" do
-      @connection.should_receive(:post).with(url, body, api_connection.default_headers)
+      expect(@connection).to receive(:post).with(url, body, api_connection.default_headers)
       subject
     end
 
     context "when 403 raised" do
       before(:each) do
-        @connection.stub(:post) { raise Nestful::ForbiddenAccess.new(nil) }
+        allow(@connection).to receive(:post) { raise Nestful::ForbiddenAccess.new(nil) }
       end
       
       it "raises an ForbiddenError" do

data/spec/controllers/push_notification_handler_spec.rb

@@ -11,9 +11,9 @@ module Esendex
     subject { controller.process_notification @type, @source }
 
     before(:each) do
-      @logger = mock('Logger', info: true)
-      controller.stub(:logger) { @logger }
-      controller.stub(:render)
+      @logger = double('Logger', info: true)
+      allow(controller).to receive(:logger) { @logger }
+      allow(controller).to receive(:render)
     end
 
     @notifications = {
@@ -58,7 +58,7 @@ module Esendex
           @source = config[:source]
           @notification_class = config[:class]
           @notification = @notification_class.from_xml(@source)
-          @notification_class.stub(:from_xml) { @notification }
+          allow(@notification_class).to receive(:from_xml) { @notification }
         end
 
         context "when a handler is configured" do
@@ -66,16 +66,16 @@ module Esendex
             Esendex.send("#{notification_type}_handler=", @handler)
           end
           it "initializes a #{config[:class].name} from the source" do
-            @notification_class.should_receive(:from_xml).with(@source)
+            expect(@notification_class).to receive(:from_xml).with(@source)
             subject
           end
           it "calls the handler" do
-            @handler.should_receive(:call).with(@notification)
+            expect(@handler).to receive(:call).with(@notification)
             subject
           end
           it "the handler can process the input" do
             subject
-            @received_id.should eq(@notification.id)
+            expect(@received_id).to eq(@notification.id)
           end
         end
         context "when no handler configured" do
@@ -83,11 +83,11 @@ module Esendex
             Esendex.send("#{notification_type}_handler=", nil)
           end
           it "does not init a #{config[:class].name}" do
-            @notification_class.should_not_receive(:from_xml)
+            expect(@notification_class).to_not receive(:from_xml)
             subject
           end
           it "should log info line" do
-            @logger.should_receive(:info).with(/#{notification_type.to_s}/)
+            expect(@logger).to receive(:info).with(/#{notification_type.to_s}/)
             subject
           end
         end

data/spec/dummy/config/environments/development.rb

@@ -6,13 +6,12 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
+  config.eager_load = false
+
   # Don't care if the mailer can't send
   # config.action_mailer.raise_delivery_errors = false
 

data/spec/dummy/config/environments/production.rb

@@ -8,6 +8,8 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  config.eager_load = true
+
   # Disable Rails's static asset server (Apache or nginx will already do this)
   # config.serve_static_assets = false
 

data/spec/dummy/config/environments/test.rb

@@ -11,8 +11,7 @@ Dummy::Application.configure do
   # config.serve_static_assets = true
   # config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/hash_serialisation_spec.rb

@@ -22,13 +22,13 @@ module Esendex
       subject { DummyHashSerialisation.new @attrs }
 
       it "sets the name" do
-        subject.name.should eq(name)
+        expect(subject.name).to eq(name)
       end
       it "sets the time" do
-        subject.time.should eq(time)
+        expect(subject.time).to eq(time)
       end
       it "sets the notes" do
-        subject.notes.should eq(notes)
+        expect(subject.notes).to eq(notes)
       end
 
       context "when invalid attribute passed" do
@@ -45,7 +45,7 @@ module Esendex
       subject { DummyHashSerialisation.new(@attrs).to_hash }
 
       it "should match the init hash" do
-        subject.should eq(@attrs)
+        expect(subject).to eq(@attrs)
       end
     end
 

data/spec/inbound_message_spec.rb

@@ -22,22 +22,22 @@ describe InboundMessage do
     subject { InboundMessage.from_xml source }
 
     it "should set the id" do
-      subject.id.should eq(id)
+      expect(subject.id).to eq(id)
     end
     it "should set the message_id" do
-      subject.message_id.should eq(message_id)
+      expect(subject.message_id).to eq(message_id)
     end
     it "should set the account_id" do
-      subject.account_id.should eq(account_id)
+      expect(subject.account_id).to eq(account_id)
     end
     it "should set the message_text" do
-      subject.message_text.should eq(message_text)
+      expect(subject.message_text).to eq(message_text)
     end
     it "should set the from" do
-      subject.from.should eq(from)
+      expect(subject.from).to eq(from)
     end
     it "should set the to" do
-      subject.to.should eq(to)
+      expect(subject.to).to eq(to)
     end
   end
 end

data/spec/message_batch_submission_spec.rb

@@ -10,18 +10,18 @@ describe MessageBatchSubmission do
     subject { message_batch.xml_node }
 
     it "creates message nodes" do
-      subject.xpath('//messages/message').count.should eq(messages.count)
+      expect(subject.xpath('//messages/message').count).to eq(messages.count)
     end
     
     it "sets the message to" do
       (0..1).each do |i|
-        subject.xpath('//messages/message/to')[i].content.should eq(messages[i].to)
+        expect(subject.xpath('//messages/message/to')[i].content).to eq(messages[i].to)
       end
     end
     
     it "sets the message body" do
       (0..1).each do |i|
-        subject.xpath('//messages/message/body')[i].content.should eq(messages[i].body)
+        expect(subject.xpath('//messages/message/body')[i].content).to eq(messages[i].body)
       end
     end
     
@@ -33,7 +33,7 @@ describe MessageBatchSubmission do
       end
 
       it "creates a properly formatted sendat node" do
-        subject.at_xpath('//messages/sendat').content.should eq("2011-04-07T15:00:00")
+        expect(subject.at_xpath('//messages/sendat').content).to eq("2011-04-07T15:00:00")
       end
     end
   end

data/spec/message_delivered_event_spec.rb

@@ -18,16 +18,16 @@ describe MessageDeliveredEvent do
     subject { MessageDeliveredEvent.from_xml source }
 
     it "should set the id" do
-      subject.id.should eq(id)
+      expect(subject.id).to eq(id)
     end
     it "should set the message_id" do
-      subject.message_id.should eq(message_id)
+      expect(subject.message_id).to eq(message_id)
     end
     it "should set the account_id" do
-      subject.account_id.should eq(account_id)
+      expect(subject.account_id).to eq(account_id)
     end
     it "should set the occurred_at" do
-      subject.occurred_at.to_i.should eq(occurred_at.to_i)
+      expect(subject.occurred_at.to_i).to eq(occurred_at.to_i)
     end
   end
 end

data/spec/message_failed_event_spec.rb

@@ -18,16 +18,16 @@ describe MessageFailedEvent do
     subject { MessageFailedEvent.from_xml source }
 
     it "should set the id" do
-      subject.id.should eq(id)
+      expect(subject.id).to eq(id)
     end
     it "should set the message_id" do
-      subject.message_id.should eq(message_id)
+      expect(subject.message_id).to eq(message_id)
     end
     it "should set the account_id" do
-      subject.account_id.should eq(account_id)
+      expect(subject.account_id).to eq(account_id)
     end
     it "should set the occurred_at" do
-      subject.occurred_at.to_i.should eq(occurred_at.to_i)
+      expect(subject.occurred_at.to_i).to eq(occurred_at.to_i)
     end
   end
 end

data/spec/message_spec.rb

@@ -8,15 +8,15 @@ describe Message do
     let(:message) { Esendex::Message.new(to, body, from) }
     
     it "should have to set" do
-      message.to.should eq(to)
+      expect(message.to).to eq(to)
     end
     
     it "should have from set" do
-      message.from.should eq(from)
+      expect(message.from).to eq(from)
     end
     
     it "should have body set" do
-      message.body.should eq(body)
+      expect(message.body).to eq(body)
     end
   end
   
@@ -28,10 +28,10 @@ describe Message do
     subject { message.xml_node }
 
     it "contains a to node" do
-      subject.at_xpath('//message/to').content.should eq(to)
+      expect(subject.at_xpath('//message/to').content).to eq(to)
     end
     it "contains a body node" do
-      subject.at_xpath('//message/body').content.should eq(body)
+      expect(subject.at_xpath('//message/body').content).to eq(body)
     end
 
     context "when #from set" do
@@ -42,7 +42,7 @@ describe Message do
       end
 
       it "contains a from node" do
-        subject.at_xpath('//message/from').content.should eq(from)
+        expect(subject.at_xpath('//message/from').content).to eq(from)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rspec'
+require 'rspec/collection_matchers'
 
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"

data/spec/voice_message_spec.rb

@@ -10,19 +10,19 @@ describe VoiceMessage do
 
     context 'its xml' do
       it "contains to" do
-        subject.at_xpath('//message/to').content.should eq(to)
+        expect(subject.at_xpath('//message/to').content).to eq(to)
       end
 
       it "contains body" do
-        subject.at_xpath('//message/body').content.should eq(body)
+        expect(subject.at_xpath('//message/body').content).to eq(body)
       end
 
       it "contains type" do
-        subject.at_xpath('//message/type').content.should eq('Voice')
+        expect(subject.at_xpath('//message/type').content).to eq('Voice')
       end
 
       it "contains language" do
-        subject.at_xpath('//message/lang').content.should eq('en-GB')
+        expect(subject.at_xpath('//message/lang').content).to eq('en-GB')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esendex
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam Bird
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nestful
@@ -28,16 +28,22 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4.1
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4.1
+        version: 1.8.2
 description: Send SMS from your application using the Esendex API
 email:
 - support@esendex.com
@@ -97,6 +103,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -111,7 +118,8 @@ files:
 - spec/spec_helper.rb
 - spec/voice_message_spec.rb
 homepage: http://developers.esendex.com
-licenses: []
+licenses:
+- Nonstandard
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -119,9 +127,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -129,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Gem for interacting with the Esendex API
@@ -158,6 +166,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html