ruby-push-notifications 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5f52999ec595b97b1c2dc8628c666d9d16e2cc7
-  data.tar.gz: c93580db1db0e4a7704f2c7b3f0661482d03b27c
+  metadata.gz: 46af4db49981e818c075e9eb41dd4c2638851dd4
+  data.tar.gz: cfa87e1a6d3611d44abf9164cf8283b6f7117039
 SHA512:
-  metadata.gz: 3373347fd40e9b6c79e216b141d7a4457a2a7a42287c0fd53a339e3f83433165600434d3e937db72210e4faa355a4d7fbdcaa55fcbfa34dad5c227731897c5f5
-  data.tar.gz: 411b301afbe3db77736f5942ffd7dfbd4a8eb7348df6f3915976f92b540f3ec97d364ff1660198b5e49ad06b7271f91a5853648cecb2b23def8f1b365c0d9194
+  metadata.gz: 0237b54486f4c8186553fa31ed4d29bc1dc1ff20183371a759a3232b8c767a506ae3a22f561afb89f5e792ce5936fd7f35cc1ea2e6a2ac3f557fd9c16147f751
+  data.tar.gz: 591583bcb8d928476bd47272993739c5b597cf2d8002bb4ddc39f9557fb363fccd58ff9368c455b1a712dd0d8fcccca5c3f0bfdf3fdf4df09a9e686a1e1d38e0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-push-notifications (0.3.1)
+    ruby-push-notifications (0.4.0)
       builder (~> 3.0)
 
 GEM
@@ -64,3 +64,6 @@ DEPENDENCIES
   rspec (~> 3.2)
   ruby-push-notifications!
   webmock (~> 1.20)
+
+BUNDLED WITH
+   1.11.2

data/examples/apns.rb

@@ -8,10 +8,11 @@ tokens = [
   'First token here',
   'Second token here'
 ]
+password = nil # optional password for .pem file
 
 notification = RubyPushNotifications::APNS::APNSNotification.new tokens, { aps: { alert: 'Hello APNS World!', sound: 'true', badge: 1 } }
 
-pusher = RubyPushNotifications::APNS::APNSPusher.new(File.read('/path/to/your/apps/certificate.pem'), true)
+pusher = RubyPushNotifications::APNS::APNSPusher.new(File.read('/path/to/your/apps/certificate.pem'), true, password) # enter the password if present
 pusher.push [notification]
 p 'Notification sending results:'
 p "Success: #{notification.success}, Failed: #{notification.failed}"

data/lib/ruby-push-notifications/apns/apns_connection.rb

@@ -27,9 +27,9 @@ module RubyPushNotifications
       # @param cert [String]. Contents of the PEM encoded certificate
       # @param sandbox [Boolean]. Whether to use the sandbox environment or not.
       # @return [APNSConnection]. The recently stablished connection.
-      def self.open(cert, sandbox)
+      def self.open(cert, sandbox, pass = nil)
         ctx = OpenSSL::SSL::SSLContext.new
-        ctx.key = OpenSSL::PKey::RSA.new cert
+        ctx.key = OpenSSL::PKey::RSA.new cert, pass
         ctx.cert = OpenSSL::X509::Certificate.new cert
 
         h = host sandbox

data/lib/ruby-push-notifications/apns/apns_notification.rb

@@ -67,7 +67,7 @@ module RubyPushNotifications
       # @return [String]. Binary representation of the notification's payload.
       def payload
         @encoded_payload ||= -> {
-            json = JSON.dump(@data).force_encoding 'ascii-8bit'
+            json = (@data.respond_to?(:to_json) ? @data.to_json : JSON.dump(@data)).force_encoding 'ascii-8bit'
             [2, json.bytesize, json].pack 'cna*'
           }.call
       end

data/lib/ruby-push-notifications/apns/apns_pusher.rb

@@ -15,8 +15,9 @@ module RubyPushNotifications
 
       # @param certificate [String]. The PEM encoded APNS certificate.
       # @param sandbox [Boolean]. Whether the certificate is an APNS sandbox or not.
-      def initialize(certificate, sandbox)
+      def initialize(certificate, sandbox, password = nil)
         @certificate = certificate
+        @pass = password
         @sandbox = sandbox
       end
 
@@ -30,7 +31,7 @@ module RubyPushNotifications
       #
       # @param notifications [Array]. All the APNSNotifications to be sent.
       def push(notifications)
-        conn = APNSConnection.open @certificate, @sandbox
+        conn = APNSConnection.open @certificate, @sandbox, @pass
 
         binaries = notifications.each_with_object([]) do |notif, binaries|
           notif.each_message(binaries.count) do |msg|
@@ -60,7 +61,7 @@ module RubyPushNotifications
               results.slice! err[2]..-1
               results << err[1]
               i = err[2]
-              conn = APNSConnection.open @certificate, @sandbox
+              conn = APNSConnection.open @certificate, @sandbox, @pass
             end
           else
             results << NO_ERROR_STATUS_CODE

data/lib/ruby-push-notifications/version.rb

@@ -1,3 +1,3 @@
 module RubyPushNotifications
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/spec/ruby-push-notifications/apns/apns_connection_spec.rb

@@ -20,7 +20,13 @@ module RubyPushNotifications
         end
 
         it 'returns an instance of APNSConnection' do
-          expect(APNSConnection.open cert, true).to be_a APNSConnection
+          expect(APNSConnection.open(cert, true)).to be_a APNSConnection
+        end
+
+        it 'sets the password for pem file' do
+          expect(OpenSSL::SSL::SSLSocket).to receive(:new).with(tcp_socket, an_instance_of(OpenSSL::SSL::SSLContext)).and_return ssl_socket
+          expect(OpenSSL::PKey::RSA).to receive(:new).with(cert, 'password')
+          expect(APNSConnection.open(cert, true, 'password')).to be_a APNSConnection
         end
       end
 

data/spec/ruby-push-notifications/apns/apns_notification_spec.rb

@@ -17,6 +17,7 @@ module RubyPushNotifications
 
       it 'caches the payload' do
         expect(JSON).to receive(:dump).with(data).once.and_return 'dummy string'
+        allow(data).to receive(:respond_to?).with(:to_json).and_return(false)
         notification.each_message(notif_id) {}
       end
 

data/spec/ruby-push-notifications/apns/apns_pusher_spec.rb

@@ -1,4 +1,3 @@
-
 module RubyPushNotifications
   module APNS
     describe APNSPusher do
@@ -10,7 +9,7 @@ module RubyPushNotifications
       let(:data) { { a: 1 } }
 
       before do
-        allow(APNSConnection).to receive(:open).with(certificate, sandbox).and_return connection
+        allow(APNSConnection).to receive(:open).with(certificate, sandbox, nil).and_return connection
       end
 
       describe '#push' do
@@ -94,7 +93,7 @@ module RubyPushNotifications
               let(:connection2) { instance_double(APNSConnection).as_null_object }
 
               before do
-                allow(APNSConnection).to receive(:open).with(certificate, sandbox).and_return connection, connection2
+                allow(APNSConnection).to receive(:open).with(certificate, sandbox, nil).and_return connection, connection2
               end
 
               context 'failing first' do
@@ -198,7 +197,7 @@ module RubyPushNotifications
                 allow(connection).to receive(:read).with(6).and_return [8, PROCESSING_ERROR_STATUS_CODE, 0].pack('ccN')
                 allow(connection2).to receive(:read).with(6).and_return [8, MISSING_DEVICE_TOKEN_STATUS_CODE, 2].pack('ccN')
                 allow(connection3).to receive(:read).with(6).and_return [8, INVALID_TOPIC_SIZE_STATUS_CODE, 9].pack('ccN')
-                allow(APNSConnection).to receive(:open).with(certificate, sandbox).and_return connection, connection2, connection3, connection4
+                allow(APNSConnection).to receive(:open).with(certificate, sandbox, nil).and_return connection, connection2, connection3, connection4
               end
 
               it 'repones the connection' do
@@ -250,7 +249,7 @@ module RubyPushNotifications
                 allow(connection).to receive(:read).with(6).and_return [8, PROCESSING_ERROR_STATUS_CODE, 0].pack('ccN')
                 allow(connection2).to receive(:read).with(6).and_return [8, MISSING_DEVICE_TOKEN_STATUS_CODE, 2].pack('ccN')
                 allow(connection3).to receive(:read).with(6).and_return [8, INVALID_TOPIC_SIZE_STATUS_CODE, 9].pack('ccN')
-                allow(APNSConnection).to receive(:open).with(certificate, sandbox).and_return connection, connection2, connection3, connection4
+                allow(APNSConnection).to receive(:open).with(certificate, sandbox, nil).and_return connection, connection2, connection3, connection4
               end
 
               it 'repones the connection' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-push-notifications
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Carlos Alonso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder