roauth 0.0.2 → 0.0.3

data/.gitignore

@@ -1 +1,2 @@
 pkg
+*.gem

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/roauth.rb

@@ -5,28 +5,31 @@ require "uri"
 module ROAuth
   class UnsupportedSignatureMethod < Exception; end
   class MissingOAuthParams < Exception; end
-  
+
   # Supported {signature methods}[http://oauth.net/core/1.0/#signing_process];
   SIGNATURE_METHODS = {"HMAC-SHA1" => OpenSSL::Digest::Digest.new("sha1")}
-  OAUTH_PARAMS      = [:consumer_key, :token, :signature_method, :version, :nonce, :timestamp]
-  
+  OAUTH_PARAMS      = [:consumer_key, :token, :signature_method, :version, :nonce, :timestamp, :body_hash, :callback]
+
   # Return an {OAuth "Authorization" HTTP header}[http://oauth.net/core/1.0/#auth_header] from request data
-  def header(oauth, uri, params = {}, http_method = :get)    
+  def header(oauth, uri, params = {}, http_method = :get)
+    oauth = oauth.dup
     oauth[:signature_method] ||= "HMAC-SHA1"
     oauth[:version]          ||= "1.0" # Assumed version, according to the spec
     oauth[:nonce]            ||= Base64.encode64(OpenSSL::Random.random_bytes(32)).gsub(/\W/, '')
     oauth[:timestamp]        ||= Time.now.to_i
     oauth[:token]            ||= oauth.delete(:access_key)
     oauth[:token_secret]     ||= oauth.delete(:access_secret)
-    
+
     sig_params = oauth_params(oauth)
     sig_params[:oauth_signature] = escape(
       signature(oauth, uri, sig_params.merge(params), http_method)
-    )
-    
-    %{OAuth } + sig_params.map {|key, value| [key, value].join("=") }.join(", ")
+      )
+    sorted_sig_params    = sig_params.sort_by{|k,v| [k.to_s, v.to_s] }
+    authorization_params = sorted_sig_params.map {|key, value| [key, "\"#{value}\""].join("=") }.join(", ")
+
+    %{OAuth } + authorization_params
   end
-  
+
   def parse(header)
     header = header.dup
     header = header.gsub!(/^OAuth\s/, "")
@@ -34,59 +37,66 @@ module ROAuth
     header = header.inject({}) {|hash, item|
       key, value = item.split("=")
       key.gsub!(/^oauth_/, "")
+      value.gsub!(/(^"|"$)/, "")
       hash[key.to_sym] = unescape(value)
       hash
     }
     header[:access_key] = header[:token]
     header
   end
-  
+
   def verify(oauth, header, uri, params = {}, http_method = :get)
     header = header.is_a?(String) ? parse(header) : header.dup
-    
+
     client_signature = header.delete(:signature)
     oauth[:consumer_key]     ||= header[:consumer_key]
     oauth[:token]            ||= header[:token]
     oauth[:token_secret]     ||= oauth.delete(:access_secret)
     oauth[:signature_method] ||= "HMAC-SHA1"
     oauth[:version]          ||= "1.0"
-    
+
     sig_params = params.dup
     sig_params.merge!(oauth_params(header))
-    
+
     client_signature == signature(oauth, uri, sig_params, http_method)
   end
-  
+
   protected
     def oauth_params(oauth)
-      oauth = oauth.to_a.select {|key, value| 
-        OAUTH_PARAMS.include?(key) 
+      oauth = oauth.to_a.select {|key, value|
+        OAUTH_PARAMS.include?(key)
       }
-      oauth.inject({}) {|hash, (key, value)| 
+      oauth.inject({}) {|hash, (key, value)|
         hash["oauth_#{key}"] = escape(value)
         hash
       }
     end
-  
-    def signature(oauth, uri, params, http_method = :get)      
+
+    def signature(oauth, uri, params, http_method = :get)
+      uri = URI.parse(uri)
+      uri.query = nil
+      uri = uri.to_s
+
       sig_base = http_method.to_s.upcase + "&" + escape(uri) + "&" + normalize(params)
       digest   = SIGNATURE_METHODS[oauth[:signature_method]]
       secret   = "#{escape(oauth[:consumer_secret])}&#{escape(oauth[:token_secret])}"
-      
+
       Base64.encode64(OpenSSL::HMAC.digest(digest, secret, sig_base)).chomp.gsub(/\n/, "")
     end
-  
+
     # Escape characters in a string according to the {OAuth spec}[http://oauth.net/core/1.0/]
     def escape(value)
-      URI::escape(value.to_s, /[^a-zA-Z0-9\-\.\_\~]/) # Unreserved characters -- must not be encoded
+      URI.escape(value.to_s, /[^a-zA-Z0-9\-\.\_\~]/) # Unreserved characters -- must not be encoded
     end
-    
+
     def unescape(value)
-      URI::unescape(value)
+      URI.unescape(value)
     end
-  
+
     # Normalize a string of parameters based on the {OAuth spec}[http://oauth.net/core/1.0/#rfc.section.9.1.1]
     def normalize(params)
+      # Stringify keys - so we can compare them
+      params.keys.each {|key| params[key.to_s] = params.delete(key) }
       params.sort.map do |key, values|
         if values.is_a?(Array)
           # Multiple values were provided for a single key
@@ -98,6 +108,6 @@ module ROAuth
           [escape(key), escape(values)] * "%3D"
         end
       end * "%26"
-    end    
+    end
   extend self
-end
+end

data/roauth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roauth}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-03-18}
+  s.date = %q{2010-08-16}
   s.description = %q{Simple Ruby OAuth library}
   s.email = %q{info@eribium.org}
   s.extra_rdoc_files = [
@@ -28,14 +28,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/maccman/roauth}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple Ruby OAuth library}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 +00:00
+date: 2010-08-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -45,6 +45,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -52,6 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -61,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple Ruby OAuth library