rack-oauth2 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15c2f24e86e767637d2796e7b66391355736973f1ee698d6431833e854f1b938
-  data.tar.gz: eb49532f9f13f99a485c9298807fdda909a68f2bc57e15666d6618b304efa5c8
+  metadata.gz: c09e887a3c902ebbbfd1b2a1698d8a4d68d28e18e75616c629dd75e981e2a9d2
+  data.tar.gz: c0142a2c05df047f0d8f1e9ac11f428983d27a8945d5ae5be213be41b5615e20
 SHA512:
-  metadata.gz: 436dc9861ffb108fbbbf305a5b539fe8d94096eceed2361a3061993ab0d3fd734e7219446e00639e596b28c86f0609cd801285bf62a3e686604876f1538d7275
-  data.tar.gz: 365e8aca4188e2ed5c9a973bb2f91050a76d6843de0dfd73e9c4304d7dbdb675f380084fc618663f4b69b4b33f8baa94d4ac5021f63e789fdd630c4c9a2589d2
+  metadata.gz: ab1002bdd363b2edab71e8eeebd9872bca8ea2be6ad2a99875543974a2b85340ddcb42fc4ddf22f779b18429dc48a9d36fd91e9059391b76b537c04293ac2056
+  data.tar.gz: bdffd308340040287a3a8777cdaaaa9de58873d4d27e080dc719b4715ca53fd413bc726f19382b63cd086ad3dd47ac139a665f0acfcd25d2bb2a5e266d8dafce

data/VERSION

@@ -1 +1 @@
-1.11.0
+1.12.0

data/lib/rack/oauth2/server/rails/response_ext.rb

@@ -5,7 +5,7 @@ module Rack
         module ResponseExt
           def redirect?
             ensure_finish do
-              super
+              @response.redirect?
             end
           end
 
@@ -17,7 +17,7 @@ module Rack
 
           def json
             ensure_finish do
-              @body
+              @response.body
             end
           end
 
@@ -39,7 +39,7 @@ module Rack
           end
 
           def ensure_finish
-            @status, @header, @body = finish unless finished?
+            @status, @header, @response = finish unless finished?
             yield
           end
         end

data/rack-oauth2.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.add_runtime_dependency 'rack', '>= 2.1.0'
+  s.add_runtime_dependency 'rack', '< 2.1'
   s.add_runtime_dependency 'httpclient'
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'attr_required'

data/spec/rack/oauth2/server/resource/error_spec.rb

@@ -10,7 +10,7 @@ describe Rack::OAuth2::Server::Resource::BadRequest do
       status, header, response = error.finish
       status.should == 400
       header['Content-Type'].should == 'application/json'
-      response.should == ['{"error":"invalid_request"}']
+      response.body.should == ['{"error":"invalid_request"}']
     end
   end
 end
@@ -44,7 +44,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         status.should == 401
         header['Content-Type'].should == 'application/json'
         header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\", error=\"invalid_token\""
-        response.should == ['{"error":"invalid_token"}']
+        response.body.should == ['{"error":"invalid_token"}']
       end
 
       context 'when error_code is not invalid_token' do
@@ -53,7 +53,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         it 'should have error_code in body but not in WWW-Authenticate header' do
           status, header, response = error_with_scheme.finish
           header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
-          response.first.should include '"error":"something"'
+          response.body.first.should include '"error":"something"'
         end
       end
 
@@ -63,7 +63,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         it 'should have error_code in body but not in WWW-Authenticate header' do
           status, header, response = error_with_scheme.finish
           header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
-          response.first.should == '{"error":"unauthorized"}'
+          response.body.first.should == '{"error":"unauthorized"}'
         end
       end
 
@@ -74,7 +74,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
         it 'should use given realm' do
           status, header, response = error_with_scheme.finish
           header['WWW-Authenticate'].should == "Scheme realm=\"#{realm}\""
-          response.first.should include '"error":"something"'
+          response.body.first.should include '"error":"something"'
         end
       end
     end
@@ -91,7 +91,7 @@ describe Rack::OAuth2::Server::Resource::Forbidden do
       status, header, response = error.finish
       status.should == 403
       header['Content-Type'].should == 'application/json'
-      response.should == ['{"error":"insufficient_scope"}']
+      response.body.should == ['{"error":"insufficient_scope"}']
     end
   end
 
@@ -100,7 +100,7 @@ describe Rack::OAuth2::Server::Resource::Forbidden do
 
     it 'should have blank WWW-Authenticate header' do
       status, header, response = error.finish
-      response.first.should include '"scope":"scope1 scope2"'
+      response.body.first.should include '"scope":"scope1 scope2"'
     end
   end
 end

data/spec/rack/oauth2/server/token/error_spec.rb

@@ -10,7 +10,7 @@ describe Rack::OAuth2::Server::Token::BadRequest do
       status, header, response = error.finish
       status.should == 400
       header['Content-Type'].should == 'application/json'
-      response.should == ['{"error":"invalid_request"}']
+      response.body.should == ['{"error":"invalid_request"}']
     end
   end
 end
@@ -26,7 +26,7 @@ describe Rack::OAuth2::Server::Token::Unauthorized do
       status.should == 401
       header['Content-Type'].should == 'application/json'
       header['WWW-Authenticate'].should == 'Basic realm="OAuth2 Token Endpoint"'
-      response.should == ['{"error":"invalid_request"}']
+      response.body.should == ['{"error":"invalid_request"}']
     end
   end
 end
@@ -74,4 +74,4 @@ describe Rack::OAuth2::Server::Token::ErrorMethods do
       end
     end
   end
-end
+end

data/spec/rack/oauth2/server/token_spec.rb

@@ -30,7 +30,7 @@ describe Rack::OAuth2::Server::Token do
       it 'should fail with unsupported_grant_type' do
         status, header, response = app.call(env)
         status.should == 400
-        response.first.should include '"error":"invalid_request"'
+        response.body.first.should include '"error":"invalid_request"'
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - nov matake
@@ -14,16 +14,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement