rack-oauth2 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92edcb16d7166257558b555867bfc52c1770514
-  data.tar.gz: 25d1d5ee07b9fe8d2f50c93b6b6384439ef53053
+  metadata.gz: cda56e136be240ecb7faedac7e0069f25318b471
+  data.tar.gz: b3349a1fd8210e59df758b8f16fcf5c0dc186092
 SHA512:
-  metadata.gz: 04d1fa45e23b7f7eafc051c84eb6d08df5234ee31c14cf06e1951df8a6a53cba636145649fbd748e7f610911b22a984a928166eb0f37e39b0d049d6b599b3de7
-  data.tar.gz: 5a45856133aed0ce20e9d8c5db3ebff15d2b5524c4bbb44a3731bf6986ce8ae5bb65f7125cba6bcdac9f14d808dc980c8ae7f5640330b522c37a428b82ea7e3f
+  metadata.gz: 6b60bd49eda41862116792fe9d7b6a4a0015063604dc1ee4fc2bb785147d6ab7690064ef768017af6c91fe3591984c9ebe8d59c23acfb0a3d9bb5fcfc6984ed4
+  data.tar.gz: 18deba6a3040a76a2970f083b6d52de13f4f31b602027bdff064cdbb6ccd3cd2be2a996400a189c6c5a7ffe4a47672f3b8f98e253f44305d4997d36e482c5038

data/.travis.yml

@@ -2,5 +2,6 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 2.3.5
-  - 2.4.2
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.8.0

data/lib/rack/oauth2.rb

@@ -1,5 +1,4 @@
 require 'rack'
-require 'multi_json'
 require 'httpclient'
 require 'logger'
 require 'active_support'

data/lib/rack/oauth2/client.rb

@@ -122,7 +122,7 @@ module Rack
       end
 
       def handle_success_response(response)
-        token_hash = parse_json response.body
+        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)
@@ -133,22 +133,17 @@ module Rack
         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

data/lib/rack/oauth2/server/abstract/error.rb

@@ -28,7 +28,7 @@ module Rack
             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

data/lib/rack/oauth2/server/token.rb

@@ -68,7 +68,7 @@ module Rack
 
           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'

data/rack-oauth2.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   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"

data/spec/rack/oauth2/debugger/request_filter_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - nov matake
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !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