mercurius 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad8436c06b411a85bb1392ae8829e647150a8813
-  data.tar.gz: 7b6021819a0c16f5b65c609e391c86eef4b10215
+  metadata.gz: 40aedae9f322daa624a3a3ca05cc2e0defd655fe
+  data.tar.gz: f6838c1e98184deae1a5b4a927fe8068cf99a4c6
 SHA512:
-  metadata.gz: f82468ba84b84c9fce6f0a8dc0b977724eda79378b1c70f1c6511be8f4d16e4baff266979c3a94dd73b08c3b4c04ce979960dae2b4afe26dd790041a7d42197e
-  data.tar.gz: 4c563b18ed858c1433ae0ff53199597028464d73f40f2b9361c0a9dd36add2fb1fc95055318c240c04809725cc5473f1315a1d1f76609695d954fe7ef178dce2
+  metadata.gz: fcfbfdb534a87c655ef7590dcf1b5d9d9ae12f6bbe6066fb179a9d45884f9cff0361faa97a6c3013beeb8b9159f6d5aec991ada34005a132bf44d0d1ae45aec6
+  data.tar.gz: d5339b66a5c9aca4e8a7d99700b844c4e13f9f90433c759df8a458f7d64e44a8cd300e420b197d00935303f789553a69c1f1880ae0ca5a245dbf82dea66281b4

data/lib/mercurius/gcm/response.rb

@@ -1,18 +1,18 @@
 module GCM
   class Response
-    attr_reader :response, :tokens
+    attr_reader :http_response, :tokens
 
-    def initialize(response, tokens = [])
-      @response = response
+    def initialize(http_response, tokens = [])
+      @http_response = http_response
       @tokens = tokens
     end
 
     def status
-      response.status
+      http_response.status
     end
 
     def success?
-      response.success?
+      http_response.success?
     end
 
     def fail?
@@ -43,11 +43,11 @@ module GCM
     end
 
     def retry_after
-      response.headers['Retry-After']
+      http_response.headers['Retry-After']
     end
 
     def to_h
-      JSON.parse response.body
+      JSON.parse http_response.body
     rescue JSON::ParserError
       {}
     end

data/lib/mercurius/gcm/response_collection.rb

@@ -1,5 +1,7 @@
 module GCM
   class ResponseCollection
+    include Enumerable
+
     attr_reader :recommendations
 
     def initialize(notification, responses = [])
@@ -7,14 +9,6 @@ module GCM
       @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|
@@ -24,5 +18,17 @@ module GCM
       end
       out
     end
+
+    def [](index)
+      @responses[index]
+    end
+
+    def <<(response)
+      @responses.concat Array(response).flatten
+    end
+
+    def each(&block)
+      @responses.each &block
+    end
   end
 end

data/lib/mercurius/gcm/result_collection.rb

@@ -6,14 +6,6 @@ module GCM
       @results = results
     end
 
-    def [](index)
-      @results[index]
-    end
-
-    def each(&block)
-      @results.each &block
-    end
-
     def succeeded
       @results.select &:success?
     end
@@ -26,8 +18,16 @@ module GCM
       @results.select &:has_canonical_id?
     end
 
+    def [](index)
+      @results[index]
+    end
+
     def <<(result)
       @results << result
     end
+
+    def each(&block)
+      @results.each &block
+    end
   end
 end

data/lib/mercurius/version.rb

@@ -1,3 +1,3 @@
 module Mercurius
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/lib/gcm_result_collection_spec.rb

@@ -7,6 +7,23 @@ describe GCM::ResultCollection do
     ]
   end
 
+  describe 'Enumerable' do
+    it '#[] returns the result at the given index' do
+      expect(subject[0].token).to eq 'token123'
+    end
+
+    it '#each iterates through the results' do
+      subject.each.with_index do |result, i|
+        expect(result).to eq subject[i]
+      end
+    end
+
+    it '#<< adds a new result to the collection' do
+      subject << GCM::Result.new({ message_id: '3' }, 'token789')
+      expect(subject.to_a.last.token).to eq 'token789'
+    end
+  end
+
   describe '#succeeded' do
     it 'returns only the successful results' do
       expect(subject.succeeded.count).to eq 2

data/spec/lib/response_collection_spec.rb

@@ -0,0 +1,26 @@
+describe GCM::ResponseCollection do
+  subject do
+    GCM::ResponseCollection.new nil, [
+      GCM::Response.new(Mercurius::FakeResponse.new(body: '{}', status: 200)),
+      GCM::Response.new(Mercurius::FakeResponse.new(body: '{}', status: 201)),
+      GCM::Response.new(Mercurius::FakeResponse.new(body: '{}', status: 204))
+    ]
+  end
+
+  describe 'Enumerable' do
+    it '#[] returns the response at the given index' do
+      expect(subject[0].status).to eq 200
+    end
+
+    it '#each iterates through the responses' do
+      subject.each.with_index do |response, i|
+        expect(response).to eq subject[i]
+      end
+    end
+
+    it '#<< adds a new response to the collection' do
+      subject << GCM::Response.new(Mercurius::FakeResponse.new(body: '{}', status: 400))
+      expect(subject.to_a.last.status).to eq 400
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercurius
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - John Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -175,6 +175,7 @@ files:
 - spec/lib/gcm_result_collection_spec.rb
 - spec/lib/gcm_result_spec.rb
 - spec/lib/gcm_service_spec.rb
+- spec/lib/response_collection_spec.rb
 - spec/lib/testing_spec.rb
 - spec/spec_helper.rb
 - spec/support/apns.pem
@@ -211,6 +212,7 @@ test_files:
 - spec/lib/gcm_result_collection_spec.rb
 - spec/lib/gcm_result_spec.rb
 - spec/lib/gcm_service_spec.rb
+- spec/lib/response_collection_spec.rb
 - spec/lib/testing_spec.rb
 - spec/spec_helper.rb
 - spec/support/apns.pem