oauth 0.4.7 → 0.5.4

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,8 +26,11 @@ module OAuth
     # construct an authorization url
     def build_authorize_url(base_url, params)
       uri = URI.parse(base_url.to_s)
+      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/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.4"
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth
 version: !ruby/object:Gem::Version
-  version: 0.4.7
-  prerelease: 
+  version: 0.5.4
 platform: ruby
 authors:
 - Pelle Braendgaard
@@ -16,138 +15,220 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: '5.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
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '2.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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.13
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.10
+        version: 0.2.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.10
+        version: 0.2.11
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     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.6.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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.6.6.0
-description: OAuth Core Ruby implementation
-email: oauth-ruby@googlegroups.com
+        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:
 - oauth
 extensions: []
@@ -156,26 +237,24 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files:
-- .gemtest
-- Gemfile
-- Gemfile.lock
-- HISTORY
 - LICENSE
 - README.rdoc
-- Rakefile
 - TODO
 - bin/oauth
-- examples/yql.rb
-- lib/digest/hmac.rb
 - 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
@@ -185,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
@@ -192,79 +272,43 @@ files:
 - lib/oauth/request_proxy/mock_request.rb
 - lib/oauth/request_proxy/net_http.rb
 - lib/oauth/request_proxy/rack_request.rb
+- lib/oauth/request_proxy/rest_client_request.rb
 - lib/oauth/request_proxy/typhoeus_request.rb
 - lib/oauth/server.rb
 - lib/oauth/signature.rb
 - lib/oauth/signature/base.rb
-- lib/oauth/signature/hmac/base.rb
-- lib/oauth/signature/hmac/md5.rb
-- lib/oauth/signature/hmac/rmd160.rb
 - lib/oauth/signature/hmac/sha1.rb
-- lib/oauth/signature/hmac/sha2.rb
-- lib/oauth/signature/md5.rb
 - lib/oauth/signature/plaintext.rb
 - lib/oauth/signature/rsa/sha1.rb
-- lib/oauth/signature/sha1.rb
 - lib/oauth/token.rb
 - lib/oauth/tokens/access_token.rb
 - lib/oauth/tokens/consumer_token.rb
 - lib/oauth/tokens/request_token.rb
 - lib/oauth/tokens/server_token.rb
 - lib/oauth/tokens/token.rb
-- oauth.gemspec
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
-- 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/keys/rsa.cert
-- test/keys/rsa.pem
-- 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_rsa_sha1.rb
-- test/test_server.rb
-- test/test_signature.rb
-- test/test_signature_base.rb
-- test/test_signature_plain_text.rb
-- test/test_token.rb
-- test/test_typhoeus_request_proxy.rb
+- lib/oauth/version.rb
 homepage: 
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: oauth
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OAuth Core Ruby implementation
 test_files: []