oauth 0.3.7.pre1 → 0.4.0

data/test/test_action_controller_request_proxy.rb

@@ -1,4 +1,4 @@
-gem 'actionpack','2.2.2'
+gem 'actionpack', '>2.2.0', '<2.3.0'
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 require 'oauth/request_proxy/action_controller_request'

data/test/test_net_http_client.rb

@@ -62,6 +62,32 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_matching_headers correct_sorted_params, request['authorization']
   end
 
+  def test_that_using_auth_headers_on_post_requests_with_data_works
+    request = Net::HTTP::Post.new(@request_uri.path)
+    request.body = "data"
+    request.content_type = 'text/ascii'
+    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp})
+
+    assert_equal 'POST', request.method
+    assert_equal '/test', request.path
+    assert_equal 'data', request.body
+    assert_equal 'text/ascii', request.content_type
+    assert_matching_headers "oauth_nonce=\"225579211881198842005988698334675835446\", oauth_body_hash=\"oXyaqmHoChv3HQ2FCvTluqmAC70%3D\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"0DA6pGTapdHSqC15RZelY5rNLDw%3D\", oauth_version=\"1.0\"", request['authorization']
+  end
+
+  def test_that_body_hash_is_obmitted_when_no_algorithm_is_defined
+    request = Net::HTTP::Post.new(@request_uri.path)
+    request.body = "data"
+    request.content_type = 'text/ascii'
+    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp, :signature_method => 'plaintext'})
+
+    assert_equal 'POST', request.method
+    assert_equal '/test', request.path
+    assert_equal 'data', request.body
+    assert_equal 'text/ascii', request.content_type
+    assert_matching_headers "oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"plaintext\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"5888bf0345e5d237%263196ffd991c8ebdb\", oauth_version=\"1.0\"", request['authorization']
+  end
+
   def test_that_version_is_added_to_existing_user_agent
     request = Net::HTTP::Post.new(@request_uri.path)
     request['User-Agent'] = "MyApp"
@@ -127,6 +153,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
 
   def test_that_using_post_with_uri_params_works
     request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
+    request.set_form_data( {} ) # just to make sure we have a correct mime type and thus no body hash
     request.oauth!(@http, @consumer, @token, {:scheme => 'query_string', :nonce => @nonce, :timestamp => @timestamp})
 
     assert_equal 'POST', request.method
@@ -134,7 +161,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal '/test', uri.path
     assert_equal nil, uri.fragment
     assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
-    assert_equal nil, request.body
+    assert_equal "", request.body
     assert_equal nil, request['authorization']
   end
 
@@ -152,6 +179,22 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal nil, request['authorization']
   end
 
+  def test_that_using_post_with_uri_and_data_works
+    request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
+    request.body = "data"
+    request.content_type = 'text/ascii'
+    request.oauth!(@http, @consumer, @token, {:scheme => :query_string, :nonce => @nonce, :timestamp => @timestamp})
+
+    assert_equal 'POST', request.method
+    uri = URI.parse(request.path)
+    assert_equal '/test', uri.path
+    assert_equal nil, uri.fragment
+    assert_equal "data", request.body
+    assert_equal 'text/ascii', request.content_type
+    assert_equal "key=value&oauth_body_hash=oXyaqmHoChv3HQ2FCvTluqmAC70%3D&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=MHRKU42iVHU4Ke9kBUDa9Zw6IAM%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join('&')
+    assert_equal nil, request['authorization']
+  end
+
 
   def test_example_from_specs
     consumer=OAuth::Consumer.new("dpf43f3p2l4k3l03","kd94hf93k423kf44")
@@ -200,12 +243,12 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal "oauth_token=requestkey&oauth_token_secret=requestsecret",response.body
   end
 
-  def test_that_put_bodies_not_signed
+  def test_that_put_bodies_signed
     request = Net::HTTP::Put.new(@request_uri.path)
     request.body = "<?xml version=\"1.0\"?><foo><bar>baz</bar></foo>"
     request["Content-Type"] = "application/xml"
     signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
+    assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&oauth_body_hash%3DDvAa1AWdFoH9K%252B%252F2AHm3f6wH27k%253D%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
   end
 
   def test_that_put_bodies_not_signed_even_if_form_urlencoded
@@ -222,12 +265,12 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&key2%3Dvalue2%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
   end
 
-  def test_that_post_bodies_not_signed_if_other_content_type
+  def test_that_post_bodies_signed_if_other_content_type
     request = Net::HTTP::Post.new(@request_uri.path)
     request.body = "<?xml version=\"1.0\"?><foo><bar>baz</bar></foo>"
     request["Content-Type"] = "application/xml"
     signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
+    assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&oauth_body_hash%3DDvAa1AWdFoH9K%252B%252F2AHm3f6wH27k%253D%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
   end
 
   protected

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.7.pre1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -16,59 +21,99 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -08:00
+date: 2010-04-21 00:00:00 -04:00
 default_executable: oauth
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 0
         version: 2.2.0
-    version: 
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: typhoeus
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 13
         version: 0.1.13
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: em-http-request
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: curb
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 6
+        - 0
+        version: 0.6.6.0
+  type: :development
+  version_requirements: *id006
 description: OAuth Core Ruby implementation
 email: oauth-ruby@googlegroups.com
 executables: 
@@ -76,13 +121,13 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.rdoc
 - TODO
 files: 
 - .gitignore
-- History.txt
-- License.txt
-- Manifest.txt
+- HISTORY
+- LICENSE
 - README.rdoc
 - Rakefile
 - TODO
@@ -133,12 +178,7 @@ files:
 - lib/oauth/tokens/request_token.rb
 - lib/oauth/tokens/server_token.rb
 - lib/oauth/tokens/token.rb
-- lib/oauth/version.rb
 - oauth.gemspec
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.rb
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/website.rake
@@ -170,11 +210,6 @@ files:
 - test/test_signature_plain_text.rb
 - test/test_token.rb
 - test/test_typhoeus_request_proxy.rb
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.rhtml
 has_rdoc: true
 homepage: 
 licenses: []
@@ -188,18 +223,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
-  version: 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: oauth
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: OAuth Core Ruby implementation

data/Manifest.txt

@@ -1,86 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.rdoc
-Rakefile
-TODO
-bin/oauth
-examples/yql.rb
-lib/oauth.rb
-lib/oauth/oauth.rb
-lib/oauth/cli.rb
-lib/oauth/client.rb
-lib/oauth/client/action_controller_request.rb
-lib/oauth/client/helper.rb
-lib/oauth/client/net_http.rb
-lib/oauth/client/em_http.rb
-lib/oauth/consumer.rb
-lib/oauth/errors.rb
-lib/oauth/errors/error.rb
-lib/oauth/errors/problem.rb
-lib/oauth/errors/unauthorized.rb
-lib/oauth/helper.rb
-lib/oauth/oauth_test_helper.rb
-lib/oauth/request_proxy.rb
-lib/oauth/request_proxy/action_controller_request.rb
-lib/oauth/request_proxy/base.rb
-lib/oauth/request_proxy/jabber_request.rb
-lib/oauth/request_proxy/mock_request.rb
-lib/oauth/request_proxy/net_http.rb
-lib/oauth/request_proxy/rack_request.rb
-lib/oauth/request_proxy/em_http_request.rb
-lib/oauth/server.rb
-lib/oauth/signature.rb
-lib/oauth/signature/base.rb
-lib/oauth/signature/hmac/base.rb
-lib/oauth/signature/hmac/md5.rb
-lib/oauth/signature/hmac/rmd160.rb
-lib/oauth/signature/hmac/sha1.rb
-lib/oauth/signature/hmac/sha2.rb
-lib/oauth/signature/md5.rb
-lib/oauth/signature/plaintext.rb
-lib/oauth/signature/rsa/sha1.rb
-lib/oauth/signature/sha1.rb
-lib/oauth/token.rb
-lib/oauth/tokens/access_token.rb
-lib/oauth/tokens/consumer_token.rb
-lib/oauth/tokens/request_token.rb
-lib/oauth/tokens/server_token.rb
-lib/oauth/tokens/token.rb
-lib/oauth/version.rb
-oauth.gemspec
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
-test/cases/oauth_case.rb
-test/cases/spec/1_0-final/test_construct_request_url.rb
-test/cases/spec/1_0-final/test_normalize_request_parameters.rb
-test/cases/spec/1_0-final/test_parameter_encodings.rb
-test/cases/spec/1_0-final/test_signature_base_strings.rb
-test/keys/rsa.cert
-test/keys/rsa.pem
-test/test_access_token.rb
-test/test_action_controller_request_proxy.rb
-test/test_consumer.rb
-test/test_helper.rb
-test/test_hmac_sha1.rb
-test/test_net_http_client.rb
-test/test_net_http_request_proxy.rb
-test/test_oauth_helper.rb
-test/test_rack_request_proxy.rb
-test/test_request_token.rb
-test/test_rsa_sha1.rb
-test/test_server.rb
-test/test_signature.rb
-test/test_signature_base.rb
-test/test_signature_plain_text.rb
-test/test_token.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

data/lib/oauth/version.rb

@@ -1,3 +0,0 @@
-module OAuth #:nodoc:
-  VERSION = '0.3.7.pre1'
-end

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

data/script/txt2html

@@ -1,74 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-begin
-  require 'newgem'
-rescue LoadError
-  puts "\n\nGenerating the website requires the newgem RubyGem"
-  puts "Install: gem install newgem\n\n"
-  exit(1)
-end
-require 'redcloth'
-require 'syntax/convertors/html'
-require 'erb'
-require File.dirname(__FILE__) + '/../lib/oauth/version.rb'
-
-version  = OAuth::VERSION::STRING
-download = 'http://rubyforge.org/projects/oauth'
-
-class Fixnum
-  def ordinal
-    # teens
-    return 'th' if (10..19).include?(self % 100)
-    # others
-    case self % 10
-    when 1: return 'st'
-    when 2: return 'nd'
-    when 3: return 'rd'
-    else    return 'th'
-    end
-  end
-end
-
-class Time
-  def pretty
-    return "#{mday}#{mday.ordinal} #{strftime('%B')} #{year}"
-  end
-end
-
-def convert_syntax(syntax, source)
-  return Syntax::Convertors::HTML.for_syntax(syntax).convert(source).gsub(%r!^<pre>|</pre>$!,'')
-end
-
-if ARGV.length >= 1
-  src, template = ARGV
-  template ||= File.join(File.dirname(__FILE__), '/../website/template.rhtml')
-  
-else
-  puts("Usage: #{File.split($0).last} source.txt [template.rhtml] > output.html")
-  exit!
-end
-
-template = ERB.new(File.open(template).read)
-
-title = nil
-body = nil
-File.open(src) do |fsrc|
-  title_text = fsrc.readline
-  body_text = fsrc.read
-  syntax_items = []
-  body_text.gsub!(%r!<(pre|code)[^>]*?syntax=['"]([^'"]+)[^>]*>(.*?)</\1>!m){
-    ident = syntax_items.length
-    element, syntax, source = $1, $2, $3
-    syntax_items << "<#{element} class='syntax'>#{convert_syntax(syntax, source)}</#{element}>"
-    "syntax-temp-#{ident}"
-  }
-  title = RedCloth.new(title_text).to_html.gsub(%r!<.*?>!,'').strip
-  body = RedCloth.new(body_text).to_html
-  body.gsub!(%r!(?:<pre><code>)?syntax-temp-(\d+)(?:</code></pre>)?!){ syntax_items[$1.to_i] }
-end
-stat = File.stat(src)
-created = stat.ctime
-modified = stat.mtime
-
-$stdout << template.result(binding)