pling 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fb8c723baf8c8b7f33c0b075149f38e39de4ab
-  data.tar.gz: 30c16bebcb41673f27cf53406f83f777bc2a7e19
+  metadata.gz: 4fef188f5e7d129c8a2f1b57405aef88b36ba3be
+  data.tar.gz: 67837b1fb7ff04fe817d129b4d031bb88cfdbf42
 SHA512:
-  metadata.gz: 3db92d5659854c437a30d14806c671a2d8de09dc95bd22d09fd40a78c632c82852c0801e9bcc3e7b9260629bc329676b29eb8e0a3d2819e486bdb090c599834b
-  data.tar.gz: 4ba6ed0a03b888bd70371dccdb06c91a87c81c0cdcde45262e49d6a9b777df2baa80b35eb07f1f5455f1c8ade9ee5b66e6191b649fe76f84e8f06a5a9773fe6f
+  metadata.gz: d9093e9bb989269561b1624f021589a9191838eafff1f79c3fa2da0fcc82caf2b3ee0b668bd6d91464de33bba0e204f37c3d3bde8111d66544aba93684a5e4ea
+  data.tar.gz: 355b638ac06e00f23cf6026a285c79c1b62c5a46d9246365f19b6121c4c90d732dea357e8101a2633094e68a07b84c04d5ab4a7dd91472a33b1b15422266f62a

data/.travis.yml

@@ -1,13 +1,7 @@
-before_install:
-  - gem update --system
-  - gem --version
+sudo: false
 language: ruby
 rvm:
   - ruby-head
-  - 1.9.3
+  - 2.2.3
+  - 2.1.7
   - jruby
-  - jruby-19mode
-  - rbx-2
-matrix:
-  allow_failures:
-    - rvm: ruby-head

data/README.md

@@ -148,4 +148,4 @@ See a list of all contributors on [GitHub](https://github.com/flinc/pling/contri
 
 ## Copyright
 
-Copyright (c) 2010-2011 [flinc AG](https://flinc.org/). See LICENSE for details.
+Copyright (c) 2010-2011 [flinc GmbH](https://flinc.org/). See LICENSE for details.

data/lib/pling/apn/gateway.rb

@@ -50,10 +50,12 @@ module Pling
           :aps => {
             :alert => message.body,
             :badge => message.badge && message.badge.to_i,
-            :sound => message.sound
+            :sound => message.sound,
           }.delete_if { |_, value| value.nil? }
         }
 
+        data[:aps]['content-available'] = 1 if message.content_available
+        data[:aps]['category'] = message.category if message.category
         data.merge!(message.payload) if configuration[:payload] && message.payload
 
         data = data.to_json

data/lib/pling/message.rb

@@ -65,6 +65,30 @@ module Pling
       @payload = payload
     end
 
+    ##
+    # The content_available property - not supported by all gateways
+    #
+    # @overload content_available
+    # @overload content_available=()
+    attr_reader :content_available
+
+    def content_available=(content_available)
+      content_available &&= !!content_available
+      @content_available = content_available
+    end
+
+    ##
+    # The category property - not supported by all gateways
+    #
+    # @overload category
+    # @overload category=()
+    attr_reader :category
+
+    def category=(category)
+      category &&= category.to_s
+      @category = category
+    end
+
     ##
     # Creates a new Pling::Message instance with the given body
     #

data/lib/pling/version.rb

@@ -1,3 +1,3 @@
 module Pling
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/pling.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "connection_pool", "~> 2.0"
   s.add_runtime_dependency("jruby-openssl") if RUBY_PLATFORM == 'java'
 
-  s.add_development_dependency "rspec", "~> 2.7"
+  s.add_development_dependency "rspec", "~> 3.3"
+  s.add_development_dependency "rspec-its", ">= 1.2"
   s.add_development_dependency "yard", ">= 0.7"
   s.add_development_dependency "rake", ">= 0.9"
 end

data/spec/pling/adapter/base_spec.rb

@@ -6,7 +6,7 @@ describe Pling::Adapter::Base do
 
     let(:device)  { Pling::Device.new }
     let(:message) { Pling::Message.new }
-    let(:gateway) { mock(:deliver => true) }
+    let(:gateway) { double(:gateway_double, :deliver => true) }
 
     it 'should try to discover a gateway' do
       Pling::Gateway.should_receive(:discover).with(device).and_return(gateway)
@@ -19,4 +19,4 @@ describe Pling::Adapter::Base do
       subject.deliver(message, device)
     end
   end
-end
+end

data/spec/pling/apn/gateway_spec.rb

@@ -37,11 +37,11 @@ describe Pling::APN::Gateway do
     subject { Pling::APN::Gateway.new(valid_configuration) }
 
     it 'should raise an error if no message is given' do
-      expect { subject.deliver(nil, device) }.to raise_error
+      expect { subject.deliver(nil, device) }.to raise_error(ArgumentError, /do not implement #to_pling_message/)
     end
 
     it 'should raise an error the device is given' do
-      expect { subject.deliver(message, nil) }.to raise_error
+      expect { subject.deliver(message, nil) }.to raise_error(ArgumentError, /do not implement #to_pling_device/)
     end
 
     it 'should initialize a new APN connection if none is established' do
@@ -118,6 +118,40 @@ describe Pling::APN::Gateway do
       subject.deliver(message, device)
     end
 
+    it 'should include the given content_available flag' do
+      expected_payload = {
+        'aps' => {
+          'alert' => 'Hello from Pling',
+          'content-available' => 1
+        }
+      }
+
+      connection.stub(:write) do |packet|
+        JSON.parse(packet[37..-1]).should eq(expected_payload)
+      end
+
+      message.content_available = 1
+
+      subject.deliver(message, device)
+    end
+
+    it 'should include the given category' do
+      expected_payload = {
+        'aps' => {
+          'alert' => 'Hello from Pling',
+          'category' => 'foobar'
+        }
+      }
+
+      connection.stub(:write) do |packet|
+        JSON.parse(packet[37..-1]).should eq(expected_payload)
+      end
+
+      message.category = 'foobar'
+
+      subject.deliver(message, device)
+    end
+
     context 'when configured to include payload' do
       before do
         valid_configuration.merge!(:payload => true)

data/spec/pling/c2dm/gateway_spec.rb

@@ -6,27 +6,27 @@ describe Pling::C2DM::Gateway do
     { :email => 'someone@gmail.com', :password => 'random', :source => 'some-source' }
   end
 
-  let(:authentication_response_mock) do
-    mock('Faraday authentication response', :success? => true, :status => 200, :body => "SID=SOMESID\nAuth=S0ME-ToKeN123")
+  let(:authentication_response_double) do
+    double(:authentication_response_double, :success? => true, :status => 200, :body => "SID=SOMESID\nAuth=S0ME-ToKeN123")
   end
 
-  let(:push_response_mock) do
-    mock('Faraday send response', :success? => true, :status => 200, :body => "")
+  let(:push_response_double) do
+    double(:push_response_double, :success? => true, :status => 200, :body => "")
   end
 
-  let(:connection_mock) do
-    mock('Faraday connection').tap do |mock|
-      mock.stub(:post).
+  let(:connection_double) do
+    double(:connection_double).tap do |connection|
+      connection.stub(:post).
         with('https://www.google.com/accounts/ClientLogin', anything).
-        and_return(authentication_response_mock)
+        and_return(authentication_response_double)
 
-      mock.stub(:post).
+      connection.stub(:post).
         with('https://android.apis.google.com/c2dm/send', anything, anything).
-        and_return(push_response_mock)
+        and_return(push_response_double)
     end
   end
 
-  before { Faraday.stub(:new).and_return(connection_mock) }
+  before { Faraday.stub(:new).and_return(connection_double) }
 
   it 'should handle various apn related device types' do
     Pling::C2DM::Gateway.handled_types.should =~ [:android, :c2dm]
@@ -60,9 +60,9 @@ describe Pling::C2DM::Gateway do
       end
 
       it 'should try to authenticate' do
-        connection_mock.should_receive(:post).
+        connection_double.should_receive(:post).
           with('https://www.google.com/accounts/ClientLogin', valid_authentication_params).
-          and_return(authentication_response_mock)
+          and_return(authentication_response_double)
 
         Pling::C2DM::Gateway.new(valid_configuration)
       end
@@ -73,13 +73,13 @@ describe Pling::C2DM::Gateway do
       end
 
       it 'should raise an error if authentication was not successful' do
-        authentication_response_mock.stub(:status => 403, :success? => false, :body => 'Error=BadAuthentication')
+        authentication_response_double.stub(:status => 403, :success? => false, :body => 'Error=BadAuthentication')
 
         expect { Pling::C2DM::Gateway.new(valid_configuration) }.to raise_error(Pling::AuthenticationFailed, /Authentication failed: \[403\] Error=BadAuthentication/)
       end
 
       it 'should raise an error if it could not extract a token from the response' do
-        authentication_response_mock.stub(:body).and_return('SOMERANDOMBODY')
+        authentication_response_double.stub(:body).and_return('SOMERANDOMBODY')
 
         expect { Pling::C2DM::Gateway.new(valid_configuration) }.to raise_error(Pling::AuthenticationFailed, /Token extraction failed/)
       end
@@ -92,25 +92,25 @@ describe Pling::C2DM::Gateway do
       end
 
       it 'should use Faraday::Response::Logger when :debug is set to true' do
-        builder = mock(:use => true, :adapter => true)
+        builder = double(:builder_double, :use => true, :adapter => true)
         builder.should_receive(:use).with(Faraday::Response::Logger)
-        Faraday.stub(:new).and_yield(builder).and_return(connection_mock)
+        Faraday.stub(:new).and_yield(builder).and_return(connection_double)
 
         Pling::C2DM::Gateway.new(valid_configuration.merge(:debug => true))
       end
 
       it 'should use the adapter set with :adapter' do
-        builder = mock(:use => true, :adapter => true)
+        builder = double(:builder_double, :use => true, :adapter => true)
         builder.should_receive(:adapter).with(:typheus)
-        Faraday.stub(:new).and_yield(builder).and_return(connection_mock)
+        Faraday.stub(:new).and_yield(builder).and_return(connection_double)
 
         Pling::C2DM::Gateway.new(valid_configuration.merge(:adapter => :typheus))
       end
 
       it 'should allow configuring the authentication_url' do
-        connection_mock.should_receive(:post).
+        connection_double.should_receive(:post).
           with('http://example.com/authentication', anything).
-          and_return(authentication_response_mock)
+          and_return(authentication_response_double)
 
         Pling::C2DM::Gateway.new(valid_configuration.merge(:authentication_url => 'http://example.com/authentication'))
       end
@@ -138,11 +138,11 @@ describe Pling::C2DM::Gateway do
     end
 
     it 'should raise an error if no message is given' do
-      expect { subject.deliver(nil, device) }.to raise_error
+      expect { subject.deliver(nil, device) }.to raise_error(ArgumentError, /do not implement #to_pling_message/)
     end
 
     it 'should raise an error the device is given' do
-      expect { subject.deliver(message, nil) }.to raise_error
+      expect { subject.deliver(message, nil) }.to raise_error(ArgumentError, /do not implement #to_pling_device/)
     end
 
     it 'should call #to_pling_message on the given message' do
@@ -156,49 +156,49 @@ describe Pling::C2DM::Gateway do
     end
 
     it 'should try to deliver the given message' do
-      connection_mock.should_receive(:post).
+      connection_double.should_receive(:post).
         with('https://android.apis.google.com/c2dm/send', valid_push_params, valid_push_headers).
-        and_return(push_response_mock)
+        and_return(push_response_double)
 
       subject.deliver(message, device)
     end
 
     it 'should raise a Pling::DeliveryFailed exception if the delivery was not successful' do
-      connection_mock.should_receive(:post).with('https://android.apis.google.com/c2dm/send', anything, anything).
-and_return(push_response_mock)
-      push_response_mock.stub(:status => 401, :success? => false, :body => "Something went wrong")
+      connection_double.should_receive(:post).with('https://android.apis.google.com/c2dm/send', anything, anything).
+        and_return(push_response_double)
+      push_response_double.stub(:status => 401, :success? => false, :body => "Something went wrong")
 
       expect { subject.deliver(message, device) }.to raise_error Pling::DeliveryFailed, /Something went wrong/
     end
 
     it 'should raise a Pling::DeliveryFailed exception if the response body contained an error' do
-      connection_mock.should_receive(:post).with('https://android.apis.google.com/c2dm/send', anything, anything).
-and_return(push_response_mock)
-      push_response_mock.stub(:status => 200, :success? => true, :body => "Error=SomeError")
+      connection_double.should_receive(:post).with('https://android.apis.google.com/c2dm/send', anything, anything).
+        and_return(push_response_double)
+      push_response_double.stub(:status => 200, :success? => true, :body => "Error=SomeError")
 
       expect { subject.deliver(message, device) }.to raise_error Pling::DeliveryFailed, /Error=SomeError/
     end
 
     it 'should send data.badge if the given message has a badge' do
-      connection_mock.should_receive(:post).
+      connection_double.should_receive(:post).
         with(anything, hash_including(:'data.badge' => '10'), anything).
-        and_return(push_response_mock)
+        and_return(push_response_double)
       message.badge = 10
       subject.deliver(message, device)
     end
 
     it 'should send data.sound if the given message has a sound' do
-      connection_mock.should_receive(:post).
+      connection_double.should_receive(:post).
         with(anything, hash_including(:'data.sound' => 'pling'), anything).
-        and_return(push_response_mock)
+        and_return(push_response_double)
       message.sound = :pling
       subject.deliver(message, device)
     end
 
     it 'should send data.subject if the given message has a subject' do
-      connection_mock.should_receive(:post).
+      connection_double.should_receive(:post).
         with(anything, hash_including(:'data.subject' => 'Important!'), anything).
-        and_return(push_response_mock)
+        and_return(push_response_double)
       message.subject = 'Important!'
       subject.deliver(message, device)
     end
@@ -210,9 +210,9 @@ and_return(push_response_mock)
       end
 
       it 'should include the given payload' do
-        connection_mock.should_receive(:post).
+        connection_double.should_receive(:post).
           with(anything, hash_including(:'data.data' => 'available'), anything).
-          and_return(push_response_mock)
+          and_return(push_response_double)
         subject.deliver(message, device)
       end
     end
@@ -224,9 +224,9 @@ and_return(push_response_mock)
       end
 
       it 'should include the given payload' do
-        connection_mock.should_receive(:post).
+        connection_double.should_receive(:post).
           with(anything, hash_not_including(:'data.data' => 'available'), anything).
-          and_return(push_response_mock)
+          and_return(push_response_double)
         subject.deliver(message, device)
       end
     end
@@ -235,9 +235,9 @@ and_return(push_response_mock)
      :InvalidRegistration, :NotRegistered,
      :MessageTooBig, :MissingCollapseKey].each do |exception|
       it "should raise a Pling::C2DM::#{exception} when the response body is ''" do
-        push_response_mock.stub(:body => "Error=#{exception}")
+        push_response_double.stub(:body => "Error=#{exception}")
         expect { subject.deliver(message, device) }.to raise_error Pling::C2DM.const_get(exception)
       end
     end
   end
-end     
+end     

data/spec/pling/device_spec.rb

@@ -4,7 +4,7 @@ describe Pling::Device do
 
   context 'when created with no arguments' do
     it 'should not require an argument' do
-      expect { Pling::Device.new }.to_not raise_error ArgumentError
+      expect { Pling::Device.new }.to_not raise_error
     end
 
     specify { Pling::Device.new.should_not be_valid }
@@ -41,7 +41,7 @@ describe Pling::Device do
 
   describe '#identifier=' do
     it 'should call #to_s on the given identifier' do
-      subject.identifier = stub(:to_s => 'XXXX')
+      subject.identifier = double(:identifier_double, :to_s => 'XXXX')
       subject.identifier.should eq('XXXX')
     end
   end

data/spec/pling/gateway_spec.rb

@@ -24,7 +24,7 @@ describe Pling::Gateway do
   describe '.discover' do
     it 'should do a delayed initialization' do
       Pling.stub(:gateways).and_return(Pling::DelayedInitializer.new([[gateway_class, { :some => :option }]]))
-      gateway_class.should_receive(:new).with({ :some => :option }).and_return(mock.as_null_object)
+      gateway_class.should_receive(:new).with({ :some => :option }).and_return(double.as_null_object)
       subject.discover(device)
     end
 
@@ -50,15 +50,15 @@ describe Pling::Gateway do
   describe '#handles?' do
     it 'should return true if the gateway supports the given device\'s type' do
       device.type = :android
-      gateway.handles?(device).should be_true
+      gateway.handles?(device).should be true
 
       device.type = :c2dm
-      gateway.handles?(device).should be_true
+      gateway.handles?(device).should be true
     end
 
     it 'should return false if the gateway does not support the given device\'s type' do
       device.type = :random
-      gateway.handles?(device).should be_false
+      gateway.handles?(device).should be false
     end
   end
 
@@ -98,9 +98,9 @@ describe Pling::Gateway do
     end
 
     it 'should not raise an Pling::Errors if an on_exception callback is set' do
-      gateway = gateway_class.new(:on_exception => lambda {})
+      gateway = gateway_class.new(:on_exception => lambda {|_| })
       gateway.stub(:deliver!).and_raise(Pling::Error)
-      expect { gateway.deliver(message, device) }.to_not raise_error Pling::Error
+      expect { gateway.deliver(message, device) }.to_not raise_error
     end
 
     it 'should pass the exception to the callback' do
@@ -109,4 +109,4 @@ describe Pling::Gateway do
       gateway.deliver(message, device)
     end
   end
-end
+end

data/spec/pling/gcm/gateway_spec.rb

@@ -6,15 +6,15 @@ describe Pling::GCM::Gateway do
     { :key => 'some-key' }
   end
 
-  let(:push_response_mock) do
-    mock('Faraday send response', :success? => true, :status => 200, :body => "")
+  let(:push_response_double) do
+    double(:response_double, :success? => true, :status => 200, :body => "")
   end
 
   let(:connection_mock) do
-    mock('Faraday connection').tap do |mock|
-      mock.stub(:post).
+    double(:connection_double).tap do |connection|
+      connection.stub(:post).
         with('https://android.googleapis.com/gcm/send', anything, anything).
-        and_return(push_response_mock)
+        and_return(push_response_double)
     end
   end
 
@@ -47,7 +47,7 @@ describe Pling::GCM::Gateway do
       end
 
       it 'should use Faraday::Response::Logger when :debug is set to true' do
-        builder = mock(:use => true, :adapter => true)
+        builder = double(:builder_double, :use => true, :adapter => true)
         builder.should_receive(:use).with(Faraday::Response::Logger)
         Faraday.stub(:new).and_yield(builder).and_return(connection_mock)
 
@@ -55,7 +55,7 @@ describe Pling::GCM::Gateway do
       end
 
       it 'should use the adapter set with :adapter' do
-        builder = mock(:use => true, :adapter => true)
+        builder = double(:builder_double, :use => true, :adapter => true)
         builder.should_receive(:adapter).with(:typheus)
         Faraday.stub(:new).and_yield(builder).and_return(connection_mock)
 
@@ -83,11 +83,11 @@ describe Pling::GCM::Gateway do
     end
 
     it 'should raise an error if no message is given' do
-      expect { subject.deliver(nil, device) }.to raise_error
+      expect { subject.deliver(nil, device) }.to raise_error(ArgumentError, /do not implement #to_pling_message/)
     end
 
     it 'should raise an error the device is given' do
-      expect { subject.deliver(message, nil) }.to raise_error
+      expect { subject.deliver(message, nil) }.to raise_error(ArgumentError, /do not implement #to_pling_device/)
     end
 
     it 'should call #to_pling_message on the given message' do
@@ -103,21 +103,21 @@ describe Pling::GCM::Gateway do
     it 'should try to deliver the given message' do
       connection_mock.should_receive(:post).
         with('https://android.googleapis.com/gcm/send', valid_push_params, valid_push_headers).
-        and_return(push_response_mock)
+        and_return(push_response_double)
 
       subject.deliver(message, device)
     end
 
     it 'should raise a Pling::DeliveryFailed exception if the delivery was not successful' do
-      connection_mock.should_receive(:post).and_return(push_response_mock)
-      push_response_mock.stub(:status => 401, :success? => false, :body => "Something went wrong")
+      connection_mock.should_receive(:post).and_return(push_response_double)
+      push_response_double.stub(:status => 401, :success? => false, :body => "Something went wrong")
 
       expect { subject.deliver(message, device) }.to raise_error Pling::DeliveryFailed, /Something went wrong/
     end
 
     it 'should raise a Pling::DeliveryFailed exception if the response body contained an error' do
-      connection_mock.should_receive(:post).and_return(push_response_mock)
-      push_response_mock.stub(:status => 200, :success? => true, :body => { 'failure' => 1, 'results' => ['error' => 'SomeError'] })
+      connection_mock.should_receive(:post).and_return(push_response_double)
+      push_response_double.stub(:status => 200, :success? => true, :body => { 'failure' => 1, 'results' => ['error' => 'SomeError'] })
 
       expect { subject.deliver(message, device) }.to raise_error Pling::DeliveryFailed, /SomeError/
     end
@@ -125,7 +125,7 @@ describe Pling::GCM::Gateway do
     it 'should send data.badge if the given message has a badge' do
       connection_mock.should_receive(:post).
         with(anything, hash_including(:data => hash_including({ :badge => '10' })), anything).
-        and_return(push_response_mock)
+        and_return(push_response_double)
       message.badge = 10
       subject.deliver(message, device)
     end
@@ -133,7 +133,7 @@ describe Pling::GCM::Gateway do
     it 'should send data.sound if the given message has a sound' do
       connection_mock.should_receive(:post).
         with(anything, hash_including(:data => hash_including({ :sound => 'pling' })), anything).
-        and_return(push_response_mock)
+        and_return(push_response_double)
       message.sound = :pling
       subject.deliver(message, device)
     end
@@ -141,7 +141,7 @@ describe Pling::GCM::Gateway do
     it 'should send data.subject if the given message has a subject' do
       connection_mock.should_receive(:post).
         with(anything, hash_including(:data => hash_including({ :subject => 'Important!' })), anything).
-        and_return(push_response_mock)
+        and_return(push_response_double)
       message.subject = 'Important!'
       subject.deliver(message, device)
     end
@@ -155,7 +155,7 @@ describe Pling::GCM::Gateway do
       it 'should include the given payload' do
         connection_mock.should_receive(:post).
           with(anything, hash_including(:data => hash_including({ :data => 'available' })), anything).
-          and_return(push_response_mock)
+          and_return(push_response_double)
         subject.deliver(message, device)
       end
     end
@@ -169,7 +169,7 @@ describe Pling::GCM::Gateway do
       it 'should include the given payload' do
         connection_mock.should_receive(:post).
           with(anything, hash_not_including(:'data.data' => 'available'), anything).
-          and_return(push_response_mock)
+          and_return(push_response_double)
         subject.deliver(message, device)
       end
     end
@@ -178,9 +178,9 @@ describe Pling::GCM::Gateway do
      :NotRegistered, :MessageTooBig, :InvalidTtl, :Unavailable,
      :InternalServerError].each do |exception|
       it "should raise a Pling::GCM::#{exception} when the response body is ''" do
-        push_response_mock.stub(:body => { 'failure' => 1, 'results' => [{ 'error' => exception }]})
+        push_response_double.stub(:body => { 'failure' => 1, 'results' => [{ 'error' => exception }]})
         expect { subject.deliver(message, device) }.to raise_error Pling::GCM.const_get(exception)
       end
     end
   end
-end     
+end     

data/spec/pling/message_spec.rb

@@ -4,7 +4,7 @@ describe Pling::Message do
 
   context 'when created with no arguments' do
     it 'should not require an argument' do
-      expect { Pling::Message.new() }.to_not raise_error ArgumentError
+      expect { Pling::Message.new() }.to_not raise_error
     end
 
     specify { Pling::Message.new().should_not be_valid }
@@ -47,6 +47,32 @@ describe Pling::Message do
     its(:payload) { should eq({ :data => true }) }
   end
 
+  context 'when created with a hash that contains a :content_available key' do
+    subject { Pling::Message.new(:content_available => true)}
+    its(:content_available) { should eq(true) }
+
+    context 'when the key is not present' do
+      subject { Pling::Message.new }
+      its(:content_available) { should eq(nil) }
+    end
+  end
+
+  context 'when created with a hash that contains a :category key' do
+    subject { Pling::Message.new(:category => 'foobar')}
+    its(:category) { should eq('foobar') }
+
+    context 'when the value behind the :category key is not a string' do
+      subject { Pling::Message.new(:category => :foobar)}
+
+      its(:category) { should eq('foobar') }
+    end
+
+    context 'when the key is not present' do
+      subject { Pling::Message.new }
+      its(:category) { should eq(nil) }
+    end
+  end
+
   context 'when created with an hash of invalid attributes' do
     it 'should ignore the invalid paramters' do
       expect { Pling::Message.new({ :random_param => true }) }.to_not raise_error
@@ -55,7 +81,7 @@ describe Pling::Message do
 
   describe '#body=' do
     it 'should call #to_s on the given body' do
-      subject.body = stub(:to_s => 'Hello from Pling')
+      subject.body = double(:body_double, :to_s => 'Hello from Pling')
       subject.body.should eq('Hello from Pling')
     end
   end

data/spec/pling_spec.rb

@@ -59,18 +59,18 @@ describe Pling do
 
     let(:message) { Pling::Message.new }
     let(:device)  { Pling::Device.new  }
-    let(:adapter) { mock(:deliver => true) }
+    let(:adapter) { double(:adapter_double, :deliver => true) }
 
     before do
       Pling.stub(:adapter).and_return(adapter)
     end
 
     it 'should raise an error if no message is given' do
-      expect { Pling.deliver(nil, device) }.to raise_error
+      expect { Pling.deliver(nil, device) }.to raise_error(ArgumentError, /do not implement #to_pling_message/)
     end
 
     it 'should raise an error the device is given' do
-      expect { Pling.deliver(message, nil) }.to raise_error
+      expect { Pling.deliver(message, nil) }.to raise_error(ArgumentError, /do not implement #to_pling_device/)
     end
 
     it 'should call #to_pling_message on the given message' do

data/spec/spec_helper.rb

@@ -1,10 +1,17 @@
 require 'rubygems'
 require 'bundler'
 
+require 'rspec/its'
 Bundler.require
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.mock_with :rspec
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = [:should, :expect]
+  end
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = [:should, :expect]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pling
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Benedikt Deicke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -74,14 +74,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Pling is a notification framework that supports multiple gateways