Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Release 1.1.pre which is Rails 3 compatible.

  • Loading branch information...
commit 6d6633d1fbf1202c603f438f4ad01f95faffb430 1 parent fdf0686
@josevalim josevalim authored
View
2  CHANGELOG.rdoc
@@ -1,4 +1,4 @@
-== 1.1.0
+== 1.1.pre
* enhancements
* Rails 3 compatibility.
View
2  Gemfile
@@ -1,7 +1,7 @@
source "http://gemcutter.org"
gem "rails", "3.0.0.beta"
-gem "warden", "0.9.2"
+gem "warden", "0.9.3"
gem "sqlite3-ruby", :require => "sqlite3"
gem "webrat", "0.7"
gem "mocha", :require => false
View
26 README.rdoc
@@ -30,24 +30,16 @@ Devise is based on Warden (http://github.com/hassox/warden), a Rack Authenticati
== Installation
-All gems are on gemcutter, so you need to add gemcutter to your sources if you haven't yet:
+Devise master branch now supports Rails 3 and is NOT backward compatible. You can install it as:
- sudo gem sources -a http://gemcutter.org/
+ sudo gem install devise --version=1.1.pre
-Install warden gem if you don't have it installed (requires 0.6.4 or higher):
-
- sudo gem install warden
-
-Install devise gem:
-
- sudo gem install devise
-
-Configure warden and devise gems inside your gemfile:
+After installing them, you need configure warden and devise gems inside your gemfile:
gem 'warden'
gem 'devise'
-Run the generator:
+And run the generator:
rails generate devise_install
@@ -55,6 +47,16 @@ And you're ready to go. The generator will install an initializer which describe
http://rdoc.info/projects/plataformatec/devise
+== Rails 2.3
+
+If you want to use the Rails 2.3.x version, you should do:
+
+ sudo gem install devise --version=1.0.1
+
+Or checkout from the v1.0 branch:
+
+ http://github.com/plataformatec/devise/tree/v1.0
+
== Basic Usage
This is a walkthrough with all steps you need to setup a devise resource, including model, migration, route files, and optional configuration. You MUST also check out the *Generators* section below to help you start.
View
5 Rakefile
@@ -43,8 +43,9 @@ begin
s.homepage = "http://github.com/plataformatec/devise"
s.description = "Flexible authentication solution for Rails with Warden"
s.authors = ['José Valim', 'Carlos Antônio']
- s.files = FileList["[A-Z]*", "{app,config,generators,lib}/**/*", "init.rb"]
- s.add_dependency("warden", "~> 0.9.0")
+ s.files = FileList["[A-Z]*", "{app,config,lib}/**/*"]
+ s.extra_rdoc_files = FileList["[A-Z]*"] - %w(Gemfile Rakefile)
+ s.add_dependency("warden", "~> 0.9.3")
end
Jeweler::GemcutterTasks.new
View
87 devise.gemspec
@@ -5,55 +5,48 @@
Gem::Specification.new do |s|
s.name = %q{devise}
- s.version = "1.0.1"
+ s.version = "1.1.pre"
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+ s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
- s.date = %q{2010-02-15}
+ s.date = %q{2010-02-17}
s.description = %q{Flexible authentication solution for Rails with Warden}
s.email = %q{contact@plataformatec.com.br}
s.extra_rdoc_files = [
- "README.rdoc",
+ "CHANGELOG.rdoc",
+ "MIT-LICENSE",
+ "README.rdoc",
"TODO"
]
s.files = [
"CHANGELOG.rdoc",
+ "Gemfile",
"MIT-LICENSE",
"README.rdoc",
"Rakefile",
"TODO",
- "app/controllers/confirmations_controller.rb",
- "app/controllers/passwords_controller.rb",
- "app/controllers/registrations_controller.rb",
- "app/controllers/sessions_controller.rb",
- "app/controllers/unlocks_controller.rb",
- "app/models/devise_mailer.rb",
- "app/views/confirmations/new.html.erb",
- "app/views/devise_mailer/confirmation_instructions.html.erb",
- "app/views/devise_mailer/reset_password_instructions.html.erb",
- "app/views/devise_mailer/unlock_instructions.html.erb",
- "app/views/passwords/edit.html.erb",
- "app/views/passwords/new.html.erb",
- "app/views/registrations/edit.html.erb",
- "app/views/registrations/new.html.erb",
- "app/views/sessions/new.html.erb",
- "app/views/shared/_devise_links.erb",
- "app/views/unlocks/new.html.erb",
- "generators/devise/USAGE",
- "generators/devise/devise_generator.rb",
- "generators/devise/lib/route_devise.rb",
- "generators/devise/templates/migration.rb",
- "generators/devise/templates/model.rb",
- "generators/devise_install/USAGE",
- "generators/devise_install/devise_install_generator.rb",
- "generators/devise_install/templates/README",
- "generators/devise_install/templates/devise.rb",
- "generators/devise_views/USAGE",
- "generators/devise_views/devise_views_generator.rb",
- "init.rb",
+ "app/controllers/devise/confirmations_controller.rb",
+ "app/controllers/devise/passwords_controller.rb",
+ "app/controllers/devise/registrations_controller.rb",
+ "app/controllers/devise/sessions_controller.rb",
+ "app/controllers/devise/unlocks_controller.rb",
+ "app/models/devise/mailer.rb",
+ "app/views/devise/confirmations/new.html.erb",
+ "app/views/devise/mailer/confirmation_instructions.html.erb",
+ "app/views/devise/mailer/reset_password_instructions.html.erb",
+ "app/views/devise/mailer/unlock_instructions.html.erb",
+ "app/views/devise/passwords/edit.html.erb",
+ "app/views/devise/passwords/new.html.erb",
+ "app/views/devise/registrations/edit.html.erb",
+ "app/views/devise/registrations/new.html.erb",
+ "app/views/devise/sessions/new.html.erb",
+ "app/views/devise/shared/_links.erb",
+ "app/views/devise/unlocks/new.html.erb",
+ "config/locales/en.yml",
"lib/devise.rb",
"lib/devise/controllers/helpers.rb",
"lib/devise/controllers/internal_helpers.rb",
+ "lib/devise/controllers/scoped_views.rb",
"lib/devise/controllers/url_helpers.rb",
"lib/devise/encryptors/authlogic_sha512.rb",
"lib/devise/encryptors/base.rb",
@@ -67,7 +60,6 @@ Gem::Specification.new do |s|
"lib/devise/hooks/rememberable.rb",
"lib/devise/hooks/timeoutable.rb",
"lib/devise/hooks/trackable.rb",
- "lib/devise/locales/en.yml",
"lib/devise/mapping.rb",
"lib/devise/models.rb",
"lib/devise/models/activatable.rb",
@@ -95,7 +87,13 @@ Gem::Specification.new do |s|
"lib/devise/strategies/rememberable.rb",
"lib/devise/strategies/token_authenticatable.rb",
"lib/devise/test_helpers.rb",
- "lib/devise/version.rb"
+ "lib/devise/version.rb",
+ "lib/generators/devise/devise_generator.rb",
+ "lib/generators/devise/templates/migration.rb",
+ "lib/generators/devise_install/devise_install_generator.rb",
+ "lib/generators/devise_install/templates/README",
+ "lib/generators/devise_install/templates/devise.rb",
+ "lib/generators/devise_views/devise_views_generator.rb"
]
s.homepage = %q{http://github.com/plataformatec/devise}
s.rdoc_options = ["--charset=UTF-8"]
@@ -125,6 +123,7 @@ Gem::Specification.new do |s|
"test/mapping_test.rb",
"test/models/authenticatable_test.rb",
"test/models/confirmable_test.rb",
+ "test/models/http_authenticatable_test.rb",
"test/models/lockable_test.rb",
"test/models/recoverable_test.rb",
"test/models/rememberable_test.rb",
@@ -140,25 +139,29 @@ Gem::Specification.new do |s|
"test/rails_app/app/controllers/admins_controller.rb",
"test/rails_app/app/controllers/application_controller.rb",
"test/rails_app/app/controllers/home_controller.rb",
+ "test/rails_app/app/controllers/sessions_controller.rb",
"test/rails_app/app/controllers/users_controller.rb",
"test/rails_app/app/helpers/application_helper.rb",
"test/rails_app/app/mongo_mapper/admin.rb",
"test/rails_app/app/mongo_mapper/user.rb",
+ "test/rails_app/config/application.rb",
"test/rails_app/config/boot.rb",
"test/rails_app/config/environment.rb",
"test/rails_app/config/environments/development.rb",
"test/rails_app/config/environments/production.rb",
"test/rails_app/config/environments/test.rb",
+ "test/rails_app/config/initializers/backtrace_silencers.rb",
+ "test/rails_app/config/initializers/cookie_verification_secret.rb",
"test/rails_app/config/initializers/devise.rb",
"test/rails_app/config/initializers/inflections.rb",
- "test/rails_app/config/initializers/new_rails_defaults.rb",
"test/rails_app/config/initializers/session_store.rb",
"test/rails_app/config/routes.rb",
"test/routes_test.rb",
- "test/support/assertions_helper.rb",
- "test/support/integration_tests_helper.rb",
+ "test/support/assertions.rb",
+ "test/support/helpers.rb",
+ "test/support/integration.rb",
"test/support/test_silencer.rb",
- "test/support/tests_helper.rb",
+ "test/support/webrat/integrations/rails.rb",
"test/test_helper.rb",
"test/test_helpers_test.rb"
]
@@ -168,12 +171,12 @@ Gem::Specification.new do |s|
s.specification_version = 3
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
- s.add_runtime_dependency(%q<warden>, ["~> 0.9.0"])
+ s.add_runtime_dependency(%q<warden>, ["~> 0.9.3"])
else
- s.add_dependency(%q<warden>, ["~> 0.9.0"])
+ s.add_dependency(%q<warden>, ["~> 0.9.3"])
end
else
- s.add_dependency(%q<warden>, ["~> 0.9.0"])
+ s.add_dependency(%q<warden>, ["~> 0.9.3"])
end
end
View
2  lib/devise/hooks/rememberable.rb
@@ -3,7 +3,7 @@
# that specific user and adds a cookie with this user info to sign in this user
# automatically without asking for credentials. Refer to rememberable strategy
# for more info.
-Warden::Manager.after_authentication do |record, warden, options|
+Warden::Manager.prepend_after_authentication do |record, warden, options|
scope = options[:scope]
remember_me = warden.params[scope].try(:fetch, :remember_me, nil)
View
2  lib/devise/version.rb
@@ -1,3 +1,3 @@
module Devise
- VERSION = "1.0.1".freeze
+ VERSION = "1.1.pre".freeze
end

1 comment on commit 6d6633d

@crmne

wow, that was fast! Great job guys

Please sign in to comment.
Something went wrong with that request. Please try again.