rack-oauth2 0.8.5 → 0.8.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.8.4)
+    rack-oauth2 (0.8.5)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
@@ -24,10 +24,10 @@ GEM
       bouncy-castle-java
     json (1.5.3)
     json (1.5.3-java)
-    rack (1.3.1)
+    rack (1.3.2)
     rake (0.9.2)
-    rcov (0.9.9)
-    rcov (0.9.9-java)
+    rcov (0.9.10)
+    rcov (0.9.10-java)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/lib/rack/oauth2/client/grant.rb

@@ -5,17 +5,19 @@ module Rack
         include AttrRequired, AttrOptional
 
         def initialize(attributes = {})
-          required_attributes.each do |key|
+          (required_attributes + optional_attributes).each do |key|
             self.send "#{key}=", attributes[key]
           end
           attr_missing!
         end
 
         def to_hash
-          required_attributes.inject({
+          (required_attributes + optional_attributes).inject({
             :grant_type => self.class.name.demodulize.underscore.to_sym
           }) do |hash, key|
             hash.merge! key => self.send(key)
+          end.delete_if do |key, value|
+            value.blank?
           end
         end
       end

data/lib/rack/oauth2/client/grant/authorization_code.rb

@@ -3,7 +3,8 @@ module Rack
     class Client
       class Grant
         class AuthorizationCode < Grant
-          attr_required :code, :redirect_uri
+          attr_required :code
+          attr_optional :redirect_uri
         end
       end
     end

data/spec/rack/oauth2/access_token/legacy_spec.rb

@@ -16,7 +16,7 @@ describe Rack::OAuth2::AccessToken::Legacy do
 
   describe '.authenticate' do
     it 'should set Authorization header' do
-      request.header.should_receive(:[]=).with('Authorization', 'OAuth2 access_token')
+      request.header.should_receive(:[]=).with('Authorization', 'OAuth access_token')
       token.authenticate(request)
     end
   end

data/spec/rack/oauth2/client/grant/authorization_code_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Client::Grant::AuthorizationCode do
+  let(:grant) { Rack::OAuth2::Client::Grant::AuthorizationCode }
+
+  context 'when code is given' do
+    let :attributes do
+      {:code => 'code'}
+    end
+
+    context 'when redirect_uri is given' do
+      let :attributes do
+        {:code => 'code', :redirect_uri => 'https://client.example.com/callback'}
+      end
+      subject { grant.new attributes }
+      its(:redirect_uri) { should == 'https://client.example.com/callback' }
+      its(:to_hash) do
+        should == {:grant_type => :authorization_code, :code => 'code', :redirect_uri => 'https://client.example.com/callback'}
+      end
+    end
+
+    context 'otherwise' do
+      subject { grant.new attributes }
+      its(:redirect_uri) { should be_nil }
+      its(:to_hash) do
+        should == {:grant_type => :authorization_code, :code => 'code'}
+      end
+    end
+  end
+
+  context 'otherwise' do
+    it do
+      expect { grant.new }.should raise_error AttrRequired::AttrMissing
+    end
+  end
+end

data/spec/rack/oauth2/client/grant/client_credentials_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Client::Grant::ClientCredentials do
+  its(:to_hash) do
+    should == {:grant_type => :client_credentials}
+  end
+end

data/spec/rack/oauth2/client/grant/password_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Client::Grant::Password do
+  let(:grant) { Rack::OAuth2::Client::Grant::Password }
+
+  context 'when username is given' do
+    let :attributes do
+      {:username => 'username'}
+    end
+
+    context 'when password is given' do
+      let :attributes do
+        {:username => 'username', :password => 'password'}
+      end
+      subject { grant.new attributes }
+      its(:to_hash) do
+        should == {:grant_type => :password, :username => 'username', :password => 'password'}
+      end
+    end
+
+    context 'otherwise' do
+      it do
+        expect { grant.new attributes }.should raise_error AttrRequired::AttrMissing
+      end
+    end
+  end
+
+  context 'otherwise' do
+    it do
+      expect { grant.new }.should raise_error AttrRequired::AttrMissing
+    end
+  end
+end

data/spec/rack/oauth2/client/grant/refresh_token_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper.rb'
+
+describe Rack::OAuth2::Client::Grant::RefreshToken do
+  let(:grant) { Rack::OAuth2::Client::Grant::RefreshToken }
+
+  context 'when refresh_token is given' do
+    let :attributes do
+      {:refresh_token => 'refresh_token'}
+    end
+    subject { grant.new attributes }
+    its(:to_hash) do
+      should == {:grant_type => :refresh_token, :refresh_token => 'refresh_token'}
+    end
+  end
+
+  context 'otherwise' do
+    it do
+      expect { grant.new }.should raise_error AttrRequired::AttrMissing
+    end
+  end
+end

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

@@ -49,3 +49,11 @@ end
 describe Rack::OAuth2::Server::Abstract::Forbidden do
   its(:status) { should == 403 }
 end
+
+describe Rack::OAuth2::Server::Abstract::ServerError do
+  its(:status) { should == 500 }
+end
+
+describe Rack::OAuth2::Server::Abstract::TemporarilyUnavailable do
+  its(:status) { should == 503 }
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: 
-  version: 0.8.5
+  segments: 
+  - 0
+  - 8
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 Z
+date: 2011-08-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -20,6 +25,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -31,6 +40,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
         version: 1.4.3
   type: :runtime
   version_requirements: *id002
@@ -42,6 +56,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 123
+        segments: 
+        - 2
+        - 2
+        - 0
+        - 2
         version: 2.2.0.2
   type: :runtime
   version_requirements: *id003
@@ -53,6 +73,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
         version: "2.3"
   type: :runtime
   version_requirements: *id004
@@ -64,6 +88,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -75,6 +102,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
   type: :runtime
   version_requirements: *id006
@@ -86,6 +118,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
   type: :development
   version_requirements: *id007
@@ -97,6 +133,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :development
   version_requirements: *id008
@@ -108,6 +148,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :development
   version_requirements: *id009
@@ -119,6 +162,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :development
   version_requirements: *id010
@@ -200,6 +248,10 @@ files:
 - spec/rack/oauth2/access_token/mac_spec.rb
 - spec/rack/oauth2/access_token_spec.rb
 - spec/rack/oauth2/client/error_spec.rb
+- spec/rack/oauth2/client/grant/authorization_code_spec.rb
+- spec/rack/oauth2/client/grant/client_credentials_spec.rb
+- 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/server/abstract/error_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb
@@ -233,12 +285,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
 
@@ -267,6 +327,10 @@ test_files:
 - spec/rack/oauth2/access_token/mac_spec.rb
 - spec/rack/oauth2/access_token_spec.rb
 - spec/rack/oauth2/client/error_spec.rb
+- spec/rack/oauth2/client/grant/authorization_code_spec.rb
+- spec/rack/oauth2/client/grant/client_credentials_spec.rb
+- 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/server/abstract/error_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb