gcm_middleware 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7668b6b374a402eb48242976980c89934f56f5
-  data.tar.gz: 23873b9160246094485e34826fa579af29e3b2ed
+  metadata.gz: ac61ade0afe4dbe472d9eadd91962d9f52e1df20
+  data.tar.gz: 2747f613ef9131048a6658c7372260d6254f949a
 SHA512:
-  metadata.gz: 6a4eff5600ad2e560fe4ebbe0eeb7f6c1affa7152abbe64a97e606a7cc009bbd3c85976cf499276e5304e887299b0469809d9ca083ff56de2e4f971d28689fc0
-  data.tar.gz: a0df42a0aafd8228d73b480c1ea238e3d3d12b6cfe02fc7bb6f67c4bd4518b2e80ecd8cb718adf4faa69174fbd4069fea2acf20b0753c2968a3ac38fbf0d8d6d
+  metadata.gz: 218463a6fe419556cee7aeef96708a7f6e93b95061141e171389349f59b1c73dd04ca2bec760260c86d68d5dd2a9d9335517653dfec2ce413559bd55674d0986
+  data.tar.gz: b8c545b3d5504c40535a9a831e77e1d4f0acc484c2bfc53d16581572253d54f28d7ce9c66393caf3f1fdd3ee9510ac0c6770b8a4ae929c36a3907ac14f4e5912

data/lib/gcm_middleware/authentication.rb

@@ -1,21 +1,26 @@
+require 'faraday'
+
 module GCMMiddleware
-  class Authentication
+  class Authentication < Faraday::Middleware
     def initialize(app, options = {})
-      @app, @options = app, options
+      super(app)
+      @key = options.fetch(:key, '')
+
+      raise ArgumentError.new('No api key was provided') if @key.nil? || @key.empty?
     end
 
     def call(env)
       env.request_headers['Authorization'] = auth_key
 
-      app.call(env).on_complete { |env| }
+      @app.call(env).on_complete { |env| }
     end
 
     private
 
-    attr_reader :app, :options
+    attr_reader :key
 
     def auth_key
-      @auth_key ||= "key=#{options[:key]}".freeze
+      @auth_key ||= "key=#{key}".freeze
     end
   end
 end

data/lib/gcm_middleware/canonical_id.rb

@@ -1,20 +1,18 @@
-module GCMMiddleware
-  class CanonicalId
-    def initialize(app, options = {})
-      @app = app
-    end
+require 'faraday'
 
+module GCMMiddleware
+  class CanonicalId < Faraday::Middleware
     def call(env)
       save_ids(env.body)
 
-      app.call(env).on_complete do |env|
+      @app.call(env).on_complete do |env|
         inject_original_ids(env.body) if has_registration_ids && env.body
       end
     end
 
     private
 
-    attr_reader :registration_ids, :app
+    attr_reader :registration_ids
 
     def inject_original_ids(body)
       body['results'].each_with_index do |result, i|

data/lib/gcm_middleware/version.rb

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

data/spec/middleware/authentication_spec.rb

@@ -1,7 +1,7 @@
 describe GCMMiddleware::Authentication do
   let(:faraday) do
     Faraday.new('http://www.example.com') do |builder|
-      builder.use GCMMiddleware::Authentication, key: 'auth-key'
+      builder.use GCMMiddleware::Authentication, key: auth_key
 
       builder.adapter :test do |stub|
         stub.get('/test') { |env| [ 200, {}, {} ] }
@@ -9,10 +9,35 @@ describe GCMMiddleware::Authentication do
     end
   end
 
-  it 'injects the key into the header' do
-    response = faraday.get '/test'
+  context 'with auth key' do
+    let(:auth_key) { 'auth-key' }
 
-    expect(response.env.request_headers['Authorization']).to eq('key=auth-key')
+    it 'injects the key into the header' do
+      response = faraday.get '/test'
+
+      expect(response.env.request_headers['Authorization']).to eq('key=auth-key')
+    end
   end
-end
 
+  context 'with no auth key' do
+    context 'with nil auth key' do
+      let(:auth_key) { nil }
+
+      it 'throws a error if no api key is provided' do
+        expect {
+          faraday.get '/test'
+        }.to raise_error(ArgumentError, 'No api key was provided')
+      end
+    end
+
+    context 'with empty api key' do
+      let(:auth_key) { '' }
+
+      it 'throws a error if no api key is provided' do
+        expect {
+          faraday.get '/test'
+        }.to raise_error(ArgumentError, 'No api key was provided')
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gcm_middleware
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Trevor John
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday