warden-hmac-authentication 0.6.2 → 0.6.3

data/lib/faraday/request/hmac.rb

@@ -39,7 +39,7 @@ module Faraday
       headers, url = *signer.sign_request(url, @secret, @options)
         
       env[:request_headers] = (env[:request_headers] || {}).merge(headers)
-      env[:url] = Addressable::URI.parse(url)
+      env[:url] = URI.parse(url)
       env
     end
       

data/lib/hmac/signer.rb

@@ -1,4 +1,3 @@
-require 'addressable/uri'
 require 'openssl'
 require 'rack/utils'
 if defined?(JRUBY_VERSION) && RUBY_VERSION =~ /^1\.9/
@@ -121,8 +120,8 @@ module HMAC
       opts = default_opts.merge(opts)
       opts[:query_based] = true
 
-      uri = Addressable::URI.parse(url)
-      query_values = uri.query_values
+      uri = parse_url(url)
+      query_values = Rack::Utils.parse_nested_query(uri.query)
       return false unless query_values
 
       auth_params = query_values.delete(opts[:auth_param])
@@ -208,7 +207,7 @@ module HMAC
     def sign_request(url, secret, opts = {})
       opts = default_opts.merge(opts)
 
-      uri = Addressable::URI.parse(url)
+      uri = parse_url(url)
       headers = opts[:headers] || {}
 
       date = opts[:date] || Time.now.gmtime
@@ -216,7 +215,7 @@ module HMAC
 
       method = opts[:method] ? opts[:method].to_s.upcase : "GET"
 
-      query_values = uri.query_values
+      query_values = Rack::Utils.parse_nested_query(uri.query)
 
       if query_values
         query_values.delete_if do |k,v|
@@ -233,9 +232,9 @@ module HMAC
         })
         auth_params[:nonce] = opts[:nonce] unless opts[:nonce].nil?
 
-        query_values =  uri.query_values || {}
+        query_values ||= {}
         query_values[opts[:auth_param]] = auth_params
-        uri.query_values = query_values
+        uri.query = Rack::Utils.build_nested_query(query_values)
       else
         headers[opts[:auth_header]]   = opts[:auth_header_format] % opts.merge({:signature => signature})
         headers[opts[:nonce_header]]  = opts[:nonce] unless opts[:nonce].nil?
@@ -281,5 +280,10 @@ module HMAC
       end
     end
 
+    #parse url if url parameter is string do nothing if parameter is URI
+    def parse_url(url)
+      return url if url.is_a?(URI)
+      URI.parse(url)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: warden-hmac-authentication
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement