grocer 0.0.11 → 0.0.12

data/grocer.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Grocer::VERSION
 
-  gem.add_development_dependency 'rspec', '~> 2.10.0'
+  gem.add_development_dependency 'rspec', '~> 2.10'
   gem.add_development_dependency 'pry', '~> 0.9.8'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'bourne'

data/lib/grocer/connection.rb

@@ -9,9 +9,9 @@ module Grocer
 
     def initialize(options = {})
       @certificate = options.fetch(:certificate) { nil }
+      @passphrase = options.fetch(:passphrase) { nil }
       @gateway = options.fetch(:gateway) { fail NoGatewayError }
       @port = options.fetch(:port) { fail NoPortError }
-      @passphrase = options.fetch(:passphrase) { nil }
       @retries = options.fetch(:retries) { 3 }
     end
 
@@ -54,10 +54,10 @@ module Grocer
     def with_connection
       attempts = 1
       begin
-        ssl.connect unless ssl.connected?
+        connect
         yield
       rescue StandardError, Errno::EPIPE
-        raise unless attempts < @retries
+        raise unless attempts < retries
 
         destroy_connection
         attempts += 1

data/lib/grocer/feedback_connection.rb

@@ -9,8 +9,7 @@ module Grocer
     SANDBOX_GATEWAY = 'feedback.sandbox.push.apple.com'
 
     def initialize(options)
-      options.extend Extensions::DeepSymbolizeKeys
-      options = defaults.merge(options.deep_symbolize_keys)
+      options = apply_defaults(options)
       super(Connection.new(options))
     end
 
@@ -27,5 +26,10 @@ module Grocer
       Grocer.env == 'production' ? PRODUCTION_GATEWAY : SANDBOX_GATEWAY
     end
 
+    def apply_defaults(options)
+      options.extend Extensions::DeepSymbolizeKeys
+      defaults.merge(options.deep_symbolize_keys)
+    end
+
   end
 end

data/lib/grocer/push_connection.rb

@@ -10,8 +10,7 @@ module Grocer
     SANDBOX_GATEWAY = 'gateway.sandbox.push.apple.com'
 
     def initialize(options)
-      options.extend Extensions::DeepSymbolizeKeys
-      options = defaults.merge(options.deep_symbolize_keys)
+      options = apply_defaults(options)
       super(Connection.new(options))
     end
 
@@ -35,5 +34,10 @@ module Grocer
       end
     end
 
+    def apply_defaults(options)
+      options.extend Extensions::DeepSymbolizeKeys
+      defaults.merge(options.deep_symbolize_keys)
+    end
+
   end
 end

data/lib/grocer/server.rb

@@ -1,4 +1,5 @@
 require 'thread'
+require 'openssl'
 require 'grocer/notification_reader'
 require 'grocer/ssl_server'
 
@@ -22,7 +23,7 @@ module Grocer
             Thread.new {
               begin
                 NotificationReader.new(client).each(&notifications.method(:push))
-              rescue Errno::EBADF, NoMethodError
+              rescue Errno::EBADF, NoMethodError, OpenSSL::OpenSSLError
                 # Expected when another thread closes the socket
               end
             }

data/lib/grocer/version.rb

@@ -1,3 +1,3 @@
 module Grocer
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grocer
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -165,12 +165,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1066047643388989879
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1066047643388989879
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24