api-auth 1.0.2 → 1.0.3

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    api-auth (1.0.2)
+    api-auth (1.0.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionpack (2.3.14)
       activesupport (= 2.3.14)

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/api_auth/headers.rb

@@ -42,7 +42,7 @@ module ApiAuth
     def canonical_string
       [ @request.content_type,
         @request.content_md5,
-        @request.request_uri,
+        @request.request_uri.gsub(/http:\/\/[^(,|\?|\/)]*/,''), # remove host
         @request.timestamp
       ].join(",")
     end

data/lib/api_auth/railtie.rb

@@ -95,7 +95,9 @@ module ApiAuth
           if use_hmac && hmac_access_id && hmac_secret_key
             h = arguments.last
             tmp = "Net::HTTP::#{method.to_s.capitalize}".constantize.new(path, h)
+            tmp.body = arguments[0] if arguments.length > 1
             ApiAuth.sign!(tmp, hmac_access_id, hmac_secret_key)
+            arguments.last['Content-MD5'] = tmp['Content-MD5'] if tmp['Content-MD5']
             arguments.last['DATE'] = tmp['DATE']
             arguments.last['Authorization'] = tmp['Authorization']
           end

data/lib/api_auth/request_drivers/action_controller.rb

@@ -20,7 +20,7 @@ module ApiAuth
 
       def calculated_md5
         if @request.body
-          body = @request.body.read
+          body = @request.raw_post
         else
           body = ''
         end

data/lib/api_auth/request_drivers/rest_client.rb

@@ -1,3 +1,6 @@
+# give access to RestClient @processed_headers
+module RestClient;class Request;attr_accessor :processed_headers;end;end
+
 module ApiAuth
 
   module RequestDrivers # :nodoc:
@@ -15,6 +18,7 @@ module ApiAuth
       def set_auth_header(header)
         @request.headers.merge!({ "Authorization" => header })
         @headers = fetch_headers
+        save_headers # enforce update of processed_headers based on last updated headers
         @request
       end
 
@@ -77,7 +81,11 @@ module ApiAuth
       def find_header(keys)
         keys.map {|key| @headers[key] }.compact.first
       end
-
+      
+      def save_headers
+        @request.processed_headers = @request.make_headers(@headers)
+      end
+      
     end
 
   end

data/spec/api_auth_spec.rb

@@ -280,7 +280,7 @@ describe "ApiAuth" do
               'REQUEST_METHOD' => 'PUT',
               'CONTENT_TYPE' => 'text/plain',
               'HTTP_DATE' => 'Mon, 23 Jan 1984 03:29:56 GMT',
-              'rack.input' => StringIO.new("hello\nworld"))
+              'RAW_POST_DATA' => "hello\nworld")
             signed_request = ApiAuth.sign!(request, @access_id, @secret_key)
             signed_request.env['Content-MD5'].should == Digest::MD5.base64digest("hello\nworld")
           end

data/spec/headers_spec.rb

@@ -194,7 +194,7 @@ describe "ApiAuth::Headers" do
     end
 
     it "should generate the proper canonical string" do
-      @headers.canonical_string.should == "text/plain,e59ff97941044f85df5297e1c302d260,http://example.org/resource.xml?foo=bar&bar=foo,Mon, 23 Jan 1984 03:29:56 GMT"
+      @headers.canonical_string.should == CANONICAL_STRING
     end
 
     it "should set the authorization header" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-auth
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3429846398106267766
+      hash: 579957539921083557
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3429846398106267766
+      hash: 579957539921083557
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24