oauth 0.4.7 → 0.5.0

data/lib/oauth/signature/plaintext.rb

@@ -16,6 +16,12 @@ module OAuth::Signature
       secret
     end
 
+    def body_hash
+      nil
+    end
+
+    private
+
     def secret
       super
     end

data/lib/oauth/signature/rsa/sha1.rb

@@ -1,10 +1,8 @@
 require 'oauth/signature/base'
-require 'openssl'
 
 module OAuth::Signature::RSA
   class SHA1 < OAuth::Signature::Base
     implements 'rsa-sha1'
-    hash_class ::Digest::SHA1
 
     def ==(cmp_signature)
       public_key.verify(OpenSSL::Digest::SHA1.new, Base64.decode64(cmp_signature.is_a?(Array) ? cmp_signature.first : cmp_signature), signature_base_string)
@@ -20,7 +18,11 @@ module OAuth::Signature::RSA
       end
     end
 
-  private
+    def body_hash
+      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || '')).chomp.gsub(/\n/,'')
+    end
+
+    private
 
     def decode_public_key
       case consumer_secret
@@ -35,6 +37,8 @@ module OAuth::Signature::RSA
       private_key = OpenSSL::PKey::RSA.new(
         if options[:private_key_file]
           IO.read(options[:private_key_file])
+        elsif options[:private_key]
+          options[:private_key]
         else
           consumer_secret
         end

data/lib/oauth/tokens/access_token.rb

@@ -59,6 +59,18 @@ module OAuth
       request(:put, path, body, headers)
     end
 
+    # Make a regular PATCH request using AccessToken
+    #
+    #   @response = @token.patch('/people/123')
+    #   @response = @token.patch('/people/123', { :name => 'Bob', :email => 'bob@mailinator.com' })
+    #   @response = @token.patch('/people/123', { :name => 'Bob', :email => 'bob@mailinator.com' }, { 'Accept' => 'application/xml' })
+    #   @response = @token.patch('/people/123', nil, { 'Accept' => 'application/xml' })
+    #   @response = @token.patch('/people/123', @person.to_xml, { 'Accept' => 'application/xml', 'Content-Type' => 'application/xml' })
+    #
+    def patch(path, body = '', headers = {})
+      request(:patch, path, body, headers)
+    end
+
     # Make a regular DELETE request using AccessToken
     #
     #   @response = @token.delete('/people/123')

data/lib/oauth/tokens/request_token.rb

@@ -5,6 +5,8 @@ module OAuth
 
     # Generate an authorization URL for user authorization
     def authorize_url(params = nil)
+      return nil if self.token.nil?
+
       params = (params || {}).merge(:oauth_token => self.token)
       build_authorize_url(consumer.authorize_url, params)
     end
@@ -24,6 +26,9 @@ module OAuth
     # construct an authorization url
     def build_authorize_url(base_url, params)
       uri = URI.parse(base_url.to_s)
+      if(!uri.query.blank? && !params.empty?)
+	uri.query += "&"
+      end
       # TODO doesn't handle array values correctly
       uri.query = params.map { |k,v| [k, CGI.escape(v)] * "=" } * "&"
       uri.to_s

data/lib/oauth/tokens/token.rb

@@ -11,7 +11,7 @@ module OAuth
     end
 
     def to_query
-      "oauth_token=#{escape(token)}&oauth_secret=#{escape(secret)}"
+      "oauth_token=#{escape(token)}&oauth_token_secret=#{escape(secret)}"
     end
   end
 end

data/lib/oauth/version.rb

@@ -0,0 +1,3 @@
+module OAuth
+  VERSION = "0.5.0"
+end

data/test/cases/oauth_case.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'oauth/signature'
 require 'oauth/request_proxy/mock_request'
 
 
-class OAuthCase < Test::Unit::TestCase
+class OAuthCase < Minitest::Test
   # avoid whining about a lack of tests
   def run(*args)
     return if @method_name.to_s == "default_test"

data/test/integration/consumer_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 module Integration
-  class ConsumerTest < Test::Unit::TestCase
+  class ConsumerTest < Minitest::Test
     def setup
       @consumer=OAuth::Consumer.new(
           'consumer_key_86cad9', '5888bf0345e5d237',
@@ -39,7 +39,7 @@ module Integration
       token = OAuth::ConsumerToken.new(consumer, 'token_411a7f', '3196ffd991c8ebdb')
       token.sign!(request, {:nonce => @nonce, :timestamp => @timestamp})
 
-      assert_no_match( /oauth_signature_method="HMAC-SHA1"/, request['authorization'])
+      refute_match( /oauth_signature_method="HMAC-SHA1"/, request['authorization'])
       assert_match(    /oauth_signature_method="PLAINTEXT"/, request['authorization'])
     end
 
@@ -52,7 +52,7 @@ module Integration
       request = Net::HTTP::Get.new('/')
       signature_base_string = consumer.signature_base_string(request)
 
-      assert_no_match( /HMAC-SHA1/, signature_base_string)
+      refute_match( /HMAC-SHA1/, signature_base_string)
       assert_equal( "#{consumer.secret}&", signature_base_string)
     end
 
@@ -162,23 +162,23 @@ module Integration
       assert !@consumer.authorize_url?, "Should not use fully qualified url"
 
       @request_token=@consumer.get_request_token
-      assert_not_nil @request_token
+      assert @request_token
       assert_equal "requestkey",@request_token.token
       assert_equal "requestsecret",@request_token.secret
       assert_equal "http://term.ie/oauth/example/authorize.php?oauth_token=requestkey",@request_token.authorize_url
 
       @access_token=@request_token.get_access_token
-      assert_not_nil @access_token
+      assert @access_token
       assert_equal "accesskey",@access_token.token
       assert_equal "accesssecret",@access_token.secret
 
       @response=@access_token.get("/oauth/example/echo_api.php?ok=hello&test=this")
-      assert_not_nil @response
+      assert @response
       assert_equal "200",@response.code
       assert_equal( "ok=hello&test=this",@response.body)
 
       @response=@access_token.post("/oauth/example/echo_api.php",{'ok'=>'hello','test'=>'this'})
-      assert_not_nil @response
+      assert @response
       assert_equal "200",@response.code
       assert_equal( "ok=hello&test=this",@response.body)
     end
@@ -203,23 +203,23 @@ module Integration
       assert @consumer.authorize_url?, "Should use fully qualified url"
 
       @request_token=@consumer.get_request_token
-      assert_not_nil @request_token
+      assert @request_token
       assert_equal "requestkey",@request_token.token
       assert_equal "requestsecret",@request_token.secret
       assert_equal "http://term.ie/oauth/example/authorize.php?oauth_token=requestkey",@request_token.authorize_url
 
       @access_token=@request_token.get_access_token
-      assert_not_nil @access_token
+      assert @access_token
       assert_equal "accesskey",@access_token.token
       assert_equal "accesssecret",@access_token.secret
 
       @response=@access_token.get("/oauth/example/echo_api.php?ok=hello&test=this")
-      assert_not_nil @response
+      assert @response
       assert_equal "200",@response.code
       assert_equal( "ok=hello&test=this",@response.body)
 
       @response=@access_token.post("/oauth/example/echo_api.php",{'ok'=>'hello','test'=>'this'})
-      assert_not_nil @response
+      assert @response
       assert_equal "200",@response.code
       assert_equal( "ok=hello&test=this",@response.body)
     end
@@ -283,13 +283,13 @@ module Integration
       request_body_stream = StringIO.new( request_body_string )
 
       @response=@access_token.post("/oauth/example/echo_api.php",request_body_stream)
-      assert_not_nil @response
+      assert @response
       assert_equal "200",@response.code
 
       request_body_file = File.open(__FILE__)
 
       @response=@access_token.post("/oauth/example/echo_api.php",request_body_file)
-      assert_not_nil @response
+      assert @response
       assert_equal "200",@response.code
 
       # unfortunately I don't know of a way to test that the body data was received correctly since the test server at http://term.ie

data/test/test_access_token.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class TestAccessToken < Test::Unit::TestCase
+class TestAccessToken < Minitest::Test
   def setup
     @fake_response = {
       :user_id => 5734758743895,
@@ -20,7 +20,7 @@ class TestAccessToken < Test::Unit::TestCase
   end
 
   def test_access_token_makes_non_oauth_response_params_available
-    assert_not_nil @access_token.params[:user_id]
+    assert @access_token.params[:user_id]
     assert_equal 5734758743895, @access_token.params[:user_id]
   end
 end

data/test/test_action_controller_request_proxy.rb

@@ -1,20 +1,20 @@
-gem 'actionpack', '~> 2.3.8'
 require File.expand_path('../test_helper', __FILE__)
 
 require 'oauth/request_proxy/action_controller_request'
-require 'action_controller/test_process'
 
-class ActionControllerRequestProxyTest < Test::Unit::TestCase
+class ActionControllerRequestProxyTest < Minitest::Test
 
   def request_proxy(request_method = :get, uri_params = {}, body_params = {})
-    request = ActionController::TestRequest.new
-    request.set_REQUEST_URI('/')
+    request = ActionDispatch::TestRequest.new
+    request.request_uri = '/'
 
     case request_method
     when :post
       request.env['REQUEST_METHOD'] = 'POST'
     when :put
       request.env['REQUEST_METHOD'] = 'PUT'
+    when :patch
+      request.env['REQUEST_METHOD'] = 'PATCH'
     end
 
     request.env['REQUEST_URI'] = '/'
@@ -50,6 +50,14 @@ class ActionControllerRequestProxyTest < Test::Unit::TestCase
     assert_equal 'PUT', request_proxy.method
   end
 
+  def test_that_proxy_simple_patch_request_works_with_query_params
+    request_proxy = request_proxy(:patch, {'key'=>'value'})
+
+    expected_parameters = [["key", "value"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'PATCH', request_proxy.method
+  end
+
   def test_that_proxy_simple_get_request_works_with_post_params
     request_proxy = request_proxy(:get, {}, {'key'=>'value'})
 
@@ -74,6 +82,14 @@ class ActionControllerRequestProxyTest < Test::Unit::TestCase
     assert_equal 'PUT', request_proxy.method
   end
 
+  def test_that_proxy_simple_patch_request_works_with_post_params
+    request_proxy = request_proxy(:patch, {}, {'key'=>'value'})
+
+    expected_parameters = []
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'PATCH', request_proxy.method
+  end
+
   def test_that_proxy_simple_get_request_works_with_mixed_params
     request_proxy = request_proxy(:get, {'key'=>'value'}, {'key2'=>'value2'})
 
@@ -98,6 +114,14 @@ class ActionControllerRequestProxyTest < Test::Unit::TestCase
     assert_equal 'PUT', request_proxy.method
   end
 
+  def test_that_proxy_simple_patch_request_works_with_mixed_params
+    request_proxy = request_proxy(:patch, {'key'=>'value'}, {'key2'=>'value2'})
+
+    expected_parameters = [["key", "value"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'PATCH', request_proxy.method
+  end
+
   def test_parameter_keys_should_preserve_brackets_from_hash
     assert_equal(
       [["message[body]", "This is a test"]],

data/test/test_consumer.rb

@@ -1,12 +1,11 @@
 require File.expand_path('../test_helper', __FILE__)
-require 'mocha'
 
 require 'stringio'
 
 # This performs testing against Andy Smith's test server http://term.ie/oauth/example/
 # Thanks Andy.
 # This also means you have to be online to be able to run these.
-class ConsumerTest < Test::Unit::TestCase
+class ConsumerTest < Minitest::Test
   def setup
     @consumer=OAuth::Consumer.new(
         'consumer_key_86cad9', '5888bf0345e5d237',
@@ -132,7 +131,14 @@ class ConsumerTest < Test::Unit::TestCase
     assert_equal :post,@consumer.http_method
   end
 
- def test_that_token_response_should_be_uri_parameter_format_as_default
+  def test_token_request_identifies_itself_as_a_token_request
+    request_options = {}
+    @consumer.stubs(:request).returns(create_stub_http_response)
+    @consumer.token_request(:post, '/', 'token', request_options) {}
+    assert_equal true, request_options[:token_request]
+  end
+
+  def test_that_token_response_should_be_uri_parameter_format_as_default
     @consumer.expects(:request).returns(create_stub_http_response("oauth_token=token&oauth_token_secret=secret"))
 
     hash = @consumer.token_request(:get, "")

data/test/test_curb_request_proxy.rb

@@ -6,7 +6,7 @@ require 'oauth/request_proxy/curb_request'
 require 'curb'
 
 
-class CurbRequestProxyTest < Test::Unit::TestCase
+class CurbRequestProxyTest < Minitest::Test
 
   def test_that_proxy_simple_get_request_works
     request = Curl::Easy.new('/test?key=value')

data/test/test_em_http_client.rb

@@ -3,7 +3,7 @@ begin
 
 require 'oauth/client/em_http'
 
-class EmHttpClientTest < Test::Unit::TestCase
+class EmHttpClientTest < Minitest::Test
 
   def setup
     @consumer = OAuth::Consumer.new('consumer_key_86cad9', '5888bf0345e5d237')

data/test/test_em_http_request_proxy.rb

@@ -6,7 +6,7 @@ require 'em-http'
 require 'oauth/request_proxy/em_http_request'
 
 
-class EmHttpRequestProxyTest < Test::Unit::TestCase
+class EmHttpRequestProxyTest < Minitest::Test
 
   def test_request_proxy_works_with_simple_request
     proxy = create_request_proxy

data/test/test_helper.rb

@@ -1,13 +1,18 @@
-require 'test/unit'
 require 'rubygems'
+require 'minitest/autorun'
+require 'mocha/mini_test'
+require 'rack/test'
+
+ENV['RACK_ENV'] = 'test'
+
+require 'byebug'
 
 $LOAD_PATH << File.dirname(__FILE__) + '/../lib/'
 require 'oauth'
-require 'mocha'
 require 'stringio'
 require 'webmock'
 
-class Test::Unit::TestCase
+class Minitest::Test
   include WebMock::API
 
   def assert_matching_headers(expected, actual)

data/test/test_hmac_sha1.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class TestSignatureHmacSha1 < Test::Unit::TestCase
+class TestSignatureHmacSha1 < Minitest::Test
   def test_that_hmac_sha1_implements_hmac_sha1
     assert OAuth::Signature.available_methods.include?('hmac-sha1')
   end

data/test/test_net_http_client.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class NetHTTPClientTest < Test::Unit::TestCase
+class NetHTTPClientTest < Minitest::Test
 
   def setup
     @consumer = OAuth::Consumer.new('consumer_key_86cad9', '5888bf0345e5d237')
@@ -62,6 +62,12 @@ class NetHTTPClientTest < Test::Unit::TestCase
     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_token_request
+    request = Net::HTTP::Post.new(@request_uri.path)
+    request.oauth!(@http, @consumer, @token, {:nonce => @nonce, :timestamp => @timestamp, :token_request => true})
+    assert_no_match(/oauth_body_hash/, 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"

data/test/test_net_http_request_proxy.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class NetHTTPRequestProxyTest < Test::Unit::TestCase
+class NetHTTPRequestProxyTest < Minitest::Test
 
   def test_that_proxy_simple_get_request_works
     request = Net::HTTP::Get.new('/test?key=value')

data/test/test_oauth_helper.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper', __FILE__)
 
-class TestOAuthHelper < Test::Unit::TestCase
+class TestOAuthHelper < Minitest::Test
 
   def test_parse_valid_header
     header = 'OAuth ' \
@@ -27,7 +27,7 @@ class TestOAuthHelper < Test::Unit::TestCase
   def test_parse_header_ill_formed
     header = "OAuth garbage"
 
-    assert_raise OAuth::Problem do
+    assert_raises OAuth::Problem do
       OAuth::Helper.parse_header(header)
     end
   end
@@ -42,7 +42,7 @@ class TestOAuthHelper < Test::Unit::TestCase
              'oauth_timestamp="1240004133", oauth_nonce="nonce", ' \
              'oauth_version="1.0" '
 
-    assert_raise OAuth::Problem do
+    assert_raises OAuth::Problem do
       OAuth::Helper.parse_header(header)
     end
   end
@@ -68,7 +68,7 @@ class TestOAuthHelper < Test::Unit::TestCase
     assert_equal "nonce", params['oauth_nonce']
     assert_equal "1.0", params['oauth_version']
   end
-  
+
   def test_normalize
     params = {
       'oauth_nonce' => 'nonce',
@@ -81,7 +81,7 @@ class TestOAuthHelper < Test::Unit::TestCase
     }
     assert_equal("oauth_consumer_key=vince_clortho&oauth_nonce=nonce&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1240004133&oauth_token=token_value&oauth_version=1.0&weight%5Bvalue%5D=65", OAuth::Helper.normalize(params))
   end
-  
+
   def test_normalize_nested_query
     assert_equal([], OAuth::Helper.normalize_nested_query({}))
     assert_equal(["foo=bar"], OAuth::Helper.normalize_nested_query({:foo => 'bar'}))