roauth 0.0.3 → 0.0.7

data/README.markdown

@@ -6,7 +6,10 @@ A *simple* OAuth library that supports OAuth header signing, and header verifyin
 
 Example Client:
 
-    uri = "https://twitter.com/direct_messages.json"
+    require "roauth"
+    require "nestful"
+
+    url = "https://twitter.com/direct_messages.json"
 
     oauth = {
       :consumer_key    => "consumer_key",
@@ -19,11 +22,9 @@ Example Client:
       :count    => "11",
       :since_id => "5000"
     }
-    oauth_header = ROAuth.header(oauth, uri, params)
-
-    http_uri = URI.parse(uri)
-    request  = Net::HTTP.new(http_uri.host, http_uri.port)
-    request.get(uri.request_uri, {'Authorization', oauth_header})
+    oauth_header = ROAuth.header(oauth, url, params)
+    
+    Nestful.get(url, :params => params, :headers => {'Authorization' => oauth_header})
 
 Example Server:
 

data/Rakefile

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'rake'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
@@ -9,5 +12,16 @@ begin
     gemspec.authors = ["Alex MacCaw"]
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+end
+
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :test => :check_dependencies
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.7

data/lib/roauth.rb

@@ -77,7 +77,7 @@ module ROAuth
       uri.query = nil
       uri = uri.to_s
 
-      sig_base = http_method.to_s.upcase + "&" + escape(uri) + "&" + normalize(params)
+      sig_base = http_method.to_s.upcase + "&" + escape(uri) + "&" + escape(normalize(params))
       digest   = SIGNATURE_METHODS[oauth[:signature_method]]
       secret   = "#{escape(oauth[:consumer_secret])}&#{escape(oauth[:token_secret])}"
 
@@ -97,17 +97,17 @@ module ROAuth
     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|
+      params.sort_by {|key, values| key.to_s }.map do |key, values|
         if values.is_a?(Array)
           # Multiple values were provided for a single key
           # in a hash
-          values.sort.collect do |v|
-            [escape(key), escape(v)] * "%3D"
+          values.sort_by(&:to_s).collect do |v|
+            [escape(key), escape(v)] * "="
           end
         else
-          [escape(key), escape(values)] * "%3D"
+          [escape(key), escape(values)] * "="
         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.3"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-10-13}
   s.description = %q{Simple Ruby OAuth library}
   s.email = %q{info@eribium.org}
   s.extra_rdoc_files = [
@@ -23,13 +23,19 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/roauth.rb",
-     "roauth.gemspec"
+     "roauth.gemspec",
+     "test/helper.rb",
+     "test/test_roauth.rb"
   ]
   s.homepage = %q{http://github.com/maccman/roauth}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple Ruby OAuth library}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_roauth.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/helper.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'roauth'
+
+class Test::Unit::TestCase
+end

data/test/test_roauth.rb

@@ -0,0 +1,47 @@
+require 'helper'
+
+class TestRoauth < Test::Unit::TestCase
+  should "correctly sign params" do
+    url = "https://twitter.com/direct_messages.json"
+
+    oauth = {
+      :consumer_key    => "consumer_key",
+      :consumer_secret => "consumer_secret",
+      :access_key      => "access_key",
+      :access_secret   => "access_secret",
+      :nonce           => "foo",
+      :timestamp       => 1286967499
+    }
+    
+    params = {
+      :count    => "11",
+      :since_id => "5000"
+    }
+    
+    oauth_header = ROAuth.header(oauth, url, params)
+    signature    = ROAuth.parse(oauth_header)[:signature]
+        
+    assert_equal "9/g1ge6nLYVkBsTEqgxH0Xlv2O4=", signature
+  end
+  
+  should "verify correctly signed params" do 
+    url = "https://twitter.com/direct_messages.json"
+    
+    oauth = {
+      :consumer_key    => "consumer_key",
+      :consumer_secret => "consumer_secret",
+      :access_key      => "access_key",
+      :access_secret   => "access_secret",
+      :nonce           => "foo",
+      :timestamp       => 1286967499
+    }
+    
+    params = {
+      :count    => "11",
+      :since_id => "5000"
+    }
+    
+    header = %{OAuth oauth_consumer_key="consumer_key", oauth_nonce="foo", oauth_signature="9%2Fg1ge6nLYVkBsTEqgxH0Xlv2O4%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1286967499", oauth_token="access_key", oauth_version="1.0"}
+    assert ROAuth.verify(oauth, header, url, params), "verify failed"
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: roauth
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +01:00
+date: 2011-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,20 +24,21 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .gitignore
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
 - lib/roauth.rb
 - roauth.gemspec
+- test/helper.rb
+- test/test_roauth.rb
 has_rdoc: true
 homepage: http://github.com/maccman/roauth
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -49,21 +46,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Simple Ruby OAuth library

data/.gitignore

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