grocer 0.1.1 → 0.2.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.2.0
+
+* Don't retry connection when the certificate has expired. (Kyle Drake and
+  Jesse Storimer)
+
 ## 0.1.1
 
 * Warn that `jruby-openssl` is needed on JRuby platform. (Kyle Drake)
@@ -7,7 +12,8 @@
 ## 0.1.0
 
 * Enables socket keepalive option on APNS client sockets (Kyle Drake)
-* Supports non-ASCII characters in notifications (Patrick Van Stee, Andy Lindeman)
+* Supports non-ASCII characters in notifications (Patrick Van Stee, Andy
+  Lindeman)
 * Certificate can be any object that responds to #read (Kyle Drake)
 
 ## 0.0.13

data/lib/grocer/certificate_expired_error.rb

@@ -0,0 +1,3 @@
+module Grocer
+  CertificateExpiredError = Module.new
+end

data/lib/grocer/connection.rb

@@ -1,6 +1,7 @@
 require 'grocer'
 require 'grocer/no_gateway_error'
 require 'grocer/no_port_error'
+require 'grocer/certificate_expired_error'
 require 'grocer/ssl_connection'
 
 module Grocer
@@ -56,7 +57,12 @@ module Grocer
       begin
         connect
         yield
-      rescue StandardError, Errno::EPIPE
+      rescue => e
+        if e.class == OpenSSL::SSL::SSLError && e.message =~ /certificate expired/i
+          e.extend(CertificateExpiredError)
+          raise
+        end
+
         raise unless attempts < retries
 
         destroy_connection

data/lib/grocer/version.rb

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

data/spec/grocer/connection_spec.rb

@@ -55,6 +55,11 @@ describe Grocer::Connection 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)
+  end
 
   context 'an open SSLConnection' do
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grocer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -133,6 +133,7 @@ files:
 - Rakefile
 - grocer.gemspec
 - lib/grocer.rb
+- lib/grocer/certificate_expired_error.rb
 - lib/grocer/connection.rb
 - lib/grocer/extensions/deep_symbolize_keys.rb
 - lib/grocer/failed_delivery_attempt.rb