lockbox_middleware 1.2.3 → 1.3.0

data/lib/lockbox_middleware.rb

@@ -5,8 +5,10 @@ require 'auth-hmac'
 class LockBox
   include HTTParty
   include LockBoxCache
+  @@config = nil
 
   def self.config
+    return @@config if @@config
     if defined?(Rails)
       root_dir = Rails.root
     else
@@ -25,7 +27,7 @@ class LockBox
         return_config = yaml_config[environment]
       end
     end
-    return_config
+    @@config = return_config
   end
 
   base_uri config['base_uri']
@@ -87,7 +89,7 @@ class LockBox
         return {:authorized => cached_auth, :headers => {}}
       end
     end
-    auth_response = self.class.get("/authentication/#{api_key}", {:headers => auth_headers(env)})
+    auth_response = self.class.get("/authentication/#{api_key}", {:headers => auth_headers(env), :request => {:application_name => LockBox.config['application_name']}})
     authorized = (auth_response.code == 200)
     cache_response_if_allowed(api_key, auth_response) if authorized
     {:authorized => authorized, :headers => response_headers(auth_response)}

data/spec/lib/lockbox_middleware_spec.rb

@@ -11,6 +11,10 @@ describe 'LockBox' do
   end
   
   def safely_edit_config_file(settings, env=nil)
+    Object.class_eval do
+      remove_const LockBox.to_s if const_defined? :LockBox
+    end
+
     env ||= Rails.env if defined?(Rails)
     env ||= ENV['RACK_ENV']
     env ||= 'test'
@@ -24,6 +28,7 @@ describe 'LockBox' do
     File.open( @config_file, 'w' ) do |out|
       YAML.dump( config, out )
     end
+    load 'lib/lockbox_middleware.rb'
   end
   
   context "setting the base_uri" do
@@ -196,13 +201,13 @@ describe 'LockBox' do
       successful_response.stubs(:headers).returns({'Cache-Control' => 'public, no-cache'})
       Time.stubs(:now).returns(Time.parse("2010-05-10 16:30:00 EDT"))
       valid_headers = {'X-Referer-Method' => 'GET', 'X-Referer-Date' => [Time.now.httpdate], 'X-Referer-Authorization' => ['AuthHMAC key-id:uxx+EgyzWBKBgS+Y8MzpcWcfy7k='], 'Referer' => 'http://example.org/api/some_controller/some_action'}
-      LockBox.stubs(:get).with("/authentication/hmac", {:headers => valid_headers}).returns(successful_response)
+      LockBox.stubs(:get).with("/authentication/hmac", {:headers => valid_headers, :request => {:application_name => 'test'}}).returns(successful_response)
       
       bad_response = mock("MockResponse")
       bad_response.stubs(:code).returns(401)
       bad_response.stubs(:headers).returns({'Cache-Control' => 'public, no-cache'})
       invalid_headers = {'X-Referer-Method' => 'GET', 'X-Referer-Date' => [Time.now.httpdate], 'X-Referer-Authorization' => 'foo', 'Referer' => 'http://example.org/api/some_controller/some_action'}
-      LockBox.stubs(:get).with("/authentication/hmac", {:headers => invalid_headers}).returns(bad_response)
+      LockBox.stubs(:get).with("/authentication/hmac", {:headers => invalid_headers, :request => {:application_name => 'test'}}).returns(bad_response)
       
       @path = "/api/some_controller/some_action"
       

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: lockbox_middleware
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 1
-  - 2
   - 3
-  version: 1.2.3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Chris Gill
@@ -18,18 +17,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -04:00
+date: 2010-08-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,11 +36,9 @@ dependencies:
   name: dnclabs-auth-hmac
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -63,12 +58,6 @@ files:
 - lib/lockbox_middleware.rb
 - LICENSE
 - README.rdoc
-- spec/lib/lockbox_cache_spec.rb
-- spec/lib/lockbox_middleware_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/helper_methods.rb
-- spec/support/mocha.rb
 has_rdoc: true
 homepage: http://github.com/dnclabs/lockbox
 licenses: []
@@ -79,27 +68,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rack middleware for the LockBox centralized API authorization service.