apple_shove 2.0.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fddaff591f202cc2de8d07ce6e6bd5d1ad00d545
+  data.tar.gz: 49a5b28b2c56c774435afc25784f0209308e6b65
+SHA512:
+  metadata.gz: afaa11ebc095e9fdc384b63a4f8bdcffd5ca9def1a3be8b1899461eb4b60675b70d5e1777d1422d16dec32cc49290086bde30bf3a38a3192859470a4d98f5562
+  data.tar.gz: 692a7a94043eb7976a4ba2ec2aa1b3e942231fdc97d2c52f5594af94294ad755d48b17052668ce797e3bd48808bdbda33f8ee346f0caf6e3f09dedba68b20333

data/lib/apple_shove/apns/connection.rb

@@ -22,7 +22,12 @@ module AppleShove
 
       def disconnect
         @ssl_sock.close if @ssl_sock
-        @sock.close     if @sock
+        
+        begin
+          @sock.close if @sock
+        rescue IOError
+          @sock = nil
+        end
       end
 
       def reconnect

data/lib/apple_shove/apns/notify_connection.rb

@@ -39,19 +39,12 @@ module AppleShove
           end
 
           socket.write message
-        rescue Errno::EPIPE
-          Logger.warn("broken pipe. reconnecting.", self, notification)
-          reconnect
-          # EPIPE raises on the second write to a closed pipe. We need to resend
-          # the previous notification that didn't make it through.
-          socket.write @last_message if @last_message 
-          retry
-        rescue Errno::ETIMEDOUT
-          Logger.warn("timeout. reconnecting.", self, notification)
-          reconnect
-          retry
         rescue Exception => e
-          Logger.error("error sending notification: #{e.message}", self, notification)
+          handler = WriteExceptionHandler.new(e)
+          Logger.warn(handler.message, self, notification)
+          reconnect                   if handler.reconnect?
+          socket.write @last_message  if handler.rewrite? && @last_message
+          retry                       if handler.retry?
         else
           Logger.info("delivered notification", self, notification)
         end

data/lib/apple_shove/apns/write_exception_handler.rb

@@ -0,0 +1,54 @@
+require 'openssl'
+
+module AppleShove
+  module APNS
+    class WriteExceptionHandler
+
+      attr_reader :message
+
+      def initialize exception
+
+        # defaults
+
+        @message    = "error sending notification: #{exception.class} - #{exception.message}"
+        @reconnect  = false
+        @rewrite    = false
+        @retry      = false
+
+        # known cases
+
+        case exception
+        when Errno::EPIPE
+          @message    = "broken pipe. reconnecting."
+          @reconnect  = true
+          @rewrite    = true
+          @retry      = true
+        when Errno::ETIMEDOUT
+          @message    = "timeout. reconnecting."
+          @reconnect  = true
+          @retry      = true
+        when OpenSSL::SSL::SSLError
+          if exception.message.match 'bad write retry'
+            @message    = "SSL bad write. reconnecting."
+            @reconnect  = true
+            @retry      = true
+          end
+        end
+
+      end
+
+      def reconnect?
+        @reconnect
+      end
+
+      def rewrite?
+        @rewrite
+      end
+
+      def retry?
+        @retry
+      end
+
+    end
+  end
+end

data/lib/apple_shove/notification.rb

@@ -28,7 +28,7 @@ module AppleShove
     # Apple APNS format
     def binary_message
       payload_json  = @payload.to_json
-
+      
       frame = [ [ 1, 32,                  @device_token         ].pack('CnH64'),
                 [ 2, payload_json.length, payload_json          ].pack('Cna*'),
                 [ 3, 4,                   ''                    ].pack('CnA4'),

data/lib/apple_shove/version.rb

@@ -1,3 +1,3 @@
 module AppleShove
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/apns/write_exception_handler_spec.rb

@@ -0,0 +1,38 @@
+require 'apple_shove'
+require 'openssl'
+
+describe AppleShove::APNS::WriteExceptionHandler do
+
+  def build_handler(exception, message)
+    begin
+      raise exception, message
+    rescue Exception => e
+      handler = AppleShove::APNS::WriteExceptionHandler.new(e)
+    end
+
+    handler
+  end
+
+  context 'when it encounters an unknown error' do 
+    subject(:handler) { build_handler StandardError, "some unknown error" }
+
+    it 'has default values' do
+      expect(handler.message).to match(/error sending notification/)
+      expect(handler).not_to be_reconnect
+      expect(handler).not_to be_rewrite
+      expect(handler).not_to be_retry
+    end
+  end
+
+  context "when it's SSL connection has issues" do
+    subject(:handler) { build_handler OpenSSL::SSL::SSLError, "SSL_write:: bad write retry" }
+
+    it 'reconnects and retries' do
+      expect(handler).to be_reconnect
+      expect(handler).to be_retry
+      expect(handler).to_not be_rewrite
+    end
+  end
+
+
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: apple_shove
 version: !ruby/object:Gem::Version
-  version: 2.0.0
-  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - Taylor Boyko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,39 +27,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,6 +113,7 @@ files:
 - lib/apple_shove/apns/error_response_packet.rb
 - lib/apple_shove/apns/feedback_connection.rb
 - lib/apple_shove/apns/notify_connection.rb
+- lib/apple_shove/apns/write_exception_handler.rb
 - lib/apple_shove/apple_shove.rb
 - lib/apple_shove/config.rb
 - lib/apple_shove/demultiplexer.rb
@@ -137,6 +125,7 @@ files:
 - lib/apple_shove/version.rb
 - lib/tasks/apple_shove.rake
 - script/daemon
+- spec/apns/write_exception_handler_spec.rb
 - spec/apple_shove_spec.rb
 - spec/demultiplexer_spec.rb
 - spec/notification_helper.rb
@@ -145,35 +134,29 @@ files:
 homepage: https://github.com/tboyko/apple_shove
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 144914022133974576
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 144914022133974576
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
+- spec/apns/write_exception_handler_spec.rb
 - spec/apple_shove_spec.rb
 - spec/demultiplexer_spec.rb
 - spec/notification_helper.rb