Hello community, here is the log from the commit of package rubygem-rack-oauth2 for openSUSE:Factory checked in at 2018-02-18 11:44:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-rack-oauth2 (Old) and /work/SRC/openSUSE:Factory/.rubygem-rack-oauth2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-rack-oauth2" Sun Feb 18 11:44:57 2018 rev:3 rq:577557 version:1.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-rack-oauth2/rubygem-rack-oauth2.changes 2018-02-14 09:28:39.069939234 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-rack-oauth2.new/rubygem-rack-oauth2.changes 2018-02-18 11:45:03.555796196 +0100 @@ -1,0 +2,12 @@ +Thu Feb 15 05:33:33 UTC 2018 - factory-a...@kulow.org + +- updated to version 1.8.0 + no changelog found + +------------------------------------------------------------------- +Wed Feb 14 05:31:37 UTC 2018 - factory-a...@kulow.org + +- updated to version 1.7.1 + no changelog found + +------------------------------------------------------------------- Old: ---- rack-oauth2-1.7.0.gem New: ---- rack-oauth2-1.8.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-rack-oauth2.spec ++++++ --- /var/tmp/diff_new_pack.sqW5Nf/_old 2018-02-18 11:45:06.055706452 +0100 +++ /var/tmp/diff_new_pack.sqW5Nf/_new 2018-02-18 11:45:06.059706309 +0100 @@ -24,7 +24,7 @@ # Name: rubygem-rack-oauth2 -Version: 1.7.0 +Version: 1.8.0 Release: 0 %define mod_name rack-oauth2 %define mod_full_name %{mod_name}-%{version} ++++++ rack-oauth2-1.7.0.gem -> rack-oauth2-1.8.0.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.travis.yml new/.travis.yml --- old/.travis.yml 2017-12-26 02:35:40.000000000 +0100 +++ new/.travis.yml 2018-02-14 10:30:10.000000000 +0100 @@ -2,5 +2,6 @@ - gem install bundler rvm: - - 2.3.5 - - 2.4.2 + - 2.3.6 + - 2.4.3 + - 2.5.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION --- old/VERSION 2017-12-26 02:35:40.000000000 +0100 +++ new/VERSION 2018-02-14 10:30:10.000000000 +0100 @@ -1 +1 @@ -1.7.0 +1.8.0 Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rack/oauth2/client.rb new/lib/rack/oauth2/client.rb --- old/lib/rack/oauth2/client.rb 2017-12-26 02:35:40.000000000 +0100 +++ new/lib/rack/oauth2/client.rb 2018-02-14 10:30:10.000000000 +0100 @@ -64,6 +64,10 @@ ) end + def force_token_type!(token_type) + @forced_token_type = token_type.to_s + end + def access_token!(*args) headers, params = {}, @grant.as_json @@ -118,8 +122,8 @@ end def handle_success_response(response) - token_hash = parse_json response.body - case token_hash[:token_type].try(:downcase) + token_hash = JSON.parse(response.body).with_indifferent_access + case (@forced_token_type || token_hash[:token_type]).try(:downcase) when 'bearer' AccessToken::Bearer.new(token_hash) when 'mac' @@ -129,22 +133,17 @@ else raise 'Unknown Token Type' end - rescue MultiJson::DecodeError + rescue JSON::ParserError # NOTE: Facebook support (They don't use JSON as token response) AccessToken::Legacy.new Rack::Utils.parse_nested_query(response.body).with_indifferent_access end def handle_error_response(response) - error = parse_json response.body + error = JSON.parse(response.body).with_indifferent_access raise Error.new(response.status, error) - rescue MultiJson::DecodeError + rescue JSON::ParserError raise Error.new(response.status, error: 'Unknown', error_description: response.body) end - - def parse_json(raw_json) - # MultiJson.parse('') returns nil when using MultiJson::Adapters::JsonGem - MultiJson.load(raw_json).try(:with_indifferent_access) || {} - end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rack/oauth2/server/abstract/error.rb new/lib/rack/oauth2/server/abstract/error.rb --- old/lib/rack/oauth2/server/abstract/error.rb 2017-12-26 02:35:40.000000000 +0100 +++ new/lib/rack/oauth2/server/abstract/error.rb 2018-02-14 10:30:10.000000000 +0100 @@ -28,7 +28,7 @@ yield response if block_given? unless response.redirect? response.header['Content-Type'] = 'application/json' - response.write MultiJson.dump(Util.compact_hash(protocol_params)) + response.write Util.compact_hash(protocol_params).to_json end response.finish end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rack/oauth2/server/token.rb new/lib/rack/oauth2/server/token.rb --- old/lib/rack/oauth2/server/token.rb 2017-12-26 02:35:40.000000000 +0100 +++ new/lib/rack/oauth2/server/token.rb 2018-02-14 10:30:10.000000000 +0100 @@ -68,7 +68,7 @@ def finish attr_missing! - write MultiJson.dump(Util.compact_hash(protocol_params)) + write Util.compact_hash(protocol_params).to_json header['Content-Type'] = 'application/json' header['Cache-Control'] = 'no-store' header['Pragma'] = 'no-cache' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rack/oauth2.rb new/lib/rack/oauth2.rb --- old/lib/rack/oauth2.rb 2017-12-26 02:35:40.000000000 +0100 +++ new/lib/rack/oauth2.rb 2018-02-14 10:30:10.000000000 +0100 @@ -1,5 +1,4 @@ require 'rack' -require 'multi_json' require 'httpclient' require 'logger' require 'active_support' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2017-12-26 02:35:40.000000000 +0100 +++ new/metadata 2018-02-14 10:30:10.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: rack-oauth2 version: !ruby/object:Gem::Version - version: 1.7.0 + version: 1.8.0 platform: ruby authors: - nov matake autorequire: bindir: bin cert_chain: [] -date: 2017-12-26 00:00:00.000000000 Z +date: 2018-02-14 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rack @@ -25,20 +25,6 @@ - !ruby/object:Gem::Version version: '1.1' - !ruby/object:Gem::Dependency - name: multi_json - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: 1.3.6 - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: 1.3.6 -- !ruby/object:Gem::Dependency name: httpclient requirement: !ruby/object:Gem::Requirement requirements: @@ -301,7 +287,7 @@ version: 1.3.6 requirements: [] rubyforge_project: -rubygems_version: 2.6.13 +rubygems_version: 2.6.11 signing_key: specification_version: 4 summary: OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rack-oauth2.gemspec new/rack-oauth2.gemspec --- old/rack-oauth2.gemspec 2017-12-26 02:35:40.000000000 +0100 +++ new/rack-oauth2.gemspec 2018-02-14 10:30:10.000000000 +0100 @@ -15,7 +15,6 @@ s.files = `git ls-files`.split("\n") s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") s.add_runtime_dependency "rack", ">= 1.1" - s.add_runtime_dependency "multi_json", ">= 1.3.6" s.add_runtime_dependency "httpclient", ">= 2.4" s.add_runtime_dependency "activesupport", ">= 2.3" s.add_runtime_dependency "attr_required", ">= 0.0.5" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/rack/oauth2/client_spec.rb new/spec/rack/oauth2/client_spec.rb --- old/spec/rack/oauth2/client_spec.rb 2017-12-26 02:35:40.000000000 +0100 +++ new/spec/rack/oauth2/client_spec.rb 2018-02-14 10:30:10.000000000 +0100 @@ -79,7 +79,7 @@ describe '#access_token!' do subject { client.access_token! } - context 'when *args given' do + context 'when *args given' do describe 'client authentication method' do before do @@ -169,7 +169,7 @@ end context 'when bearer token is given' do - before do + before do client.authorization_code = 'code' mock_response( :post, @@ -184,7 +184,7 @@ its(:expires_in) { should == 3600 } context 'when token type is "Bearer", not "bearer"' do - before do + before do client.authorization_code = 'code' mock_response( :post, @@ -198,7 +198,7 @@ end context 'when mac token is given' do - before do + before do client.authorization_code = 'code' mock_response( :post, @@ -214,7 +214,7 @@ end context 'when no-type token is given (JSON)' do - before do + before do client.authorization_code = 'code' mock_response( :post, @@ -227,6 +227,14 @@ its(:access_token) { should == 'access_token' } its(:refresh_token) { should == 'refresh_token' } its(:expires_in) { should == 3600 } + + context 'when token_type is forced' do + before do + client.force_token_type! :bearer + end + it { should be_instance_of Rack::OAuth2::AccessToken::Bearer } + its(:token_type) { should == :bearer } + end end context 'when no-type token is given (key-value)' do @@ -255,7 +263,7 @@ end context 'when unknown-type token is given' do - before do + before do client.authorization_code = 'code' mock_response( :post, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/rack/oauth2/debugger/request_filter_spec.rb new/spec/rack/oauth2/debugger/request_filter_spec.rb --- old/spec/rack/oauth2/debugger/request_filter_spec.rb 2017-12-26 02:35:40.000000000 +0100 +++ new/spec/rack/oauth2/debugger/request_filter_spec.rb 2018-02-14 10:30:10.000000000 +0100 @@ -3,7 +3,7 @@ describe Rack::OAuth2::Debugger::RequestFilter do let(:resource_endpoint) { 'https://example.com/resources' } let(:request) { HTTP::Message.new_request(:get, URI.parse(resource_endpoint)) } - let(:response) { HTTP::Message.new_response(MultiJson.dump({hello: 'world'})) } + let(:response) { HTTP::Message.new_response({hello: 'world'}.to_json) } let(:request_filter) { Rack::OAuth2::Debugger::RequestFilter.new } describe '#filter_request' do