oauth 0.5.8 → 0.5.9

data/lib/oauth/consumer.rb

@@ -16,8 +16,8 @@ module OAuth
       end
     end
 
-    if !defined?(CA_FILE)
-      CA_FILES = %W(/etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt /usr/share/curl/curl-ca-bundle.crt)
+    unless defined?(CA_FILE)
+      CA_FILES = %w[/etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt /usr/share/curl/curl-ca-bundle.crt].freeze
       CA_FILES.each do |ca_file|
         if File.exist?(ca_file)
           CA_FILE = ca_file
@@ -29,15 +29,15 @@ module OAuth
 
     @@default_options = {
       # Signature method used by server. Defaults to HMAC-SHA1
-      :signature_method   => "HMAC-SHA1",
+      signature_method: "HMAC-SHA1",
 
       # default paths on site. These are the same as the defaults set up by the generators
-      :request_token_path => "/oauth/request_token",
-      :authenticate_path  => "/oauth/authenticate",
-      :authorize_path     => "/oauth/authorize",
-      :access_token_path  => "/oauth/access_token",
+      request_token_path: "/oauth/request_token",
+      authenticate_path: "/oauth/authenticate",
+      authorize_path: "/oauth/authorize",
+      access_token_path: "/oauth/access_token",
 
-      :proxy              => nil,
+      proxy: nil,
       # How do we send the oauth values to the server see
       # https://oauth.net/core/1.0/#consumer_req_param for more info
       #
@@ -46,10 +46,10 @@ module OAuth
       #   :header - via the Authorize header (Default) ( option 1. in spec)
       #   :body - url form encoded in body of POST request ( option 2. in spec)
       #   :query_string - via the query part of the url ( option 3. in spec)
-      :scheme        => :header,
+      scheme: :header,
 
       # Default http method used for OAuth Token Requests (defaults to :post)
-      :http_method   => :post,
+      http_method: :post,
 
       # Add a custom ca_file for consumer
       # :ca_file       => '/etc/certs.pem'
@@ -59,9 +59,9 @@ module OAuth
       # nil, false - no debug output
       # true - uses $stdout
       # some_value - uses some_value
-      :debug_output => nil,
+      debug_output: nil,
 
-      :oauth_version => "1.0"
+      oauth_version: "1.0"
     }
 
     attr_accessor :options, :key, :secret
@@ -94,9 +94,8 @@ module OAuth
       @secret = consumer_secret
 
       # ensure that keys are symbols
-      @options = @@default_options.merge(options.inject({}) do |opts, (key, value)|
+      @options = @@default_options.merge(options.each_with_object({}) do |(key, value), opts|
         opts[key.to_sym] = value
-        opts
       end)
     end
 
@@ -127,7 +126,7 @@ module OAuth
       if custom_uri
         @uri  = custom_uri
         @http = create_http # yike, oh well. less intrusive this way
-      else  # if no custom passed, we use existing, which, if unset, is set to site uri
+      else # if no custom passed, we use existing, which, if unset, is set to site uri
         @uri ||= URI.parse(site)
       end
     end
@@ -156,18 +155,18 @@ module OAuth
       # will be exchanged out of band
       request_options[:oauth_callback] ||= OAuth::OUT_OF_BAND unless request_options[:exclude_callback]
 
-      if block_given?
-        response = token_request(
-          http_method,
-          (request_token_url? ? request_token_url : request_token_path),
-          nil,
-          request_options,
-          *arguments,
-          &block
-        )
-      else
-        response = token_request(http_method, (request_token_url? ? request_token_url : request_token_path), nil, request_options, *arguments)
-      end
+      response = if block_given?
+                   token_request(
+                     http_method,
+                     (request_token_url? ? request_token_url : request_token_path),
+                     nil,
+                     request_options,
+                     *arguments,
+                     &block
+                   )
+                 else
+                   token_request(http_method, (request_token_url? ? request_token_url : request_token_path), nil, request_options, *arguments)
+                 end
       OAuth::RequestToken.from_hash(self, response)
     end
 
@@ -190,18 +189,18 @@ module OAuth
 
       # override the request with your own, this is useful for file uploads which Net::HTTP does not do
       req = create_signed_request(http_method, path, token, request_options, *arguments)
-      return nil if block_given? and yield(req) == :done
+      return nil if block_given? && (yield(req) == :done)
       rsp = http.request(req)
       # check for an error reported by the Problem Reporting extension
       # (https://wiki.oauth.net/ProblemReporting)
       # note: a 200 may actually be an error; check for an oauth_problem key to be sure
       if !(headers = rsp.to_hash["www-authenticate"]).nil? &&
-        (h = headers.select { |hdr| hdr =~ /^OAuth / }).any? &&
-        h.first =~ /oauth_problem/
+         (h = headers.select { |hdr| hdr =~ /^OAuth / }).any? &&
+         h.first =~ /oauth_problem/
 
         # puts "Header: #{h.first}"
 
-        # TODO doesn't handle broken responses from api.login.yahoo.com
+        # TODO: doesn't handle broken responses from api.login.yahoo.com
         # remove debug code when done
         params = OAuth::Helper.parse_header(h.first)
 
@@ -235,10 +234,9 @@ module OAuth
           # symbolize keys
           # TODO this could be considered unexpected behavior; symbols or not?
           # TODO this also drops subsequent values from multi-valued keys
-          CGI.parse(response.body).inject({}) do |h,(k,v)|
+          CGI.parse(response.body).each_with_object({}) do |(k, v), h|
             h[k.strip.to_sym] = v.first
             h[k.strip]        = v.first
-            h
           end
         end
       when (300..399)
@@ -250,11 +248,11 @@ module OAuth
         response.error! if uri.path == path && our_uri.host == uri.host
 
         if uri.path == path && our_uri.host != uri.host
-            options[:site] = "#{uri.scheme}://#{uri.host}"
-            @http = create_http
+          options[:site] = "#{uri.scheme}://#{uri.host}"
+          @http = create_http
         end
 
-        self.token_request(http_method, uri.path, token, request_options, arguments)
+        token_request(http_method, uri.path, token, request_options, arguments)
       when (400..499)
         raise OAuth::Unauthorized, response
       else
@@ -301,13 +299,13 @@ module OAuth
       @options[:access_token_path]
     end
 
-    # TODO this is ugly, rewrite
+    # TODO: this is ugly, rewrite
     def request_token_url
       @options[:request_token_url] || site + request_token_path
     end
 
     def request_token_url?
-      @options.has_key?(:request_token_url)
+      @options.key?(:request_token_url)
     end
 
     def authenticate_url
@@ -315,7 +313,7 @@ module OAuth
     end
 
     def authenticate_url?
-      @options.has_key?(:authenticate_url)
+      @options.key?(:authenticate_url)
     end
 
     def authorize_url
@@ -323,7 +321,7 @@ module OAuth
     end
 
     def authorize_url?
-      @options.has_key?(:authorize_url)
+      @options.key?(:authorize_url)
     end
 
     def access_token_url
@@ -331,7 +329,7 @@ module OAuth
     end
 
     def access_token_url?
-      @options.has_key?(:access_token_url)
+      @options.key?(:access_token_url)
     end
 
     def proxy
@@ -342,10 +340,7 @@ module OAuth
 
     # Instantiates the http object
     def create_http(_url = nil)
-
-      if !request_endpoint.nil?
-       _url = request_endpoint
-      end
+      _url = request_endpoint unless request_endpoint.nil?
 
       our_uri = if _url.nil? || _url[0] =~ /^\//
                   URI.parse(site)
@@ -372,10 +367,8 @@ module OAuth
       if @options[:no_verify]
         http_object.verify_mode = OpenSSL::SSL::VERIFY_NONE
       else
-        ca_file =  @options[:ca_file] || CA_FILE
-        if ca_file
-          http_object.ca_file = ca_file
-        end
+        ca_file = @options[:ca_file] || CA_FILE
+        http_object.ca_file = ca_file if ca_file
         http_object.verify_mode = OpenSSL::SSL::VERIFY_PEER
         http_object.verify_depth = 5
       end
@@ -394,9 +387,7 @@ module OAuth
     def create_http_request(http_method, path, *arguments)
       http_method = http_method.to_sym
 
-      if [:post, :put, :patch].include?(http_method)
-        data = arguments.shift
-      end
+      data = arguments.shift if %i[post put patch].include?(http_method)
 
       # if the base site contains a path, add it now
       # only add if the site host matches the current http object's host
@@ -408,22 +399,22 @@ module OAuth
 
       case http_method
       when :post
-        request = Net::HTTP::Post.new(path,headers)
+        request = Net::HTTP::Post.new(path, headers)
         request["Content-Length"] = "0" # Default to 0
       when :put
-        request = Net::HTTP::Put.new(path,headers)
+        request = Net::HTTP::Put.new(path, headers)
         request["Content-Length"] = "0" # Default to 0
       when :patch
-        request = Net::HTTP::Patch.new(path,headers)
+        request = Net::HTTP::Patch.new(path, headers)
         request["Content-Length"] = "0" # Default to 0
       when :get
-        request = Net::HTTP::Get.new(path,headers)
+        request = Net::HTTP::Get.new(path, headers)
       when :delete
-        request =  Net::HTTP::Delete.new(path,headers)
+        request = Net::HTTP::Delete.new(path, headers)
       when :head
-        request = Net::HTTP::Head.new(path,headers)
+        request = Net::HTTP::Head.new(path, headers)
       else
-        raise ArgumentError, "Don't know how to handle http_method: :#{http_method.to_s}"
+        raise ArgumentError, "Don't know how to handle http_method: :#{http_method}"
       end
 
       if data.is_a?(Hash)
@@ -448,13 +439,12 @@ module OAuth
       request
     end
 
-    def marshal_dump(*args)
-      {:key => @key, :secret => @secret, :options => @options}
+    def marshal_dump(*_args)
+      { key: @key, secret: @secret, options: @options }
     end
 
     def marshal_load(data)
       initialize(data[:key], data[:secret], data[:options])
     end
-
   end
 end

data/lib/oauth/helper.rb

@@ -24,11 +24,11 @@ module OAuth
 
     # Generate a random key of up to +size+ bytes. The value returned is Base64 encoded with non-word
     # characters removed.
-    def generate_key(size=32)
+    def generate_key(size = 32)
       Base64.encode64(OpenSSL::Random.random_bytes(size)).gsub(/\W/, "")
     end
 
-    alias_method :generate_nonce, :generate_key
+    alias generate_nonce generate_key
 
     def generate_timestamp #:nodoc:
       Time.now.to_i.to_s
@@ -51,13 +51,13 @@ module OAuth
             normalize_nested_query(values, k)
           else
             values.sort.collect do |v|
-              [escape(k),escape(v)] * "="
+              [escape(k), escape(v)].join("=")
             end
           end
         elsif values.is_a?(Hash)
           normalize_nested_query(values, k)
         else
-          [escape(k),escape(values)] * "="
+          [escape(k), escape(values)].join("=")
         end
       end * "&"
     end
@@ -76,7 +76,7 @@ module OAuth
           normalize_nested_query(v, prefix ? "#{prefix}[#{k}]" : k)
         end.flatten.sort
       else
-        [escape(prefix), escape(value)] * "="
+        [escape(prefix), escape(value)].join("=")
       end
     end
 
@@ -90,10 +90,10 @@ module OAuth
     #
     def parse_header(header)
       # decompose
-      params = header[6,header.length].split(/[,=&]/)
+      params = header[6, header.length].split(/[,=&]/)
 
       # odd number of arguments - must be a malformed header.
-      raise OAuth::Problem.new("Invalid authorization header") if params.size % 2 != 0
+      raise OAuth::Problem, "Invalid authorization header" if params.size.odd?
 
       params.map! do |v|
         # strip and unescape

data/lib/oauth/oauth.rb

@@ -1,12 +1,12 @@
 module OAuth
   # request tokens are passed between the consumer and the provider out of
   # band (i.e. callbacks cannot be used), per section 6.1.1
-  OUT_OF_BAND = "oob"
+  OUT_OF_BAND = "oob".freeze
 
   # required parameters, per sections 6.1.1, 6.3.1, and 7
-  PARAMETERS = %w(oauth_callback oauth_consumer_key oauth_token
-    oauth_signature_method oauth_timestamp oauth_nonce oauth_verifier
-    oauth_version oauth_signature oauth_body_hash)
+  PARAMETERS = %w[oauth_callback oauth_consumer_key oauth_token
+                  oauth_signature_method oauth_timestamp oauth_nonce oauth_verifier
+                  oauth_version oauth_signature oauth_body_hash].freeze
 
   # reserved character regexp, per section 5.1
   RESERVED_CHARACTERS = /[^a-zA-Z0-9\-\.\_\~]/

data/lib/oauth/request_proxy/base.rb

@@ -79,15 +79,15 @@ module OAuth
       end
 
       def parameters_for_signature
-        parameters.select { |k, _v| !signature_and_unsigned_parameters.include?(k) }
+        parameters.reject { |k, _v| signature_and_unsigned_parameters.include?(k) }
       end
 
       def oauth_parameters
-        parameters.select { |k, _v| OAuth::PARAMETERS.include?(k) }.select { |_k, v| v != "" }
+        parameters.select { |k, _v| OAuth::PARAMETERS.include?(k) }.reject { |_k, v| v == "" }
       end
 
       def non_oauth_parameters
-        parameters.select { |k, _v| !OAuth::PARAMETERS.include?(k) }
+        parameters.reject { |k, _v| OAuth::PARAMETERS.include?(k) }
       end
 
       def signature_and_unsigned_parameters

data/lib/oauth/request_proxy/net_http.rb

@@ -39,8 +39,8 @@ module OAuth
             # request_params.each{|k,v| request_params[k] = [nil] if v == []}
 
             if options[:parameters]
-              options[:parameters].each do |k,v|
-                if request_params.has_key?(k) && v
+              options[:parameters].each do |k, v|
+                if request_params.key?(k) && v
                   request_params[k] << v
                 else
                   request_params[k] = [v]

data/lib/oauth/request_proxy/rest_client_request.rb

@@ -51,9 +51,9 @@ module OAuth
           query.split("&").inject({}) do |result, q|
             k, v = q.split("=")
             if !v.nil?
-              result.merge({ k => v })
+              result.merge(k => v)
             elsif !result.key?(k)
-              result.merge({ k => true })
+              result.merge(k => true)
             else
               result
             end

data/lib/oauth/request_proxy.rb

@@ -5,13 +5,13 @@ module OAuth
     end
 
     def self.proxy(request, options = {})
-      return request if request.kind_of?(OAuth::RequestProxy::Base)
+      return request if request.is_a?(OAuth::RequestProxy::Base)
 
       klass = available_proxies[request.class]
 
       # Search for possible superclass matches.
       if klass.nil?
-        request_parent = available_proxies.keys.find { |rc| request.kind_of?(rc) }
+        request_parent = available_proxies.keys.find { |rc| request.is_a?(rc) }
         klass = available_proxies[request_parent]
       end
 
@@ -19,6 +19,6 @@ module OAuth
       klass.new(request, options)
     end
 
-    class UnknownRequestType < Exception; end
+    class UnknownRequestType < RuntimeError; end
   end
 end

data/lib/oauth/server.rb

@@ -8,9 +8,9 @@ module OAuth
     attr_accessor :base_url
 
     @@server_paths = {
-      :request_token_path => "/oauth/request_token",
-      :authorize_path     => "/oauth/authorize",
-      :access_token_path  => "/oauth/access_token"
+      request_token_path: "/oauth/request_token",
+      authorize_path: "/oauth/authorize",
+      access_token_path: "/oauth/access_token"
     }
 
     # Create a new server instance
@@ -23,7 +23,7 @@ module OAuth
       [generate_key(16), generate_key]
     end
 
-    def generate_consumer_credentials(params = {})
+    def generate_consumer_credentials(_params = {})
       Consumer.new(*generate_credentials)
     end
 
@@ -31,12 +31,10 @@ module OAuth
     def create_consumer
       creds = generate_credentials
       Consumer.new(creds[0], creds[1],
-        {
-          :site               => base_url,
-          :request_token_path => request_token_path,
-          :authorize_path     => authorize_path,
-          :access_token_path  => access_token_path
-        })
+                   site: base_url,
+                   request_token_path: request_token_path,
+                   authorize_path: authorize_path,
+                   access_token_path: access_token_path)
     end
 
     def request_token_path

data/lib/oauth/signature/base.rb

@@ -17,7 +17,7 @@ module OAuth::Signature
     end
 
     def initialize(request, options = {}, &block)
-      raise TypeError unless request.kind_of?(OAuth::RequestProxy::Base)
+      raise TypeError unless request.is_a?(OAuth::RequestProxy::Base)
       @request = request
       @options = options
 
@@ -47,7 +47,7 @@ module OAuth::Signature
     end
 
     def signature
-      Base64.encode64(digest).chomp.gsub(/\n/,"")
+      Base64.encode64(digest).chomp.delete("\n")
     end
 
     def ==(cmp_signature)
@@ -57,7 +57,7 @@ module OAuth::Signature
     end
 
     def verify
-      self == self.request.signature
+      self == request.signature
     end
 
     def signature_base_string
@@ -93,6 +93,5 @@ module OAuth::Signature
     def raise_instantiation_error
       raise NotImplementedError, "Cannot instantiate #{self.class.name} class directly."
     end
-
   end
 end

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

@@ -5,7 +5,7 @@ module OAuth::Signature::HMAC
     implements "hmac-sha1"
 
     def body_hash
-      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.gsub(/\n/,"")
+      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.delete("\n")
     end
 
     private

data/lib/oauth/signature/hmac/sha256.rb

@@ -5,7 +5,7 @@ module OAuth::Signature::HMAC
     implements "hmac-sha256"
 
     def body_hash
-      Base64.encode64(OpenSSL::Digest::SHA256.digest(request.body || "")).chomp.gsub(/\n/,"")
+      Base64.encode64(OpenSSL::Digest::SHA256.digest(request.body || "")).chomp.delete("\n")
     end
 
     private

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

@@ -19,7 +19,7 @@ module OAuth::Signature::RSA
     end
 
     def body_hash
-      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.gsub(/\n/,"")
+      Base64.encode64(OpenSSL::Digest::SHA1.digest(request.body || "")).chomp.delete("\n")
     end
 
     private
@@ -27,9 +27,9 @@ module OAuth::Signature::RSA
     def decode_public_key
       case consumer_secret
       when /-----BEGIN CERTIFICATE-----/
-        OpenSSL::X509::Certificate.new( consumer_secret).public_key
+        OpenSSL::X509::Certificate.new(consumer_secret).public_key
       else
-        OpenSSL::PKey::RSA.new( consumer_secret)
+        OpenSSL::PKey::RSA.new(consumer_secret)
       end
     end
 

data/lib/oauth/signature.rb

@@ -20,26 +20,26 @@ module OAuth
 
     # Sign a +request+
     def self.sign(request, options = {}, &block)
-      self.build(request, options, &block).signature
+      build(request, options, &block).signature
     end
 
     # Verify the signature of +request+
     def self.verify(request, options = {}, &block)
-      self.build(request, options, &block).verify
+      build(request, options, &block).verify
     end
 
     # Create the signature base string for +request+. This string is the normalized parameter information.
     #
     # See Also: {OAuth core spec version 1.0, section 9.1.1}[http://oauth.net/core/1.0#rfc.section.9.1.1]
     def self.signature_base_string(request, options = {}, &block)
-      self.build(request, options, &block).signature_base_string
+      build(request, options, &block).signature_base_string
     end
 
     # Create the body hash for a request
     def self.body_hash(request, options = {}, &block)
-      self.build(request, options, &block).body_hash
+      build(request, options, &block).body_hash
     end
 
-    class UnknownSignatureMethod < Exception; end
+    class UnknownSignatureMethod < RuntimeError; end
   end
 end

data/lib/oauth/tokens/consumer_token.rb

@@ -5,12 +5,12 @@ module OAuth
     attr_reader   :response
 
     def self.from_hash(consumer, hash)
-      token = self.new(consumer, hash[:oauth_token], hash[:oauth_token_secret])
+      token = new(consumer, hash[:oauth_token], hash[:oauth_token_secret])
       token.params = hash
       token
     end
 
-    def initialize(consumer, token="", secret="")
+    def initialize(consumer, token = "", secret = "")
       super(token, secret)
       @consumer = consumer
       @params   = {}

data/lib/oauth/tokens/request_token.rb

@@ -2,19 +2,18 @@ module OAuth
   # The RequestToken is used for the initial Request.
   # This is normally created by the Consumer object.
   class RequestToken < ConsumerToken
-
     # Generate an authorization URL for user authorization
     def authorize_url(params = nil)
-      return nil if self.token.nil?
+      return nil if token.nil?
 
-      params = (params || {}).merge(:oauth_token => self.token)
+      params = (params || {}).merge(oauth_token: token)
       build_url(consumer.authorize_url, params)
     end
 
     def authenticate_url(params = nil)
-      return nil if self.token.nil?
+      return nil if token.nil?
 
-      params = (params || {}).merge(:oauth_token => self.token)
+      params = (params || {}).merge(oauth_token: token)
       build_url(consumer.authenticate_url, params)
     end
 
@@ -28,16 +27,16 @@ module OAuth
       OAuth::AccessToken.from_hash(consumer, response)
     end
 
-  protected
+    protected
 
     # construct an authorization or authentication url
     def build_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
+      # TODO: doesn't handle array values correctly
       queries.merge!(params) if params
-      uri.query = URI.encode_www_form(queries) if !queries.empty?
+      uri.query = URI.encode_www_form(queries) unless queries.empty?
       uri.to_s
     end
   end