mercurius 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ccb885f46ade09933f1d11b586e9dde8a787a98
-  data.tar.gz: ee229449b16cef9938a8fbe519ed4d6dbb5a0f16
+  metadata.gz: 770cfa0ddc12836b9e92eaec376949918e6b3f45
+  data.tar.gz: 4f21ff49852f315976929e4909eb0a38e73f66e1
 SHA512:
-  metadata.gz: 69b2ec2ff3797d0c122d0a4daff22d07044ebf61fbc63f13d4fd182cf1842a4e03d76b4b85bc6ac6b2e6c3cdd96bb6a6660f74672e9e205935050bcc6497512a
-  data.tar.gz: d6e7d78b30512d57605fbd1dd9711c020555adcee0ddb070b09898d5affb4b912d9ca6c3501bd603a5754f07e9407cd78a199860da330504c24f3d2a3de2c88b
+  metadata.gz: 9445e87cc176641987a28ca5beae772b235a0ea24ce352cac2bdb18a371fab1f95858784f627c1a21658365c4b0fce04d221d503d48c03523cf33b2d87b3a8f1
+  data.tar.gz: b7ad5f7db52bf7bda6bc405a5c2334d60bc4d94ff7ef954e1bbf23bc03e857d8f9fc80dd86c6170a56551d6e3b867c014ae07b81814d3fd9d533ad6ab6d3133c

data/lib/mercurius/gcm/notification.rb

@@ -2,14 +2,18 @@ module GCM
   class Notification
     include ActiveModel::Model
 
-    attr_accessor :data, :collapse_key, :time_to_live, :delay_while_idle
+    def self.special_attrs
+      [:collapse_key, :time_to_live, :delay_while_idle, :dry_run]
+    end
 
+    attr_accessor :data
+    attr_accessor *special_attrs
     # validate delay_while_idle is true/false
     # validate ttl is integer in seconds
 
     def initialize(attributes = {})
       @attributes = attributes
-      super data: @attributes.except(:collapse_key, :time_to_live, :delay_while_idle)
+      super @attributes.slice(*self.class.special_attrs).merge(data: @attributes.except(*self.class.special_attrs))
     end
 
     def to_h
@@ -17,7 +21,8 @@ module GCM
         data: data,
         collapse_key: collapse_key,
         time_to_live: time_to_live,
-        delay_while_idle: delay_while_idle
+        delay_while_idle: delay_while_idle,
+        dry_run: dry_run
       }
 
       hash.reject { |k, v| v.nil? }

data/lib/mercurius/gcm/response.rb

@@ -31,5 +31,19 @@ module GCM
     def failed?
       !success?
     end
+
+    def has_canonical_ids?
+      (response_body.canonical_ids || 0) > 0
+    end
+
+    def canonical_ids
+      response_body.results.map do |result|
+        result["registration_id"]
+      end
+    end
+
+    def response_body
+      @response_body ||= OpenStruct.new JSON.parse(response.body)
+    end
   end
 end

data/lib/mercurius/gcm/result.rb

@@ -23,5 +23,8 @@ module GCM
       @_failed_device_tokens ||= failed_responses.flat_map { |response| response.device_tokens }
     end
 
+    def has_canonical_ids?
+      responses.map{ |response| response.has_canonical_ids? }.reduce{ |carry, val| carry || val }
+    end
   end
 end

data/lib/mercurius/testing/result.rb

@@ -23,6 +23,10 @@ module Mercurius
         []
       end
 
+      def has_canonical_ids?
+        false
+      end
+
     end
   end
 end

data/lib/mercurius/version.rb

@@ -1,3 +1,3 @@
 module Mercurius
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/lib/gcm_notification_spec.rb

@@ -0,0 +1,17 @@
+describe GCM::Notification do
+  describe 'with attributes' do
+    it 'should extract special attributes from the hash and assign them' 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

data/spec/lib/gcm_response_spec.rb

@@ -0,0 +1,25 @@
+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
+  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
+  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]
+  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'})
+  end
+end

data/spec/lib/gcm_result_spec.rb

@@ -0,0 +1,13 @@
+describe GCM::Result do
+  subject { GCM::Result.new nil }
+
+  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
+  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
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercurius
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - John Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -165,6 +165,9 @@ files:
 - spec/lib/apns_notification_spec.rb
 - spec/lib/apns_service_spec.rb
 - spec/lib/apns_spec.rb
+- spec/lib/gcm_notification_spec.rb
+- spec/lib/gcm_response_spec.rb
+- spec/lib/gcm_result_spec.rb
 - spec/lib/gcm_service_spec.rb
 - spec/lib/testing_spec.rb
 - spec/spec_helper.rb
@@ -197,6 +200,9 @@ test_files:
 - spec/lib/apns_notification_spec.rb
 - spec/lib/apns_service_spec.rb
 - spec/lib/apns_spec.rb
+- spec/lib/gcm_notification_spec.rb
+- spec/lib/gcm_response_spec.rb
+- spec/lib/gcm_result_spec.rb
 - spec/lib/gcm_service_spec.rb
 - spec/lib/testing_spec.rb
 - spec/spec_helper.rb