mercurius 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba600c5ea9ccfe58f1be1c8a0190f76ed156876
-  data.tar.gz: 878a4fbc8539723e11c8b489a6335fa1e0839e88
+  metadata.gz: fd30d51ece41def120dc1676a015a2b8a66e0bf0
+  data.tar.gz: ee291d676c6797d48753ce2638f35be20f3560b7
 SHA512:
-  metadata.gz: a80bcb308c866c6d4b98beb7ea1ec19e7407c306f6ec6fa322dd40388973473324363dbf6d26432ff8aeea0f57fb492086c4b6e87d2ed50be1e8ba0982b09502
-  data.tar.gz: f63ae742964e49c26bb46ada8088dc77cdb94539663ecef72ffa63fcb0232a1945caed3ce11eedb63b516db770ff85de4d63ff865fb8a8995fa14d1f4dc2161d
+  metadata.gz: f549a2dd708bb10c62dd415d38c66956d06f58b2ce8962ece93876e9c28deb2cbaf16991b48a420686cee92cb0199f84a0fc88e9635bf932f43e393329bbdfd1
+  data.tar.gz: a51150db3b488ea1da40619e54830b84504334684fcd42a40b646ef2e40c0e0f747fdf7dd55cacb86134e69139071deec3741d811be9eff81a85b25f319bea5f

data/.rspec

@@ -1 +1,2 @@
---require spec_helper
+--color
+--require spec_helper

data/lib/mercurius/apns/connection.rb

@@ -1,23 +1,26 @@
 module APNS
   class Connection
-    attr_reader :host, :port, :ssl
+    attr_reader :host, :port, :pem
 
     def initialize(host, port, pem)
-      @socket = TCPSocket.new host, port
-      @ssl = OpenSSL::SSL::SSLSocket.new @socket, ssl_context_for_pem(pem)
+      @host = host
+      @port = port
+      @pem = pem
     end
 
     def open
+      @socket ||= TCPSocket.new host, port
+      @ssl ||= OpenSSL::SSL::SSLSocket.new @socket, ssl_context_for_pem(pem)
       @ssl.connect
     end
 
     def close
-      @ssl.close
-      @socket.close
+      @ssl.close if @ssl
+      @socket.close if @socket
     end
 
     def closed?
-      @ssl.closed? && @socket.closed?
+      (@ssl.nil? || @ssl.closed?) ||  (@socket.nil? || @socket.closed?)
     end
 
     def write(data)

data/lib/mercurius/apns/service.rb

@@ -45,7 +45,7 @@ module APNS
           connection.open if connection.closed?
           yield connection
         rescue StandardError, Errno::EPIPE => e
-          raise TooManyRetriesError.new if too_many_retries?
+          raise TooManyRetriesError.new(e) if too_many_retries?
           connection.close
           @attempts += 1
           retry

data/lib/mercurius/errors/too_many_retries_error.rb

@@ -1,7 +1,7 @@
 class TooManyRetriesError < StandardError
 
-  def initialize
-    super "APNS Service has reached it's maximum number of retries"
+  def initialize(e)
+    super "APNS Service has reached it's maximum number of retries. Error: #{e.message}"
   end
 
-end
+end

data/lib/mercurius/testing/service.rb

@@ -0,0 +1,29 @@
+module Mercurius
+  module Testing
+    module Service
+
+      class Delivery < Struct.new(:notification, :device_tokens)
+      end
+
+      def deliver(notification, *device_tokens)
+        @deliveries ||= []
+        @deliveries << Delivery.new(notification, Array(device_tokens).flatten)
+      end
+
+      def deliveries
+        @deliveries
+      end
+
+      def notifications_to(device_token)
+        deliveries_to(device_token).map(&:notification)
+      end
+
+      def deliveries_to(device_token)
+        deliveries.select do |delivery|
+          delivery.device_tokens.include? device_token
+        end
+      end
+
+    end
+  end
+end

data/lib/mercurius/testing.rb

@@ -0,0 +1,4 @@
+require File.expand_path('testing/service', __FILE__)
+
+APNS::Service.send :prepend, TestService
+GCM::Service.send :prepend, TestService

data/lib/mercurius/version.rb

@@ -1,3 +1,3 @@
 module Mercurius
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/mercurius.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.require_paths = ["lib"]
+  s.required_ruby_version = '~> 2.0'
 
   s.add_dependency 'json'
   s.add_dependency 'faraday'

data/spec/lib/apns_service_spec.rb

@@ -57,14 +57,14 @@ describe APNS::Service do
         service.deliver APNS::Notification.new(alert: 'Hey2'), 'token123'
       end
     end
+  end
 
-    describe 'retries' do
-      it 'tries 3 times before giving up' do
-        allow(service.connection).to receive(:open) { raise StandardError }
-        expect { service.deliver APNS::Notification.new(alert: 'Hey1'), 'token123' }.to raise_exception(TooManyRetriesError)
-        expect(service.attempts).to eq 3
-      end
+  describe 'retries' do
+    it 'tries 3 times before giving up' do
+      allow(service.connection).to receive(:open) { raise StandardError }
+      expect { service.deliver APNS::Notification.new(alert: 'Hey1'), 'token123' }.to raise_exception(TooManyRetriesError)
+      expect(service.attempts).to eq 3
     end
-
   end
+
 end

data/spec/lib/testing_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path('../../../lib/mercurius/testing/service', __FILE__)
+
+describe 'Test mode' do
+
+  class GCM::MockService < GCM::Service
+    include Mercurius::Testing::Service
+  end
+
+  class APNS::MockService < APNS::Service
+    include Mercurius::Testing::Service
+  end
+
+  context 'GCM' do
+    let(:service) { GCM::MockService.new }
+    let(:message) { GCM::Notification.new(alert: 'Hey') }
+
+    it 'returns the deliveries sent to GCM' do
+      service.deliver message, 'token123'
+      delivery = service.deliveries[0]
+      expect(delivery.device_tokens).to include 'token123'
+      expect(delivery.notification.data).to eq Hash[alert: 'Hey']
+    end
+  end
+
+  context 'APNS' do
+    let(:service) { APNS::MockService.new }
+    let(:message) { APNS::Notification.new(alert: 'Hey') }
+
+    it 'returns the deliveries sent to APNS' do
+      service.deliver message, 'token123'
+      delivery = service.deliveries[0]
+      expect(delivery.device_tokens).to include 'token123'
+      expect(delivery.notification.alert).to eq 'Hey'
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercurius
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - John Beck
@@ -154,11 +154,14 @@ files:
 - lib/mercurius/gcm/response.rb
 - lib/mercurius/gcm/result.rb
 - lib/mercurius/gcm/service.rb
+- lib/mercurius/testing.rb
+- lib/mercurius/testing/service.rb
 - lib/mercurius/version.rb
 - mercurius.gemspec
 - spec/lib/apns_service_spec.rb
 - spec/lib/gcm_service_spec.rb
 - spec/lib/notification_spec.rb
+- spec/lib/testing_spec.rb
 - spec/spec_helper.rb
 - spec/support/apns.pem
 - spec/support/fake_socket.rb
@@ -171,9 +174,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -189,6 +192,7 @@ test_files:
 - spec/lib/apns_service_spec.rb
 - spec/lib/gcm_service_spec.rb
 - spec/lib/notification_spec.rb
+- spec/lib/testing_spec.rb
 - spec/spec_helper.rb
 - spec/support/apns.pem
 - spec/support/fake_socket.rb