rack-couchdb-oauth2 0.2.0 → 0.3.0

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem 'rack'
 gem 'couchrest'
-gem 'couchrest_model', :git => 'git://github.com/couchrest/couchrest_model.git'
+gem 'couchrest_model', '>= 1.1.1'
 gem 'activesupport'
 gem 'rack-oauth2'
 gem 'bcrypt-ruby'

data/Gemfile.lock

@@ -1,13 +1,3 @@
-GIT
-  remote: git://github.com/couchrest/couchrest_model.git
-  revision: dca47ac3b2b6fd5a4f3ee131083dde4a5cd2b8db
-  specs:
-    couchrest_model (1.1.0.rc1)
-      activemodel (~> 3.0)
-      couchrest (= 1.1.0.pre3)
-      mime-types (~> 1.15)
-      tzinfo (~> 0.3.22)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -19,14 +9,19 @@ GEM
     attr_required (0.0.3)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
-    couchrest (1.1.0.pre3)
+    couchrest (1.1.1)
       mime-types (~> 1.15)
       multi_json (~> 1.0.0)
       rest-client (~> 1.6.1)
+    couchrest_model (1.1.1)
+      activemodel (~> 3.0)
+      couchrest (= 1.1.1)
+      mime-types (~> 1.15)
+      tzinfo (~> 0.3.22)
     git (1.2.5)
     httpclient (2.2.1)
     i18n (0.5.0)
-    jeweler (1.6.2)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
@@ -34,7 +29,7 @@ GEM
     mime-types (1.16)
     multi_json (1.0.3)
     rack (1.3.0)
-    rack-oauth2 (0.8.2)
+    rack-oauth2 (0.8.3)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
@@ -47,7 +42,7 @@ GEM
     rcov (0.9.9)
     rest-client (1.6.3)
       mime-types (>= 1.16)
-    tzinfo (0.3.28)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
@@ -57,7 +52,7 @@ DEPENDENCIES
   bcrypt-ruby
   bundler (~> 1.0.0)
   couchrest
-  couchrest_model!
+  couchrest_model (>= 1.1.1)
   jeweler (~> 1.6.2)
   rack
   rack-oauth2

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/couchdb_oauth2/model/access_token.rb

@@ -6,6 +6,16 @@ class AccessToken < CouchRest::Model::Base
   belongs_to :refresh_token
   timestamps!
   
+  def self.find_by_env(env)
+    request = Rack::OAuth2::Server::Resource::Bearer::Request.new(env)
+    return nil unless request && request.oauth2?
+    request.setup!
+    token = self.find_by_token request.access_token
+    (token.nil? || token.expired?) ? nil : token
+  rescue
+    nil
+  end
+  
   def to_bearer_token(with_refresh_token = false)
     bearer_token = Rack::OAuth2::AccessToken::Bearer.new(
       :access_token => self.token,

data/lib/couchdb_oauth2/model/oauth2_token.rb

@@ -17,16 +17,7 @@ module Oauth2Token
       
       before_validation :setup, :on => :create
       validates :client, :expires_at, :account, :presence => true
-      validates :token, :presence => true, :uniqueness => true
-      
-      def self.find_by_env(env)
-        token = find_by_token(env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN])
-        if token.nil? || token.expired?
-          nil
-        else
-          token
-        end
-      end
+      validates :token, :presence => true, :uniqueness => true      
       
       def self.valid
         view(:by_expires_at, :startkey => Time.now.utc)

data/rack-couchdb-oauth2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-couchdb-oauth2}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Lu"]
-  s.date = %q{2011-06-27}
+  s.date = %q{2011-07-11}
   s.description = %q{Rack middleware for OAuth2 Provider Server Based on Couchdb}
   s.email = %q{iamawalrus@gmail.com}
   s.extra_rdoc_files = [
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<couchrest>, [">= 0"])
-      s.add_runtime_dependency(%q<couchrest_model>, [">= 0"])
+      s.add_runtime_dependency(%q<couchrest_model>, [">= 1.1.1"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<rack-oauth2>, [">= 0"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
@@ -66,7 +66,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<couchrest>, [">= 0"])
-      s.add_dependency(%q<couchrest_model>, [">= 0"])
+      s.add_dependency(%q<couchrest_model>, [">= 1.1.1"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rack-oauth2>, [">= 0"])
       s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
@@ -78,7 +78,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<couchrest>, [">= 0"])
-    s.add_dependency(%q<couchrest_model>, [">= 0"])
+    s.add_dependency(%q<couchrest_model>, [">= 1.1.1"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rack-oauth2>, [">= 0"])
     s.add_dependency(%q<bcrypt-ruby>, [">= 0"])

data/test/test_token.rb

@@ -22,12 +22,9 @@ class TestToken < Test::Unit::TestCase
       end
       
       map '/db' do
-        use Rack::OAuth2::Server::Resource::Bearer, 'test' do |req|
-          
-        end
         run proc {|env| 
           token = AccessToken.find_by_env(env)
-          raise 'no client' if token.nil?
+          raise 'no token' if token.nil?
           [200, {}, 'OK']
         }
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-couchdb-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Robin Lu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 +08:00
+date: 2011-07-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,10 +54,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 17
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
   name: couchrest_model
   version_requirements: *id003
 - !ruby/object:Gem::Dependency