mercurius 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9d092e2bac4a62f415675ab2377d5bbef233fda
-  data.tar.gz: 39e988fb569e75e8053352d00fee748cfa6b9028
+  metadata.gz: 2ab94d197c802c11b53e6fc8dc34090237b456af
+  data.tar.gz: 4dbcf381ccc7185f1cb27514ac24ff3d80bf8332
 SHA512:
-  metadata.gz: fbe5d38205bde19ef187af2287c029a30a2d348e874b10c4da3b24c9dd77a92bfb04edf58ee5854e38e7f8d1aa90bb3b87b4c47cdd89789d769c45103ec68fe2
-  data.tar.gz: a868cdc0297e17c69e72fbec34c4d615e4570d3d59169de4acb89d59f2230d8c9f7a73ee6ee802e9a83a16cb1b3129a6c7584552a279888ce32d77bed641b297
+  metadata.gz: 098bd1d77a6e27e53e52cc873aeee6b8428569d47fbf855af51cd2624ab0470c7cfede9e0dc8b1e092100e779d78c6d0843751bacbba837e332102b2351e77f7
+  data.tar.gz: fee9b5c35b361e65a8d4496e9127f5627b2078ab249349477b9827fe24855125c0664bf66fc5946735d2a7fc7539eb87d9856cfd3d8f8904724c5165b08f21a3

data/README.md

@@ -28,14 +28,14 @@ Create the service with:
 
 Now create the notification that you wish to send:
 
-    gcm_notification = GCM::Notification.new(alert: 'Hey')
+    gcm_notification = GCM::Notification.new(data: { alert: 'Hey' })
 
 You can deliver the gcm_notification in the following manners:
 
-    gcm_service.deliver gcm_notification, 'token123'              # single recipient
-    gcm_service.deliver gcm_notification, 'token123', 'token456'  # multiple recipients
-    token_array = ['token123', 'token456']
-    gcm_service.deliver gcm_notification, token_array             # multiple recipients
+    gcm_service.deliver gcm_notification, 'token123'               # single recipient
+    gcm_service.deliver gcm_notification, 'token123', 'token456'   # multiple recipients
+    gcm_service.deliver gcm_notification, ['token123', 'token456'] # multiple recipients
+    gcm_service.deliver gcm_notification, topic: 'topic123'        # topic delivery
 
 ## APNS
 

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/mercurius.rb

@@ -23,4 +23,6 @@ require 'mercurius/gcm/connection'
 require 'mercurius/gcm/notification'
 require 'mercurius/gcm/service'
 require 'mercurius/gcm/response'
+require 'mercurius/gcm/response_collection'
+require 'mercurius/gcm/result_collection'
 require 'mercurius/gcm/result'

data/lib/mercurius/apns/connection.rb

@@ -34,13 +34,11 @@ module APNS
     end
 
     private
-
       def ssl_context_for_pem(pem)
         context = OpenSSL::SSL::SSLContext.new
         context.cert = OpenSSL::X509::Certificate.new(pem.data)
         context.key = OpenSSL::PKey::RSA.new(pem.data, pem.password)
         context
       end
-
   end
 end

data/lib/mercurius/apns/notification.rb

@@ -26,16 +26,6 @@ module APNS
       [0, 0, 32, package_device_token(device_token), 0, packaged_message.bytesize, packaged_message].pack("ccca*cca*")
     end
 
-    def package_device_token(device_token)
-      [device_token.gsub(/[\s|<|>]/,'')].pack('H*')
-    end
-
-    def packaged_message
-      { aps: payload }.to_json.gsub(/\\u([\da-fA-F]{4})/) do |m|
-        [$1].pack("H*").unpack("n*").pack("U*")
-      end
-    end
-
     def ==(that)
       attributes == that.attributes
     end
@@ -44,5 +34,15 @@ module APNS
       packaged_message.bytesize <= MAX_PAYLOAD_BYTES
     end
 
+    private
+      def package_device_token(device_token)
+        [device_token.gsub(/[\s|<|>]/,'')].pack('H*')
+      end
+
+      def packaged_message
+        { aps: payload }.to_json.gsub(/\\u([\da-fA-F]{4})/) do |m|
+          [$1].pack("H*").unpack("n*").pack("U*")
+        end
+      end
   end
 end

data/lib/mercurius/apns/pem.rb

@@ -9,7 +9,6 @@ module APNS
     end
 
     private
-
       def read_file_at_path
         if File.exist? path
           File.read path
@@ -17,6 +16,5 @@ module APNS
           raise PemNotFoundError.new
         end
       end
-
   end
 end

data/lib/mercurius/apns/service.rb

@@ -33,7 +33,6 @@ module APNS
     end
 
     private
-
       def persistent?
         @_persistent
       end
@@ -57,6 +56,5 @@ module APNS
       def too_many_retries?
         @attempts >= MAX_NUMBER_OF_RETRIES
       end
-
   end
 end

data/lib/mercurius/errors/invalid_apns_mode_error.rb

@@ -1,7 +1,5 @@
 class InvalidApnsModeError < StandardError
-
   def initialize
     super 'Tried to set invalid APNS mode.'
   end
-
 end

data/lib/mercurius/errors/pem_not_configured_error.rb

@@ -1,7 +1,5 @@
 class PemNotConfiguredError < StandardError
-
   def initialize
     super 'PEM is not configured properly.'
   end
-
-end
+end

data/lib/mercurius/errors/pem_not_found_error.rb

@@ -1,7 +1,5 @@
 class PemNotFoundError < StandardError
-
   def initialize
     super 'The specified PEM file does not exist.'
   end
-
-end
+end

data/lib/mercurius/errors/too_many_retries_error.rb

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

data/lib/mercurius/gcm/notification.rb

@@ -1,36 +1,22 @@
 module GCM
   class Notification
     include ActiveModel::Model
-
-    def self.special_attrs
-      [:collapse_key, :time_to_live, :delay_while_idle, :dry_run, :notification]
-    end
-
-    attr_accessor :data
-    attr_accessor *special_attrs
-    # validate delay_while_idle is true/false
-    # validate ttl is integer in seconds
+    attr_accessor :attributes
 
     def initialize(attributes = {})
       @attributes = attributes
-      super @attributes.slice(*self.class.special_attrs).merge(data: @attributes.except(*self.class.special_attrs))
     end
 
     def to_h
-      hash = {
-        notification: notification,
-        data: data,
-        collapse_key: collapse_key,
-        time_to_live: time_to_live,
-        delay_while_idle: delay_while_idle,
-        dry_run: dry_run
-      }
-
-      hash.reject { |k, v| v.nil? }
+      @attributes
     end
 
     def ==(that)
       attributes == that.attributes
     end
+
+    def method_missing(method, *args, &block)
+      @attributes.fetch(method) { super }
+    end
   end
 end

data/lib/mercurius/gcm/response.rb

@@ -1,49 +1,55 @@
 module GCM
   class Response
-    attr_reader :response, :device_tokens
-
-    MESSAGES = {
-      200 => 'Success',
-      400 => 'The request could not be parsed as JSON or it contained invalid fields',
-      401 => 'There was an error authenticating the sender account',
-      500 => 'There was an internal error in the GCM server',
-      503 => 'GCM server is temporarily unavailable',
-      default: 'Unknown error'
-    }
-
-    def initialize(response, device_tokens)
+    attr_reader :response, :tokens
+
+    def initialize(response, tokens = [])
       @response = response
-      @device_tokens = device_tokens
+      @tokens = tokens
     end
 
     def status
-      @response.status
-    end
-
-    def message
-      MESSAGES.fetch(status, MESSAGES[:default])
+      response.status
     end
 
     def success?
-      @response.success?
+      response.success?
     end
 
-    def failed?
+    def fail?
       !success?
     end
 
-    def has_canonical_ids?
-      (response_body.canonical_ids || 0) > 0
+    def results
+      @_results ||= begin
+        results = to_h.fetch 'results', []
+        results.map!.with_index do |attributes, i|
+          GCM::Result.new attributes, tokens[i]
+        end
+        ResultCollection.new(results)
+      end
     end
 
-    def canonical_ids
-      response_body.results.map do |result|
-        result["registration_id"]
+    def error
+      case status
+      when 401
+        'Authentication error with GCM. Check the server whitelist and the validity of your project key.'
+      when 400
+        'Invalid JSON was sent to GCM.'
+      when 500..599
+        'GCM Internal server error.'
+      else
+        nil
       end
     end
 
-    def response_body
-      @response_body ||= OpenStruct.new JSON.parse(response.body)
+    def retry_after
+      response.headers['Retry-After']
+    end
+
+    def to_h
+      JSON.parse response.body
+    rescue JSON::ParserError
+      {}
     end
   end
 end

data/lib/mercurius/gcm/response_collection.rb

@@ -0,0 +1,28 @@
+module GCM
+  class ResponseCollection
+    attr_reader :recommendations
+
+    def initialize(notification, responses = [])
+      @responses = responses
+      @notification = notification
+    end
+
+    def [](index)
+      @responses[index]
+    end
+
+    def <<(response)
+      @responses.concat Array(response).flatten
+    end
+
+    def results
+      out = GCM::ResultCollection.new
+      @responses.map do |response|
+        response.results.each do |result|
+          out << result
+        end
+      end
+      out
+    end
+  end
+end

data/lib/mercurius/gcm/result.rb

@@ -1,30 +1,29 @@
 module GCM
   class Result
-    attr_reader :responses
+    include ActiveModel::Model
 
-    def initialize(notification)
-      @notification = notification
-      @responses = []
-    end
+    attr_accessor :message_id, :registration_id, :error
+    attr_reader :token
 
-    def success?
-      failed_responses.empty?
+    def initialize(attributes, token)
+      super attributes
+      @token = token
     end
 
-    def process_response(response, device_tokens)
-      self.responses << GCM::Response.new(response, device_tokens)
+    def success?
+      message_id.present?
     end
 
-    def failed_responses
-      @_failed_responses ||= responses.select(&:failed?)
+    def fail?
+      !success?
     end
 
-    def failed_device_tokens
-      @_failed_device_tokens ||= failed_responses.flat_map { |response| response.device_tokens }
+    def canonical_id
+      registration_id
     end
 
-    def has_canonical_ids?
-      responses.map{ |response| response.has_canonical_ids? }.reduce{ |carry, val| carry || val }
+    def has_canonical_id?
+      canonical_id.present?
     end
   end
 end

data/lib/mercurius/gcm/result_collection.rb

@@ -0,0 +1,33 @@
+module GCM
+  class ResultCollection
+    include Enumerable
+
+    def initialize(results = [])
+      @results = results
+    end
+
+    def [](index)
+      @results[index]
+    end
+
+    def each(&block)
+      @results.each &block
+    end
+
+    def succeeded
+      @results.select &:success?
+    end
+
+    def failed
+      @results.select &:fail?
+    end
+
+    def with_canonical_ids
+      @results.select &:has_canonical_id?
+    end
+
+    def <<(result)
+      @results << result
+    end
+  end
+end

data/lib/mercurius/gcm/service.rb

@@ -2,8 +2,7 @@ module GCM
   class Service
     include ActiveModel::Model
 
-    MAX_NUMBER_OF_RETRIES = 3
-    MAX_DEVICES_AT_ONCE = 999
+    BATCH_SIZE = 999
 
     attr_accessor :host, :key
     attr_reader :connection, :attempts
@@ -16,27 +15,27 @@ module GCM
       @attempts = 0
     end
 
-    def deliver(notification, *device_tokens)
-      result = GCM::Result.new(notification)
-      device_tokens = Array(device_tokens).flatten
-      device_tokens.each_slice(MAX_DEVICES_AT_ONCE) do |tokens|
-        payload = notification.to_h.merge registration_ids: tokens
-        result.process_response connection.write(payload), tokens
-      end
-      result
-    end
-
-    def deliver_topic(notification, topic)
-      GCM::Result.new(notification).tap do |result|
-        result.process_response connection.write(notification.to_h.merge(to: topic)), [topic]
-      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
     end
 
     private
+      def each_batch_of_tokens(tokens, batch_size: BATCH_SIZE, &block)
+        Array(tokens).flatten.compact.each_slice(batch_size)
+      end
 
-      def too_many_retries?
-        @attempts >= MAX_NUMBER_OF_RETRIES
+      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
       end
 
+      def deliver_to_topic(notification, topic)
+        GCM::Response.new connection.write(notification.to_h.merge(to: topic))
+      end
   end
 end

data/lib/mercurius/version.rb

@@ -1,3 +1,3 @@
 module Mercurius
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/mercurius.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables       = `git ls-files -- exe/*`.split("\n").map{ |f| File.basename(f) }
 
   s.require_paths = ["lib"]
   s.required_ruby_version = '~> 2.0'

data/spec/lib/gcm_notification_spec.rb

@@ -1,17 +1,11 @@
 describe GCM::Notification do
   describe 'with attributes' do
-    it 'should extract special attributes from the hash and assign them' do
+    it 'delegates methods to the attributes hash' do
       notification = GCM::Notification.new({ collapse_key: 'some_key', time_to_live: 123, delay_while_idle: true, dry_run: true })
       expect(notification.collapse_key).to eq 'some_key'
       expect(notification.time_to_live).to eq 123
       expect(notification.delay_while_idle).to eq true
       expect(notification.dry_run).to eq true
     end
-
-    it 'should move other attributes to data' do
-      notification = GCM::Notification.new({ message: 'hello', dry_run: true})
-      expect(notification.dry_run).to eq true
-      expect(notification.data).to eq({ message: 'hello' })
-    end
   end
-end
+end

data/spec/lib/gcm_response_spec.rb

@@ -1,25 +1,82 @@
 describe GCM::Response do
-  subject { GCM::Response.new nil, nil }
-
-  it 'has_canonical_ids? should return true if the response body has canonical ids' do
-    allow(subject).to receive(:response_body) { OpenStruct.new canonical_ids: 1 }
-    expect(subject.has_canonical_ids?).to be_truthy
+  class FakeResponse < Struct.new(:hash, :success)
+    def body; hash.to_json; end
+    def success?; success; end
   end
 
-  it 'has_canonical_ids? should return false if the body has no canonical ids' do
-    allow(subject).to receive(:response_body) { OpenStruct.new success: 1 }
-    expect(subject.has_canonical_ids?).to be_falsy
+  let(:json) { Hash.new }
+  let(:success) { true }
+  let(:tokens) { ['token123', 'token456'] }
+
+  let(:response) do
+    GCM::Response.new FakeResponse.new(json, success), tokens
   end
 
-  it 'canonical_ids should return an array of registration ids' do
-    allow(subject).to receive(:response_body) { OpenStruct.new results: [{'registration_id' => '1234'}, {'registration_id' => '5678'}, {}] }
-    expect(subject.canonical_ids).to eq ['1234', '5678', nil]
+  describe '#results' do
+    let(:json) do
+      {
+        multicast_id: 108, success: 2, failure: 1, canonical_ids: 1, results: [
+          { message_id: '1' },
+          { message_id: '2', registration_id: 'canonicalToken456' },
+          { error: 'DeviceMessageRateExceeded' }
+        ]
+      }
+    end
+
+    it 'returns an array of the results in a response' do
+      expect(response.results.count).to eq 3
+      expect(response.results[0].message_id).to eq '1'
+      expect(response.results[0].token).to eq 'token123'
+      expect(response.results[1].message_id).to eq '2'
+      expect(response.results[1].token).to eq 'token456'
+      expect(response.results[1].canonical_id).to eq 'canonicalToken456'
+    end
+
+    describe 'ResultCollection#succeeded' do
+      subject { response.results.succeeded }
+
+      it 'returns only the successful results' do
+        expect(subject.count).to eq 2
+        expect(subject[0].message_id).to eq '1'
+        expect(subject[1].message_id).to eq '2'
+      end
+    end
+
+    describe 'ResultCollection#failed' do
+      subject { response.results.failed }
+
+      it 'returns only the failed results' do
+        expect(subject.count).to eq 1
+        expect(subject[0].error).to eq 'DeviceMessageRateExceeded'
+      end
+    end
+
+    describe 'ResultCollection#with_canonical_ids' do
+      subject { response.results.with_canonical_ids }
+
+      it 'returns only the results with canonical ids' do
+        expect(subject.count).to eq 1
+        expect(subject[0].token).to eq 'token456'
+        expect(subject[0].canonical_id).to eq 'canonicalToken456'
+      end
+    end
   end
 
-  it 'response_body should return an openstruct of the response.body' do
-    allow(subject).to receive(:response) { OpenStruct.new body: { one: 'two' }.to_json }
-    result = subject.response_body
-    expect(result).to be_a OpenStruct
-    expect(result.to_h).to eq({one: 'two'})
+  describe '#success?' do
+    context 'Faraday response is successful' do
+      let(:success) { true }
+
+      it 'returns true' do
+        expect(response).to be_success
+      end
+    end
+
+    context 'Faraday response is not successful' do
+      let(:success) { false }
+
+      it 'returns false' do
+        expect(response).to_not be_success
+      end
+    end
   end
-end
+end

data/spec/lib/gcm_result_collection_spec.rb

@@ -0,0 +1,32 @@
+describe GCM::ResultCollection do
+  subject do
+    GCM::ResultCollection.new [
+      GCM::Result.new({ message_id: '1' }, 'token123'),
+      GCM::Result.new({ message_id: '2', registration_id: 'canonicalToken456' }, 'token456'),
+      GCM::Result.new({ error: 'DeviceMessageRateExceeded' }, nil)
+    ]
+  end
+
+  describe '#succeeded' do
+    it 'returns only the successful results' do
+      expect(subject.succeeded.count).to eq 2
+      expect(subject.succeeded[0].message_id).to eq '1'
+      expect(subject.succeeded[1].message_id).to eq '2'
+    end
+  end
+
+  describe '#failed' do
+    it 'returns only the failed results' do
+      expect(subject.failed.count).to eq 1
+      expect(subject.failed[0].error).to eq 'DeviceMessageRateExceeded'
+    end
+  end
+
+  describe '#with_canonical_ids' do
+    it 'returns only the results with canonical ids' do
+      expect(subject.with_canonical_ids.count).to eq 1
+      expect(subject.with_canonical_ids[0].token).to eq 'token456'
+      expect(subject.with_canonical_ids[0].canonical_id).to eq 'canonicalToken456'
+    end
+  end
+end

data/spec/lib/gcm_result_spec.rb

@@ -1,13 +1,49 @@
 describe GCM::Result do
-  subject { GCM::Result.new nil }
+  describe '#canonical_id' do
+    it 'returns the registration_id from the GCM response JSON' do
+      result = GCM::Result.new({ message_id: '1:08', registration_id: 'canonicalToken123' }, nil)
+      expect(result.canonical_id).to eq 'canonicalToken123'
+    end
 
-  it 'has_canonical_ids? should return true if any responses have them' do
-    allow(subject).to receive(:responses) { [instance_double(GCM::Response, has_canonical_ids?: true), instance_double(GCM::Response, has_canonical_ids?: false)] }
-    expect(subject.has_canonical_ids?).to be_truthy
+    it 'returns nil if no canonical ID is given by GCM' do
+      result = GCM::Result.new({ message_id: '1:08' }, nil)
+      expect(result.canonical_id).to be_nil
+    end
   end
 
-  it 'otherwise, has_canonical_ids should return false' do
-    allow(subject).to receive(:responses) { [instance_double(GCM::Response, has_canonical_ids?: false), instance_double(GCM::Response, has_canonical_ids?: false)] }
-    expect(subject.has_canonical_ids?).to be_falsy
+  describe '#has_canonical_id?' do
+    it 'returns true when canonical_id is given by GCM' do
+      result = GCM::Result.new({ message_id: '1:08', registration_id: 'canonicalToken123' }, nil)
+      expect(result.has_canonical_id?).to be_truthy
+    end
+
+    it 'returns false when canonical_id is not given by GCM' do
+      result = GCM::Result.new({ message_id: '1:08' }, nil)
+      expect(result.has_canonical_id?).to be_falsey
+    end
+  end
+
+  describe '#success?' do
+    it 'returns true when the message is sent and returned with a message id' do
+      result = GCM::Result.new({ message_id: '1:08' }, nil)
+      expect(result).to be_success
+    end
+
+    it 'returns false otherwise' do
+      result = GCM::Result.new({ error: 'DeviceMessageRateExceeded' }, nil)
+      expect(result).to_not be_success
+    end
+  end
+
+  describe '#error' do
+    it 'returns the error from GCM' do
+      result = GCM::Result.new({ error: 'DeviceMessageRateExceeded' }, nil)
+      expect(result.error).to eq 'DeviceMessageRateExceeded'
+    end
+
+    it 'returns nil when there is no error' do
+      result = GCM::Result.new({ message_id: '1:08' }, nil)
+      expect(result.error).to be_nil
+    end
   end
 end

data/spec/lib/gcm_service_spec.rb

@@ -1,6 +1,6 @@
 describe GCM::Service do
   let(:service) { GCM::Service.new }
-  let(:message) { GCM::Notification.new(alert: 'Hey') }
+  let(:message) { GCM::Notification.new(data: { alert: 'Hey' }) }
 
   it 'should default to the GCM module configs' do
     expect(service.host).to eq GCM.host
@@ -34,7 +34,7 @@ describe GCM::Service do
       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: [tokens.last] })
+        with(body: { data: { alert: 'Hey' }, registration_ids: ['token1000'] })
     end
   end
 
@@ -43,7 +43,7 @@ describe GCM::Service do
     let(:message) { { notification: { title: 'hello', body: 'world' } } }
 
     it 'sends a notification to a topic' do
-      service.deliver_topic message, '/topics/global'
+      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'))
     end
@@ -54,28 +54,47 @@ describe GCM::Service do
       before { stub_request :post, %r[android.googleapis.com/gcm/send] }
 
       it 'processes a 200 response' do
-        result = service.deliver message, 'token123'
-        expect(result.responses[0].status).to eq 200
-        expect(result.responses[0].message).to eq GCM::Response::MESSAGES[200]
-        expect(result.failed_device_tokens).to eq []
+        responses = service.deliver message, 'token123'
+        expect(responses[0].status).to eq 200
+        expect(responses[0].success?).to eq true
+        expect(responses.results.failed).to eq []
       end
     end
 
-    context 'failure' do
-      before { stub_request(:post, %r[android.googleapis.com/gcm/send]).to_return(status: 400) }
+    describe 'failure' do
+      context 401 do
+        before { stub_request(:post, %r[android.googleapis.com/gcm/send]).to_return(status: 401) }
 
-      it 'processes a 400 response' do
-        result = service.deliver message, 'token123'
-        expect(result.responses[0].status).to eq 400
-        expect(result.responses[0].message).to eq GCM::Response::MESSAGES[400]
-        expect(result.failed_device_tokens).to eq ['token123']
+        it 'has a meaningful message from #error' do
+          responses = service.deliver message, 'token123'
+          expect(responses[0].error).to match /Authentication error/
+        end
       end
 
-      it 'adds all failed messages to the failed device tokens array' do
-        tokens = (1..1000).to_a.map { |i| "token#{i}" }
-        result = service.deliver message, tokens
-        expect(result.failed_device_tokens).to include 'token1'
-        expect(result.failed_device_tokens).to include 'token1000'
+      context 400 do
+        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'
+          expect(responses[0].error).to match /Invalid JSON/
+        end
+      end
+
+      context 500..599 do
+        before do
+          stub_request(:post, %r[android.googleapis.com/gcm/send]).
+            to_return status: 500, headers: { 'Retry-After' => '120' }
+        end
+
+        it 'has a meaningful message from #error' do
+          responses = service.deliver message, 'token123'
+          expect(responses[0].error).to match /GCM Internal server error/
+        end
+
+        it 'returns the Retry-After header from GCM' do
+          responses = service.deliver message, 'token123'
+          expect(responses[0].retry_after).to eq '120'
+        end
       end
     end
 

data/spec/lib/testing_spec.rb

@@ -18,7 +18,7 @@ describe 'Test mode' do
 
   context 'GCM' do
     let(:service) { GCM::MockService.new }
-    let(:message) { GCM::Notification.new(alert: 'Hey') }
+    let(:message) { GCM::Notification.new(data: { alert: 'Hey' }) }
 
     it 'returns the deliveries sent to GCM' do
       result = service.deliver message, 'token123'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercurius
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - John Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -139,6 +139,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/rake
+- bin/rspec
 - lib/mercurius.rb
 - lib/mercurius/apns.rb
 - lib/mercurius/apns/connection.rb
@@ -153,7 +155,9 @@ files:
 - lib/mercurius/gcm/connection.rb
 - lib/mercurius/gcm/notification.rb
 - lib/mercurius/gcm/response.rb
+- lib/mercurius/gcm/response_collection.rb
 - lib/mercurius/gcm/result.rb
+- lib/mercurius/gcm/result_collection.rb
 - lib/mercurius/gcm/service.rb
 - lib/mercurius/testing.rb
 - lib/mercurius/testing/base.rb
@@ -167,6 +171,7 @@ files:
 - spec/lib/apns_spec.rb
 - spec/lib/gcm_notification_spec.rb
 - spec/lib/gcm_response_spec.rb
+- spec/lib/gcm_result_collection_spec.rb
 - spec/lib/gcm_result_spec.rb
 - spec/lib/gcm_service_spec.rb
 - spec/lib/testing_spec.rb
@@ -202,6 +207,7 @@ test_files:
 - spec/lib/apns_spec.rb
 - spec/lib/gcm_notification_spec.rb
 - spec/lib/gcm_response_spec.rb
+- spec/lib/gcm_result_collection_spec.rb
 - spec/lib/gcm_result_spec.rb
 - spec/lib/gcm_service_spec.rb
 - spec/lib/testing_spec.rb