doorkeeper 0.6.0 → 0.6.1

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.6.1
+
+- bugfixes
+  - [#160] Removed |routes| argument from initializer authenticator blocks
+- documentation
+  - [#160] Fixed description of context of authenticator blocks
+
 ## 0.6.0
 
 - enhancements

data/README.md

@@ -101,22 +101,26 @@ You need to configure Doorkeeper in order to provide resource_owner model and au
 
 ``` ruby
 Doorkeeper.configure do
-  resource_owner_authenticator do |routes|
-    current_user || redirect_to(routes.login_url) # returns nil if current_user is not logged in
+  resource_owner_authenticator do
+    User.find(session[:current_user_id]) || redirect_to(login_url)
   end
 end
 ```
 
-This block runs into the context of your Rails application, and it has access to `current_user` method, for example.
+This code is run in the context of your application so you have access to your models, session or routes helpers. However,
+since this code is not run in the context of your application's ApplicationController it doesn't have access
+to the methods defined over there.
 
 If you use [devise](https://github.com/plataformatec/devise), you may want to use warden to authenticate the block:
 
 ``` ruby
-resource_owner_authenticator do |routes|
+resource_owner_authenticator do
   current_user || warden.authenticate!(:scope => :user)
 end
 ```
 
+Side note: when using devise you have access to current_user as devise extends entire ActionController::Base with the current_#{mapping}.
+
 If you are not using devise, you may want to check other ways of authentication [here](https://github.com/applicake/doorkeeper/wiki/Authenticating-using-Clearance-DIY).
 
 ## Protecting resources with OAuth (a.k.a your API endpoint)

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/generators/doorkeeper/templates/initializer.rb

@@ -4,22 +4,18 @@ Doorkeeper.configure do
   orm :active_record
 
   # This block will be called to check whether the resource owner is authenticated or not.
-  resource_owner_authenticator do |routes|
+  resource_owner_authenticator do
     raise "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"
     # Put your resource owner authentication logic here.
-    # If you want to use named routes from your app, you need to call them on the routes object.
-    # For example:
-    #   routes.new_user_session_path
     # Example implementation:
-    #   User.find_by_id(session[:user_id]) || redirect_to(routes.new_user_session_url)
+    #   User.find_by_id(session[:user_id]) || redirect_to(new_user_session_url)
   end
 
   # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
-  # admin_authenticator do |routes|
+  # admin_authenticator do
   #   # Put your admin authentication logic here.
-  #   # If you want to use named routes from your app, you need to call them on routes object, e.g., routes.new_admin_session_path
   #   # Example implementation:
-  #   Admin.find_by_id(session[:admin_id]) || redirect_to(routes.new_admin_session_url)
+  #   Admin.find_by_id(session[:admin_id]) || redirect_to(new_admin_session_url)
   # end
 
   # Authorization Code expiration time (default 10 minutes).

data/spec/dummy/config/initializers/doorkeeper.rb

@@ -5,24 +5,18 @@ Doorkeeper.configure do
 
   # This block will be called to check whether the
   # resource owner is authenticated or not
-  resource_owner_authenticator do |routes|
+  resource_owner_authenticator do
     # Put your resource owner authentication logic here.
-    # If you want to use named routes from your app you need
-    # to call them on routes object eg.
-    # routes.new_user_session_path
-    # e.g. User.find_by_id(session[:user_id]) || redirect_to(routes.new_user_session_url)
-    User.find_by_id(session[:user_id]) || redirect_to(routes.root_url, :alert => "Needs sign in.")
+    # e.g. User.find_by_id(session[:user_id]) || redirect_to(new_user_session_url)
+    User.find_by_id(session[:user_id]) || redirect_to(root_url, :alert => "Needs sign in.")
   end
 
   # If you want to restrict the access to the web interface for
   # adding oauth authorized applications you need to declare the
   # block below
-  # admin_authenticator do |routes|
+  # admin_authenticator do
   #   # Put your admin authentication logic here.
-  #   # If you want to use named routes from your app you need
-  #   # to call them on routes object eg.
-  #   # routes.new_admin_session_path
-  #   Admin.find_by_id(session[:admin_id]) || redirect_to(routes.new_admin_session_url)
+  #   Admin.find_by_id(session[:admin_id]) || redirect_to(new_admin_session_url)
   # end
 
   # Authorization Code expiration time (default 10 minutes).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70291103985780 !ruby/object:Gem::Requirement
+  requirement: &70219049574960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70291103985780
+  version_requirements: *70219049574960
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70291104000920 !ruby/object:Gem::Requirement
+  requirement: &70219049571320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70291104000920
+  version_requirements: *70219049571320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70291103998100 !ruby/object:Gem::Requirement
+  requirement: &70219049581140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.11.4
   type: :development
   prerelease: false
-  version_requirements: *70291103998100
+  version_requirements: *70219049581140
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70291104056620 !ruby/object:Gem::Requirement
+  requirement: &70219049584040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70291104056620
+  version_requirements: *70219049584040
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &70291104052840 !ruby/object:Gem::Requirement
+  requirement: &70219049597420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *70291104052840
+  version_requirements: *70219049597420
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70291104065760 !ruby/object:Gem::Requirement
+  requirement: &70219049607540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.4
   type: :development
   prerelease: false
-  version_requirements: *70291104065760
+  version_requirements: *70219049607540
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70291104063100 !ruby/object:Gem::Requirement
+  requirement: &70219049604780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *70291104063100
+  version_requirements: *70219049604780
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70291104059980 !ruby/object:Gem::Requirement
+  requirement: &70219049603620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70291104059980
+  version_requirements: *70219049603620
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70291104084240 !ruby/object:Gem::Requirement
+  requirement: &70219049602680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70291104084240
+  version_requirements: *70219049602680
 description: Doorkeeper is an OAuth 2 provider for Rails.
 email:
 - felipe@applicake.com
@@ -360,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1014835453915892093
+      hash: -1225818604492077819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -369,10 +369,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1014835453915892093
+      hash: -1225818604492077819
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Doorkeeper is an OAuth 2 provider for Rails.