cellular 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 795f3cf5910cae941deac18841ab94e637597054
-  data.tar.gz: 20b41bc30ceee340d9daa9b129ce456c518d5e78
+  metadata.gz: 3fdd4bd856508028b2de1f016627e9a107be0dd4
+  data.tar.gz: a50db77596d53823b496506604356532e9519096
 SHA512:
-  metadata.gz: 9d6de54b0843941760b6c9cd0a728a80d37d357d728cd3a999e703754bf315aad26395da9834272fd3cf3513b3e92066d5cca2c7e0f2588bddfea59e014c12e7
-  data.tar.gz: 7b2cb314b60c8c43e646b50c2005ce98e86132002c3db9d92df124b27339c35312c5fb7dace0956fa0f37dbb401be1ce952e13314f6e02f9f9c576dcb2d425cc
+  metadata.gz: 1670df114c490aae52f7ad804656c4e3d538929f07fa7cbda5121466a4cfe637b3dcec5d39bb5c80e0a575e691842b8734bbe925011195b31a14d97dd4b746b8
+  data.tar.gz: 9403f6ab944a9e0bba7df7b26a0e18c334f8a9bf16635c1cf4835573070aa1161c54814adc84e385fc1bac203097a9afddc0c8a83c36e4ee5e28afcdc0373bbe

data/CHANGELOG.md

@@ -0,0 +1,38 @@
+# Changelog
+
+### Next release
+
+- Add `SMS#deliver_at` for scheduled delivery through Sidekiq.
+
+
+### v1.3.0 - November 18, 2014
+
+- Drop support for Ruby 1.9.
+- Log and test backends for development purposes.
+- Add `SMS#deliver_later` for asynchronous delivery through Sidekiq.
+
+
+### v1.2.0 - March 5, 2014
+
+- Global configuration for sender, price and country code.
+
+
+### v1.1.0 - February 28, 2014
+
+- Drop support for Ruby 1.9.1 and 1.9.2.
+- CoolSMS backend support.
+
+
+### v1.0.0 - February 3, 2014
+
+- Metadata, copyright and license tweaks.
+
+
+### v0.0.1 - August 27, 2013
+
+- Initial release with Sendega backend support.
+
+
+### v0.0.0 - May 8, 2013
+
+- Placeholder release to secure Ruby gem.

data/Guardfile

@@ -1,6 +1,23 @@
-guard :rspec do
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec, cmd: 'bundle exec rspec', notification: false do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})          { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^spec/support/(.+)\.rb$}) { 'spec' }
-  watch('spec/spec_helper.rb')       { 'spec' }
-end
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end

data/README.md

@@ -42,6 +42,9 @@ Cellular.configure do |config|
 end
 ```
 
+Cellular uses Rails' [ActiveJob](http://edgeguides.rubyonrails.org/active_job_basics.html)
+interface to interact with queue backends. Read appropriate documentation to set up queue.
+
 
 ### Available Backends
 
@@ -66,11 +69,26 @@ sms = Cellular::SMS.new(
 
 sms.deliver
 ```
+For use with multiple recipients in one request use:
+
+```ruby
+sms = Cellular::SMS.new(
+  recipients: ['47xxxxxxx1','47xxxxxxx2','47xxxxxxx3'],
+  sender: 'Custom sender',
+  message: 'This is an SMS message',
+  price: 0,
+  country_code: 'NO' # defaults to Cellular.config.country_code
+)
+
+sms.deliver
+```
+
 
-You can also use Sidekiq to send texts, which is great if you're in a Rails app
-and are concerned that it might time out or something. Actually, if you have
-Sidekiq at your disposal, it's a great idea anyway! To use it, just call
-`deliver_later` instead of `deliver` on the SMS object:
+#### Delayed SMSs delivery
+
+You can also send texts asynchronously, which is great if you're in a Rails app
+and are concerned that it might time out or something. To use it, just call
+`deliver_async` instead of `deliver` on the SMS object:
 
 ```ruby
 sms = Cellular::SMS.new(
@@ -79,14 +97,29 @@ sms = Cellular::SMS.new(
   message: 'This is an SMS message'
 )
 
-sms.deliver_later
+sms.deliver_async
 ```
 
-This will create a Sidekiq job for you on the **cellular** queue, so make sure
-that Sidekiq is processing that queue.
+This will create a delayed job for you on the **cellular** queue, so make sure
+that your queue processor is running.
+
+To override queue name, use **queue** option
+
+```ruby
+sms.deliver_async(queue: :urgent)
+```
+Using ActiveJob, Cellular allows you to schedule the time when an SMS will be sent.
+Just call `deliver_async(wait_until: timestamp)` or `deliver_async(wait: time)` on the SMS object:
 
-[sidekiq]: http://sidekiq.org
+```ruby
+sms = Cellular::SMS.new(
+  recipient: '47xxxxxxxx',
+  sender: 'Custom sender',
+  message: 'This is an SMS message'
+)
 
+sms.deliver_async(wait_until: Date.tomorrow.noon)
+```
 
 ## Contributing
 

data/cellular.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'httparty', '~> 0.13.0'
   gem.add_dependency 'savon',    '~> 2.0'
+  gem.add_dependency 'rails',    '>= 4.2'
 
   gem.add_development_dependency 'pry', '~> 0.10'
 
@@ -29,7 +30,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'webmock', '~> 1.19'
 
-  gem.add_development_dependency 'sidekiq', '~> 3.2'
   gem.add_development_dependency 'rspec-rails', '~> 2.99'
 
   gem.add_development_dependency 'coveralls', '~> 0.7'

data/lib/cellular.rb

@@ -5,6 +5,8 @@ require 'cellular/backends'
 require 'cellular/jobs'
 
 module Cellular
+  autoload :Logger, 'cellular/logger'
+
   @deliveries = []
 
   class << self

data/lib/cellular/backends.rb

@@ -1,5 +1,6 @@
 module Cellular
   module Backends
+    autoload :Backend, 'cellular/backends/backend'
     autoload :CoolSMS, 'cellular/backends/cool_sms'
     autoload :Sendega, 'cellular/backends/sendega'
     autoload :Log,     'cellular/backends/log'

data/lib/cellular/backends/backend.rb

@@ -0,0 +1,13 @@
+module Cellular
+  module Backends
+    class Backend
+      def self.deliver(options = {})
+        raise NotImplementedError
+      end
+
+      def self.receive(data)
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/cellular/backends/cool_sms.rb

@@ -2,30 +2,58 @@ require 'httparty'
 
 module Cellular
   module Backends
-    class CoolSMS
+    class CoolSMS < Backend
 
       # Documentation: http://www.coolsms.com/support/dokumentation/http-gateway.sms
       GATEWAY_URL = 'https://sms.coolsmsc.dk/'
 
       def self.deliver(options = {})
-        query = {
+        request_queue = {}
+
+        recipients_batch(options).each_with_index do |recipient, index|
+          options[:batch] = recipient
+          result = HTTParty.get(GATEWAY_URL, query: defaults_with(options) )
+          request_queue[index] = {
+            recipient: recipient,
+            response: parse_response(result.parsed_response['smsc'])
+          }
+        end
+
+        # return first response for now
+        request_queue[0][:response]
+      end
+
+      def self.parse_response(response)
+        [
+          response['status'],
+          response['result'] || response['message']['result']
+        ]
+      end
+
+      def self.coolsms_config
+        {
           username: Cellular.config.username,
-          password: Cellular.config.password,
+          password: Cellular.config.password
+        }
+      end
+
+      def self.defaults_with(options)
+        {
           from: options[:sender],
-          to: options[:recipient],
+          to: options[:batch],
           message: options[:message],
           charset: 'utf-8',
           resulttype: 'xml',
           lang: 'en'
-        }
-
-        result = HTTParty.get(GATEWAY_URL, query: query)
-        response = result.parsed_response['smsc']
+        }.merge!(coolsms_config)
+      end
 
-        [
-          response['status'],
-          response['result'] || response['message']['result']
-        ]
+      def self.recipients_batch(options)
+        if options[:recipients].blank?
+          [options[:recipient]]
+        else
+          options[:recipients]
+        end
       end
 
     end

data/lib/cellular/backends/log.rb

@@ -1,12 +1,8 @@
 module Cellular
   module Backends
-    class Log
+    class Log < Backend
       def self.deliver(options = {})
-        $stdout.puts options[:message]
-      end
-
-      def self.receive(data)
-        raise NotImplementedError
+        Cellular.config.logger.info options[:message]
       end
     end
   end

data/lib/cellular/backends/sendega.rb

@@ -2,7 +2,7 @@ require 'savon'
 
 module Cellular
   module Backends
-    class Sendega
+    class Sendega < Backend
 
       GATEWAY_URL = 'https://smsc.sendega.com/Content.asmx?WSDL'
 
@@ -35,49 +35,73 @@ module Cellular
         # http://controlpanel.sendega.no/Content/Sendega%20-%20API%20documentation%20v2.3.pdf
 
         savon_options[:wsdl] = GATEWAY_URL
-
+        request_queue = {}
         client = Savon.client savon_options
 
-        result = client.call(:send, message: {
-            username: Cellular.config.username,
-            password: Cellular.config.password,
-            sender: options[:sender],
-            destination: options[:recipient],
-            pricegroup: options[:price] || 0, # default price to 0
-            contentTypeID: 1,
-            contentHeader: '',
-            content: options[:message],
-            dlrUrl: Cellular.config.delivery_url,
-            ageLimit: 0,
-            extID: '',
-            sendDate: '',
-            refID: '',
-            priority: 0,
-            gwID: 0,
-            pid: 0,
-            dcs: 0
-          }
-        )
-
-        body = result.body[:send_response][:send_result]
+        recipients_batch(options).each_with_index do |batch, index|
+          options[:batch] = batch
+          result = client.call(:send, message: defaults_with(options))
 
-        if body[:success]
-          [
-            body[:error_number].to_i,
-            'Message is received and is being processed.'
-          ]
-        else
-          [
-            body[:error_number].to_i,
-            body[:error_message]
-          ]
+          request_queue[index] = {
+            batch: batch,
+            result: result,
+            body:result.body[:send_response][:send_result],
+            response: map_response(result.body[:send_response][:send_result])
+          }
         end
+
+        # for now just resturn first response
+        request_queue[0][:response]
       end
 
       def self.receive(data)
         raise NotImplementedError
       end
 
+      def self.savon_config
+        {
+           username: Cellular.config.username,
+           password: Cellular.config.password,
+           dlrUrl: Cellular.config.delivery_url
+        }
+      end
+
+      def self.defaults_with(options)
+       {
+          sender: options[:sender],
+          destination: options[:batch],
+          pricegroup: options[:price] || 0, # default price to 0
+          contentTypeID: 1,
+          contentHeader: '',
+          content: options[:message],
+          ageLimit: 0,
+          extID: '',
+          sendDate: '',
+          refID: '',
+          priority: 0,
+          gwID: 0,
+          pid: 0,
+          dcs: 0
+        }.merge!(savon_config)
+      end
+
+      def self.map_response(_body)
+        msg = _body[:success] ?  success_message : _body[:error_message]
+        [ _body[:error_number].to_i, msg ]
+      end
+
+      def self.success_message
+        'Message is received and is being processed.'
+      end
+
+      def self.recipients_batch(options)
+        if options[:recipients].blank?
+          [options[:recipient]]
+        else
+          options[:recipients].each_slice(100).to_a.map{|x| x.join(',') }
+        end
+      end
+
     end
   end
 end

data/lib/cellular/backends/test.rb

@@ -1,13 +1,9 @@
 module Cellular
   module Backends
-    class Test
+    class Test < Backend
       def self.deliver(options = {})
         Cellular.deliveries << options[:message]
       end
-
-      def self.receive(data)
-        raise NotImplementedError
-      end
     end
   end
 end

data/lib/cellular/configuration.rb

@@ -4,6 +4,12 @@ module Cellular
     attr_accessor :username, :password, :delivery_url, :backend
 
     attr_accessor :country_code, :price, :sender
+    
+    attr_accessor :logger
+    
+    def logger
+      @logger ||= Object.const_defined?(:Rails) ? Rails.logger : Logger.new
+    end
 
   end
 end

data/lib/cellular/jobs/async_messenger.rb

@@ -1,7 +1,7 @@
-class Cellular::Jobs::AsyncMessenger
-  include Sidekiq::Worker
+require 'active_job'
 
-  sidekiq_options queue: :cellular, retry: false
+class Cellular::Jobs::AsyncMessenger < ActiveJob::Base
+  queue_as :cellular
 
   def perform(sms_options)
     sms_options.keys.each do |key|
@@ -11,5 +11,4 @@ class Cellular::Jobs::AsyncMessenger
     sms = Cellular::SMS.new sms_options
     sms.deliver
   end
-
 end

data/lib/cellular/logger.rb

@@ -0,0 +1,12 @@
+module Cellular
+
+  # An API compatible logger when not in a rails environment
+  # logs to stdout
+  class Logger
+    def info(message)
+      $stdout.puts message
+    end
+  end
+
+end
+

data/lib/cellular/models/sms.rb

@@ -1,11 +1,14 @@
+require 'active_support/time'
+
 module Cellular
   class SMS
 
     attr_accessor :recipient, :sender, :message, :price, :country_code
-
+    attr_accessor :recipients
     def initialize(options = {})
       @backend = Cellular.config.backend
 
+      @recipients = options[:recipients]
       @recipient = options[:recipient]
       @sender = options[:sender] || Cellular.config.sender
       @message = options[:message]
@@ -20,9 +23,10 @@ module Cellular
       @delivered = true
     end
 
-    def deliver_later
-      Cellular::Jobs::AsyncMessenger.perform_async options
+    def deliver_async(delivery_options = {})
+      Cellular::Jobs::AsyncMessenger.set(delivery_options).perform_later(options)
     end
+    alias_method :deliver_later, :deliver_async
 
     def save(options = {})
       raise NotImplementedError
@@ -35,21 +39,12 @@ module Cellular
     def delivered?
       @delivered
     end
-    
-    def country
-      warn "[DEPRECATION] 'country' is deprecated; use 'country_code' instead"
-      @country_code
-    end
-
-    def country=(country)
-      warn "[DEPRECATION] 'country' is deprecated; use 'country_code' instead"
-      @country_code = country
-    end
 
     private
 
     def options
       {
+        recipients: @recipients,
         recipient: @recipient,
         sender: @sender,
         message: @message,

data/lib/cellular/version.rb

@@ -1,3 +1,3 @@
 module Cellular
-  VERSION = '1.3.0'
+  VERSION = '2.0.0'
 end

data/spec/cellular/backends/cool_sms_spec.rb

@@ -14,6 +14,19 @@ describe Cellular::Backends::CoolSMS do
     }
   }
 
+  let(:payload) {
+    {
+      username: 'username',
+      password: 'password',
+      from: sender,
+      to: recipient,
+      message: message,
+      charset: 'utf-8',
+      resulttype: 'xml',
+      lang: 'en'
+    }
+  }
+
   before do
     Cellular.config.username = 'username'
     Cellular.config.password = 'password'
@@ -26,16 +39,8 @@ describe Cellular::Backends::CoolSMS do
     end
 
     it 'uses HTTParty to deliver an SMS' do
-      expect(HTTParty).to receive(:get).with(described_class::GATEWAY_URL, query: {
-        username: 'username',
-        password: 'password',
-        from: sender,
-        to: recipient,
-        message: message,
-        charset: 'utf-8',
-        resulttype: 'xml',
-        lang: 'en'
-      }).and_call_original
+      expect(HTTParty).to receive(:get).with(described_class::GATEWAY_URL, query:
+        payload).and_call_original
 
       described_class.deliver(options)
     end
@@ -64,4 +69,45 @@ describe Cellular::Backends::CoolSMS do
     end
   end
 
+  describe '::parse_response' do
+    it 'should return the correct response' do
+      message = ['success', 'The message was sent correctly.']
+
+      check = { 'status' => message[0], 'result' => message[1] }
+      second_check =  { 'status' => message[0],
+                        'message' => { 'result' => message[1] } }
+
+      expect(described_class.parse_response(check)).to eq(message)
+      expect(described_class.parse_response(second_check)).to eq(message)
+    end
+  end
+
+  describe '::coolsms_config' do
+    it 'should return the config for coolsms' do
+      expect(described_class.coolsms_config).to eq(
+        {
+          username: Cellular.config.username,
+          password: Cellular.config.password
+        })
+    end
+  end
+
+  describe '::defaults_with' do
+    it 'should return the whole query' do
+      options[:batch] = recipient
+      expect(described_class.defaults_with(options)).to eq(payload)
+    end
+  end
+
+  describe '::recipients_batch' do
+    it 'should wrap recipient option into a array' do
+      expect(described_class.recipients_batch({recipient: recipient}))
+        .to eq([recipient])
+    end
+    it 'should return recipients option as it is' do
+      expect(described_class.recipients_batch({recipients: [recipient,recipient]}))
+        .to eq([recipient,recipient])
+    end
+  end
+
 end

data/spec/cellular/backends/log_with_rails_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Cellular::Backends::Log do
+
+  let(:recipient) { '47xxxxxxxx' }
+  let(:sender)    { 'Custom sender' }
+  let(:message)   { 'This is an SMS message' }
+  let(:price)     { 100 }
+  let(:country)   { 'NO '}
+
+  let(:options) {
+    {
+      recipient: recipient,
+      sender: sender,
+      message: message,
+      price: price
+    }
+  }
+
+  before do
+    # mock rails, we're pretending we're in a rails env
+    rails = Class.new
+    def rails.logger
+      @logger ||= Cellular::Logger.new
+    end
+    Object.const_set(:Rails, rails)
+    
+    Cellular.config.username = 'username'
+    Cellular.config.password = 'password'
+    Cellular.config.delivery_url = nil
+    Cellular.config.logger = nil # so it will autowire
+  end
+  
+  after do
+    Object.send :remove_const, :Rails
+  end
+
+  describe '::deliver' do
+    let(:deliveries) { Cellular.deliveries }
+
+    it 'logs the message' do
+      expect(Rails.logger).to receive(:info)
+      described_class.deliver(options)
+    end
+  end
+
+end

data/spec/cellular/backends/sendega_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Cellular::Backends::Sendega do
 
-  let(:recipient) { '47xxxxxxxx' }
-  let(:sender)    { 'Custom sender' }
-  let(:message)   { 'This is an SMS message' }
-  let(:price)     { 100 }
-  let(:country)   { 'NO '}
-
-  let(:options) {
+  let(:recipient)  { '47xxxxxxxx' }
+  let(:sender)     { 'Custom sender' }
+  let(:message)    { 'This is an SMS message' }
+  let(:price)      { 100 }
+  let(:country)    { 'NO '}
+  let(:recipients) { (1..300).to_a.map!{|n| "47xxxxxxx#{n}"} }
+  let(:options)    {
     {
       recipient: recipient,
       sender: sender,
@@ -22,6 +22,28 @@ describe Cellular::Backends::Sendega do
     }
   }
 
+  let(:payload) {
+    {
+      username: Cellular.config.username,
+      password: Cellular.config.password,
+      sender: sender,
+      destination: recipient,
+      pricegroup: price,
+      contentTypeID: 1,
+      contentHeader: '',
+      content: message,
+      dlrUrl: nil,
+      ageLimit: 0,
+      extID: '',
+      sendDate: '',
+      refID: '',
+      priority: 0,
+      gwID: 0,
+      pid: 0,
+      dcs: 0
+    }
+  }
+
   before do
     stub_request(:get, described_class::GATEWAY_URL).
       to_return body: fixture('backends/sendega/service.wsdl')
@@ -38,25 +60,8 @@ describe Cellular::Backends::Sendega do
 
       result = double(body: {send_response: {send_result: {}}})
 
-      expect(client).to receive(:call).with(:send, message: {
-        username: Cellular.config.username,
-        password: Cellular.config.password,
-        sender: sender,
-        destination: recipient,
-        pricegroup: price,
-        contentTypeID: 1,
-        contentHeader: '',
-        content: message,
-        dlrUrl: nil,
-        ageLimit: 0,
-        extID: '',
-        sendDate: '',
-        refID: '',
-        priority: 0,
-        gwID: 0,
-        pid: 0,
-        dcs: 0
-      }).and_return result
+      expect(client).to receive(:call).with(:send, message:
+      payload).and_return result
 
       described_class.deliver(options, savon_options)
     end
@@ -98,4 +103,42 @@ describe Cellular::Backends::Sendega do
     end
   end
 
+  describe '::success_message' do
+    it 'should return this message' do
+      expect(
+        described_class.success_message)
+      .to eq 'Message is received and is being processed.'
+    end
+  end
+
+
+  describe '::defaults_with' do
+    it 'should return the whole payload' do
+      options[:batch] = recipient
+      expect(described_class.defaults_with(options)).to eq(payload)
+   end
+  end
+
+  describe '::savon_config' do
+    it 'should return a hash with config' do
+      expect(described_class.savon_config)
+      .to eq({
+           username: Cellular.config.username,
+           password: Cellular.config.password,
+           dlrUrl: Cellular.config.delivery_url
+        })
+    end
+  end
+
+  describe '::recipients_batch' do
+    it 'should split recipients into arrays of 100 then join them with ,' do
+      check = described_class.recipients_batch({recipients:recipients}).length
+      expect(check).to eq 3
+    end
+
+    it 'should put recipient into one array' do
+      check = described_class.recipients_batch({receipient:recipient}).length
+      expect(check).to eq 1
+    end
+  end
 end

data/spec/cellular/configuration_spec.rb

@@ -17,5 +17,8 @@ describe Cellular::Configuration do
   it { should respond_to :country_code }
   it { should respond_to :sender= }
   it { should respond_to :sender }
+  
+  it { should respond_to :logger= }
+  it { should respond_to :logger }
 
 end

data/spec/cellular/logger_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Cellular::Logger do
+
+  it { should respond_to :info }
+
+end

data/spec/cellular/models/sms_spec.rb

@@ -7,9 +7,11 @@ describe Cellular::SMS do
   let(:message)      { 'This is an SMS message' }
   let(:price)        { 100 }
   let(:country_code) { 'NO'}
+  let(:recipients)   { nil }
 
   subject do
     described_class.new(
+      recipients: recipients,
       recipient: recipient,
       sender: sender,
       message: message,
@@ -23,11 +25,11 @@ describe Cellular::SMS do
   end
 
   describe '#initialize' do
-    its(:recipient)    { should eq recipient }
-    its(:sender)       { should eq sender }
-    its(:message)      { should eq message }
-    its(:price)        { should eq price }
-    its(:country_code) { should eq country_code }
+    it{ expect(subject.recipient).to eq recipient }
+    it{ expect(subject.sender).to eq sender }
+    it{ expect(subject.message).to eq message }
+    it{ expect(subject.price).to eq price }
+    it{ expect(subject.country_code).to eq country_code }
 
     it { should_not be_delivered }
 
@@ -37,8 +39,7 @@ describe Cellular::SMS do
       end
 
       subject { described_class.new }
-
-      its(:sender) { should eq 'Hyper' }
+      it{ expect(subject.sender).to eq 'Hyper' }
     end
 
     context 'when price omitted' do
@@ -48,7 +49,7 @@ describe Cellular::SMS do
 
       subject { described_class.new }
 
-      its(:price) { should eq 5 }
+      it{ expect(subject.price).to be 5 }
     end
 
     context 'when country omitted' do
@@ -57,14 +58,14 @@ describe Cellular::SMS do
       end
 
       subject { described_class.new }
-
-      its(:country_code) { should eq 'NL' }
+      it{ expect(subject.country_code).to eq 'NL'}
     end
   end
 
   describe '#deliver' do
     before do
       expect(Cellular::Backends::Sendega).to receive(:deliver).with(
+        recipients: recipients,
         recipient: recipient,
         sender: sender,
         price: price,
@@ -79,22 +80,24 @@ describe Cellular::SMS do
     end
   end
 
-  describe "#deliver_later" do
-    it "calls out to the Sidekiq job to send the SMS" do
+  describe "#deliver_async" do
+    it "makes ActiveJob schedule an SMS job" do
       sms_options = {
         receiver: "12345678",
         message: "Test SMS"
       }
+      wait = 100
 
-      expect(Cellular::Jobs::AsyncMessenger)
-        .to receive(:perform_async)
-        .with sms_options
+      expect_any_instance_of(ActiveJob::ConfiguredJob)
+        .to receive(:perform_later)
+        .with(sms_options)
 
       sms = Cellular::SMS.new sms_options
 
+      allow(ActiveJob::Base).to receive(:queue_adapter).and_return ActiveJob::QueueAdapters::TestAdapter.new
       allow(sms).to receive(:options).and_return sms_options
 
-      sms.deliver_later
+      sms.deliver_async(wait: wait)
     end
   end
 
@@ -113,30 +116,4 @@ describe Cellular::SMS do
       end.to raise_error NotImplementedError
     end
   end
-
-  describe '#country' do
-    it 'issues a deprecation warning' do
-      expect(subject).to receive(:warn)
-      subject.country
-    end
-
-    it 'returns country_code' do
-      allow(subject).to receive(:warn)
-      expect(subject.country).to eq(subject.country_code)
-    end
-  end
-
-  describe '#country=' do
-    it 'issues a deprecation warning' do
-      expect(subject).to receive(:warn)
-      subject.country = 'Test'
-    end
-
-    it 'assigns country_code' do
-      allow(subject).to receive(:warn)
-      subject.country = 'Test'
-      expect(subject.country_code).to eq('Test')
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cellular
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sindre Moen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +123,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.19'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.md
@@ -182,6 +183,7 @@ files:
 - cellular.gemspec
 - lib/cellular.rb
 - lib/cellular/backends.rb
+- lib/cellular/backends/backend.rb
 - lib/cellular/backends/cool_sms.rb
 - lib/cellular/backends/log.rb
 - lib/cellular/backends/sendega.rb
@@ -189,14 +191,17 @@ files:
 - lib/cellular/configuration.rb
 - lib/cellular/jobs.rb
 - lib/cellular/jobs/async_messenger.rb
+- lib/cellular/logger.rb
 - lib/cellular/models/sms.rb
 - lib/cellular/version.rb
 - spec/cellular/backends/cool_sms_spec.rb
 - spec/cellular/backends/log_spec.rb
+- spec/cellular/backends/log_with_rails_spec.rb
 - spec/cellular/backends/sendega_spec.rb
 - spec/cellular/backends/test_spec.rb
 - spec/cellular/configuration_spec.rb
 - spec/cellular/jobs/async_messenger_spec.rb
+- spec/cellular/logger_spec.rb
 - spec/cellular/models/sms_spec.rb
 - spec/cellular_spec.rb
 - spec/fixtures/backends/cool_sms/failure.xml
@@ -232,10 +237,12 @@ summary: Sending and receiving SMSs through pluggable backends
 test_files:
 - spec/cellular/backends/cool_sms_spec.rb
 - spec/cellular/backends/log_spec.rb
+- spec/cellular/backends/log_with_rails_spec.rb
 - spec/cellular/backends/sendega_spec.rb
 - spec/cellular/backends/test_spec.rb
 - spec/cellular/configuration_spec.rb
 - spec/cellular/jobs/async_messenger_spec.rb
+- spec/cellular/logger_spec.rb
 - spec/cellular/models/sms_spec.rb
 - spec/cellular_spec.rb
 - spec/fixtures/backends/cool_sms/failure.xml