rack-oauth2 0.2.2.1 → 0.2.3

data/.gitignore

@@ -17,5 +17,6 @@ tmtags
 coverage
 rdoc
 pkg
+Gemfile.lock
 
 ## PROJECT::SPECIFIC

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 nov matake
+Copyright (c) 2010 nov matake
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -6,7 +6,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
-  spec.rcov_opts = ['--exclude spec,gems']
+  spec.rcov_opts = ['-Ilib -Ispec --exclude spec,gems']
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.2.2.1
+0.2.3

data/lib/rack/oauth2.rb

@@ -1,6 +1,8 @@
 require 'rack'
 require 'json'
 require 'active_support/core_ext'
+require 'attr_required'
+require 'attr_optional'
 require 'rack/oauth2/server'
 
 module Rack

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

@@ -3,33 +3,25 @@ module Rack
     module Server
       module Abstract
         class Request < Rack::Request
-          attr_accessor :client_id, :scope
+          include AttrRequired, AttrOptional
+          attr_required :client_id
+          attr_optional :scope
 
           def initialize(env)
             super
-            missing_params = verify_required_params
             @client_id ||= params['client_id']
             @scope = Array(params['scope'].to_s.split(' '))
-            missing_params << :client_id if @client_id.blank?
-            unless missing_params.blank?
-              invalid_request!("'#{missing_params.join('\', \'')}' required.", :state => @state, :redirect_uri => @redirect_uri)
-            end
-            if params['client_id'].present? && @client_id != params['client_id']
-              invalid_client!("Multiple client credentials are provided.")
-            end
           end
 
-          def required_params
-            []
-          end
-
-          def verify_required_params
-            missing_params = []
-            required_params.each do |key|
-              missing_params << key unless params[key.to_s]
+          def attr_missing_with_error_handling!
+            if params['client_id'].present? && @client_id != params['client_id']
+              invalid_client!("Multiple client credentials are provided.")
             end
-            missing_params
+            attr_missing_without_error_handling!
+          rescue AttrRequired::AttrMissing => e
+            invalid_request!(e.message, :state => @state, :redirect_uri => @redirect_uri)
           end
+          alias_method_chain :attr_missing!, :error_handling
 
         end
       end

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

@@ -3,26 +3,14 @@ module Rack
     module Server
       module Abstract
         class Response < Rack::Response
+          include AttrRequired, AttrOptional
+
           def initialize(request)
             super([], 200, {})
           end
 
-          def required_params
-            []
-          end
-
-          def verify_required_params!
-            missing_params = []
-            required_params.each do |key|
-              missing_params << key unless self.send(key)
-            end
-            unless missing_params.blank?
-              raise "Setup '#{missing_params.join('\', \'')}' first!"
-            end
-          end
-
           def finish
-            verify_required_params!
+            attr_missing!
             super
           end
         end

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

@@ -12,26 +12,25 @@ module Rack
 
         class Request < Abstract::Request
           include Error::Authorize
-          attr_accessor :response_type, :redirect_uri, :state
+          attr_required :response_type
+          attr_optional :redirect_uri, :state
 
           def initialize(env)
             super
-            @state = params['state']
             @redirect_uri = Util.parse_uri(params['redirect_uri']) if params['redirect_uri']
-          end
-
-          def required_params
-            super + [:response_type]
+            @state = params['state']
           end
 
           def profile
-            case params['response_type']
+            case params['response_type'].to_s
             when 'code'
               Code
             when 'token'
               Token
             when 'code_and_token'
               CodeAndToken
+            when ''
+              attr_missing!
             else
               unsupported_response_type!("'#{params['response_type']}' isn't supported.")
             end
@@ -40,7 +39,8 @@ module Rack
         end
 
         class Response < Abstract::Response
-          attr_accessor :redirect_uri, :state, :approved
+          attr_required :redirect_uri
+          attr_optional :state, :approved
 
           def initialize(request)
             @state = request.state

data/lib/rack/oauth2/server/authorize/code.rb

@@ -14,15 +14,12 @@ module Rack
             def initialize(env)
               super
               @response_type = :code
+              attr_missing!
             end
           end
 
           class Response < Authorize::Response
-            attr_accessor :code
-
-            def required_params
-              super + [:code]
-            end
+            attr_required :code
 
             def finish
               if approved?

data/lib/rack/oauth2/server/authorize/code_and_token.rb

@@ -14,15 +14,13 @@ module Rack
             def initialize(env)
               super
               @response_type = :code_and_token
+              attr_missing!
             end
           end
 
           class Response < Authorize::Response
-            attr_accessor :code, :access_token, :expires_in, :scope
-
-            def required_params
-              super + [:code, :access_token]
-            end
+            attr_required :code, :access_token
+            attr_optional :expires_in, :scope
 
             def finish
               if approved?

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

@@ -14,15 +14,13 @@ module Rack
             def initialize(env)
               super
               @response_type = :token
+              attr_missing!
             end
           end
 
           class Response < Authorize::Response
-            attr_accessor :access_token, :expires_in, :scope
-
-            def required_params
-              super + [:access_token]
-            end
+            attr_required :access_token
+            attr_optional :expires_in, :scope
 
             def finish
               if approved?

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

@@ -15,7 +15,9 @@ module Rack
         class Request < Abstract::Request
           include Error::Token
 
-          attr_accessor :grant_type, :client_secret, :via_authorization_header
+          attr_required :grant_type
+          attr_optional :client_secret
+          attr_accessor :via_authorization_header
 
           def initialize(env)
             auth = Rack::Auth::Basic::Request.new(env)
@@ -30,12 +32,8 @@ module Rack
             @grant_type = params['grant_type']
           end
 
-          def required_params
-            super + [:grant_type]
-          end
-
           def profile(allow_no_profile = false)
-            case params['grant_type']
+            case params['grant_type'].to_s
             when 'authorization_code'
               AuthorizationCode
             when 'password'
@@ -44,6 +42,8 @@ module Rack
               Assertion
             when 'refresh_token'
               RefreshToken
+            when ''
+              attr_missing!
             else
               unsupported_grant_type!("'#{params['grant_type']}' isn't supported.")
             end
@@ -52,11 +52,8 @@ module Rack
         end
 
         class Response < Abstract::Response
-          attr_accessor :access_token, :expires_in, :refresh_token, :scope
-
-          def required_params
-            super + [:access_token]
-          end
+          attr_required :access_token
+          attr_optional :expires_in, :refresh_token, :scope
 
           def finish
             params = {

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

@@ -11,17 +11,14 @@ module Rack
           end
 
           class Request < Token::Request
-            attr_accessor :assertion_type, :assertion
+            attr_required :assertion_type, :assertion
 
             def initialize(env)
               super
               @grant_type     = 'assertion'
               @assertion_type = params['assertion_type']
               @assertion      = params['assertion']
-            end
-
-            def required_params
-              super + [:assertion_type, :assertion]
+              attr_missing!
             end
           end
 

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

@@ -11,16 +11,13 @@ module Rack
           end
 
           class Request < Token::Request
-            attr_accessor :code
+            attr_required :code
 
             def initialize(env)
               super
               @grant_type = :authorization_code
               @code       = params['code']
-            end
-
-            def required_params
-              super + [:code]
+              attr_missing!
             end
           end
 

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

@@ -11,17 +11,14 @@ module Rack
           end
 
           class Request < Token::Request
-            attr_reader :username, :password
+            attr_required :username, :password
 
             def initialize(env)
               super
               @grant_type = :password
               @username   = params['username']
               @password   = params['password']
-            end
-
-            def required_params
-              super + [:username, :password]
+              attr_missing!
             end
           end
 

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

@@ -11,16 +11,13 @@ module Rack
           end
 
           class Request < Token::Request
-            attr_reader :refresh_token
+            attr_required :refresh_token
 
             def initialize(env)
               super
               @grant_type    = 'refresh_token'
               @refresh_token = params['refresh_token']
-            end
-
-            def required_params
-              super + [:refresh_token]
+              attr_missing!
             end
           end
 

data/rack-oauth2.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "json", ">= 1.4.3"
   s.add_runtime_dependency "activesupport", ">= 2.3"
   s.add_runtime_dependency "i18n"
+  s.add_runtime_dependency "attr_required", ">= 0.0.2"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "rcov", ">= 0.9"
   s.add_development_dependency "rspec", ">= 2"

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

@@ -12,6 +12,7 @@ describe Rack::OAuth2::Server::Authorize::Request do
   before do
     @app = Rack::OAuth2::Server::Authorize.new(simple_app) do |request, response|
       response.code = "authorization_code"
+      response.redirect_uri ||= "http://client.example.com/callback/pre-registered"
     end
     @request = Rack::MockRequest.new @app
   end

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

@@ -1,3 +1,5 @@
+require 'spec_helper.rb'
+
 describe Rack::OAuth2::Server::Util, ".parse_uri" do
 
   context "when String is given" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  - 1
-  version: 0.2.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - nov matake
@@ -15,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 +09:00
+date: 2010-12-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
@@ -35,9 +37,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 4
@@ -49,9 +53,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 2
         - 3
@@ -62,52 +68,76 @@ dependencies:
   name: i18n
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: attr_required
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 8
         version: "0.8"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 9
         version: "0.9"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         version: "2"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: Rack Middleware for OAuth2 server
 email: nov@matake.jp
 executables: []
@@ -122,7 +152,6 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -175,16 +204,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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
@@ -193,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rack Middleware for OAuth2 server

data/Gemfile.lock

@@ -1,41 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rack-oauth2 (0.2.1)
-      activesupport (>= 2.3)
-      i18n
-      json (= 1.4.3)
-      rack (= 1.1)
-
-GEM
-  specs:
-    activesupport (3.0.1)
-    diff-lcs (1.1.2)
-    i18n (0.4.2)
-    json (1.4.3)
-    rack (1.1.0)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (>= 2.3)
-  i18n
-  json (= 1.4.3)
-  rack (= 1.1)
-  rack-oauth2!
-  rake (>= 0.8)
-  rcov (>= 0.9)
-  rspec (>= 2.0)