gcm_middleware 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac61ade0afe4dbe472d9eadd91962d9f52e1df20
-  data.tar.gz: 2747f613ef9131048a6658c7372260d6254f949a
+  metadata.gz: bb36403e61c66e64c2ff8fa8c3503688a1e526d9
+  data.tar.gz: d90d36193d8d59c40da959a508f937cad8d0a4dd
 SHA512:
-  metadata.gz: 218463a6fe419556cee7aeef96708a7f6e93b95061141e171389349f59b1c73dd04ca2bec760260c86d68d5dd2a9d9335517653dfec2ce413559bd55674d0986
-  data.tar.gz: b8c545b3d5504c40535a9a831e77e1d4f0acc484c2bfc53d16581572253d54f28d7ce9c66393caf3f1fdd3ee9510ac0c6770b8a4ae929c36a3907ac14f4e5912
+  metadata.gz: b667337bdb8072c193f74f099728fc0770b42fcf6ac126fc09a26fa77f5fb548c912a5b8f7431d3a8ed19e5c42c1fe9e98fa63380eb657665db41f00928f6416
+  data.tar.gz: 6e3fe15c892949d6285b6932041396422a92394066764af863d16227825a25582d5f5bd59b9708ddb1038eeba07a292ae2c3b38e79691a2b4f3b5399c9357200

data/gcm_middleware.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'faraday'
-  spec.add_dependency 'faraday_middleware'
 
   spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1"
 end

data/lib/gcm_middleware/canonical_id.rb

@@ -1,31 +1,71 @@
 require 'faraday'
+require 'json'
 
 module GCMMiddleware
   class CanonicalId < Faraday::Middleware
+    GCM_PATH = '/gcm/send'.freeze
+    GCM_REGISTRATION_ID_KEY = 'registration_ids'.freeze
+    GCM_RESULTS_KEY = 'results'.freeze
+    ORIGINAL_ID_KEY = 'original_id'.freeze
+
     def call(env)
-      save_ids(env.body)
+      save_ids(env.body) if should_save_ids?(env)
 
       @app.call(env).on_complete do |env|
-        inject_original_ids(env.body) if has_registration_ids && env.body
+        if should_inject_ids? env
+          env.body = injected_response_body(env.body)
+        end
       end
     end
 
     private
 
-    attr_reader :registration_ids
+    attr_reader :registration_ids, :has_saved_ids
+
+    def injected_response_body(body)
+      if body.is_a? Hash
+        set_ids(body)
+      else
+        set_ids(JSON.parse(body)).to_json
+      end
+    end
 
-    def inject_original_ids(body)
-      body['results'].each_with_index do |result, i|
-        result['original_id'] = registration_ids[i]
+    def set_ids(body)
+      body.tap do |b|
+        b.fetch(GCM_RESULTS_KEY, []).each_with_index do |result, i|
+          result[ORIGINAL_ID_KEY] = registration_ids[i]
+        end
       end
     end
 
+    def should_save_ids?(env)
+      @has_saved_ids = is_gcm_url?(env.url) && env.body
+    end
+
     def save_ids(body)
-      @registration_ids = body.fetch('registration_ids', []) if body
+      @registration_ids = parse(body).fetch(GCM_REGISTRATION_ID_KEY, [])
+    end
+
+    def should_inject_ids?(env)
+      has_saved_ids &&
+        is_success?(env.status) &&
+        has_registration_ids?
     end
 
-    def has_registration_ids
+    def has_registration_ids?
       registration_ids && registration_ids.any?
     end
+
+    def parse(body)
+      body.is_a?(String) ? JSON.parse(body) : body
+    end
+
+    def is_success?(status)
+      status == 200
+    end
+
+    def is_gcm_url?(url)
+      url.path == GCM_PATH
+    end
   end
 end

data/lib/gcm_middleware/version.rb

@@ -1,3 +1,3 @@
 module GCMMiddleware
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/gcm_middleware_spec.rb

@@ -22,13 +22,13 @@ describe GCMMiddleware do
         f.use :gcm_canonical_id
 
         f.adapter :test do |stub|
-          stub.post('/test') { |env| [ 200, {}, {'results' => [{}]} ] }
+          stub.post('/gcm/send') { |env| [ 200, {}, {'results' => [{}]} ] }
         end
       end
     end
 
     it 'registers :gcm_canonical_id' do
-      response = faraday.post('test', { 'registration_ids' => ['1'] })
+      response = faraday.post('/gcm/send', { 'registration_ids' => ['1'] })
 
       expect(response.body['results'][0]['original_id']).to eq '1'
     end

data/spec/middleware/canonical_id_spec.rb

@@ -1,74 +1,104 @@
+
 describe GCMMiddleware::CanonicalId do
+  let(:response) { faraday.post(path, request_body) }
+  let(:path) { '/gcm/send' }
+  let(:status_code) { 200 }
+  let(:raw_response) { {} }
+  let(:response_object) { [status_code, {}, raw_response] }
   let(:faraday) do
     Faraday.new('http://www.example.com') do |builder|
       builder.use GCMMiddleware::CanonicalId
 
       builder.adapter :test do |stub|
-        stub.post('/test') { |env| [ 200, {}, {'results' => raw_results} ] }
-        stub.post('/error') { |env| [ 200, {}, nil ] }
+        stub.post('/gcm/send') { |env| response_object }
+        stub.post('/other') { |env| [ 200, {}, raw_response ] }
       end
     end
   end
-  let(:raw_results) { [] }
-
-  context 'with no body' do
-    it 'does not modify request' do
-      response = faraday.post '/test', nil
+  let(:request_body) { nil }
 
-      expect(response.body).to eq({'results' => []})
+  shared_examples 'a normal request' do
+    it 'does not modify request or response' do
+      expect(response.body).to eq(raw_response)
     end
   end
 
-  context 'when no registration ids' do
-    let(:body) { {'foo' =>  'bar'} }
+  context 'with no request body' do
+    it_behaves_like 'a normal request'
+  end
 
-    it 'does nothing with the request' do
-      response = faraday.post '/test', body
+  context 'when it is not the gcm path' do
+    let(:path) { '/other' }
+    let(:raw_response) { { 'foo' => 'bar' } }
+    let(:request_body) { { 'registration_ids' => ['1'] } }
 
-      expect(response.body).to eq({'results' => []})
-    end
+    it_behaves_like 'a normal request'
   end
 
-  context 'with registration ids' do
-    let(:raw_results) do
-      [
-        {
-          'message_id' => 'message-1',
-          'registration_id' => 'registration-1',
-          'error' => nil
-        },
-        {
-          'message_id' => 'message-2',
-          'registration_id' => 'registration-2',
-          'error' => nil
-        }
-      ]
+  context 'when a error is thrown' do
+    let(:status_code) { 500 }
+    let(:request_body) { {'registration_ids' => ['1']} }
+
+    it_behaves_like 'a normal request'
+  end
+
+  context 'with a request body' do
+    context 'with no registration ids' do
+      let(:body) { {'foo' =>  'bar'} }
+
+      it_behaves_like 'a normal request'
     end
-    let(:body) { {'registration_ids' => ['first-id', 'second-id']} }
 
-    it 'stores the original ids in the response' do
-      response = faraday.post '/test', body
+    shared_examples 'a gcm request' do
+      it 'stores the original id in the results' do
+        body = response.body
+
+        results = body.is_a?(String) ? JSON.parse(body)['results'] : body['results']
 
-      results = response.body['results']
-      expect(results[0]).to eq({
+        expect(results[0]).to eq({
           'message_id' => 'message-1',
           'registration_id' => 'registration-1',
           'error' => nil,
           'original_id' => 'first-id'
-      })
-      expect(results[1]).to eq({
+        })
+
+        expect(results[1]).to eq({
           'message_id' => 'message-2',
           'registration_id' => 'registration-2',
           'error' => nil,
           'original_id' => 'second-id'
-      })
+        })
+      end
     end
 
-    context 'with no response body' do
-      it 'does not throw exception' do
-        response = faraday.post '/error', body
+    context 'with registration ids' do
+      let(:request_body) do
+        {'registration_ids' => ['first-id', 'second-id']}
+      end
+      let(:raw_response) do
+        { 'results' =>
+          [
+            {
+              'message_id' => 'message-1',
+              'registration_id' => 'registration-1',
+              'error' => nil
+            },
+            {
+              'message_id' => 'message-2',
+              'registration_id' => 'registration-2',
+              'error' => nil
+            }
+          ]
+        }
+      end
+
+      it_behaves_like 'a gcm request'
+
+      context 'with json request' do
+        let(:response_object) { [status_code, {}, raw_response.to_json] }
+        let(:response) { faraday.post(path, request_body.to_json) }
 
-        expect(response.body).to be_nil
+        it_behaves_like 'a gcm request'
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'gcm_middleware'
+require 'pry'
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcm_middleware
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Trevor John
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement