api-auth 0.9.2 → 0.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_auth (0.9.2)
+    api-auth (0.9.3)
 
 GEM
   remote: http://rubygems.org/
@@ -12,9 +12,7 @@ GEM
     activeresource (2.3.14)
       activesupport (= 2.3.14)
     activesupport (2.3.14)
-    amatch (0.2.10)
-      tins (~> 0.3)
-    curb (0.7.18)
+    curb (0.8.1)
     diff-lcs (1.1.3)
     mime-types (1.17.2)
     rack (1.1.3)
@@ -28,7 +26,6 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
-    tins (0.3.9)
 
 PLATFORMS
   ruby
@@ -37,8 +34,7 @@ DEPENDENCIES
   actionpack (~> 2.3.2)
   activeresource (~> 2.3.2)
   activesupport (~> 2.3.2)
-  amatch (~> 0.2.10)
-  api_auth!
-  curb (~> 0.7.7)
+  api-auth!
+  curb (~> 0.8.1)
   rest-client (~> 1.6.0)
   rspec (~> 2.4.0)

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/api_auth.gemspec

@@ -11,12 +11,11 @@ Gem::Specification.new do |s|
   s.email = "mauricio@edge14.com"
 
   s.add_development_dependency "rspec", "~> 2.4.0"
-  s.add_development_dependency "amatch", "~> 0.2.10"
   s.add_development_dependency "actionpack", "~> 2.3.2"
   s.add_development_dependency "activesupport", "~> 2.3.2"
   s.add_development_dependency "activeresource", "~> 2.3.2"
   s.add_development_dependency "rest-client", "~> 1.6.0"
-  s.add_development_dependency "curb", "~> 0.7.7"
+  s.add_development_dependency "curb", "~> 0.8.1"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/api_auth/headers.rb

@@ -18,7 +18,11 @@ module ApiAuth
       when /ActionController::Request/
         @request = ActionControllerRequest.new(request)
       when /ActionController::TestRequest/
-        @request = ActionControllerRequest.new(request)
+        if defined?(ActionDispatch)
+          @request = ActionDispatchRequest.new(request)
+        else
+          @request = ActionControllerRequest.new(request)
+        end
       when /ActionDispatch::Request/
         @request = ActionDispatchRequest.new(request)
       else

data/lib/api_auth/railtie.rb

@@ -25,7 +25,7 @@ module ApiAuth
           gem 'activesupport'
           require 'action_controller'
           require 'active_support'
-        rescue
+        rescue LoadError
           nil
         end
       end
@@ -42,10 +42,17 @@ module ApiAuth
       
         def self.included(base)
           base.extend(ClassMethods)
+          
+          if base.respond_to?('class_attribute')
+            base.class_attribute :hmac_access_id
+            base.class_attribute :hmac_secret_key
+            base.class_attribute :use_hmac
+          else
+            base.class_inheritable_accessor :hmac_access_id            
+            base.class_inheritable_accessor :hmac_secret_key            
+            base.class_inheritable_accessor :use_hmac            
+          end
         
-          base.class_inheritable_accessor :hmac_access_id
-          base.class_inheritable_accessor :hmac_secret_key
-          base.class_inheritable_accessor :use_hmac
         end
       
         module ClassMethods
@@ -103,7 +110,7 @@ module ApiAuth
           require 'rubygems'
           gem 'activeresource'
           require 'active_resource'
-        rescue
+        rescue LoadError
           nil
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-auth
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70291317916400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,15 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70291317916400
-- !ruby/object:Gem::Dependency
-  name: amatch
-  requirement: &70291317915760 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.10
-  type: :development
-  prerelease: false
-  version_requirements: *70291317915760
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70291317915220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +37,15 @@ dependencies:
         version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70291317915220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70291317914540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +53,15 @@ dependencies:
         version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70291317914540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70291317913500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +69,15 @@ dependencies:
         version: 2.3.2
   type: :development
   prerelease: false
-  version_requirements: *70291317913500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70291317912540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,18 +85,28 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70291317912540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70291317911220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
   type: :development
   prerelease: false
-  version_requirements: *70291317911220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: Full HMAC auth implementation for use in your gems and Rails apps.
 email: mauricio@edge14.com
 executables: []
@@ -143,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple HMAC authentication for your APIs