grocer 0.0.3 → 0.0.4

data/README.md

@@ -32,15 +32,20 @@ pusher = Grocer.pusher(
     certificate: "/path/to/cert.pem",      # required
     passphrase:  "",                       # optional
     gateway:     "gateway.push.apple.com", # optional; See note below.
-    port:        2195                      # optional
+    port:        2195,                     # optional
+    retries:     3                         # optional
 )
 ```
 
-**NOTE**: The `gateway` option defaults to `gateway.push.apple.com`
-**only** when running in a production environement, as determined by
-either the `RAILS_ENV` or `RACK_ENV` environment variables. In all other
-cases, it defaults to the sandbox gateway,
-`gateway.sandbox.push.apple.com`.
+#### Notes
+
+* `gateway`: Defaults to `gateway.push.apple.com` **only** when running in a
+  production environment, as determined by either the `RAILS_ENV` or
+  `RACK_ENV` environment variables. In all other cases, it defaults to the
+  sandbox gateway, `gateway.sandbox.push.apple.com`.
+* `retries`: The number of times **grocer** will retry writing to or reading
+  from the Apple Push Notification Service before raising any errors to client
+  code.
 
 ### Sending Notifications
 
@@ -80,6 +85,7 @@ feedback = Grocer.feedback(
   passphrase:  "",                        # optional
   gateway:     "feedback.push.apple.com", # optional; See note below.
   port:        2196                       # optional
+  retries:     3                          # optional
 )
 
 feedback.each do |attempt|
@@ -87,11 +93,15 @@ feedback.each do |attempt|
 end
 ```
 
-**NOTE**: The `gateway` option defaults to `feedback.push.apple.com`
-**only** when running in a production environement, as determined by
-either the `RAILS_ENV` or `RACK_ENV` environment variables. In all other
-cases, it defaults to the sandbox gateway,
-`feedback.sandbox.push.apple.com`.
+#### Notes
+
+* `gateway`: Defaults to `feedback.push.apple.com` **only** when running in a
+  production environment, as determined by either the `RAILS_ENV` or
+  `RACK_ENV` environment variables. In all other cases, it defaults to the
+  sandbox gateway, `feedback.sandbox.push.apple.com`.
+* `retries`: The number of times **grocer** will retry writing to or reading
+  from the Apple Push Notification Service before raising any errors to client
+  code.
 
 ### Device Token
 

data/lib/grocer/connection.rb

@@ -6,23 +6,24 @@ require 'grocer/ssl_connection'
 
 module Grocer
   class Connection
-    attr_reader :certificate, :passphrase, :gateway, :port
+    attr_reader :certificate, :passphrase, :gateway, :port, :retries
 
     def initialize(options = {})
       @certificate = options.fetch(:certificate) { fail NoCertificateError }
       @gateway = options.fetch(:gateway) { fail NoGatewayError }
       @port = options.fetch(:port) { fail NoPortError }
       @passphrase = options.fetch(:passphrase) { nil }
+      @retries = options.fetch(:retries) { 3 }
     end
 
     def read(size = nil, buf = nil)
-      with_open_connection do
+      with_connection do
         ssl.read(size, buf)
       end
     end
 
     def write(content)
-      with_open_connection do
+      with_connection do
         ssl.write(content)
       end
     end
@@ -40,9 +41,25 @@ module Grocer
                                 port: port)
     end
 
-    def with_open_connection(&block)
-      ssl.connect unless ssl.connected?
-      block.call
+    def destroy_connection
+      return unless @ssl_connection
+
+      @ssl_connection.disconnect rescue nil
+      @ssl_connection = nil
+    end
+
+    def with_connection
+      attempts = 1
+      begin
+        ssl.connect unless ssl.connected?
+        yield
+      rescue StandardError, Errno::EPIPE
+        raise unless attempts < @retries
+
+        destroy_connection
+        attempts += 1
+        retry
+      end
     end
   end
 end

data/lib/grocer/version.rb

@@ -1,3 +1,3 @@
 module Grocer
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/grocer/connection_spec.rb

@@ -5,7 +5,8 @@ describe Grocer::Connection do
   subject { described_class.new(connection_options) }
   let(:connection_options) { { certificate: '/path/to/cert.pem',
                                gateway: 'push.example.com',
-                               port: 443 } }
+                               port: 443,
+                               retries: 3 } }
   let(:ssl) { stub_everything('SSLConnection') }
   before do
     Grocer::SSLConnection.stubs(:new).returns(ssl)
@@ -47,6 +48,10 @@ describe Grocer::Connection do
     subject.port.should == 443
   end
 
+  it 'can be initialized with a number of retries' do
+    subject.retries.should == 3
+  end
+
   context 'an open SSLConnection' do
     before do
       ssl.stubs(:connected?).returns(true)
@@ -80,4 +85,18 @@ describe Grocer::Connection do
       ssl.should have_received(:read).with(42, 'IO')
     end
   end
+
+  describe 'retries' do
+    [SocketError, OpenSSL::SSL::SSLError, Errno::EPIPE].each do |error|
+      it "retries #read in the case of an #{error}" do
+        ssl.stubs(:read).raises(error).then.returns(42)
+        subject.read
+      end
+
+      it "retries #write in the case of an #{error}" do
+        ssl.stubs(:write).raises(error).then.returns(42)
+        subject.write("abc123")
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grocer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70358032520280 !ruby/object:Gem::Requirement
+  requirement: &70235826824560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70358032520280
+  version_requirements: *70235826824560
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70358032519500 !ruby/object:Gem::Requirement
+  requirement: &70235826838540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70358032519500
+  version_requirements: *70235826838540
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70358032518920 !ruby/object:Gem::Requirement
+  requirement: &70235826837180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358032518920
+  version_requirements: *70235826837180
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70358032518260 !ruby/object:Gem::Requirement
+  requirement: &70235826836020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358032518260
+  version_requirements: *70235826836020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70358032533920 !ruby/object:Gem::Requirement
+  requirement: &70235826835400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358032533920
+  version_requirements: *70235826835400
 description: ! "                          Grocer interfaces with the Apple Push\n
   \                         Notification Service to send push\n                          notifications
   to iOS devices and collect\n                          notification feedback via
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2039363373187503925
+      hash: 4223240216448352640
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2039363373187503925
+      hash: 4223240216448352640
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15