mercurius 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68382188ef199ed571c96140d38fbec9c6e83981
-  data.tar.gz: 9642812648df51e4312892f026ef67475a910e06
+  metadata.gz: dcf94ca22b14696f4e623967e3263648e4a778d7
+  data.tar.gz: 925d653cd0b8061045851c12647d91817f9e87e4
 SHA512:
-  metadata.gz: 091b2149bae4a550f06bfff6192fc6e349c03d15e3029b659f76579c0ad8116fe62808221ee21a25c48ce7441272e2aee79da7d5e2b84533ac740417a50622bd
-  data.tar.gz: e9c41c7b95fc140548ab2cf28176f2db9fb6b07f9f343f5067523cf2785c966dcfa433331a655416be722e4b3fa1c788c925a58a35b0c113a0635248e372a70e
+  metadata.gz: 228be44c3ea0a68319d2e9d6dee19c9f7d3628950ff7b3bcab64cafec887e0c454968e605a51a709339a6830f30383b62a74c4c30d8b84b18a36b5e481744814
+  data.tar.gz: 2b3b0b76a14c62ac88873a1f40bc79881d76118324bd3c26b6908108ea3f8a59c1f776bf70465e201317aa51d7b74df87e5277978b0e4aeccd5b487f7a023faa

data/lib/mercurius/gcm/service.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/enumerable'
+
 module GCM
   class Service
     include ActiveModel::Model
@@ -16,26 +18,37 @@ module GCM
     end
 
     def deliver(notification, *tokens, topic: nil)
-      responses = GCM::ResponseCollection.new(notification)
-      responses << deliver_to_tokens(notification, tokens)
-      responses << deliver_to_topic(notification, topic) if topic
+      responses = GCM::ResponseCollection.new notification
+      responses << deliver_all(notification, tokens)
+      responses << deliver_all(notification, topic) if topic
       responses
     end
 
     private
-      def each_batch_of_tokens(tokens, batch_size: BATCH_SIZE, &block)
-        Array(tokens).flatten.compact.each_slice(batch_size)
+      def deliver_all(notification, recipients)
+        batch(recipients).map do |batch|
+          if batch.many?
+            multicast notification, batch
+          else
+            unicast notification, batch.first
+          end
+        end
       end
 
-      def deliver_to_tokens(notification, tokens)
-        each_batch_of_tokens(tokens).map do |tokens|
-          payload = notification.to_h.merge registration_ids: tokens
-          GCM::Response.new(connection.write(payload), tokens)
-        end
+      def unicast(notification, recipient)
+        deliver! notification.to_h.merge(to: recipient), recipient
+      end
+
+      def multicast(notification, recipients)
+        deliver! notification.to_h.merge(registration_ids: recipients), recipients
+      end
+
+      def deliver!(payload, recipients = [])
+        GCM::Response.new connection.write(payload), recipients
       end
 
-      def deliver_to_topic(notification, topic)
-        GCM::Response.new connection.write(notification.to_h.merge(to: topic))
+      def batch(recipients, batch_size: BATCH_SIZE)
+        Array(recipients).flatten.compact.each_slice batch_size
       end
   end
 end

data/lib/mercurius/testing/gcm/canonical_id_connection.rb

@@ -7,7 +7,7 @@ module GCM
     end
 
     def write(json)
-      tokens = json[:registration_ids]
+      tokens = json[:registration_ids] || Array(json[:to])
 
       json = {
         'multicast_id' => '123',

data/lib/mercurius/testing/gcm/unregistered_device_token_connection.rb

@@ -7,7 +7,7 @@ module GCM
     end
 
     def write(json)
-      tokens = json[:registration_ids]
+      tokens = json[:registration_ids] || Array(json[:to])
 
       json = {
         'multicast_id' => '123',

data/lib/mercurius/version.rb

@@ -1,3 +1,3 @@
 module Mercurius
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/lib/apns_spec.rb

@@ -12,7 +12,7 @@ describe APNS do
 
   it 'will not change the host if an invalid mode is specified' do
     APNS.host = 'host'
-    expect { APNS.set_mode(:overdrive) }.to raise_error
+    expect { APNS.mode = :overdrive }.to raise_error InvalidApnsModeError
     expect(APNS.host).to eq 'host'
   end
 

data/spec/lib/gcm_service_spec.rb

@@ -1,6 +1,7 @@
 describe GCM::Service do
   let(:service) { GCM::Service.new }
-  let(:message) { GCM::Notification.new(data: { alert: 'Hey' }) }
+  let(:notification) { GCM::Notification.new message }
+  let(:message) { { title: 'Hello', body: 'World' } }
 
   it 'should default to the GCM module configs' do
     expect(service.host).to eq GCM.host
@@ -8,50 +9,46 @@ describe GCM::Service do
   end
 
   describe '#deliver' do
-    before { stub_request :post, %r[android.googleapis.com/gcm/send] }
+    before { stub_request :post, %r{android.googleapis.com/gcm/send} }
 
     it 'sends a single message' do
-      service.deliver message, 'token123'
-      expect(WebMock).to have_requested(:post, %r[android.googleapis.com/gcm/send]).
-        with(body: { data: { alert: 'Hey' }, registration_ids: ['token123'] })
+      service.deliver notification, 'token123'
+      expect(WebMock).to have_requested(:post, %r{android.googleapis.com/gcm/send})
+        .with body: message.merge(to: 'token123')
     end
 
     it 'sends to multiple tokens via splat' do
-      service.deliver message, 'token123', 'token456'
-      expect(WebMock).to have_requested(:post, %r[android.googleapis.com/gcm/send]).
-        with(body: { data: { alert: 'Hey' }, registration_ids: ['token123', 'token456'] })
+      service.deliver notification, 'token123', 'token456'
+      expect(WebMock).to have_requested(:post, %r{android.googleapis.com/gcm/send})
+        .with body: message.merge(registration_ids: %w(token123 token456))
     end
 
     it 'sends to multiple tokens via array' do
-      service.deliver message, ['token123', 'token456']
-      expect(WebMock).to have_requested(:post, %r[android.googleapis.com/gcm/send]).
-        with(body: { data: { alert: 'Hey' }, registration_ids: ['token123', 'token456'] })
+      service.deliver message, %w(token123 token456)
+      expect(WebMock).to have_requested(:post, %r{android.googleapis.com/gcm/send})
+        .with body: message.merge(registration_ids: %w(token123 token456))
     end
 
     it 'only sends 999 tokens at a time' do
       tokens = (1..1000).to_a.map { |i| "token#{i}" }
       service.deliver message, tokens
-      expect(WebMock).to have_requested(:post, %r[android.googleapis.com/gcm/send]).
-        with(body: { data: { alert: 'Hey' }, registration_ids: tokens.take(999) })
-      expect(WebMock).to have_requested(:post, %r[android.googleapis.com/gcm/send]).
-        with(body: { data: { alert: 'Hey' }, registration_ids: ['token1000'] })
-    end
-  end
+      expect(WebMock).to have_requested(:post, %r{android.googleapis.com/gcm/send})
+        .with body: message.merge(registration_ids: tokens.take(999))
 
-  describe '#deliver_topic' do
-    before { stub_request :post, %r[android.googleapis.com/gcm/send] }
-    let(:message) { { notification: { title: 'hello', body: 'world' } } }
+      expect(WebMock).to have_requested(:post, %r{android.googleapis.com/gcm/send})
+        .with body: message.merge(to: 'token1000')
+    end
 
     it 'sends a notification to a topic' do
       service.deliver message, topic: '/topics/global'
-      expect(WebMock).to have_requested(:post, %r[android.googleapis.com/gcm/send]).
-        with(body: message.merge(to: '/topics/global'))
+      expect(WebMock).to have_requested(:post, %r{android.googleapis.com/gcm/send})
+        .with body: message.merge(to: '/topics/global')
     end
   end
 
   describe 'response' do
     context 'success' do
-      before { stub_request :post, %r[android.googleapis.com/gcm/send] }
+      before { stub_request :post, %r{android.googleapis.com/gcm/send} }
 
       it 'processes a 200 response' do
         responses = service.deliver message, 'token123'
@@ -63,7 +60,7 @@ describe GCM::Service do
 
     describe 'failure' do
       context 401 do
-        before { stub_request(:post, %r[android.googleapis.com/gcm/send]).to_return(status: 401) }
+        before { stub_request(:post, %r{android.googleapis.com/gcm/send}).to_return(status: 401) }
 
         it 'has a meaningful message from #error' do
           responses = service.deliver message, 'token123'
@@ -72,7 +69,7 @@ describe GCM::Service do
       end
 
       context 400 do
-        before { stub_request(:post, %r[android.googleapis.com/gcm/send]).to_return(status: 400) }
+        before { stub_request(:post, %r{android.googleapis.com/gcm/send}).to_return(status: 400) }
 
         it 'has a meaningful message from #error' do
           responses = service.deliver message, 'token123'
@@ -82,7 +79,7 @@ describe GCM::Service do
 
       context 500..599 do
         before do
-          stub_request(:post, %r[android.googleapis.com/gcm/send]).
+          stub_request(:post, %r{android.googleapis.com/gcm/send}).
             to_return status: 500, headers: { 'Retry-After' => '120' }
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercurius
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json