oauth 0.3.5 → 0.3.6

data/History.txt

@@ -1,7 +1,16 @@
+== 0.3.6 2009-09-14
+
+* Added -B CLI option to use the :body authentication scheme (Seth)
+* Respect `--method` in `authorize` CLI command (Seth)
+* Support POST and PUT with raw bodies (Yu-Shan Fung et al)
+* Test clean-up (Xavier Shay, Hannes Tydén)
+* Added :ca_file consumer option to allow consumer specific certificate
+  override. (Pelle)
+
 == 0.3.5 2009-06-03
 
 * `query` CLI command to access protected resources (Seth)
-* Added -H, -Q CLI options for specifying the authorization scheme (Seth)
+* Added -H, -Q CLI options for specifying the authentication scheme (Seth)
 * Added -O CLI option for specifying a file containing options (Seth)
 * Support streamable body contents for large request bodies (Seth Cousins)
 * Support for OAuth 1.0a (Seth)

data/Rakefile

@@ -1,4 +1,4 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+%w[rubygems rake rake/clean fileutils newgem rubigen hoe].each { |f| require f }
 $LOAD_PATH << File.dirname(__FILE__) + '/lib'
 require 'oauth'
 require 'oauth/version'

data/lib/oauth/cli.rb

@@ -50,13 +50,14 @@ module OAuth
               :access_token_url  => options[:access_token_url],
               :authorize_url     => options[:authorize_url],
               :request_token_url => options[:request_token_url],
-              :scheme            => options[:scheme]
+              :scheme            => options[:scheme],
+              :http_method       => options[:method].to_s.downcase.to_sym
 
             # parameters for OAuth 1.0a
             oauth_verifier = nil
 
             # get a request token
-            request_token = consumer.get_request_token({ :oauth_callback => options[:oauth_callback] }, { :scope => options[:scope] })
+            request_token = consumer.get_request_token({ :oauth_callback => options[:oauth_callback] }, { "scope" => options[:scope] })
 
             if request_token.callback_confirmed?
               stdout.puts "Server appears to support OAuth 1.0a; enabling support."
@@ -100,7 +101,13 @@ module OAuth
 
           access_token = OAuth::AccessToken.new(consumer, options[:oauth_token], options[:oauth_token_secret])
 
-          response = access_token.request(options[:method].downcase.to_sym, options[:uri])
+          # append params to the URL
+          uri = URI.parse(options[:uri])
+          params = prepare_parameters.map { |k,v| v.map { |v2| "#{URI.encode(k)}=#{URI.encode(v2)}" } * "&" }
+          uri.query = [uri.query, *params].reject { |x| x.nil? } * "&"
+          p uri.to_s
+
+          response = access_token.request(options[:method].downcase.to_sym, uri.to_s)
           puts "#{response.code} #{response.message}"
           puts response.body
         when "sign"
@@ -190,12 +197,17 @@ module OAuth
         options[:oauth_signature_method] = "HMAC-SHA1"
         options[:oauth_timestamp] = OAuth::Helper.generate_timestamp
         options[:oauth_version] = "1.0"
+        options[:method] = :post
         options[:params] = []
         options[:scheme] = :header
         options[:version] = "1.0"
 
         ## Common Options
 
+        opts.on("-B", "--body", "Use the request body for OAuth parameters.") do
+          options[:scheme] = :body
+        end
+
         opts.on("--consumer-key KEY", "Specifies the consumer key to use.") do |v|
           options[:oauth_consumer_key] = v
         end

data/lib/oauth/consumer.rb

@@ -39,6 +39,9 @@ module OAuth
       # Default http method used for OAuth Token Requests (defaults to :post)
       :http_method   => :post,
 
+      # Add a custom ca_file for consumer
+      # :ca_file       => '/etc/certs.pem'
+
       :oauth_version => "1.0"
     }
 
@@ -278,8 +281,8 @@ module OAuth
 
       http_object.use_ssl = (our_uri.scheme == 'https')
 
-      if CA_FILE
-        http_object.ca_file = CA_FILE
+      if @options[:ca_file] || CA_FILE
+        http_object.ca_file = @options[:ca_file] || CA_FILE
         http_object.verify_mode = OpenSSL::SSL::VERIFY_PEER
         http_object.verify_depth = 5
       else
@@ -294,7 +297,8 @@ module OAuth
       http_method = http_method.to_sym
 
       if [:post, :put].include?(http_method)
-        data = (arguments.shift || {}).reject { |k,v| v.nil? }
+        data = arguments.shift
+        data.reject! { |k,v| v.nil? } if data.is_a?(Hash)
       end
 
       headers = arguments.first.is_a?(Hash) ? arguments.shift : {}

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -1,7 +1,6 @@
 require 'active_support'
 require 'action_controller'
 require 'action_controller/request'
-require 'oauth/request_proxy/base'
 require 'uri'
 
 module OAuth::RequestProxy

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth #:nodoc:
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/oauth.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard", "Blaine Cook", "Larry Halff", "Jesse Clark", "Jon Crosby", "Seth Fitzsimmons", "Matt Sanford"]
-  s.date = %q{2009-06-03}
+  s.date = %q{2009-09-14}
   s.default_executable = %q{oauth}
   s.description = %q{OAuth Core Ruby implementation}
   s.email = %q{oauth-ruby@googlegroups.com}

data/test/test_access_token.rb

@@ -1,6 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/token'
-require 'oauth/consumer'
 
 class TestAccessToken < Test::Unit::TestCase
   def setup

data/test/test_action_controller_request_proxy.rb

@@ -1,10 +1,10 @@
+gem 'actionpack','2.2.2'
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/request_proxy/action_controller_request.rb'
-require 'action_controller'
+
+require 'oauth/request_proxy/action_controller_request'
 require 'action_controller/test_process'
 
 class ActionControllerRequestProxyTest < Test::Unit::TestCase
-
   def request_proxy(request_method = :get, uri_params = {}, body_params = {})
     request = ActionController::TestRequest.new
 
@@ -15,11 +15,13 @@ class ActionControllerRequestProxyTest < Test::Unit::TestCase
       request.env['REQUEST_METHOD'] = 'PUT'
     end
 
+    request.env['REQUEST_URI'] = '/'
     request.env['RAW_POST_DATA'] = body_params.to_query
+    request.env['QUERY_STRING'] = body_params.to_query
     request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'
 
     yield request if block_given?
-    OAuth::RequestProxy.proxy(request, :parameters=>uri_params)
+    OAuth::RequestProxy.proxy(request, :parameters => uri_params)
   end
 
   def test_that_proxy_simple_get_request_works_with_query_params
@@ -46,7 +48,7 @@ class ActionControllerRequestProxyTest < Test::Unit::TestCase
     assert_equal 'PUT', request_proxy.method
   end
 
-  def test_that_proxy_simple_put_request_works_with_post_params
+  def test_that_proxy_simple_get_request_works_with_post_params
     request_proxy = request_proxy(:get, {}, {'key'=>'value'})
 
     expected_parameters = []
@@ -70,7 +72,7 @@ class ActionControllerRequestProxyTest < Test::Unit::TestCase
     assert_equal 'PUT', request_proxy.method
   end
 
-  def test_that_proxy_simple_put_request_works_with_mixed_params
+  def test_that_proxy_simple_get_request_works_with_mixed_params
     request_proxy = request_proxy(:get, {'key'=>'value'}, {'key2'=>'value2'})
 
     expected_parameters = [["key", "value"]]

data/test/test_consumer.rb

@@ -1,8 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
-require 'oauth/consumer'
-require 'oauth/signature/rsa/sha1'
-require 'stringio'
 
+require 'stringio'
 
 # This performs testing against Andy Smith's test server http://term.ie/oauth/example/
 # Thanks Andy.

data/test/test_helper.rb

@@ -1,5 +1,9 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/oauth'
+
+$LOAD_PATH << File.dirname(__FILE__) + '/../lib/'
+require 'oauth'
+
+# require File.dirname(__FILE__) + '/../lib/oauth'
 
 begin
   # load redgreen unless running from within TextMate (in which case ANSI

data/test/test_hmac_sha1.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/signature/hmac/sha1'
 
 class TestSignatureHmacSha1 < Test::Unit::TestCase
   def test_that_hmac_sha1_implements_hmac_sha1

data/test/test_net_http_client.rb

@@ -1,6 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/client/net_http'
-require 'oauth/version'
 
 class NetHTTPClientTest < Test::Unit::TestCase
 

data/test/test_net_http_request_proxy.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/request_proxy/net_http'
 
 class NetHTTPRequestProxyTest < Test::Unit::TestCase
 

data/test/test_oauth_helper.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/helper'
 
 class TestOAuthHelper < Test::Unit::TestCase
 

data/test/test_request_token.rb

@@ -1,6 +1,4 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require 'oauth/token'
-require 'oauth/consumer'
 
 class StubbedToken < OAuth::RequestToken
   define_method :build_authorize_url_promoted do |root_domain, params|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Pelle Braendgaard
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -07:00
+date: 2009-09-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -65,7 +65,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.3
     version: 
 description: OAuth Core Ruby implementation
 email: oauth-ruby@googlegroups.com
@@ -77,7 +77,6 @@ extra_rdoc_files:
 - History.txt
 - License.txt
 - Manifest.txt
-- README.rdoc
 - website/index.txt
 files: 
 - History.txt
@@ -171,7 +170,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement