oauth2-rack 0.0.1 → 0.0.2

data/.gitignore

@@ -8,6 +8,5 @@ TAGS
 .rvmrc
 .yardoc
 /doc/*
-Gemfile.lock
 *.gem
 pkg/*

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.1
+  - 1.9.2
+  - jruby
+  - rbx
+  - ree
+  - ruby-head

data/Gemfile

@@ -1,7 +1,15 @@
+source 'http://ruby.taobao.org'
 source :rubygems
 
 gemspec
 
-gem 'libnotify'
-gem 'rb-inotify'
+group :linux_development do
+  gem 'libnotify'
+  gem 'rb-inotify'
+end
+
+group :mac_development do
+  gem 'rb-fsevent'
+  gem 'growl'
+end
 

data/Gemfile.lock

@@ -0,0 +1,62 @@
+PATH
+  remote: .
+  specs:
+    oauth2-rack (0.0.2)
+      multi_json
+      rack
+
+GEM
+  remote: http://ruby.taobao.org/
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    diff-lcs (1.1.2)
+    faraday (0.7.4)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.0)
+      rack (>= 1.1.0, < 2)
+    ffi (1.0.9)
+    growl (1.0.3)
+    guard (0.6.2)
+      thor (~> 0.14.6)
+    guard-rspec (0.4.3)
+      guard (>= 0.4.0)
+    libnotify (0.5.7)
+    multi_json (1.0.3)
+    multipart-post (1.1.3)
+    oauth2 (0.5.0)
+      faraday (>= 0.6.1, < 0.8)
+      multi_json (~> 1.0.0)
+    rack (1.3.2)
+    rake (0.9.2)
+    rb-fsevent (0.4.3.1)
+    rb-inotify (0.8.6)
+      ffi (>= 0.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    shotgun (0.9)
+      rack (>= 1.0)
+    thor (0.14.6)
+    yard (0.7.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  growl
+  guard-rspec
+  libnotify
+  oauth2
+  oauth2-rack!
+  rake
+  rb-fsevent
+  rb-inotify
+  rspec
+  shotgun
+  yard

data/LICENSE.md

@@ -0,0 +1,23 @@
+LICENSE
+
+The MIT License
+
+Copyright (c) 2011 Ian Yang
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,31 @@
+# OAuth2 Rack
+
+OAuth2 Rack implements OAuth2 provider in Rack.
+
+
+## Usage
+
+See an example in `config.ru`.
+
+## Continuous Integration
+
+[![Build Status](http://travis-ci.org/doitian/oauth2-rack.png)](http://travis-ci.org/doitian/oauth2-rack)
+
+## Contributing
+
+Forck the repository, make your changes and issue a pull request. Do add test
+cases so I won't break your code in feature releases.
+
+### Bunder ###
+
+For Linux:
+
+    bundle install --without mac_development
+
+For Mac:
+
+    bundle install --without linux_development
+
+## License
+
+oauth2-rack is licensed under the MIT License.

data/Rakefile

@@ -2,3 +2,5 @@ require 'rspec/core/rake_task'
 require 'bundler/gem_tasks'
 
 RSpec::Core::RakeTask.new
+
+task :default => :spec

data/lib/oauth2/rack/authentication/client/http_basic.rb

@@ -1,6 +1,6 @@
 require 'oauth2/rack'
 
-# 2.4.1. Client Password
+# 2.3.1. Client Password
 class OAuth2::Rack::Authentication::Client::HTTPBasic
   HEADER_KEYS = ['HTTP_AUTHORIZATION', 'X-HTTP_AUTHORIZATION', 'X_HTTP_AUTHORIZATION']
 
@@ -28,7 +28,9 @@ class OAuth2::Rack::Authentication::Client::HTTPBasic
     end
 
     client_id, client_secret = credentials.unpack('m*').first.split(':', 2)
-    client = @authenticator.call(:client_id => client_id, :client_secret => client_secret)
+    client = @authenticator.call(:client_id => client_id,
+                                 :client_secret => client_secret)
+
     if client
       env['oauth2.client'] = client
       @app.call(env)

data/lib/oauth2/rack/authentication/client/request_params.rb

@@ -1,6 +1,6 @@
 require 'oauth2/rack'
 
-# 2.4.1. Client Password
+# 2.3.1. Client Password
 # Send client_id and client_secret in request params
 class OAuth2::Rack::Authentication::Client::RequestParams
   def initialize(app, opts = {}, &authenticator)
@@ -23,7 +23,8 @@ class OAuth2::Rack::Authentication::Client::RequestParams
       return bad_request
     end
 
-    client = @authenticator.call(:client_id => client_id, :client_secret => client_secret)
+    client = @authenticator.call(:client_id => client_id,
+                                 :client_secret => client_secret)
     if client
       env['oauth2.client'] = client
       @app.call(env)

data/lib/oauth2/rack/authentication/resource_owner/request_params.rb

@@ -22,7 +22,13 @@ class OAuth2::Rack::Authentication::ResourceOwner::RequestParams
       return bad_request
     end
 
-    resource_owner = @authenticator.call(:username => username, :password => password)
+    credentials = {
+      :username => username,
+      :password => password
+    }
+    credentials[:client] = env['oauth2.client'] if env['oauth2.client']
+    resource_owner = @authenticator.call credentials
+
     if resource_owner
       env['oauth2.resource_owner'] = resource_owner
       @app.call(env)
@@ -30,7 +36,7 @@ class OAuth2::Rack::Authentication::ResourceOwner::RequestParams
       unauthorized
     end
   end
-  
+
   private
   def authenticate(opts)
     @authenticator && @authenticator.call(opts)

data/lib/oauth2/rack/version.rb

@@ -0,0 +1,5 @@
+module OAuth2
+  module Rack
+    VERSION = "0.0.2"
+  end
+end

data/oauth2-rack.gemspec

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "oauth2/rack/version"
+
+Gem::Specification.new do |s|
+  s.name        = "oauth2-rack"
+  s.version     = OAuth2::Rack::VERSION
+  s.authors     = ["Ian Yang"]
+  s.email       = ["me@iany.me"]
+  s.homepage    = "https://github.com/doitian/oauth2-rack"
+  s.summary     = %q{Rack middlewares for OAuth2 authorization server and resource server}
+  s.description = %q{Rack middlewares for OAuth2 authorization server and resource server}
+  s.license     = 'MIT'
+  s.rubyforge_project = "oauth2-rack"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency 'multi_json'
+  s.add_runtime_dependency 'rack'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'shotgun'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'oauth2'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth2-rack
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-12-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &8610000 !ruby/object:Gem::Requirement
+  requirement: &2152835660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8610000
+  version_requirements: *2152835660
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &8609580 !ruby/object:Gem::Requirement
+  requirement: &2152835060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8609580
+  version_requirements: *2152835060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8609160 !ruby/object:Gem::Requirement
+  requirement: &2152834500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8609160
+  version_requirements: *2152834500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8608740 !ruby/object:Gem::Requirement
+  requirement: &2152828640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8608740
+  version_requirements: *2152828640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &8608320 !ruby/object:Gem::Requirement
+  requirement: &2152828100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8608320
+  version_requirements: *2152828100
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &8607900 !ruby/object:Gem::Requirement
+  requirement: &2152827500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8607900
+  version_requirements: *2152827500
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &8607480 !ruby/object:Gem::Requirement
+  requirement: &2152826840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8607480
+  version_requirements: *2152826840
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &8607060 !ruby/object:Gem::Requirement
+  requirement: &2152826100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8607060
+  version_requirements: *2152826100
 description: Rack middlewares for OAuth2 authorization server and resource server
 email:
 - me@iany.me
@@ -108,8 +108,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
+- Gemfile.lock
 - Guardfile
+- LICENSE.md
+- README.md
 - Rakefile
 - config.ru
 - examples/ruby-client/password_authorization.rb
@@ -126,6 +130,8 @@ files:
 - lib/oauth2/rack/authorization/client_credentials/access_token_issuer.rb
 - lib/oauth2/rack/authorization/password.rb
 - lib/oauth2/rack/authorization/password/access_token_issuer.rb
+- lib/oauth2/rack/version.rb
+- oauth2-rack.gemspec
 - spec/oauth2/rack/authentication/client/http_basic_spec.rb
 - spec/oauth2/rack/authentication/client/request_params_spec.rb
 - spec/oauth2/rack/authentication/resource_owner/request_params_spec.rb
@@ -134,7 +140,8 @@ files:
 - spec/spec_helper.rb
 - spec/support/rake_test_helper.rb
 homepage: https://github.com/doitian/oauth2-rack
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -145,15 +152,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4282263229156932656
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4282263229156932656
 requirements: []
 rubyforge_project: oauth2-rack
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rack middlewares for OAuth2 authorization server and resource server