rack-oauth2 0.9.4 → 0.9.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.9.2)
+    rack-oauth2 (0.9.4)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
@@ -12,18 +12,20 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.10)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     addressable (2.2.6)
     attr_required (0.0.3)
     bouncy-castle-java (1.5.0146.1)
     crack (0.1.8)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     httpclient (2.2.1)
     i18n (0.6.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
-    json (1.5.3)
-    json (1.5.3-java)
+    json (1.5.4)
+    json (1.5.4-java)
+    multi_json (1.0.3)
     rack (1.3.2)
     rake (0.9.2)
     rcov (0.9.10)
@@ -36,8 +38,8 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    webmock (1.7.4)
-      addressable (> 2.2.5, ~> 2.2)
+    webmock (1.7.6)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/rack/oauth2/client.rb

@@ -17,6 +17,7 @@ module Rack
 
       def authorization_uri(params = {})
         params[:response_type] ||= :code
+        params[:response_type] = Array(params[:response_type]).join(' ')
         params[:scope] = Array(params[:scope]).join(' ')
         Util.redirect_uri absolute_uri_for(authorization_endpoint), :query, params.merge(
           :client_id => self.identifier,

data/lib/rack/oauth2/debugger.rb

@@ -1 +1,3 @@
-require 'rack/oauth2/debugger/request_filter'
+Dir[File.dirname(__FILE__) + '/debugger/*.rb'].each do |file|
+  require file
+end

data/spec/rack/oauth2/client_spec.rb

@@ -47,6 +47,11 @@ describe Rack::OAuth2::Client do
       it { should include 'response_type=token' }
     end
 
+    context 'when response_type is an Array' do
+      subject { client.authorization_uri(:response_type => [:token, :code]) }
+      it { should include 'response_type=token+code' }
+    end
+
     context 'when scope is given' do
       subject { client.authorization_uri(:scope => [:scope1, :scope2]) }
       it { should include 'scope=scope1+scope2' }

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

@@ -0,0 +1,29 @@
+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({:hello => 'world'}.to_json) }
+  let(:request_filter) { Rack::OAuth2::Debugger::RequestFilter.new }
+
+  describe '#filter_request' do
+    it 'should log request' do
+      Rack::OAuth2.logger.should_receive(:info).with(
+        "======= [Rack::OAuth2] HTTP REQUEST STARTED =======\n" +
+        request.dump
+      )
+      request_filter.filter_request(request)
+    end
+  end
+
+  describe '#filter_response' do
+    it 'should log response' do
+      Rack::OAuth2.logger.should_receive(:info).with(
+        "--------------------------------------------------\n" +
+        response.dump +
+        "\n======= [Rack::OAuth2] HTTP REQUEST FINISHED ======="
+      )
+      request_filter.filter_response(request, response)
+    end
+  end
+end

data/spec/rack/oauth2/oauth2_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Rack::OAuth2 do
+  subject { Rack::OAuth2 }
+  after { Rack::OAuth2.debugging = false }
+
+  its(:logger) { should be_a Logger }
+  its(:debugging?) { should be_false }
+
+  describe '.debug!' do
+    before { Rack::OAuth2.debug! }
+    its(:debugging?) { should be_true }
+  end
+
+  describe '.debug' do
+    it 'should enable debugging within given block' do
+      Rack::OAuth2.debug do
+        Rack::OAuth2.debugging?.should be_true
+      end
+      Rack::OAuth2.debugging?.should be_false
+    end
+
+    it 'should not force disable debugging' do
+      Rack::OAuth2.debug!
+      Rack::OAuth2.debug do
+        Rack::OAuth2.debugging?.should be_true
+      end
+      Rack::OAuth2.debugging?.should be_true
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 Z
+date: 2011-09-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -211,6 +211,8 @@ files:
 - spec/rack/oauth2/client/grant/password_spec.rb
 - spec/rack/oauth2/client/grant/refresh_token_spec.rb
 - spec/rack/oauth2/client_spec.rb
+- spec/rack/oauth2/debugger/request_filter_spec.rb
+- spec/rack/oauth2/oauth2_spec.rb
 - spec/rack/oauth2/server/abstract/error_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb
 - spec/rack/oauth2/server/authorize/error_spec.rb
@@ -284,6 +286,8 @@ test_files:
 - spec/rack/oauth2/client/grant/password_spec.rb
 - spec/rack/oauth2/client/grant/refresh_token_spec.rb
 - spec/rack/oauth2/client_spec.rb
+- spec/rack/oauth2/debugger/request_filter_spec.rb
+- spec/rack/oauth2/oauth2_spec.rb
 - spec/rack/oauth2/server/abstract/error_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb
 - spec/rack/oauth2/server/authorize/error_spec.rb