lockbox_middleware 1.2.1 → 1.2.2

data/lib/lockbox_middleware.rb

@@ -107,7 +107,7 @@ class LockBox
       end
     end
     caching_allowed = (cache_max_age > 0 && cache_public)
-    expiration = cache_max_age.seconds.since(Time.now)
+    expiration = Time.at(Time.now.to_i + cache_max_age)
     cache_auth(api_key,expiration) if caching_allowed
   end
 

data/spec/lib/lockbox_middleware_spec.rb

@@ -133,7 +133,7 @@ describe 'LockBox' do
       bad_response.stubs(:headers).returns({'Cache-Control' => 'public,no-cache'})
       bad_response.stubs(:code).returns(401)
       LockBox.stubs(:get).with("/authentication/123456", any_parameters).returns(bad_response)
-      expired_time = @max_age.seconds.since(Time.now)
+      expired_time = Time.at(Time.now.to_i + @max_age)
       Time.stubs(:now).returns(expired_time)
       get "/api/some_controller/some_action?key=123456"
       last_response.status.should == 401
@@ -160,7 +160,7 @@ describe 'LockBox' do
       headers = {
         'X-RateLimit-Limit' => '100',
         'X-RateLimit-Remaining' => '99',
-        'X-RateLimit-Reset' => 1.hour.from_now.to_i.to_s
+        'X-RateLimit-Reset' => (Time.now.to_i + 3600).to_s
       }
       successful_response.stubs(:headers).returns(headers.merge({'Cache-Control' => 'public,no-cache'}))
       LockBox.stubs(:get).with("/authentication/123456", any_parameters).returns(successful_response)

data/spec/spec_helper.rb

@@ -3,13 +3,11 @@
 ENV["RAILS_ENV"] ||= 'test'
 env_file = File.expand_path(File.join(File.dirname(__FILE__),'..','config','environment'))
 if File.exists?("#{env_file}.rb")
-  puts "Detected Rails"
   require env_file
   require 'spec/autorun'
   require 'spec/rails'
   require 'authlogic/test_case'
 else
-  puts "No Rails"
   require 'rubygems'
   require 'mocha' # gem install jferris-mocha, not regular mocha
 end