grocer 0.2.0 → 0.3.0

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - jruby-19mode
-  - jruby-head # To get JRuby 1.7.x, which defaults to -19mode
+  - jruby-19mode # JRuby 1.7.0
   - rbx-19mode
   # - ruby-head  # seems unstable on travis at this time

data/CHANGELOG.md

@@ -1,20 +1,30 @@
 # CHANGELOG
 
+## 0.3.0
+
+* Add `Grocer::PassbookNotification` for sending, well... Passbook
+  notifications. This kind of notification requires no payload.
+* Determining current environment is case-insensitive ([Oriol
+  Gual](https://github.com/oriolgual))
+
 ## 0.2.0
 
-* Don't retry connection when the certificate has expired. (Kyle Drake and
-  Jesse Storimer)
+* Don't retry connection when the certificate has expired. ([Kyle
+  Drake](https://github.com/kyledrake) and [Jesse
+  Storimer](https://github.com/jstorimer))
 
 ## 0.1.1
 
-* Warn that `jruby-openssl` is needed on JRuby platform. (Kyle Drake)
+* Warn that `jruby-openssl` is needed on JRuby platform. ([Kyle
+  Drake](https://github.com/kyledrake))
 
 ## 0.1.0
 
-* Enables socket keepalive option on APNS client sockets (Kyle Drake)
-* Supports non-ASCII characters in notifications (Patrick Van Stee, Andy
-  Lindeman)
-* Certificate can be any object that responds to #read (Kyle Drake)
+* Supports non-ASCII characters in notifications
+* Enables socket keepalive option on APNS client sockets ([Kyle
+  Drake](https://github.com/kyledrake))
+* Certificate can be any object that responds to #read ([Kyle
+  Drake](https://github.com/kyledrake))
 
 ## 0.0.13
 

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in grocer.gemspec
 gemspec
-
-platforms :jruby do
-  gem 'jruby-openssl'
-end

data/README.md

@@ -1,6 +1,6 @@
 # Grocer
 
-[![Build Status](https://secure.travis-ci.org/highgroove/grocer.png)](http://travis-ci.org/highgroove/grocer)
+[![Build Status](https://api.travis-ci.org/highgroove/grocer.png?branch=master)](https://travis-ci.org/highgroove/grocer)
 [![Dependency Status](https://gemnasium.com/highgroove/grocer.png)](https://gemnasium.com/highgroove/grocer)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/highgroove/grocer)
 
@@ -13,7 +13,7 @@ cleanest, most extensible, and friendliest.
 
 ## Requirements
 
-* Ruby/MRI 1.9.x or JRuby 1.7.x in 1.9 mode
+* Ruby/MRI 1.9.x, JRuby 1.7.x in 1.9 mode, Rubinius in 1.9 mode
 
 ## Installation
 
@@ -50,7 +50,7 @@ pusher = Grocer.pusher(
 
 #### Notes
 
-* `certificate`: If you don't have the certificate stored in a file, you 
+* `certificate`: If you don't have the certificate stored in a file, you
   can pass any object that responds to `read`.
   Example: `certificate: StringIO.new(pem_string)`
 * `gateway`: Defaults to different values depending on the `RAILS_ENV` or
@@ -109,6 +109,20 @@ notification = Grocer::Notification.new(
 # {"aps": {"alert": "Hello from Grocer"}, "acme2": ["bang", "whiz"]}
 ```
 
+#### Passbook Notifications
+
+A `Grocer::PassbookNotification` is a specialized kind of notification which
+does not require any payload. That is, you need not (and *[Apple explicitly says
+not to](http://developer.apple.com/library/ios/#Documentation/UserExperience/Conceptual/PassKit_PG/Chapters/Updating.html#//apple_ref/doc/uid/TP40012195-CH5-SW1)*)
+send any payload for a Passbook notification. If you do, it will be ignored.
+
+```ruby
+notification = Grocer::PassbookNotification.new(device_token: "...")
+
+# Generates a JSON payload like:
+# {"aps": {}}
+```
+
 ### Feedback
 
 ```ruby
@@ -169,7 +183,7 @@ describe "apple push notifications" do
 
     Timeout.timeout(3) {
       notification = @server.notifications.pop # blocking
-      notification.alert.should == "An awesome thing happened"
+      expect(notification.alert).to eq("An awesome thing happened")
     }
   end
 end

data/grocer.gemspec

@@ -26,8 +26,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Grocer::VERSION
 
-  gem.add_dependency 'json'
-
   gem.add_development_dependency 'rspec', '~> 2.11'
   gem.add_development_dependency 'pry', '~> 0.9.8'
   gem.add_development_dependency 'mocha'

data/lib/grocer/notification.rb

@@ -2,10 +2,20 @@ require 'json'
 require 'grocer/no_payload_error'
 
 module Grocer
+  # Public: An object used to send notifications to APNS.
   class Notification
     attr_accessor :identifier, :expiry, :device_token, :alert, :badge, :sound,
                   :custom
 
+    # Public: Initialize a new Grocer::Notification. You must specify at least an `alert` or `badge`.
+    #
+    # payload - The Hash of notification parameters and payload to be sent to APNS.:
+    #           :device_token - The String representing to device token sent to APNS.
+    #           :alert        - The String or Hash to be sent as the alert portion of the payload. (optional)
+    #           :badge        - The Integer to be sent as the badge portion of the payload. (optional)
+    #           :sound        - The String representing the sound portion of the payload. (optional)
+    #           :expiry       - The Integer representing UNIX epoch date sent to APNS as the notification expiry. (default: 0)
+    #           :identifier   - The arbitrary value sent to APNS to uniquely this notification. (default: 0)
     def initialize(payload = {})
       @identifier = 0
 

data/lib/grocer/passbook_notification.rb

@@ -0,0 +1,20 @@
+require 'grocer/notification'
+
+module Grocer
+  # Public: A specialized form of a Grocer::Notification which requires neither
+  # an alert nor badge to be present in the payload. It requires only the
+  # `device_token`, and allows an optional `expiry` and `identifier` to be set.
+  #
+  # Examples
+  #
+  #   Grocer::PassbookNotification.new(device_token: '...')
+  class PassbookNotification < Notification
+
+    private
+
+    def validate_payload
+      true
+    end
+
+  end
+end

data/lib/grocer/push_connection.rb

@@ -24,7 +24,7 @@ module Grocer
     end
 
     def find_default_gateway
-      case Grocer.env
+      case Grocer.env.downcase
       when 'production'
         PRODUCTION_GATEWAY
       when 'test'

data/lib/grocer/version.rb

@@ -1,3 +1,3 @@
 module Grocer
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/grocer/connection_spec.rb

@@ -12,25 +12,25 @@ describe Grocer::Connection do
   end
 
   it 'can be initialized with a certificate' do
-    subject.certificate.should == '/path/to/cert.pem'
+    expect(subject.certificate).to eq('/path/to/cert.pem')
   end
 
   it 'defaults to an empty passphrase' do
-    subject.passphrase.should be_nil
+    expect(subject.passphrase).to be_nil
   end
 
   it 'can be initialized with a passphrase' do
     connection_options[:passphrase] = 'new england clam chowder'
-    subject.passphrase.should == 'new england clam chowder'
+    expect(subject.passphrase).to eq('new england clam chowder')
   end
 
   it 'defaults to 3 retries' do
-    subject.retries.should == 3
+    expect(subject.retries).to eq(3)
   end
 
   it 'can be initialized with a number of retries' do
     connection_options[:retries] = 2
-    subject.retries.should == 2
+    expect(subject.retries).to eq(2)
   end
 
   it 'requires a gateway' do
@@ -39,7 +39,7 @@ describe Grocer::Connection do
   end
 
   it 'can be initialized with a gateway' do
-    subject.gateway.should == 'push.example.com'
+    expect(subject.gateway).to eq('push.example.com')
   end
 
   it 'requires a port' do
@@ -48,14 +48,14 @@ describe Grocer::Connection do
   end
 
   it 'can be initialized with a port' do
-    subject.port.should == 443
+    expect(subject.port).to eq(443)
   end
 
   it 'can open the connection to the apple push notification service' do
     subject.connect
     ssl.should have_received(:connect)
   end
-  
+
   it 'raises CertificateExpiredError for OpenSSL::SSL::SSLError with /certificate expired/i message' do
     ssl.stubs(:write).raises(OpenSSL::SSL::SSLError.new('certificate expired'))
     -> {subject.write('abc123')}.should raise_error(Grocer::CertificateExpiredError)

data/spec/grocer/extensions/deep_symbolize_keys_spec.rb

@@ -15,22 +15,22 @@ describe Grocer::Extensions::DeepSymbolizeKeys do
   end
 
   it 'does not change nested symbols' do
-    nested_symbols.deep_symbolize_keys.should == nested_symbols
+    expect(nested_symbols.deep_symbolize_keys).to eq(nested_symbols)
   end
 
   it 'symbolizes nested strings' do
-    nested_strings.deep_symbolize_keys.should == nested_symbols
+    expect(nested_strings.deep_symbolize_keys).to eq(nested_symbols)
   end
 
   it 'symbolizes a mix of nested strings and symbols' do
-    nested_mixed.deep_symbolize_keys.should == nested_symbols
+    expect(nested_mixed.deep_symbolize_keys).to eq(nested_symbols)
   end
 
   it 'preserves fixnum keys' do
-    nested_fixnums.deep_symbolize_keys.should == nested_fixnums
+    expect(nested_fixnums.deep_symbolize_keys).to eq(nested_fixnums)
   end
 
   it 'preserves keys that cannot be symbolized' do
-    nested_illegal_symbols.deep_symbolize_keys.should == nested_illegal_symbols
+    expect(nested_illegal_symbols.deep_symbolize_keys).to eq(nested_illegal_symbols)
   end
 end

data/spec/grocer/failed_delivery_attempt_spec.rb

@@ -10,8 +10,8 @@ describe Grocer::FailedDeliveryAttempt do
   describe 'decoding' do
     it 'accepts a binary tuple and sets each attribute' do
       failed_delivery_attempt = described_class.new(binary_tuple)
-      failed_delivery_attempt.timestamp.should == timestamp
-      failed_delivery_attempt.device_token.should == device_token
+      expect(failed_delivery_attempt.timestamp).to eq(timestamp)
+      expect(failed_delivery_attempt.device_token).to eq(device_token)
     end
 
     it 'raises an exception when there are problems decoding' do

data/spec/grocer/feedback_connection_spec.rb

@@ -17,45 +17,45 @@ describe Grocer::FeedbackConnection do
   end
 
   it 'can be initialized with a certificate' do
-    subject.certificate.should == '/path/to/cert.pem'
+    expect(subject.certificate).to eq('/path/to/cert.pem')
   end
 
   it 'can be initialized with a passphrase' do
     options[:passphrase] = 'open sesame'
-    subject.passphrase.should == 'open sesame'
+    expect(subject.passphrase).to eq('open sesame')
   end
 
   it 'defaults to Apple feedback gateway in production environment' do
     Grocer.stubs(:env).returns('production')
-    subject.gateway.should == 'feedback.push.apple.com'
+    expect(subject.gateway).to eq('feedback.push.apple.com')
   end
 
   it 'defaults to the sandboxed Apple feedback gateway in development environment' do
     Grocer.stubs(:env).returns('development')
-    subject.gateway.should == 'feedback.sandbox.push.apple.com'
+    expect(subject.gateway).to eq('feedback.sandbox.push.apple.com')
   end
 
   it 'defaults to the sandboxed Apple feedback gateway in test environment' do
     Grocer.stubs(:env).returns('test')
-    subject.gateway.should == 'feedback.sandbox.push.apple.com'
+    expect(subject.gateway).to eq('feedback.sandbox.push.apple.com')
   end
 
   it 'defaults to the sandboxed Apple feedback gateway for other random values' do
     Grocer.stubs(:env).returns('random')
-    subject.gateway.should == 'feedback.sandbox.push.apple.com'
+    expect(subject.gateway).to eq('feedback.sandbox.push.apple.com')
   end
 
   it 'can be initialized with a gateway' do
     options[:gateway] = 'gateway.example.com'
-    subject.gateway.should == 'gateway.example.com'
+    expect(subject.gateway).to eq('gateway.example.com')
   end
 
   it 'defaults to 2196 as the port' do
-    subject.port.should == 2196
+    expect(subject.port).to eq(2196)
   end
 
   it 'can be initialized with a port' do
     options[:port] = 443
-    subject.port.should == 443
+    expect(subject.port).to eq(443)
   end
 end

data/spec/grocer/feedback_spec.rb

@@ -21,7 +21,7 @@ describe Grocer::Feedback do
   subject { described_class.new(connection) }
 
   it 'is enumerable' do
-    subject.should be_kind_of(Enumerable)
+    expect(subject).to be_kind_of(Enumerable)
   end
 
   it 'reads failed delivery attempt messages from the connection' do
@@ -29,10 +29,10 @@ describe Grocer::Feedback do
 
     delivery_attempts = subject.to_a
 
-    delivery_attempts[0].timestamp.should == jan1
-    delivery_attempts[0].device_token.should == device_token
+    expect(delivery_attempts[0].timestamp).to eq(jan1)
+    expect(delivery_attempts[0].device_token).to eq(device_token)
 
-    delivery_attempts[1].timestamp.should == jan2
-    delivery_attempts[1].device_token.should == device_token
+    expect(delivery_attempts[1].timestamp).to eq(jan2)
+    expect(delivery_attempts[1].device_token).to eq(device_token)
   end
 end

data/spec/grocer/notification_reader_spec.rb

@@ -12,7 +12,7 @@ describe Grocer::NotificationReader do
       io.rewind
 
       notification = subject.first
-      notification.identifier.should == 1234
+      expect(notification.identifier).to eq(1234)
     end
 
     it "reads expiry" do
@@ -20,7 +20,7 @@ describe Grocer::NotificationReader do
       io.rewind
 
       notification = subject.first
-      notification.expiry.should == Time.utc(2013, 3, 24)
+      expect(notification.expiry).to eq(Time.utc(2013, 3, 24))
     end
 
     it "reads device token" do
@@ -28,7 +28,7 @@ describe Grocer::NotificationReader do
       io.rewind
 
       notification = subject.first
-      notification.device_token.should == 'fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'
+      expect(notification.device_token).to eq('fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2')
     end
 
     it "reads alert" do
@@ -36,7 +36,7 @@ describe Grocer::NotificationReader do
       io.rewind
 
       notification = subject.first
-      notification.alert.should == "Foo"
+      expect(notification.alert).to eq("Foo")
     end
 
     it "reads badge" do
@@ -44,7 +44,7 @@ describe Grocer::NotificationReader do
       io.rewind
 
       notification = subject.first
-      notification.badge.should == 5
+      expect(notification.badge).to eq(5)
     end
 
     it "reads sound" do
@@ -52,7 +52,7 @@ describe Grocer::NotificationReader do
       io.rewind
 
       notification = subject.first
-      notification.sound.should == "foo.aiff"
+      expect(notification.sound).to eq("foo.aiff")
     end
 
     it "reads custom attributes" do
@@ -60,7 +60,7 @@ describe Grocer::NotificationReader do
       io.rewind
 
       notification = subject.first
-      notification.custom.should == { foo: "bar" }
+      expect(notification.custom).to eq({ foo: "bar" })
     end
   end
 end

data/spec/grocer/notification_spec.rb

@@ -1,86 +1,49 @@
 # encoding: UTF-8
-
 require 'spec_helper'
 require 'grocer/notification'
+require 'grocer/shared_examples_for_notifications'
 
 describe Grocer::Notification do
   describe 'binary format' do
-    let(:notification) { described_class.new(payload_options) }
-    let(:payload_from_bytes) { notification.to_bytes[45..-1] }
-    let(:payload_dictionary_from_bytes) { JSON.parse(payload_from_bytes, symbolize_names: true) }
     let(:payload_options) { { alert: 'hi', badge: 2, sound: 'siren.aiff' } }
+    let(:payload_dictionary_from_bytes) { JSON.parse(payload_from_bytes, symbolize_names: true) }
+    let(:payload_from_bytes) { notification.to_bytes[45..-1] }
 
-    subject(:bytes) { notification.to_bytes }
-
-    it 'sets the command byte to 1' do
-      bytes[0].should == "\x01"
-    end
-
-    it 'defaults the identifer to 0' do
-      bytes[1...5].should == "\x00\x00\x00\x00"
-    end
-
-    it 'allows the identifier to be set' do
-      notification.identifier = 1234
-      bytes[1...5].should == [1234].pack('N')
-    end
-
-    it 'defaults expiry to zero' do
-      bytes[5...9].should == "\x00\x00\x00\x00"
-    end
-
-    it 'allows the expiry to be set' do
-      expiry = notification.expiry = Time.utc(2013, 3, 24, 12, 34, 56)
-      bytes[5...9].should == [expiry.to_i].pack('N')
-    end
-
-    it 'encodes the device token length as 32' do
-      bytes[9...11].should == "\x00\x20"
-    end
-
-    it 'encodes the device token as a 256-bit integer' do
-      token = notification.device_token = 'fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'
-      bytes[11...43].should == ['fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'].pack('H*')
-    end
-
-    it 'as a convenience, flattens the device token to remove spaces' do
-      token = notification.device_token = 'fe15 a27d 5df3c3 4778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'
-      bytes[11...43].should == ['fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'].pack('H*')
-    end
-
-    it 'encodes the payload length' do
-      notification.alert = 'Hello World!'
-      bytes[43...45].should == [payload_from_bytes.bytesize].pack('n')
-    end
+    include_examples 'a notification'
 
     it 'encodes alert as part of the payload' do
       notification.alert = 'Hello World!'
-      payload_dictionary_from_bytes[:aps][:alert].should == 'Hello World!'
+      expect(payload_dictionary_from_bytes[:aps][:alert]).to eq('Hello World!')
     end
 
     it 'encodes badge as part of the payload' do
       notification.badge = 42
-      payload_dictionary_from_bytes[:aps][:badge].should == 42
+      expect(payload_dictionary_from_bytes[:aps][:badge]).to eq(42)
     end
 
     it 'encodes sound as part of the payload' do
       notification.sound = 'siren.aiff'
-      payload_dictionary_from_bytes[:aps][:sound].should == 'siren.aiff'
+      expect(payload_dictionary_from_bytes[:aps][:sound]).to eq('siren.aiff')
     end
 
     it 'encodes custom payload attributes' do
       notification.custom = { :foo => 'bar' }
-      payload_dictionary_from_bytes[:foo].should == 'bar'
+      expect(payload_dictionary_from_bytes[:foo]).to eq('bar')
     end
 
     it 'encodes UTF-8 characters' do
       notification.alert = '私'
-      payload_dictionary_from_bytes[:aps][:alert].force_encoding("UTF-8").should == '私'
+      expect(payload_dictionary_from_bytes[:aps][:alert].force_encoding("UTF-8")).to eq('私')
+    end
+
+    it 'encodes the payload length' do
+      notification.alert = 'Hello World!'
+      expect(bytes[43...45]).to eq([payload_from_bytes.bytesize].pack('n'))
     end
 
     it 'encodes the payload length correctly for multibyte UTF-8 strings' do
       notification.alert = '私'
-      bytes[43...45].should == [payload_from_bytes.bytesize].pack('n')
+      expect(bytes[43...45]).to eq([payload_from_bytes.bytesize].pack('n'))
     end
 
     context 'invalid payload' do

data/spec/grocer/passbook_notification_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'grocer/passbook_notification'
+require 'grocer/shared_examples_for_notifications'
+
+describe Grocer::PassbookNotification do
+  describe 'binary format' do
+    let(:payload_options) { Hash.new }
+    let(:payload_dictionary_from_bytes) { JSON.parse(payload_from_bytes, symbolize_names: true) }
+    let(:payload_from_bytes) { notification.to_bytes[45..-1] }
+
+    include_examples 'a notification'
+
+    it 'does not require a payload' do
+      expect(payload_dictionary_from_bytes[:aps]).to be_empty
+    end
+
+    it 'encodes the payload length' do
+      payload_length = bytes[43...45].to_i
+      expect(payload_length).to be_zero
+    end
+
+  end
+end

data/spec/grocer/push_connection_spec.rb

@@ -17,46 +17,51 @@ describe Grocer::PushConnection do
   end
 
   it 'can be initialized with a certificate' do
-    subject.certificate.should == '/path/to/cert.pem'
+    expect(subject.certificate).to eq('/path/to/cert.pem')
   end
 
   it 'can be initialized with a passphrase' do
     options[:passphrase] = 'open sesame'
-    subject.passphrase.should == 'open sesame'
+    expect(subject.passphrase).to eq('open sesame')
   end
 
   it 'defaults to Apple push gateway in production environment' do
     Grocer.stubs(:env).returns('production')
-    subject.gateway.should == 'gateway.push.apple.com'
+    expect(subject.gateway).to eq('gateway.push.apple.com')
   end
 
   it 'defaults to the sandboxed Apple push gateway in development environment' do
     Grocer.stubs(:env).returns('development')
-    subject.gateway.should == 'gateway.sandbox.push.apple.com'
+    expect(subject.gateway).to eq('gateway.sandbox.push.apple.com')
   end
 
   it 'defaults to the localhost Apple push gateway in test environment' do
     Grocer.stubs(:env).returns('test')
-    subject.gateway.should == '127.0.0.1'
+    expect(subject.gateway).to eq('127.0.0.1')
+  end
+
+  it 'uses a case-insensitive environment to determine the push gateway' do
+    Grocer.stubs(:env).returns('TEST')
+    expect(subject.gateway).to eq('127.0.0.1')
   end
 
   it 'defaults to the sandboxed Apple push gateway for other random values' do
     Grocer.stubs(:env).returns('random')
-    subject.gateway.should == 'gateway.sandbox.push.apple.com'
+    expect(subject.gateway).to eq('gateway.sandbox.push.apple.com')
   end
 
   it 'can be initialized with a gateway' do
     options[:gateway] = 'gateway.example.com'
-    subject.gateway.should == 'gateway.example.com'
+    expect(subject.gateway).to eq('gateway.example.com')
   end
 
   it 'defaults to 2195 as the port' do
-    subject.port.should == 2195
+    expect(subject.port).to eq(2195)
   end
 
   it 'can be initialized with a port' do
     options[:port] = 443
-    subject.port.should == 443
+    expect(subject.port).to eq(443)
   end
 
 end

data/spec/grocer/server_spec.rb

@@ -25,7 +25,7 @@ describe Grocer::Server do
     subject.accept
     Timeout.timeout(5) {
       notification = subject.notifications.pop
-      notification.alert.should == "Hi!"
+      expect(notification.alert).to eq("Hi!")
     }
   end
 

data/spec/grocer/shared_examples_for_notifications.rb

@@ -0,0 +1,41 @@
+shared_examples 'a notification' do
+    let(:notification) { described_class.new(payload_options) }
+
+    subject(:bytes) { notification.to_bytes }
+
+    it 'sets the command byte to 1' do
+      expect(bytes[0]).to eq("\x01")
+    end
+
+    it 'defaults the identifer to 0' do
+      expect(bytes[1...5]).to eq("\x00\x00\x00\x00")
+    end
+
+    it 'allows the identifier to be set' do
+      notification.identifier = 1234
+      expect(bytes[1...5]).to eq([1234].pack('N'))
+    end
+
+    it 'defaults expiry to zero' do
+      expect(bytes[5...9]).to eq("\x00\x00\x00\x00")
+    end
+
+    it 'allows the expiry to be set' do
+      expiry = notification.expiry = Time.utc(2013, 3, 24, 12, 34, 56)
+      expect(bytes[5...9]).to eq([expiry.to_i].pack('N'))
+    end
+
+    it 'encodes the device token length as 32' do
+      expect(bytes[9...11]).to eq("\x00\x20")
+    end
+
+    it 'encodes the device token as a 256-bit integer' do
+      token = notification.device_token = 'fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'
+      expect(bytes[11...43]).to eq(['fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'].pack('H*'))
+    end
+
+    it 'as a convenience, flattens the device token to remove spaces' do
+      token = notification.device_token = 'fe15 a27d 5df3c3 4778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'
+      expect(bytes[11...43]).to eq(['fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'].pack('H*'))
+    end
+end

data/spec/grocer/ssl_connection_spec.rb

@@ -35,7 +35,7 @@ describe Grocer::SSLConnection do
     }
 
     it 'is initialized with a certificate IO' do
-      subject.certificate.should == File.read(connection_options[:certificate])
+      expect(subject.certificate).to eq(File.read(connection_options[:certificate]))
     end
   end
   
@@ -43,19 +43,19 @@ describe Grocer::SSLConnection do
 
   describe 'configuration' do
     it 'is initialized with a certificate' do
-      subject.certificate.should == connection_options[:certificate]
+      expect(subject.certificate).to eq(connection_options[:certificate])
     end
 
     it 'is initialized with a passphrase' do
-      subject.passphrase.should == connection_options[:passphrase]
+      expect(subject.passphrase).to eq(connection_options[:passphrase])
     end
 
     it 'is initialized with a gateway' do
-      subject.gateway.should == connection_options[:gateway]
+      expect(subject.gateway).to eq(connection_options[:gateway])
     end
 
     it 'is initialized with a port' do
-      subject.port.should == connection_options[:port]
+      expect(subject.port).to eq(connection_options[:port])
     end
   end
 

data/spec/grocer/ssl_server_spec.rb

@@ -16,7 +16,7 @@ describe Grocer::SSLServer do
   end
 
   it "is constructed with a port option" do
-    subject.port.should == 12345
+    expect(subject.port).to eq(12345)
   end
 
 
@@ -25,7 +25,7 @@ describe Grocer::SSLServer do
       clients = []
       subject.accept { |c| clients << c }
 
-      clients.should == [mock_client]
+      expect(clients).to eq([mock_client])
     end
   end
 

data/spec/grocer_spec.rb

@@ -12,17 +12,17 @@ describe Grocer do
     end
 
     it 'defaults to development' do
-      subject.env.should == 'development'
+      expect(subject.env).to eq('development')
     end
 
     it 'reads RAILS_ENV from ENV' do
       ENV.stubs(:[]).with('RAILS_ENV').returns('staging')
-      subject.env.should == 'staging'
+      expect(subject.env).to eq('staging')
     end
 
     it 'reads RACK_ENV from ENV' do
       ENV.stubs(:[]).with('RACK_ENV').returns('staging')
-      subject.env.should == 'staging'
+      expect(subject.env).to eq('staging')
     end
   end
 
@@ -35,7 +35,7 @@ describe Grocer do
       end
 
       it 'gets a Pusher' do
-        subject.pusher(connection_options).should be_a Grocer::Pusher
+        expect(subject.pusher(connection_options)).to be_a Grocer::Pusher
       end
 
       it 'passes the connection options on to the underlying Connection' do
@@ -50,7 +50,7 @@ describe Grocer do
       end
 
       it 'gets Feedback' do
-        subject.feedback(connection_options).should be_a Grocer::Feedback
+        expect(subject.feedback(connection_options)).to be_a Grocer::Feedback
       end
 
       it 'passes the connection options on to the underlying Connection' do
@@ -66,7 +66,7 @@ describe Grocer do
       end
 
       it 'gets Server' do
-        subject.server(connection_options).should be_a Grocer::Server
+        expect(subject.server(connection_options)).to be_a Grocer::Server
       end
 
       it 'passes the connection options on to the underlying SSLServer' do
@@ -76,5 +76,4 @@ describe Grocer do
     end
 
   end
-
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 ENV['RACK_ENV'] = 'test'
-require 'mocha'
+require 'mocha/api'
 require 'bourne'
 
 RSpec.configure do |config|

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: grocer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
   prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Andy Lindeman
@@ -11,104 +11,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  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: '2.11'
+    none: false
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8
+    none: false
+  name: pry
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: mocha
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bourne
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: bourne
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: ! "                          Grocer interfaces with the Apple Push\n
   \                         Notification Service to send push\n                          notifications
   to iOS devices and collect\n                          notification feedback via
@@ -145,6 +129,7 @@ files:
 - lib/grocer/no_port_error.rb
 - lib/grocer/notification.rb
 - lib/grocer/notification_reader.rb
+- lib/grocer/passbook_notification.rb
 - lib/grocer/push_connection.rb
 - lib/grocer/pusher.rb
 - lib/grocer/server.rb
@@ -164,9 +149,11 @@ files:
 - spec/grocer/feedback_spec.rb
 - spec/grocer/notification_reader_spec.rb
 - spec/grocer/notification_spec.rb
+- spec/grocer/passbook_notification_spec.rb
 - spec/grocer/push_connection_spec.rb
 - spec/grocer/pusher_spec.rb
 - spec/grocer/server_spec.rb
+- spec/grocer/shared_examples_for_notifications.rb
 - spec/grocer/ssl_connection_spec.rb
 - spec/grocer/ssl_server_spec.rb
 - spec/grocer_spec.rb
@@ -179,20 +166,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Pushing Apple notifications since 2012.
@@ -207,10 +194,13 @@ test_files:
 - spec/grocer/feedback_spec.rb
 - spec/grocer/notification_reader_spec.rb
 - spec/grocer/notification_spec.rb
+- spec/grocer/passbook_notification_spec.rb
 - spec/grocer/push_connection_spec.rb
 - spec/grocer/pusher_spec.rb
 - spec/grocer/server_spec.rb
+- spec/grocer/shared_examples_for_notifications.rb
 - spec/grocer/ssl_connection_spec.rb
 - spec/grocer/ssl_server_spec.rb
 - spec/grocer_spec.rb
 - spec/spec_helper.rb
+has_rdoc: