oauth 0.5.1 → 0.5.2

data/lib/oauth/core_ext.rb

@@ -13,8 +13,6 @@ end
 
 class String
 
-
-
   unless method_defined?(:bytesize)
     def bytesize
       self.size
@@ -29,3 +27,27 @@ class String
   end
 
 end
+
+# TODO: Work around URI.escape obsolete method
+#
+# 21/May/2016 - We are silencing a warning introduced in 2009
+# https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
+#
+# The only clear alternative to this problem is to invoke CGI.escape instead
+# but that one does not take a secondary argument so we can pass OAuth::RESERVED_CHARACTERS
+# As of today, ignoring this secondary argument would introduce 44 errors on our tests
+# 181 runs, 511 assertions, 44 failures, 0 errors, 0 skips
+#
+# If you have a proper way to work around this so we don't need to override ruby core code
+# Please send us a Pull Request
+module URI
+  module Escape
+    def escape(*arg)
+      DEFAULT_PARSER.escape(*arg)
+    end
+
+    def unescape(*arg)
+      DEFAULT_PARSER.unescape(*arg)
+    end
+  end
+end

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.escape(string, OAuth::RESERVED_CHARACTERS)
+    end
+
+    def unescape(value)
+      URI.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/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)

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Pelle Braendgaard
@@ -15,110 +15,113 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: minitest
   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: byebug
   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: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: iconv
   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: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   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: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.12
@@ -126,6 +129,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.12
@@ -133,6 +139,9 @@ dependencies:
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.13
@@ -140,6 +149,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.13
@@ -161,14 +173,70 @@ dependencies:
   name: curb
   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: 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'
+- !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: 
@@ -187,6 +255,12 @@ 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
@@ -225,35 +299,7 @@ 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: 
+homepage: https://github.com/oauth-xx/oauth-ruby
 licenses:
 - MIT
 metadata: {}
@@ -265,7 +311,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:
   - - ">="
@@ -273,37 +319,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 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/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