wp-hmac 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803b79ca1b59726cc4c853a13831d65f4e2a63e7
-  data.tar.gz: 0107c029b7d51c9a6272fef49557b5d360ff536f
+  metadata.gz: 7890c63aaa7a52e55fae583b772d0fdd4ed2f09e
+  data.tar.gz: 9de22c8167a45b4a20f45edc6daeb69e1a1fb53e
 SHA512:
-  metadata.gz: b839d3bf6dd843dff393a606058b7b28b51b0b8f207f4ac7397fd1b452e5e9958421283aba15e70bcd7c41be7e79a0b6faec2e54c1f33a6d7a9fa0ce1c71b061
-  data.tar.gz: c8b94d52230bfea5d18aea7409532e24e5a43ef1eaa089ee712b7ba16e1a3ffa67e13edb027bd103c8122c260690e0403fff2d76d37d6f9297e41a715ab0c85e
+  metadata.gz: 4d2230ec01a97d7b2e18595ff3d6f4e16564c907c4f720c8a81d5042b629351366e649514cc38f4bfe27d5638dc12d7a85f5c055537cd98e666e7942443efff0
+  data.tar.gz: 50f840e23e5aa29b9a3e71d45e9ef0728cdc2b5f56b83454a6b7a2d312e9d4db3d0d1cd924e077162534f6ca165995f9a333e4c1290ee4ca76b15da385e43eeb

data/lib/wp/hmac/key_cabinet.rb

@@ -12,9 +12,20 @@ module WP
         end
 
         def find_by_auth_id(id)
-          key = @keys[id]
-          raise KeyNotFound, 'Ensure all secret keys are loaded with `HMAC::KeyCabinet.add_key`' if key.nil?
-          OpenStruct.new(key)
+          hash = lookup(id) || @keys[id]
+          raise KeyNotFound, 'Ensure all secret keys are loaded with `HMAC::KeyCabinet.add_key`' if hash.nil?
+          OpenStruct.new(hash)
+        end
+
+        def lookup(id)
+          return unless @lookup_block
+          if key = @lookup_block.call(id)
+            return { id: id, auth_key: key }
+          end
+        end
+
+        def lookup_block=(block)
+          @lookup_block = block
         end
       end
     end

data/lib/wp/hmac/version.rb

@@ -1,5 +1,5 @@
 module Wp
   module Hmac
-    VERSION = "0.1.1"
+    VERSION = "0.2.1"
   end
 end

data/lib/wp/hmac.rb

@@ -1,4 +1,4 @@
-require "wp/hmac/version"
+require 'wp/hmac/version'
 require 'rubygems'
 require 'bundler/setup'
 Bundler.require
@@ -34,8 +34,13 @@ module WP
       @callable.call
     end
 
+    def self.lookup_auth_key_with(&block)
+      KeyCabinet.lookup_block = block
+    end
+
     def self.reset
       KeyCabinet.keys = {}
+      KeyCabinet.lookup_block = nil
       Server.hmac_enabled_routes = []
     end
   end

data/spec/hmac_spec.rb

@@ -79,4 +79,22 @@ RSpec.describe WP::HMAC, type: :request do
       expect(rack_response.body).to include('Hello, 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 }
+      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 '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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wp-hmac
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Nagi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ey_api_hmac