rack-oauth2 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

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

@@ -3,10 +3,10 @@ module Rack
     module Server
 
       class Error < StandardError
-        attr_accessor :code, :error, :description, :uri, :state, :scope, :redirect_uri, :realm
+        attr_accessor :status, :error, :description, :uri, :state, :scope, :redirect_uri, :realm
 
-        def initialize(code, error, description = "", options = {})
-          @code         = code
+        def initialize(status, error, description = "", options = {})
+          @status       = status
           @error        = error
           @description  = description
           @uri          = options[:uri]
@@ -34,24 +34,25 @@ module Rack
           }.delete_if do |key, value|
             value.blank?
           end
+          response = Rack::Response.new
           case @channel
           when :www_authenticate
-            params = params.collect do |key, value|
-              "#{key}=\"#{URI.encode value.to_s}\""
-            end
-            [code, {'WWW-Authenticate' => "OAuth realm=\"#{realm}\" #{params.join(" ")}"}, []]
+            response.status = status
+            response.header['WWW-Authenticate'] = "OAuth realm='#{realm}' #{params.collect { |key, value| "#{key}='#{value.to_s}'" }.join(' ')}"
+            response.write params.to_json
           when :query_string
             redirect_uri.query = if redirect_uri.query
               [redirect_uri.query, params.to_query].join('&')
             else
               params.to_query
             end
-            response = Rack::Response.new
             response.redirect redirect_uri.to_s
-            response.finish
           when :json_body
-            [code, {'Content-Type' => 'application/json'}, params.to_json]
+            response.status = status
+            response.header['Content-Type'] = 'application/json'
+            response.write params.to_json
           end
+          response.finish
         end
       end
 

data/rack-oauth2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-oauth2}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-09-16}
+  s.date = %q{2010-09-17}
   s.description = %q{Rack Middleware for OAuth2 Client & Server, currently working on server code first.}
   s.email = %q{nov@matake.jp}
   s.extra_rdoc_files = [

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

@@ -5,8 +5,8 @@ describe Rack::OAuth2::Server::Error, '#finish' do
   context "when state is given" do
     it "should return state as error response" do
       error = Rack::OAuth2::Server::Error.new(400, :invalid_request, "Something Invalid!!", :state => "anything")
-      status, header, body = error.finish
-      body.should match("\"state\":\"anything\"")
+      status, header, response = error.finish
+      response.body.to_s.should match("\"state\":\"anything\"")
     end
   end
 
@@ -21,7 +21,7 @@ describe Rack::OAuth2::Server::Error, '#finish' do
     end
 
     it "should redirect to redirect_uri with error message in query string" do
-      status, header, body = @error.finish
+      status, header, response = @error.finish
       status.should == 302
       header['Content-Type'].should == "text/html"
       header['Location'].should == "#{@params.delete(:redirect_uri)}?#{@params.to_query}"
@@ -38,9 +38,9 @@ describe Rack::OAuth2::Server::Error, '#finish' do
     end
 
     it "should return failure response with error message in WWW-Authenticate header" do
-      status, header, body = @error.finish
+      status, header, response = @error.finish
       status.should === 401
-      header['WWW-Authenticate'].should == "OAuth realm=\"\" error_description=\"Something%20invalid!!\" error=\"invalid_request\""
+      header['WWW-Authenticate'].should == "OAuth realm='' error_description='Something invalid!!' error='invalid_request'"
     end
   end
 
@@ -54,9 +54,9 @@ describe Rack::OAuth2::Server::Error, '#finish' do
     end
 
     it "should return failure response with error message in json body" do
-      status, header, body = @error.finish
+      status, header, response = @error.finish
       status.should === 400
-      body.should == @params.to_json
+      response.body.to_s.should == @params.to_json
     end
   end
 
@@ -65,13 +65,13 @@ end
 describe Rack::OAuth2::Server::BadRequest do
   it "should use 400 as status" do
     error = Rack::OAuth2::Server::BadRequest.new(:invalid_request)
-    error.code.should == 400
+    error.status.should == 400
   end
 end
 
 describe Rack::OAuth2::Server::Unauthorized do
   it "should use 400 as status" do
     error = Rack::OAuth2::Server::Unauthorized.new(:invalid_request)
-    error.code.should == 401
+    error.status.should == 401
   end
 end

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

@@ -28,7 +28,7 @@ describe Rack::OAuth2::Server::Resource, '#call' do
   context "when no access token is given" do
     it "should skip OAuth 2.0 authentication" do
       env = Rack::MockRequest.env_for("/protected_resource")
-      status, header, body = @app.call(env)
+      status, header, response = @app.call(env)
       status.should == 200
       env[Rack::OAuth2::ACCESS_TOKEN].should be_nil
     end
@@ -51,7 +51,7 @@ describe Rack::OAuth2::Server::Resource, '#call' do
     it "should fail with expired_token error" do
       response = @request.get("/protected_resource?oauth_token=expired_token")
       response.status.should == 401
-      response.headers["WWW-Authenticate"].should == "OAuth realm=\"server.example.com\" error_description=\"Given%20access%20token%20has%20been%20expired.\" error=\"expired_token\""
+      response.headers["WWW-Authenticate"].should == "OAuth realm='server.example.com' error_description='Given access token has been expired.' error='expired_token'"
     end
 
     it "should not store access token in env" do
@@ -65,7 +65,7 @@ describe Rack::OAuth2::Server::Resource, '#call' do
     it "should fail with invalid_token error" do
       response = @request.get("/protected_resource?oauth_token=invalid_token")
       response.status.should == 401
-      response.headers["WWW-Authenticate"].should == "OAuth realm=\"server.example.com\" error_description=\"Given%20access%20token%20is%20invalid.\" error=\"invalid_token\""
+      response.headers["WWW-Authenticate"].should == "OAuth realm='server.example.com' error_description='Given access token is invalid.' error='invalid_token'"
     end
 
     it "should not store access token in env" do
@@ -79,13 +79,13 @@ describe Rack::OAuth2::Server::Resource, '#call' do
     it "should fail with invalid_request error" do
       response = @request.get("/protected_resource?oauth_token=invalid_token", "HTTP_AUTHORIZATION" => "OAuth valid_token")
       response.status.should == 400
-      response.headers["WWW-Authenticate"].should == "OAuth realm=\"server.example.com\" error_description=\"Both%20Authorization%20header%20and%20payload%20includes%20oauth_token.\" error=\"invalid_request\""
+      response.headers["WWW-Authenticate"].should == "OAuth realm='server.example.com' error_description='Both Authorization header and payload includes oauth_token.' error='invalid_request'"
     end
   end
 
   context "when OAuth 1.0 Authorization header is given" do
     it "should ignore the OAuth params" do
-      env = Rack::MockRequest.env_for("/protected_resource", "HTTP_AUTHORIZATION" => "OAuth realm=\"server.example.com\" oauth_consumer_key=\"key\" oauth_token=\"token\" oauth_signature_method=\"HMAC-SHA1\" oauth_signature=\"sig\" oauth_timestamp=\"123456789\" oauth_nonce=\"nonce\"")
+      env = Rack::MockRequest.env_for("/protected_resource", "HTTP_AUTHORIZATION" => "OAuth realm='server.example.com' oauth_consumer_key='key' oauth_token='token' oauth_signature_method='HMAC-SHA1' oauth_signature='sig' oauth_timestamp='123456789' oauth_nonce='nonce'")
       status, header, body = @app.call(env)
       status.should == 200
       env[Rack::OAuth2::ACCESS_TOKEN].should be_nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +09:00
+date: 2010-09-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency