mercurius 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40aedae9f322daa624a3a3ca05cc2e0defd655fe
-  data.tar.gz: f6838c1e98184deae1a5b4a927fe8068cf99a4c6
+  metadata.gz: c407384556945caff8534e28bb17bc33eeb1e804
+  data.tar.gz: fb500925edc12008a2cf11653699083f37995d18
 SHA512:
-  metadata.gz: fcfbfdb534a87c655ef7590dcf1b5d9d9ae12f6bbe6066fb179a9d45884f9cff0361faa97a6c3013beeb8b9159f6d5aec991ada34005a132bf44d0d1ae45aec6
-  data.tar.gz: d5339b66a5c9aca4e8a7d99700b844c4e13f9f90433c759df8a458f7d64e44a8cd300e420b197d00935303f789553a69c1f1880ae0ca5a245dbf82dea66281b4
+  metadata.gz: 060ef7919702f1ca15acbb7f501fcaee491da68f5d5a416ecc49e57c84eef62c07abeff7afebacd9d1479ed56e74d270261789622b7cc30ec9f6d36c4c045153
+  data.tar.gz: dd66a90ef1b5a22689bebf352700b4303bbe24993c24119df9b3782af55f3a0acfba3d23e3d5832054237159fd854f2928a9e6b636b019c2e32df4d9d4b7c91b

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

@@ -10,7 +10,7 @@ module GCM
         'success' => tokens.size,
         'failure' => 0,
         'canonical_ids' => 0,
-        'results' => valid_token_json(tokens)
+        'results' => tokens.map { |token| valid_token_json(token) }
       }.to_json
 
       Mercurius::FakeResponse.new body: json, status: 200

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

@@ -1,15 +1,11 @@
 module GCM
   module TokenSerializer
-    def valid_token_json(tokens)
-      tokens.map do |token|
-        { 'message_id' => SecureRandom.hex }
-      end
+    def valid_token_json(token)
+      { 'message_id' => SecureRandom.hex }
     end
 
-    def invalid_token_json(tokens, error)
-      tokens.map do |token|
-        { 'error' => error }
-      end
+    def invalid_token_json(token, error)
+      { 'error' => error }
     end
 
     def canonical_token_json(tokens, canonical_ids_map)

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

@@ -7,19 +7,40 @@ module GCM
     end
 
     def write(json)
-      invalid, valid = json[:registration_ids].partition do |token|
-        @invalid_tokens.include? token
-      end
+      tokens = json[:registration_ids]
 
       json = {
         'multicast_id' => '123',
-        'success' => valid.size,
-        'failure' => invalid.size,
+        'success' => valid_tokens_count(tokens),
+        'failure' => invalid_tokens_count(tokens),
         'canonical_ids' => 0,
-        'results' => valid_token_json(valid).concat(invalid_token_json(invalid, 'NotRegistered'))
+        'results' => tokens.map do |token|
+          if valid? token
+            valid_token_json token
+          else
+            invalid_token_json token, 'NotRegistered'
+          end
+        end
       }.to_json
 
       Mercurius::FakeResponse.new body: json, status: 200
     end
+
+    private
+      def valid?(token)
+        !invalid? token
+      end
+
+      def invalid?(token)
+        @invalid_tokens.include?(token)
+      end
+
+      def valid_tokens_count(tokens)
+        tokens.count { |token| valid? token }
+      end
+
+      def invalid_tokens_count(tokens)
+        tokens.count { |token| invalid? token }
+      end
   end
 end

data/lib/mercurius/version.rb

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

data/spec/lib/testing_spec.rb

@@ -20,7 +20,7 @@ describe 'Test mode' do
       end
 
       it 'Returns invalid device errors for the tokens provided' do
-        responses = service.deliver message, 'token123', 'token456'
+        responses = service.deliver message, 'token456', 'token123'
         expect(responses.results.failed.size).to eq 1
         expect(responses.results.failed[0].token).to eq 'token456'
         expect(responses.results.failed[0].error).to eq 'NotRegistered'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mercurius
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - John Beck