crashlog-auth-hmac 1.1.2 → 1.1.3

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  # - jruby-18mode
+  # - jruby-19mode
+  # - jruby-head
+  - rbx-18mode
+  - rbx-19mode
+  - ree
+

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in crashlog-faraday-auth-hmac.gemspec
 gemspec
+
+gem 'rake'
+
+gem 'rspec', '>= 2.7.0'
+gem 'activesupport', '~> 3.2.0'

data/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    crashlog-auth-hmac (1.1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.7)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    i18n (0.6.0)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.2.0)
+  crashlog-auth-hmac!
+  rake
+  rspec (>= 2.7.0)

data/README.md

@@ -1,5 +1,7 @@
 # Crashlog::AuthHMAC
 
+[![Build Status](https://secure.travis-ci.org/crashlog/auth-hmac.png?branch=master)](http://travis-ci.org/crashlog/auth-hmac)
+
 auth-hmac is a Ruby implementation of HMAC based authentication of HTTP requests.
 
 HMAC authentication involves a client and server having a shared secret key. When sending the request the client, signs the request using the secret key. This involves building a canonical representation of the request and then generating a HMAC of the request using the secret. The generated HMAC is then sent as part of the request.

data/lib/crash_log.rb

@@ -1,3 +1,4 @@
 module CrashLog
-  autoload :AuthHMAC, 'crash_log/auth_hmac'
 end
+
+require 'crash_log/auth_hmac'

data/lib/crash_log/auth_hmac.rb

@@ -26,6 +26,8 @@ module CrashLog
       def headers(request)
         if request.respond_to?(:headers)
           request.headers
+        elsif request.is_a?(Hash) && request.has_key?(:request_headers)
+          request[:request_headers]
         elsif request.respond_to?(:[])
           request
         else
@@ -71,6 +73,8 @@ module CrashLog
       def request_method(request)
         if request.respond_to?(:request_method) && request.request_method.is_a?(String)
           request.request_method
+        elsif request.is_a?(Hash) && request.has_key?(:method)
+          request[:method].to_s
         elsif request.respond_to?(:method) && request.method.is_a?(String)
           request.method
         elsif request.respond_to?(:env) && request.env
@@ -103,6 +107,8 @@ module CrashLog
         # Try unparsed_uri in case it is a Webrick request
         path = if request.respond_to?(:unparsed_uri)
           request.unparsed_uri
+        elsif request.is_a?(Hash) && request.has_key?(:url) && request[:url].is_a?(URI)
+          request[:url].path
         else
           request.path
         end
@@ -150,7 +156,7 @@ module CrashLog
     # Supports same options as AuthHMAC.initialize for overriding service_id and
     # signature method.
     #
-    def AuthHMAC.canonical_string(request, options = nil)
+    def self.canonical_string(request, options = nil)
       self.new(nil, options).canonical_string(request)
     end
 
@@ -159,7 +165,7 @@ module CrashLog
     # Supports same options as AuthHMAC.initialize for overriding service_id and
     # signature method.
     #
-    def AuthHMAC.signature(request, secret, options = nil)
+    def self.signature(request, secret, options = nil)
       self.new(nil, options).signature(request, secret)
     end
 
@@ -168,7 +174,7 @@ module CrashLog
     # Supports same options as AuthHMAC.initialize for overriding service_id and
     # signature method.
     #
-    def AuthHMAC.sign!(request, access_key_id, secret, options = nil)
+    def self.sign!(request, access_key_id, secret, options = nil)
       credentials = { access_key_id => secret }
       self.new(credentials, options).sign!(request, access_key_id)
     end
@@ -178,7 +184,7 @@ module CrashLog
     # Supports same options as AuthHMAC.initialize for overriding service_id and
     # signature method.
     #
-    def AuthHMAC.authenticated?(request, access_key_id, secret, options)
+    def self.authenticated?(request, access_key_id, secret, options)
       credentials = { access_key_id => secret }
       self.new(credentials, options).authenticated?(request)
     end

data/lib/crash_log/auth_hmac/version.rb

@@ -1,5 +1,5 @@
 module CrashLog
   class AuthHMAC
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

data/spec/crash_log/auth_hmac_spec.rb

@@ -54,6 +54,22 @@ describe CrashLog::AuthHMAC do
       CrashLog::AuthHMAC.sign!(request, "my-key-id", "secret", options)
       request['Authorization'].should == "MyService my-key-id:/L4N1v1BZSHfAYkQjsvZn696D9c="
     end
+
+    it 'can sign a faraday request hash' do
+      Time.stub(:now).and_return(Time.parse("Thu, 10 Jul 2008 03:29:56 GMT"))
+
+      env = {
+        :method=>:get,
+        :body=>"test",
+        :url=>URI.parse("http://sushi.com/api/foo.json"),
+        :request_headers=>{"Date" => Time.now.utc.httpdate},
+        :parallel_manager=>nil,
+        :request=>nil,
+        :ssl=>{}
+      }
+      CrashLog::AuthHMAC.sign!(env, "access_id", "secret", { :service_id => 'MyService' })
+      env['Authorization'].should == 'MyService access_id:ZQnbYwmno+PsaavXzUAdvj/DKvo='
+    end
   end
 
   describe "#sign!" do

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require "crash_log"
+require "crash_log/auth_hmac"
 
 Dir[File.expand_path("../support/*.rb", __FILE__)].each { |file| require file }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crashlog-auth-hmac
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby Gem for authenticating HTTP requests using a HMAC
 email:
@@ -20,7 +20,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile