oauth2 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a7e97c3a76d87a0499aa0cd5f9b908df43f5b91
-  data.tar.gz: 390e6188e44d5e7eb909a29141b63dc05276608d
+  metadata.gz: 0e6df01671ac06be9840d38d64d3cc349e3f8a41
+  data.tar.gz: 4ebfa842881a53f3c98cc407646614f5f8883cbc
 SHA512:
-  metadata.gz: fe86948ffabdc2334b89db64fb4cb6c98a65f93198b543b380cab70c9d18daa47fcf92272678f5794caf23827e8e4e93f3d053d106d98a0438b4f1befb86301b
-  data.tar.gz: c5a507967b19c5019aaa4fd8f52448c78b4d13ada1041705d0f6526bc96b2b04311e063f7f5f98cd4a6520c61ab79eb841626c6e6dcf510bdb7a94c801e52ba1
+  metadata.gz: fde60355bd37fd6ab71e9f103fae0d4fbb065b62c4070c95aef84842fb9cfce6a6125e75a0e78e98c87c54c32ccc72042a1c5cfae514d534799310ac5a82e0c6
+  data.tar.gz: 6c358951c337a85275fe064a599e2fa03d92c4eeb3425d3ec2e51b857aa42cdcfd31ab1e1a2e77a2e9780c246970a0bcde4c3ae2e42c5775847e951faf45be28

data/README.md

@@ -104,7 +104,6 @@ This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
 * Ruby 1.8.7
-* Ruby 1.9.2
 * Ruby 1.9.3
 * Ruby 2.0.0
 * Ruby 2.1.0

data/lib/oauth2/access_token.rb

@@ -36,7 +36,7 @@ module OAuth2
     # @option opts [String] :header_format ('Bearer %s') the string format to use for the Authorization header
     # @option opts [String] :param_name ('access_token') the parameter name to use for transmission of the
     #    Access Token value in :body or :query transmission mode
-    def initialize(client, token, opts = {})
+    def initialize(client, token, opts = {}) # rubocop:disable Metrics/AbcSize
       @client = client
       @token = token.to_s
       [:refresh_token, :expires_in, :expires_at].each do |arg|
@@ -63,7 +63,7 @@ module OAuth2
     #
     # @return [Boolean]
     def expires?
-      !!@expires_at # rubocop:disable DoubleNegation
+      !!@expires_at
     end
 
     # Whether or not the token is expired
@@ -79,10 +79,10 @@ module OAuth2
     # @note options should be carried over to the new AccessToken
     def refresh!(params = {})
       fail('A refresh_token is not available') unless refresh_token
-      params.merge!(:client_id      => @client.id,
-                    :client_secret  => @client.secret,
-                    :grant_type     => 'refresh_token',
-                    :refresh_token  => refresh_token)
+      params[:client_id] = @client.id
+      params[:client_secret] = @client.secret
+      params[:grant_type] = 'refresh_token'
+      params[:refresh_token] = refresh_token
       new_token = @client.get_token(params)
       new_token.options = options
       new_token.refresh_token = refresh_token unless new_token.refresh_token
@@ -149,7 +149,7 @@ module OAuth2
 
   private
 
-    def token=(opts) # rubocop:disable MethodLength
+    def token=(opts) # rubocop:disable MethodLength, Metrics/AbcSize
       case options[:mode]
       when :header
         opts[:headers] ||= {}

data/lib/oauth2/client.rb

@@ -85,7 +85,7 @@ module OAuth2
     #   code response for this request.  Will default to client option
     # @option opts [Symbol] :parse @see Response::initialize
     # @yield [req] The Faraday request
-    def request(verb, url, opts = {}) # rubocop:disable CyclomaticComplexity, MethodLength
+    def request(verb, url, opts = {}) # rubocop:disable CyclomaticComplexity, MethodLength, Metrics/AbcSize
       connection.response :logger, ::Logger.new($stdout) if ENV['OAUTH_DEBUG'] == 'true'
 
       url = connection.build_url(url, opts[:params]).to_s
@@ -125,12 +125,12 @@ module OAuth2
     # @param [Hash] access token options, to pass to the AccessToken object
     # @param [Class] class of access token for easier subclassing OAuth2::AccessToken
     # @return [AccessToken] the initalized AccessToken
-    def get_token(params, access_token_opts = {}, access_token_class = AccessToken)
+    def get_token(params, access_token_opts = {}, access_token_class = AccessToken) # rubocop:disable Metrics/AbcSize
       opts = {:raise_errors => options[:raise_errors], :parse => params.delete(:parse)}
       if options[:token_method] == :post
         headers = params.delete(:headers)
         opts[:body] = params
-        opts[:headers] =  {'Content-Type' => 'application/x-www-form-urlencoded'}
+        opts[:headers] = {'Content-Type' => 'application/x-www-form-urlencoded'}
         opts[:headers].merge!(headers) if headers
       else
         opts[:params] = params

data/lib/oauth2/mac_token.rb

@@ -12,11 +12,7 @@ module OAuth2
     # @param [Hash] opts the options to create the Access Token with
     # @see MACToken#initialize
     def self.from_access_token(token, secret, options = {})
-      new(token.client, token.token, secret, token.params.merge(
-        :refresh_token => token.refresh_token,
-        :expires_in => token.expires_in,
-        :expires_at => token.expires_at
-      ).merge(options))
+      new(token.client, token.token, secret, token.params.merge(:refresh_token => token.refresh_token, :expires_in => token.expires_in, :expires_at => token.expires_at).merge(options))
     end
 
     attr_reader :secret, :algorithm
@@ -48,7 +44,7 @@ module OAuth2
       url = client.connection.build_url(path, opts[:params]).to_s
 
       opts[:headers] ||= {}
-      opts[:headers].merge!('Authorization' => header(verb, url))
+      opts[:headers]['Authorization'] = header(verb, url)
 
       @client.request(verb, path, opts, &block)
     end
@@ -99,7 +95,8 @@ module OAuth2
     #
     # @param [String] alg the algorithm to use (one of 'hmac-sha-1', 'hmac-sha-256')
     def algorithm=(alg)
-      @algorithm = case alg.to_s
+      @algorithm = begin
+        case alg.to_s
         when 'hmac-sha-1'
           OpenSSL::Digest::SHA1.new
         when 'hmac-sha-256'
@@ -107,6 +104,7 @@ module OAuth2
         else
           fail(ArgumentError, 'Unsupported algorithm')
         end
+      end
     end
 
   private
@@ -118,7 +116,7 @@ module OAuth2
 
     # Base64.strict_encode64 is not available on Ruby 1.8.7
     def strict_encode64(str)
-      Base64.encode64(str).gsub("\n", '')
+      Base64.encode64(str).delete("\n")
     end
   end
 end

data/lib/oauth2/response.rb

@@ -8,6 +8,22 @@ module OAuth2
     attr_reader :response
     attr_accessor :error, :options
 
+    # Procs that, when called, will parse a response body according
+    # to the specified format.
+    @@parsers = {
+      :json  => lambda { |body| MultiJson.load(body) rescue body }, # rubocop:disable RescueModifier
+      :query => lambda { |body| Rack::Utils.parse_query(body) },
+      :text  => lambda { |body| body },
+    }
+
+    # Content type assignments for various potential HTTP content types.
+    @@content_types = {
+      'application/json' => :json,
+      'text/javascript' => :json,
+      'application/x-www-form-urlencoded' => :query,
+      'text/plain' => :text,
+    }
+
     # Adds a new content type parser.
     #
     # @param [Symbol] key A descriptive symbol key such as :json or :query.
@@ -15,9 +31,9 @@ module OAuth2
     # @yield [String] A block returning parsed content.
     def self.register_parser(key, mime_types, &block)
       key = key.to_sym
-      PARSERS[key] = block
+      @@parsers[key] = block
       Array(mime_types).each do |mime_type|
-        CONTENT_TYPES[mime_type] = key
+        @@content_types[mime_type] = key
       end
     end
 
@@ -47,28 +63,12 @@ module OAuth2
       response.body || ''
     end
 
-    # Procs that, when called, will parse a response body according
-    # to the specified format.
-    PARSERS = {
-      :json  => lambda { |body| MultiJson.load(body) rescue body }, # rubocop:disable RescueModifier
-      :query => lambda { |body| Rack::Utils.parse_query(body) },
-      :text  => lambda { |body| body }
-    }
-
-    # Content type assignments for various potential HTTP content types.
-    CONTENT_TYPES = {
-      'application/json' => :json,
-      'text/javascript' => :json,
-      'application/x-www-form-urlencoded' => :query,
-      'text/plain' => :text
-    }
-
     # The parsed response body.
     #   Will attempt to parse application/x-www-form-urlencoded and
     #   application/json Content-Type response bodies
     def parsed
-      return nil unless PARSERS.key?(parser)
-      @parsed ||= PARSERS[parser].call(body)
+      return nil unless @@parsers.key?(parser)
+      @parsed ||= @@parsers[parser].call(body)
     end
 
     # Attempts to determine the content type of the response.
@@ -78,8 +78,8 @@ module OAuth2
 
     # Determines the parser that will be used to supply the content of #parsed
     def parser
-      return options[:parse].to_sym if PARSERS.key?(options[:parse])
-      CONTENT_TYPES[content_type]
+      return options[:parse].to_sym if @@parsers.key?(options[:parse])
+      @@content_types[content_type]
     end
   end
 end

data/lib/oauth2/strategy/assertion.rb

@@ -52,7 +52,7 @@ module OAuth2
         {:grant_type     => 'assertion',
          :assertion_type => 'urn:ietf:params:oauth:grant-type:jwt-bearer',
          :assertion      => assertion,
-         :scope          => params[:scope]
+         :scope          => params[:scope],
         }.merge(client_params)
       end
 
@@ -60,7 +60,7 @@ module OAuth2
         claims = {:iss => params[:iss],
                   :aud => params[:aud],
                   :prn => params[:prn],
-                  :exp => params[:exp]
+                  :exp => params[:exp],
                  }
         if params[:hmac_secret]
           JWT.encode(claims, params[:hmac_secret], 'HS256')

data/lib/oauth2/strategy/client_credentials.rb

@@ -19,7 +19,7 @@ module OAuth2
       # @param [Hash] opts options
       def get_token(params = {}, opts = {})
         request_body = opts.delete('auth_scheme') == 'request_body'
-        params.merge!('grant_type' => 'client_credentials')
+        params['grant_type'] = 'client_credentials'
         params.merge!(request_body ? client_params : {:headers => {'Authorization' => authorization(client_params['client_id'], client_params['client_secret'])}})
         @client.get_token(params, opts.merge('refresh_token' => nil))
       end
@@ -29,7 +29,7 @@ module OAuth2
       # @param [String] The client ID
       # @param [String] the client secret
       def authorization(client_id, client_secret)
-        'Basic ' + Base64.encode64(client_id + ':' + client_secret).gsub("\n", '')
+        'Basic ' + Base64.encode64(client_id + ':' + client_secret).delete("\n")
       end
     end
   end

data/lib/oauth2/version.rb

@@ -1,15 +1,59 @@
 module OAuth2
-  class Version
-    MAJOR = 1
-    MINOR = 0
-    PATCH = 0
-    PRE = nil
-
-    class << self
-      # @return [String]
-      def to_s
-        [MAJOR, MINOR, PATCH, PRE].compact.join('.')
-      end
+  module Version
+  module_function
+
+    # The major version
+    #
+    # @return [Integer]
+    def major
+      1
+    end
+
+    # The minor version
+    #
+    # @return [Integer]
+    def minor
+      1
+    end
+
+    # The patch version
+    #
+    # @return [Integer]
+    def patch
+      0
+    end
+
+    # The pre-release version, if any
+    #
+    # @return [Integer, NilClass]
+    def pre
+      nil
+    end
+
+    # The version number as a hash
+    #
+    # @return [Hash]
+    def to_h
+      {
+        :major => major,
+        :minor => minor,
+        :patch => patch,
+        :pre => pre,
+      }
+    end
+
+    # The version number as an array
+    #
+    # @return [Array]
+    def to_a
+      [major, minor, patch, pre].compact
+    end
+
+    # The version number as a string
+    #
+    # @return [String]
+    def to_s
+      to_a.join('.')
     end
   end
 end

data/oauth2.gemspec

@@ -5,23 +5,20 @@ require 'oauth2/version'
 
 Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', ['>= 0.8', '< 0.10']
-  spec.add_dependency 'jwt', '~> 1.0'
+  spec.add_dependency 'jwt', '~> 1.0', '< 1.5.2'
   spec.add_dependency 'multi_json', '~> 1.3'
   spec.add_dependency 'multi_xml', '~> 0.5'
-  spec.add_dependency 'rack', '~> 1.2'
+  spec.add_dependency 'rack', ['>= 1.2', '< 3']
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.authors       = ['Michael Bleigh', 'Erik Michaels-Ober']
   spec.description   = 'A Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth spec.'
   spec.email         = ['michael@intridea.com', 'sferik@gmail.com']
-  spec.files         = %w(.document CONTRIBUTING.md LICENSE.md README.md Rakefile oauth2.gemspec)
-  spec.files        += Dir.glob('lib/**/*.rb')
-  spec.files        += Dir.glob('spec/**/*')
+  spec.files         = %w(.document CONTRIBUTING.md LICENSE.md README.md oauth2.gemspec) + Dir['lib/**/*.rb']
   spec.homepage      = 'http://github.com/intridea/oauth2'
   spec.licenses      = %w(MIT)
   spec.name          = 'oauth2'
   spec.require_paths = %w(lib)
   spec.required_rubygems_version = '>= 1.3.5'
   spec.summary       = 'A Ruby wrapper for the OAuth 2.0 protocol.'
-  spec.test_files    = Dir.glob('spec/**/*')
   spec.version       = OAuth2::Version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,6 +48,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -77,16 +83,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +126,6 @@ files:
 - CONTRIBUTING.md
 - LICENSE.md
 - README.md
-- Rakefile
 - lib/oauth2.rb
 - lib/oauth2/access_token.rb
 - lib/oauth2/client.rb
@@ -129,17 +140,6 @@ files:
 - lib/oauth2/strategy/password.rb
 - lib/oauth2/version.rb
 - oauth2.gemspec
-- spec/helper.rb
-- spec/oauth2/access_token_spec.rb
-- spec/oauth2/client_spec.rb
-- spec/oauth2/mac_token_spec.rb
-- spec/oauth2/response_spec.rb
-- spec/oauth2/strategy/assertion_spec.rb
-- spec/oauth2/strategy/auth_code_spec.rb
-- spec/oauth2/strategy/base_spec.rb
-- spec/oauth2/strategy/client_credentials_spec.rb
-- spec/oauth2/strategy/implicit_spec.rb
-- spec/oauth2/strategy/password_spec.rb
 homepage: http://github.com/intridea/oauth2
 licenses:
 - MIT
@@ -160,20 +160,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the OAuth 2.0 protocol.
-test_files:
-- spec/helper.rb
-- spec/oauth2/access_token_spec.rb
-- spec/oauth2/client_spec.rb
-- spec/oauth2/mac_token_spec.rb
-- spec/oauth2/response_spec.rb
-- spec/oauth2/strategy/assertion_spec.rb
-- spec/oauth2/strategy/auth_code_spec.rb
-- spec/oauth2/strategy/base_spec.rb
-- spec/oauth2/strategy/client_credentials_spec.rb
-- spec/oauth2/strategy/implicit_spec.rb
-- spec/oauth2/strategy/password_spec.rb
+test_files: []
 has_rdoc: