oauth 0.5.0 → 0.5.4

data/lib/oauth/helper.rb

@@ -9,9 +9,17 @@ module OAuth
     #
     # See Also: {OAuth core spec version 1.0, section 5.1}[http://oauth.net/core/1.0#rfc.section.5.1]
     def escape(value)
-      URI::escape(value.to_s.to_str, OAuth::RESERVED_CHARACTERS)
+      _escape(value.to_s.to_str)
     rescue ArgumentError
-      URI::escape(value.to_s.to_str.force_encoding(Encoding::UTF_8), OAuth::RESERVED_CHARACTERS)
+      _escape(value.to_s.to_str.force_encoding(Encoding::UTF_8))
+    end
+
+    def _escape(string)
+      URI::DEFAULT_PARSER.escape(string, OAuth::RESERVED_CHARACTERS)
+    end
+
+    def unescape(value)
+      URI::DEFAULT_PARSER.unescape(value.gsub('+', '%2B'))
     end
 
     # Generate a random key of up to +size+ bytes. The value returned is Base64 encoded with non-word
@@ -94,10 +102,6 @@ module OAuth
       Hash[*params.flatten]
     end
 
-    def unescape(value)
-      URI.unescape(value.gsub('+', '%2B'))
-    end
-
     def stringify_keys(hash)
       new_h = {}
       hash.each do |k, v|

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -23,7 +23,7 @@ then # rails 3.x
     ActionDispatch::Request::HTTP_METHOD_LOOKUP["patch"] = :patch
   end
 
-else # rails 4.x - already has patch
+else # rails 4.x and later - already has patch
   require 'action_dispatch/http/request'
 end
 
@@ -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

data/lib/oauth/request_proxy/action_dispatch_request.rb

@@ -0,0 +1,7 @@
+require 'oauth/request_proxy/rack_request'
+
+module OAuth::RequestProxy
+  class ActionDispatchRequest < OAuth::RequestProxy::RackRequest
+    proxies ActionDispatch::Request
+  end
+end

data/lib/oauth/request_proxy/base.rb

@@ -76,7 +76,7 @@ module OAuth::RequestProxy
     end
 
     def parameters_for_signature
-      parameters.reject { |k,v| k == "oauth_signature" || unsigned_parameters.include?(k)}
+      parameters.select { |k,v| not signature_and_unsigned_parameters.include?(k) }
     end
 
     def oauth_parameters
@@ -87,6 +87,10 @@ module OAuth::RequestProxy
       parameters.reject { |k,v| OAuth::PARAMETERS.include?(k) }
     end
 
+    def signature_and_unsigned_parameters
+      unsigned_parameters+["oauth_signature"]
+    end
+
     # See 9.1.2 in specs
     def normalized_uri
       u = URI.parse(uri)
@@ -146,7 +150,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
 

data/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

data/lib/oauth/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.4
 platform: ruby
 authors:
 - Pelle Braendgaard
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,62 +59,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: iconv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -175,16 +161,72 @@ dependencies:
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.16
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.16
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: oauth-ruby@googlegroupspec.com
 executables:
@@ -201,13 +243,18 @@ files:
 - bin/oauth
 - lib/oauth.rb
 - lib/oauth/cli.rb
+- lib/oauth/cli/authorize_command.rb
+- lib/oauth/cli/base_command.rb
+- lib/oauth/cli/help_command.rb
+- lib/oauth/cli/query_command.rb
+- lib/oauth/cli/sign_command.rb
+- lib/oauth/cli/version_command.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
@@ -217,6 +264,7 @@ files:
 - lib/oauth/oauth_test_helper.rb
 - lib/oauth/request_proxy.rb
 - lib/oauth/request_proxy/action_controller_request.rb
+- lib/oauth/request_proxy/action_dispatch_request.rb
 - lib/oauth/request_proxy/base.rb
 - lib/oauth/request_proxy/curb_request.rb
 - lib/oauth/request_proxy/em_http_request.rb
@@ -239,36 +287,9 @@ files:
 - lib/oauth/tokens/server_token.rb
 - lib/oauth/tokens/token.rb
 - lib/oauth/version.rb
-- 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
-- test/test_em_http_request_proxy.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_rest_client_request_proxy.rb
-- test/test_rsa_sha1.rb
-- test/test_server.rb
-- test/test_signature.rb
-- test/test_signature_base.rb
-- test/test_signature_hmac_sha1.rb
-- test/test_signature_plain_text.rb
-- test/test_token.rb
-- test/test_typhoeus_request_proxy.rb
 homepage: 
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -278,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -286,37 +307,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OAuth Core Ruby implementation
-test_files:
-- test/test_rsa_sha1.rb
-- test/test_helper.rb
-- test/test_server.rb
-- test/test_em_http_client.rb
-- test/test_signature_hmac_sha1.rb
-- test/test_signature.rb
-- test/test_em_http_request_proxy.rb
-- test/test_net_http_client.rb
-- test/test_rest_client_request_proxy.rb
-- test/cases/oauth_case.rb
-- test/cases/spec/1_0-final/test_parameter_encodings.rb
-- test/cases/spec/1_0-final/test_signature_base_strings.rb
-- test/cases/spec/1_0-final/test_normalize_request_parameters.rb
-- test/cases/spec/1_0-final/test_construct_request_url.rb
-- test/test_hmac_sha1.rb
-- test/test_consumer.rb
-- test/test_rack_request_proxy.rb
-- test/test_signature_base.rb
-- test/test_typhoeus_request_proxy.rb
-- test/integration/consumer_test.rb
-- test/test_signature_plain_text.rb
-- test/test_curb_request_proxy.rb
-- test/test_token.rb
-- test/test_action_controller_request_proxy.rb
-- test/test_oauth_helper.rb
-- test/test_access_token.rb
-- test/test_request_token.rb
-- test/test_net_http_request_proxy.rb
-has_rdoc: 
+test_files: []

data/lib/oauth/core_ext.rb

@@ -1,31 +0,0 @@
-# these are to backport methods from 1.8.7/1.9.1 to 1.8.6
-
-class Object
-
-  unless method_defined?(:tap)
-    def tap
-      yield self
-      self
-    end
-  end
-
-end
-
-class String
-
-
-
-  unless method_defined?(:bytesize)
-    def bytesize
-      self.size
-    end
-  end
-
-  unless method_defined?(:bytes)
-    def bytes
-      require 'enumerator'
-      Enumerable::Enumerator.new(self, :each_byte)
-    end
-  end
-
-end

data/test/cases/oauth_case.rb

@@ -1,19 +0,0 @@
-require 'minitest/autorun'
-require 'oauth/signature'
-require 'oauth/request_proxy/mock_request'
-
-
-class OAuthCase < Minitest::Test
-  # avoid whining about a lack of tests
-  def run(*args)
-    return if @method_name.to_s == "default_test"
-    super
-  end
-
-  protected
-
-  # Creates a fake request
-  def request(params={},method='GET',uri="http://photos.example.net/photos")
-    OAuth::RequestProxy.proxy({'parameters'=>params,'method'=>method,'uri'=>uri})
-  end
-end

data/test/cases/spec/1_0-final/test_construct_request_url.rb

@@ -1,62 +0,0 @@
-require File.expand_path('../../../oauth_case', __FILE__)
-
-# See http://oauth.net/core/1.0/#anchor14
-#
-#9.1.2.  Construct Request URL
-#
-#The Signature Base String includes the request absolute URL, tying the signature to a specific endpoint. The URL used in the Signature Base String MUST include the scheme, authority, and path, and MUST exclude the query and fragment as defined by [RFC3986] section 3.
-#
-#If the absolute request URL is not available to the Service Provider (it is always available to the Consumer), it can be constructed by combining the scheme being used, the HTTP Host header, and the relative HTTP request URL. If the Host header is not available, the Service Provider SHOULD use the host name communicated to the Consumer in the documentation or other means.
-#
-#The Service Provider SHOULD document the form of URL used in the Signature Base String to avoid ambiguity due to URL normalization. Unless specified, URL scheme and authority MUST be lowercase and include the port number; http default port 80 and https default port 443 MUST be excluded.
-#
-#For example, the request:
-#
-#                HTTP://Example.com:80/resource?id=123
-#Is included in the Signature Base String as:
-#
-#                http://example.com/resource
-
-
-class ConstructRequestUrlTest < OAuthCase
-
-  def test_from_spec
-    assert_request_url("http://example.com/resource","HTTP://Example.com:80/resource?id=123")
-  end
-
-  def test_simple_url_with_ending_slash
-    assert_request_url("http://example.com/","http://example.com/")
-  end
-
-  def test_simple_url_without_ending_slash
-    assert_request_url("http://example.com/","http://example.com")
-  end
-
-  def test_of_normalized_http
-    assert_request_url("http://example.com/resource","http://example.com/resource")
-  end
-
-  def test_of_https
-    assert_request_url("https://example.com/resource","HTTPS://Example.com:443/resource?id=123")
-  end
-
-  def test_of_normalized_https
-    assert_request_url("https://example.com/resource","https://example.com/resource")
-  end
-
-  def test_of_http_with_non_standard_port
-    assert_request_url("http://example.com:8080/resource","http://example.com:8080/resource")
-  end
-
-  def test_of_https_with_non_standard_port
-    assert_request_url("https://example.com:8080/resource","https://example.com:8080/resource")
-  end
-
-  protected
-
-
-  def assert_request_url(expected,given,message=nil)
-    assert_equal expected, request({},'GET',given).normalized_uri, message
-  end
-
-end