[DRE-commits] [ruby-oauth] 01/01: Imported Upstream version 0.5.1
Daisuke Higuchi
dai at moszumanska.debian.org
Tue May 24 13:10:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
dai pushed a commit to branch exp/upstream
in repository ruby-oauth.
commit fc6762ede105054c43d873a62692912c38450414
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date: Mon May 16 12:41:26 2016 +0900
Imported Upstream version 0.5.1
---
.../request_proxy/action_controller_request.rb | 2 +-
lib/oauth/request_proxy/base.rb | 2 +-
lib/oauth/tokens/request_token.rb | 8 +++----
lib/oauth/version.rb | 2 +-
oauth.gemspec | 28 ++++++++++------------
.../1_0-final/test_normalize_request_parameters.rb | 4 ++--
test/test_net_http_client.rb | 4 ++++
test/test_rest_client_request_proxy.rb | 20 ++++++++--------
test/test_signature_hmac_sha1.rb | 2 +-
9 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/lib/oauth/request_proxy/action_controller_request.rb b/lib/oauth/request_proxy/action_controller_request.rb
index 91ea397..dadfea4 100644
--- a/lib/oauth/request_proxy/action_controller_request.rb
+++ b/lib/oauth/request_proxy/action_controller_request.rb
@@ -67,7 +67,7 @@ module OAuth::RequestProxy
params.
join('&').split('&').
- reject(&:blank?).
+ reject { |s| s.match(/\A\s*\z/) }.
map { |p| p.split('=').map{|esc| CGI.unescape(esc)} }.
reject { |kv| kv[0] == 'oauth_signature'}
end
diff --git a/lib/oauth/request_proxy/base.rb b/lib/oauth/request_proxy/base.rb
index 857cd03..4ffd848 100644
--- a/lib/oauth/request_proxy/base.rb
+++ b/lib/oauth/request_proxy/base.rb
@@ -146,7 +146,7 @@ module OAuth::RequestProxy
if uri = request.env['REQUEST_URI']
uri.split('?', 2)[1].nil?
else
- request.query_string.blank?
+ request.query_string.match(/\A\s*\z/)
end
end
diff --git a/lib/oauth/tokens/request_token.rb b/lib/oauth/tokens/request_token.rb
index 177eb46..39187cd 100644
--- a/lib/oauth/tokens/request_token.rb
+++ b/lib/oauth/tokens/request_token.rb
@@ -26,11 +26,11 @@ 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
+ queries = {}
+ queries = Hash[URI.decode_www_form(uri.query)] if uri.query
# TODO doesn't handle array values correctly
- uri.query = params.map { |k,v| [k, CGI.escape(v)] * "=" } * "&"
+ queries.merge!(params) if params
+ uri.query = URI.encode_www_form(queries) if !queries.empty?
uri.to_s
end
end
diff --git a/lib/oauth/version.rb b/lib/oauth/version.rb
index 0449fdf..85c2b76 100644
--- a/lib/oauth/version.rb
+++ b/lib/oauth/version.rb
@@ -1,3 +1,3 @@
module OAuth
- VERSION = "0.5.0"
+ VERSION = "0.5.1"
end
diff --git a/oauth.gemspec b/oauth.gemspec
index a6a9b22..0994b0f 100644
--- a/oauth.gemspec
+++ b/oauth.gemspec
@@ -2,20 +2,21 @@
# This file has been automatically generated by gem2tgz #
#########################################################
# -*- encoding: utf-8 -*-
-# stub: oauth 0.5.0 ruby lib
+# stub: oauth 0.5.1 ruby lib
Gem::Specification.new do |s|
s.name = "oauth"
- s.version = "0.5.0"
+ s.version = "0.5.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.require_paths = ["lib"]
s.authors = ["Pelle Braendgaard", "Blaine Cook", "Larry Halff", "Jesse Clark", "Jon Crosby", "Seth Fitzsimmons", "Matt Sanford", "Aaron Quint"]
- s.date = "2016-02-20"
+ s.date = "2016-02-29"
s.email = "oauth-ruby at googlegroupspec.com"
s.executables = ["oauth"]
s.extra_rdoc_files = ["LICENSE", "README.rdoc", "TODO"]
s.files = ["LICENSE", "README.rdoc", "TODO", "bin/oauth", "lib/oauth.rb", "lib/oauth/cli.rb", "lib/oauth/client.rb", "lib/oauth/client/action_controller_request.rb", "lib/oauth/client/em_http.rb", "lib/oauth/client/helper.rb", "lib/oauth/client/net_http.rb", "lib/oauth/consumer.rb", "lib/oauth/core_ext.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.rb", "lib/oauth/oauth_ [...]
+ s.licenses = ["MIT"]
s.rubygems_version = "2.5.1"
s.summary = "OAuth Core Ruby implementation"
s.test_files = ["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/integration/consumer_test.rb", "test/test_access_token.rb", "test/test_action_controller_request_proxy.rb", "test/test_consumer.rb", "test/test_curb_request_proxy.rb", "test/test_em_http_client.rb", [...]
@@ -26,26 +27,24 @@ Gem::Specification.new do |s|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<actionpack>, [">= 4.0.2"])
s.add_development_dependency(%q<byebug>, [">= 0"])
- s.add_development_dependency(%q<curb>, ["= 0.7.16"])
+ s.add_development_dependency(%q<curb>, [">= 0"])
s.add_development_dependency(%q<em-http-request>, ["= 0.2.11"])
- s.add_development_dependency(%q<iconv>, ["~> 1.0.3"])
- s.add_development_dependency(%q<jeweler>, [">= 0"])
+ s.add_development_dependency(%q<iconv>, [">= 0"])
s.add_development_dependency(%q<minitest>, [">= 0"])
s.add_development_dependency(%q<mocha>, [">= 0.9.12"])
- s.add_development_dependency(%q<rack>, ["~> 1.6.1"])
+ s.add_development_dependency(%q<rack>, [">= 0"])
s.add_development_dependency(%q<rack-test>, [">= 0"])
s.add_development_dependency(%q<rake>, [">= 0"])
s.add_development_dependency(%q<typhoeus>, [">= 0.1.13"])
else
s.add_dependency(%q<actionpack>, [">= 4.0.2"])
s.add_dependency(%q<byebug>, [">= 0"])
- s.add_dependency(%q<curb>, ["= 0.7.16"])
+ s.add_dependency(%q<curb>, [">= 0"])
s.add_dependency(%q<em-http-request>, ["= 0.2.11"])
- s.add_dependency(%q<iconv>, ["~> 1.0.3"])
- s.add_dependency(%q<jeweler>, [">= 0"])
+ s.add_dependency(%q<iconv>, [">= 0"])
s.add_dependency(%q<minitest>, [">= 0"])
s.add_dependency(%q<mocha>, [">= 0.9.12"])
- s.add_dependency(%q<rack>, ["~> 1.6.1"])
+ s.add_dependency(%q<rack>, [">= 0"])
s.add_dependency(%q<rack-test>, [">= 0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<typhoeus>, [">= 0.1.13"])
@@ -53,13 +52,12 @@ Gem::Specification.new do |s|
else
s.add_dependency(%q<actionpack>, [">= 4.0.2"])
s.add_dependency(%q<byebug>, [">= 0"])
- s.add_dependency(%q<curb>, ["= 0.7.16"])
+ s.add_dependency(%q<curb>, [">= 0"])
s.add_dependency(%q<em-http-request>, ["= 0.2.11"])
- s.add_dependency(%q<iconv>, ["~> 1.0.3"])
- s.add_dependency(%q<jeweler>, [">= 0"])
+ s.add_dependency(%q<iconv>, [">= 0"])
s.add_dependency(%q<minitest>, [">= 0"])
s.add_dependency(%q<mocha>, [">= 0.9.12"])
- s.add_dependency(%q<rack>, ["~> 1.6.1"])
+ s.add_dependency(%q<rack>, [">= 0"])
s.add_dependency(%q<rack-test>, [">= 0"])
s.add_dependency(%q<rake>, [">= 0"])
s.add_dependency(%q<typhoeus>, [">= 0.1.13"])
diff --git a/test/cases/spec/1_0-final/test_normalize_request_parameters.rb b/test/cases/spec/1_0-final/test_normalize_request_parameters.rb
index 58b2d63..91c9383 100644
--- a/test/cases/spec/1_0-final/test_normalize_request_parameters.rb
+++ b/test/cases/spec/1_0-final/test_normalize_request_parameters.rb
@@ -27,13 +27,13 @@ require File.expand_path('../../../oauth_case', __FILE__)
class NormalizeRequestParametersTest < OAuthCase
def test_parameters_for_signature
- params={'a'=>1, 'c'=>'hi there', 'f'=>'25', 'f'=>'50', 'f'=>'a', 'z'=>'p', 'z'=>'t'}
+ params={"a"=>1, "c"=>"hi there", "f"=>"a", "z"=>"t"}
assert_equal params,request(params).parameters_for_signature
end
def test_parameters_for_signature_removes_oauth_signature
- params={'a'=>1, 'c'=>'hi there', 'f'=>'25', 'f'=>'50', 'f'=>'a', 'z'=>'p', 'z'=>'t'}
+ params={"a"=>1, "c"=>"hi there", "f"=>"a", "z"=>"t"}
assert_equal params,request(params.merge({'oauth_signature'=>'blalbla'})).parameters_for_signature
end
diff --git a/test/test_net_http_client.rb b/test/test_net_http_client.rb
index 7d53285..87bed4b 100644
--- a/test/test_net_http_client.rb
+++ b/test/test_net_http_client.rb
@@ -291,6 +291,10 @@ class NetHTTPClientTest < Minitest::Test
protected
+ def assert_no_match exp, act, msg = "Expected #{act.inspect} to not match #{exp.inspect}"
+ assert act !~ exp, msg
+ end
+
def request_parameters_to_s
@request_parameters.map { |k,v| "#{k}=#{v}" }.join("&")
end
diff --git a/test/test_rest_client_request_proxy.rb b/test/test_rest_client_request_proxy.rb
index 651fab9..d86b3cf 100644
--- a/test/test_rest_client_request_proxy.rb
+++ b/test/test_rest_client_request_proxy.rb
@@ -3,9 +3,9 @@ require File.expand_path('../test_helper', __FILE__)
begin
require 'oauth/request_proxy/rest_client_request'
require 'rest-client'
-
- class RestlClientRequestProxyTest < Test::Unit::TestCase
-
+
+ class RestlClientRequestProxyTest < Minitest::Test
+
def test_that_proxy_simple_get_request_works
request = ::RestClient::Request.new(method: :get, url: "http://example.com/test?key=value")
request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value'})
@@ -15,7 +15,7 @@ begin
assert_equal 'http://example.com/test', request_proxy.normalized_uri
assert_equal 'GET', request_proxy.method
end
-
+
def test_that_proxy_simple_post_request_works_with_arguments
request = ::RestClient::Request.new(method: :post, url: "http://example.com/test")
params = {'key' => 'value'}
@@ -26,7 +26,7 @@ begin
assert_equal 'http://example.com/test', request_proxy.normalized_uri
assert_equal 'POST', request_proxy.method
end
-
+
def test_that_proxy_simple_post_request_works_with_form_data
request = ::RestClient::Request.new(method: :post, url: "http://example.com/test",
payload: {'key' => 'value'},
@@ -38,7 +38,7 @@ begin
assert_equal 'http://example.com/test', request_proxy.normalized_uri
assert_equal 'POST', request_proxy.method
end
-
+
def test_that_proxy_simple_put_request_works_with_arguments
request = ::RestClient::Request.new(method: :put, url: "http://example.com/test")
params = {'key' => 'value'}
@@ -49,7 +49,7 @@ begin
assert_equal 'http://example.com/test', request_proxy.normalized_uri
assert_equal 'PUT', request_proxy.method
end
-
+
def test_that_proxy_simple_put_request_works_with_form_data
request = ::RestClient::Request.new(method: :put, url: "http://example.com/test",
payload: {'key' => 'value'},
@@ -61,7 +61,7 @@ begin
assert_equal 'http://example.com/test', request_proxy.normalized_uri
assert_equal 'PUT', request_proxy.method
end
-
+
def test_that_proxy_post_request_works_with_mixed_parameter_sources
request = ::RestClient::Request.new(url: 'http://example.com/test?key=value',
method: :post,
@@ -74,8 +74,8 @@ begin
assert_equal 'http://example.com/test', request_proxy.normalized_uri
assert_equal 'POST', request_proxy.method
end
-
+
end
rescue LoadError => e
warn "! problem loading rest-client, skipping these tests: #{e}"
-end
\ No newline at end of file
+end
diff --git a/test/test_signature_hmac_sha1.rb b/test/test_signature_hmac_sha1.rb
index cc200f3..df0434f 100644
--- a/test/test_signature_hmac_sha1.rb
+++ b/test/test_signature_hmac_sha1.rb
@@ -1,7 +1,7 @@
require File.expand_path('../test_helper', __FILE__)
require 'oauth/signature/hmac/sha1'
-class SignatureHMACSHA1Test < Test::Unit::TestCase
+class SignatureHMACSHA1Test < Minitest::Test
def test_that_verify_returns_true_when_the_request_signature_is_right
request = OAuth::RequestProxy::MockRequest.new(
'method' => 'POST',
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-oauth.git
More information about the Pkg-ruby-extras-commits
mailing list