apns_dispatch 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b358e96c901dfd0757116b623f643fa2a574a9e
-  data.tar.gz: 8f82788c67d2506878938736872e1932d216c9ef
+  metadata.gz: 721ee8dbbf30859aa73eea70d7540addf381e30c
+  data.tar.gz: 2d94582ec84875a3dc32b8f06dc8c715cfe490e8
 SHA512:
-  metadata.gz: 116df1b07cb7a127f40ca8753691e4cf62dd9b27fccf4ef95baa3e93bb06c37d7d99b85c709ee52bf7d20c88da42e6f44b94ec37ad3a99e083aa55bae58dd1c9
-  data.tar.gz: 8623b2e40f3ec19a4339447d3c4be20ede2dec83f46f703952f33878079c4cb147d192c4c9e4b4bf899a965586057a4832464f7fff64d76412ba203503315a76
+  metadata.gz: f534f8e61319c70dfe4a2b1c5ea37b39e99e9ecefc45e458d0f4971ba2e5149ea2b2963f38492ea092701259ed3d62b158e29c6e5160b0181691218c3aef9a5b
+  data.tar.gz: 46acc5e9615e592452fa5fef37084b68c74a6db31b1d03100ea12a6dafd994e765838281d4b76f54a8e189fb00da911f50f07fcab9d6b1516c666ec6182c7aa1

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    apns_dispatch (1.0.2)
+    apns_dispatch (1.0.3)
       json (~> 1.8.1)
-      retryable (~> 1.3.5)
+      retryable (~> 2.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    json (1.8.1)
-    rake (10.1.1)
-    retryable (1.3.5)
+    json (1.8.3)
+    rake (10.4.2)
+    retryable (2.0.2)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -28,3 +28,6 @@ DEPENDENCIES
   apns_dispatch!
   rake
   rspec (~> 2.13.0)
+
+BUNDLED WITH
+   1.10.6

data/apns_dispatch.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
   gem.add_dependency 'json', '~> 1.8.1'
-  gem.add_dependency 'retryable', '~> 1.3.5'
+  gem.add_dependency 'retryable', '~> 2.0.2'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 2.13.0'

data/lib/apns_dispatch/apn_notification.rb

@@ -2,6 +2,9 @@ module ApnsDispatch
   # Creates a packaged notification for the APNs. Based on code from https://github.com/jpoz/APNS.
 
   class ApnNotification
+    # Constants
+    COMMAND = 0
+
     def initialize(connection, token, message, options = {})
       @connection = connection
       @token = token
@@ -16,15 +19,11 @@ module ApnsDispatch
     private
 
     def binary_token
-      [@token].pack 'H*'
-    end
-
-    def command
-      0
+      [@token].pack 'H*'.freeze
     end
 
     def default_aps_message
-      { alert: @message, sound: 'default' }
+      { alert: @message, sound: 'default'.freeze }
     end
 
     def message_information
@@ -34,7 +33,8 @@ module ApnsDispatch
     end
 
     def notification_packet
-      [command, binary_token.bytesize, binary_token, payload.bytesize, payload].pack 'cna*na*'
+      [COMMAND, binary_token.bytesize, binary_token, payload.bytesize, payload].
+        pack 'cna*na*'.freeze
     end
 
     def payload

data/lib/apns_dispatch/apns_connection.rb

@@ -12,6 +12,7 @@ module ApnsDispatch
     GATEWAY_PORT = 2195
     PRODUCTION_FEEDBACK_HOST = 'feedback.push.apple.com'
     PRODUCTION_GATEWAY_HOST = 'gateway.push.apple.com'
+    RETRYABLE_ERRORS = [Errno::EPIPE, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError]
     SANDBOX_FEEDBACK_HOST = 'feedback.sandbox.push.apple.com'
     SANDBOX_GATEWAY_HOST = 'gateway.sandbox.push.apple.com'
 
@@ -39,6 +40,7 @@ module ApnsDispatch
 
       @certificate = certificate
       @options = options
+      @mutex = Mutex.new
     end
 
     def read(length)
@@ -78,17 +80,18 @@ module ApnsDispatch
       connect!
     end
 
-    def retryable_errors
-      [Errno::EPIPE, Errno::ETIMEDOUT, OpenSSL::SSL::SSLError]
+    def retryable(&block)
+      options = { exception_cb: lambda { |e| reconnect! }, on: RETRYABLE_ERRORS, sleep: 0, tries: 2 }
+      Retryable.retryable(options) { yield }
     end
 
     def with_connection(&block)
-      unless connected?
-        connect!
-      end
+      @mutex.synchronize do
+        unless connected?
+          connect!
+        end
 
-      retryable exception_cb: lambda { |e| reconnect! }, on: retryable_errors, sleep: 0, tries: 2 do
-        yield
+        retryable { yield }
       end
     end
   end

data/lib/apns_dispatch/version.rb

@@ -1,3 +1,3 @@
 module ApnsDispatch
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/spec/apns_dispatch/apn_notification_spec.rb

@@ -8,7 +8,7 @@ describe ApnsDispatch::ApnNotification do
     @connection = stub
     @apn_notificiation = ApnsDispatch::ApnNotification.new(@connection, token, message, options)
 
-    expected_message = { aps: { alert: message, sound: 'default', badge: 1}, order_id: 1}
+    expected_message = { aps: { alert: message, sound: 'default', badge: 1 }, order_id: 1 }
     payload = expected_message.to_json
     @packet = [0, 32, [token].pack('H*'), payload.bytesize, payload].pack('cna*na*')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apns_dispatch
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Costa Walcott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for communicating with the APNs