signet 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODJiNTkyYjQ1OGRkNDY2Y2RjNDZiY2U1YjJhNWI3MWFmNmU5OTNiNw==
-  data.tar.gz: !binary |-
-    MGUyODYzMjdmODI4Y2U4YjE5YTMyYzY2ZDU1ZWE3ZGFlYjZmNjRlMw==
+SHA1:
+  metadata.gz: 54a525db784c45a39a547b947ad806222183aafa
+  data.tar.gz: f2e9672239bacebf70d02803f0a072234095ea96
 SHA512:
-  metadata.gz: !binary |-
-    YTIyZGY5MDFjYmM4OWQwOWQzNTBjM2ZmNTNiNjg2ODBlYzAzMTdkOWQ4MWRh
-    OGQ4NTcxMjhkMGYxZmQyZGVhZTk5YzI3N2IyN2JmYjM0OTIyYTc2Yzc2ZTAw
-    MmRiZDRjZjM2NzFkMjdhYTEyNzQ5YTBlMjljZGU5NDA0YzRjZTc=
-  data.tar.gz: !binary |-
-    MWY0ZWJhNDg2MWQ1YjlkODQ5ZmQzMzBjNmRjZWVhYjA5N2JkZjU5YjRkMjU2
-    ZTBkNzNmZGQ5NDU4YjgyZjMxM2FiODdhZjM3YjE4OWZkYzBhZTk2ZGMxZWM5
-    YmE4YzU2YzI2M2E0NGIzZDI5ODMzYWJhMzM5MjkzMmQ5MjM5NTM=
+  metadata.gz: f32cda6094a605750a1b1743e0cb1cca838e2d452ddf62d06601321cd0f8fed9910d29966beb1b9208401cb46e7be4e7ce22de8eb80e58ed6d95bc8e96e40821
+  data.tar.gz: f6fb4fdf4853079697938fbf6319c91b4b6d0327551ab68f00260c22070ee6efcdbba0c4d620d6b76ebfb1382d36269e327a54a763952e5ac57a848398387f49

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.6.1
+* Fix language warnings for unused & shadowed variables ((@blowmage)[])
+* Update SSL cert path for OSX ((@gambaroff)[])
+* Update JWT library and fix broken tests
+* Fix incorrect parameter name in OAuth2 client docs ((@samuelreh)[])
+* Fix symbolization of URL parameter keys ((@swifthand)[])
+
 # 0.6.0
 
 * Drop support for ruby versions < 1.9.3

data/lib/signet.rb

@@ -29,7 +29,6 @@ module Signet #:nodoc:
     # Combine the above production rules to find valid auth-param pairs.
     auth_param = /((?:#{token})\s*=\s*(?:#{d_qs}|#{s_qs}|#{token}))/
     auth_param_pairs = []
-    position = 0
     last_match = nil
     remainder = auth_param_string
     # Iterate over the string, consuming pair matches as we go.  Verify that

data/lib/signet/oauth_1/client.rb

@@ -592,7 +592,7 @@ module Signet
           :client_credential_secret => 'Client credential secret'
         }
         # Make sure all required state is set
-        verifications.each do |(key, value)|
+        verifications.each do |(key, _value)|
           unless self.send(key)
             raise ArgumentError, "#{key} was not set."
           end
@@ -748,7 +748,7 @@ module Signet
           :temporary_credential_secret => 'Temporary credential secret'
         }
         # Make sure all required state is set
-        verifications.each do |(key, value)|
+        verifications.each do |(key, _value)|
           unless self.send(key)
             raise ArgumentError, "#{key} was not set."
           end
@@ -912,7 +912,7 @@ module Signet
           )
         end
         # Make sure all required state is set
-        verifications.each do |(key, value)|
+        verifications.each do |(key, _value)|
           unless self.send(key)
             raise ArgumentError, "#{key} was not set."
           end
@@ -979,7 +979,7 @@ module Signet
         content_type = content_type.split(';', 2).first if content_type.index(';')
         if request.method == :post && content_type == 'application/x-www-form-urlencoded'
           # Serializes the body in case a hash/array was passed. Noop if already string like
-          encoder = Faraday::Request::UrlEncoded.new(lambda { |env| })
+          encoder = Faraday::Request::UrlEncoded.new(lambda { |_env| })
           encoder.call(env)
           request.body = env[:body]
 

data/lib/signet/oauth_1/server.rb

@@ -250,7 +250,7 @@ module Signet
                                                          )
             }
         }
-        verifications.each do |(key, value)|
+        verifications.each do |(key, _value)|
           raise ArgumentError, "#{key} was not set." unless self.send(key)
         end
 
@@ -321,7 +321,7 @@ module Signet
           :verifier =>
             lambda {|x| 'Verifier' }
         }
-        verifications.each do |(key, value)|
+        verifications.each do |(key, _value)|
           unless self.send(key)
             raise ArgumentError, "#{key} was not set."
           end
@@ -405,7 +405,7 @@ module Signet
           )
         end
         # Make sure all required state is set
-        verifications.each do |(key, value)|
+        verifications.each do |(key, _value)|
           unless self.send(key)
             raise ArgumentError, "#{key} was not set."
           end

data/lib/signet/oauth_2/client.rb

@@ -77,9 +77,9 @@ module Signet
       #
       # @example
       #   client = Signet::OAuth2::Client.new(
-      #     :authorization_endpoint_uri =>
+      #     :authorization_uri =>
       #       'https://example.server.com/authorization',
-      #     :token_endpoint_uri =>
+      #     :token_credential_uri =>
       #       'https://example.server.com/token',
       #     :client_id => 'anonymous',
       #     :client_secret => 'anonymous',
@@ -89,6 +89,22 @@ module Signet
       #
       # @see Signet::OAuth2::Client#update!
       def initialize(options={})
+        @authorization_uri    = nil
+        @client_id            = nil
+        @client_secret        = nil
+        @code                 = nil
+        @expires_at           = nil
+        @expires_in           = nil
+        @issued_at            = nil
+        @issued_at            = nil
+        @issuer               = nil
+        @password             = nil
+        @principal            = nil
+        @redirect_uri         = nil
+        @scope                = nil
+        @state                = nil
+        @token_credential_uri = nil
+        @username             = nil
         self.update!(options)
       end
 
@@ -259,6 +275,9 @@ module Signet
         options[:state] = self.state unless options[:state]
         options.merge!(self.additional_parameters.merge(options[:additional_parameters] || {}))
         options.delete(:additional_parameters)
+        options = Hash[options.map do |key, option|
+          [key.to_s, option]
+        end]
         uri = Addressable::URI.parse(
           ::Signet::OAuth2.generate_authorization_uri(
             @authorization_uri, options
@@ -297,7 +316,7 @@ module Signet
         @token_credential_uri = coerce_uri(new_token_credential_uri)
       end
 
-      # Addressable expects URIs formatted as hashes to come in with symbols as keys. 
+      # Addressable expects URIs formatted as hashes to come in with symbols as keys.
       # Returns nil implicitly for the nil case.
       def coerce_uri(incoming_uri)
         if incoming_uri.is_a? Hash
@@ -690,8 +709,8 @@ module Signet
       #   omitted.
       #
       # @return [String] The decoded ID token.
-      def decoded_id_token(public_key=nil)
-        payload, header = JWT.decode(self.id_token, public_key, !!public_key)
+      def decoded_id_token(public_key=nil, options = {})
+        payload, _header = JWT.decode(self.id_token, public_key, !!public_key, options)
         if !payload.has_key?('aud')
           raise Signet::UnsafeOperationError, 'No ID token audience declared.'
         elsif payload['aud'] != self.client_id
@@ -832,11 +851,11 @@ module Signet
         skew = options[:skew] || 60
         assertion = {
           "iss" => self.issuer,
-          "scope" => self.scope.join(' '),
           "aud" => self.audience,
           "exp" => (now + self.expiry).to_i,
           "iat" => (now - skew).to_i
         }
+        assertion['scope'] = self.scope.join(' ') unless self.scope.nil?
         assertion['prn'] = self.person unless self.person.nil?
         assertion['sub'] = self.sub unless self.sub.nil?
         JWT.encode(assertion, self.signing_key, self.signing_algorithm)
@@ -1130,7 +1149,7 @@ module Signet
       def uri_is_oob?(uri)
         return uri.to_s == 'urn:ietf:wg:oauth:2.0:oob' || uri.to_s == 'oob'
       end
-      
+
       # Convert all keys in this hash (nested) to symbols for uniform retrieval
       def recursive_hash_normalize_keys(val)
         if val.is_a? Hash
@@ -1141,10 +1160,10 @@ module Signet
       end
 
       def deep_hash_normalize(old_hash)
-        old_hash.inject(formatted_hash={}) do |formatted_hash,(k,v)|
+        old_hash.inject(formatted_hash={}) do |hash,(k,v)|
 
-          formatted_hash[k.to_sym] = recursive_hash_normalize_keys(v)
-          formatted_hash
+          hash[k.to_sym] = recursive_hash_normalize_keys(v)
+          hash
         end
 
         formatted_hash

data/lib/signet/ssl_config.rb

@@ -16,6 +16,7 @@ if (!ENV['SSL_CERT_FILE'] || !File.exist?(ENV['SSL_CERT_FILE'])) &&
     '/usr/ssl/certs/ca-certificates.crt',
     '/usr/share/curl/curl-ca-bundle.crt',
     '/etc/ssl/certs/ca-certificates.crt',
+    '/etc/openssl/cert.pem',
     '/etc/pki/tls/cert.pem',
     '/etc/pki/CA/cacert.pem',
     'C:\Windows\curl-ca-bundle.crt',

data/lib/signet/version.rb

@@ -18,7 +18,7 @@ unless defined? Signet::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 6
-      TINY  = 0
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/signet.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'addressable', '~> 2.3'
   s.add_runtime_dependency 'faraday', '~> 0.9'
   s.add_runtime_dependency 'multi_json', '~> 1.10'
-  s.add_runtime_dependency 'jwt', '~> 1.0'
+  s.add_runtime_dependency 'jwt', '~> 1.5'
   s.add_runtime_dependency 'extlib', '~> 0.9'
 
   s.add_development_dependency 'rake', '~> 10.0'

data/spec/signet/oauth_2/client_spec.rb

@@ -763,7 +763,7 @@ JSON
     )
     expect(@client.access_token).to eq '12345'
     expect(@client.refresh_token).to eq '54321'
-    expect(@client.decoded_id_token).to eq ({
+    expect(@client.decoded_id_token(nil, :verify_expiration => false)).to eq ({
       "token_hash" => "tghD9J7n8V0N2vcw6eMijg",
       "id" => "12345",
       "aud" => "client-12345",
@@ -806,7 +806,7 @@ JSON
     expect(@client.refresh_token).to eq '54321'
     expect(@client.expires_in).to eq 3600
     expect(lambda do
-      @client.decoded_id_token
+      @client.decoded_id_token(nil, :verify_expiration => false)
     end).to raise_error(Signet::UnsafeOperationError)
     stubs.verify_stubbed_calls
   end
@@ -840,7 +840,7 @@ JSON
     expect(@client.refresh_token).to eq '54321'
     expect(@client.expires_in).to eq 3600
     expect(lambda do
-      @client.decoded_id_token
+      @client.decoded_id_token(nil, :verify_expiration => false)
     end).to raise_error(Signet::UnsafeOperationError)
     stubs.verify_stubbed_calls
   end
@@ -938,7 +938,7 @@ describe Signet::OAuth2::Client, 'configured with custom parameters' do
 
   it 'should allow custom parameters to be updated' do
     @client.update!(:additional_parameters => {:type => 'new_type'})
-    @client.additional_parameters.should == { :type => 'new_type'}
+    expect(@client.additional_parameters).to eq ({ :type => 'new_type'})
   end
 
   it 'should use custom parameters when generating authorization_uri' do
@@ -951,14 +951,14 @@ describe Signet::OAuth2::Client, 'configured with custom parameters' do
   end
 
   it 'should merge new authorization_uri custom parameters' do
-    @client.authorization_uri(:additional_parameters => {'type' => 'new_type', 'new_param' => 'new_val'}).query_values.should == {"access_type"=>"offline", "client_id"=>"s6BhdRkqt3", "new_param"=>"new_val",  "response_type"=>"code","redirect_uri"=>"https://example.client.com/callback", "type"=>"new_type"}
+    expect(@client.authorization_uri(:additional_parameters => {'type' => 'new_type', 'new_param' => 'new_val'}).query_values).to eql({"access_type"=>"offline", "client_id"=>"s6BhdRkqt3", "new_param"=>"new_val",  "response_type"=>"code","redirect_uri"=>"https://example.client.com/callback", "type"=>"new_type"})
   end
 
   it 'should merge new generate_access_token_request custom parameters' do
     @client.update!(:code=>'12345')
     body = @client.generate_access_token_request(:additional_parameters => {'type' => 'new_type', 'new_param' => 'new_val'}).body
-    body.should include("type=new_type")
-    body.should include("new_param=new_val")
+    expect(body).to include("type=new_type")
+    expect(body).to include("new_param=new_val")
   end
 end
 
@@ -977,32 +977,32 @@ describe Signet::OAuth2::Client, 'configured with custom parameters' do
   # Also tests Addressable's output.
   # Note: The only changes made here are to testing the **INTERNAL** representation of options.
   it 'should allow custom parameters to be set on init' do
-    @client.additional_parameters.should == { :type => 'web_server'}
+    expect(@client.additional_parameters).to eq ({ :type => 'web_server'})
   end
 
   it 'should allow custom parameters to be updated' do
     @client.update!(:additional_parameters => {'type' => 'new_type'})
-    @client.additional_parameters.should == { :type => 'new_type'}
+    expect(@client.additional_parameters).to eql ({ :type => 'new_type'})
   end
 
   it 'should use custom parameters when generating authorization_uri' do
-    @client.authorization_uri().query_values.should == {"access_type"=>"offline", "client_id"=>"s6BhdRkqt3", "redirect_uri"=>"https://example.client.com/callback", "response_type"=>"code", "type"=>"web_server"}
+    expect(@client.authorization_uri().query_values).to eq ({"access_type"=>"offline", "client_id"=>"s6BhdRkqt3", "redirect_uri"=>"https://example.client.com/callback", "response_type"=>"code", "type"=>"web_server"})
   end
 
   it 'should have the correct authorization_uri' do
-    @client.authorization_uri.host.should == 'example.com'
-    @client.authorization_uri.path.should == '/authorize'
+    expect(@client.authorization_uri.host).to eq 'example.com'
+    expect(@client.authorization_uri.path).to eq '/authorize'
   end
 
   it 'should merge new authorization_uri custom parameters' do
-    @client.authorization_uri(:additional_parameters => {'type' => 'new_type', 'new_param' => 'new_val'}).query_values.should == {"access_type"=>"offline", "client_id"=>"s6BhdRkqt3", "new_param"=>"new_val",  "response_type"=>"code","redirect_uri"=>"https://example.client.com/callback", "type"=>"new_type"}
+    expect(@client.authorization_uri(:additional_parameters => {'type' => 'new_type', 'new_param' => 'new_val'}).query_values).to eq ({"access_type"=>"offline", "client_id"=>"s6BhdRkqt3", "new_param"=>"new_val",  "response_type"=>"code","redirect_uri"=>"https://example.client.com/callback", "type"=>"new_type"})
   end
 
   it 'should merge new generate_access_token_request custom parameters' do
     @client.update!(:code=>'12345')
     body = @client.generate_access_token_request(:additional_parameters => {'type' => 'new_type', 'new_param' => 'new_val'}).body
-    body.should include("type=new_type")
-    body.should include("new_param=new_val")
+    expect(body).to include("type=new_type")
+    expect(body).to include("new_param=new_val")
   end
 end
 
@@ -1018,21 +1018,21 @@ describe Signet::OAuth2::Client, 'configured with custom parameters a la JSON.lo
   end
 
   it 'should allow custom parameters to be set on init' do
-    @client.additional_parameters.should == {:type => 'web_server'}
+    expect(@client.additional_parameters).to eq ({:type => 'web_server'})
   end
 
   it 'should allow custom parameters to be updated' do
     @client.update!(:additional_parameters => {'type' => 'new_type'})
-    @client.additional_parameters.should == {:type => 'new_type'}
+    expect(@client.additional_parameters).to eql ({:type => 'new_type'})
   end
 
   it 'should have correct authorization_uri hash options' do
-    @client.authorization_uri.host.should == "accounts.google.com"
-    @client.authorization_uri.path.should == "/o/oauth2/auth"
+    expect(@client.authorization_uri.host).to eq "accounts.google.com"
+    expect(@client.authorization_uri.path).to eq "/o/oauth2/auth"
   end
 
   it 'should use custom parameters when generating authorization_uri' do
-    @client.authorization_uri().query_values.should == {"access_type"=>"offline", "client_id"=>"s6BhdRkqt3", "redirect_uri"=>"https://example.client.com/callback", "response_type"=>"code", "type"=>"web_server"}
+    expect(@client.authorization_uri().query_values).to eq ({"access_type"=>"offline", "client_id"=>"s6BhdRkqt3", "redirect_uri"=>"https://example.client.com/callback", "response_type"=>"code", "type"=>"web_server"})
   end
 
   # , "path" => "/o/oauth2/oauth", "host" => "accounts.google.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signet
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Bob Aman
@@ -9,165 +9,164 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: extlib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-description: ! 'Signet is an OAuth 1.0 / OAuth 2.0 implementation.
-
-'
+description: |
+  Signet is an OAuth 1.0 / OAuth 2.0 implementation.
 email: sbazyl@google.com
 executables: []
 extensions: []
@@ -226,23 +225,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Signet is an OAuth 1.0 / OAuth 2.0 implementation.