wp-hmac 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db868028407a6446871761f00d2344bdaea894f8
-  data.tar.gz: 6ac7ab349d36f90aa6ab398f72b1c53632a23ef4
+  metadata.gz: fabdf9898de29b2dac5ba244f9e96cdd008bb126
+  data.tar.gz: 228fef53f920e1d4e08ecca8113f21f21988927b
 SHA512:
-  metadata.gz: 91a8b8aa1a81fddaf79f577455a43671b0cdc4dbb0da28c55be29c550695917da42e441905724dd8abf08a20dbdd3b9d490f1d208bc747dcdf4b80308b828114
-  data.tar.gz: e2927f2c94c822d9220e41ebb71ae76d09ce7c23e6183880061ec9cadb6979f661cd55066ce0c063bc45fce4e1c1dde8677b20ecaa1c4cc94425acd471af1db0
+  metadata.gz: 35a0facf321f5acde5224ff62d80cad3401b35563457d965e8029757f0883971317d88360809f8ac32b37e2281d92cdddb759135b3dc5794a4b08651caae33e0
+  data.tar.gz: 54859f1e2c700e97ff1443397e0bc560545ff8f80a48eb17d690519a44458629ae3c4738e29947e38b9c40bfa4572fd7df21cda93187db644f96060458cea1fc

data/lib/wp/hmac/key_cabinet.rb

@@ -7,18 +7,20 @@ module WP
       class KeyNotFound < Exception; end
 
       class << self
-        attr_accessor :keys
-        attr_writer :lookup_block
+        attr_writer :lookup_block, :keys
 
         def add_key(id:, auth_key:)
+          keys[id] = { id: id, auth_key: auth_key }
+        end
+
+        def keys
           @keys ||= {}
-          @keys[id] = { id: id, auth_key: auth_key }
         end
 
         # This method will be called by EY::ApiHMAC. It must return
         # an object that responds to +id+ and +auth_key+
         def find_by_auth_id(id)
-          hash = lookup(id) || @keys[id]
+          hash = lookup(id) || keys[id]
           msg = 'Ensure secret keys are loaded with `HMAC::KeyCabinet.add_key`'
           fail KeyNotFound, msg if hash.nil?
           OpenStruct.new(hash)

data/lib/wp/hmac/version.rb

@@ -1,5 +1,5 @@
 module Wp
   module Hmac
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/spec/hmac_spec.rb

@@ -23,38 +23,27 @@ end
 
 RSpec.describe WP::HMAC, type: :request do
   let(:app) { App::Application }
+  let(:hmac_client) { WP::HMAC::Client.new(nil) }
 
   before(:example) do
     WP::HMAC.configure do
-      add_key(id: 'esso', auth_key: 'secret_key')
       add_hmac_enabled_route %r{^/dummy/}
       get_auth_id_for_request -> { 'esso' }
     end
 
     WP::HMAC::Client.rack_app = app
-  end
-
-  after(:example) do
-    WP::HMAC.reset
-  end
 
-  let(:hmac_client) { WP::HMAC::Client.new(nil) }
-
-  before do
     Rails.application.routes.draw do
       resources :dummy
     end
   end
 
-  after do
+  after(:example) do
+    WP::HMAC.reset
     Rails.application.reload_routes!
   end
 
   context 'with no key' do
-    before(:each) do
-      WP::HMAC::KeyCabinet.instance_eval('@keys = {}')
-    end
-
     context 'when hmac is enabled for the route' do
       it 'raises an exception' do
         expect do
@@ -73,6 +62,13 @@ RSpec.describe WP::HMAC, type: :request do
   end
 
   context 'with a key cabinet' do
+
+    before(:example) do
+      WP::HMAC.configure do
+        add_key(id: 'esso', auth_key: 'secret_key')
+      end
+    end
+
     it 'fails when a request is not signed' do
       get 'http://esso.example.org/dummy/1'
 
@@ -126,23 +122,23 @@ RSpec.describe WP::HMAC, type: :request do
 
       expect(rack_response.body).to include('Hello, updated world!')
     end
-  end
 
-  context 'with a key configured via a block' do
-    before do
-      WP::HMAC.configure do
-        lookup_auth_key_with { |id| id == 'account2' ? 'mykey' : nil }
+    context 'with a key configured via a block' do
+      before do
+        WP::HMAC.configure do
+          lookup_auth_key_with { |id| id == 'account2' ? 'mykey' : nil }
+        end
       end
-    end
 
-    it 'looks up the key via the block' do
-      key = WP::HMAC::KeyCabinet.find_by_auth_id('account2')
-      expect(key.auth_key).to eq 'mykey'
-    end
+      it 'looks up the key via the block' do
+        key = WP::HMAC::KeyCabinet.find_by_auth_id('account2')
+        expect(key.auth_key).to eq 'mykey'
+      end
 
-    it 'still finds keys from the add_key method' do
-      key = WP::HMAC::KeyCabinet.find_by_auth_id('esso')
-      expect(key.auth_key).to eq 'secret_key'
+      it 'still finds keys from the add_key method' do
+        key = WP::HMAC::KeyCabinet.find_by_auth_id('esso')
+        expect(key.auth_key).to eq 'secret_key'
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wp-hmac
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Andrew Nagi