Release 1.1.2.

CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 1.1.2
+
+* bugfix
+  * Compatibility with latest Rails routes schema
+
+== 1.1.1
+
+* bugfix
+  * Fix a small bug where generated locale file was empty on devise:install
+
 == 1.1.0
 
 * enhancements

Gemfile

@@ -1,11 +1,6 @@
 source "http://rubygems.org"
 
-if File.exist? File.expand_path('../../rails', __FILE__)
-  gem "rails", :path => "../rails"
-else
-  gem "rails", :git => "git://github.com/rails/rails.git"
-end
-
+gem "rails", "3.0.0.rc2"
 gem "warden", "0.10.7"
 gem "sqlite3-ruby"
 gem "webrat", "0.7.0"
@@ -18,6 +13,6 @@ end
 
 group :mongoid do
   gem "mongo"
-  gem "mongoid", :git => "git://github.com/durran/mongoid.git"
+  gem "mongoid", :git => "git://github.com/mongoid/mongoid.git"
   gem "bson_ext"
 end

Gemfile.lock

@@ -1,62 +1,45 @@
 GIT
-  remote: git://github.com/durran/mongoid.git
-  revision: a5abe21
+  remote: git://github.com/mongoid/mongoid.git
+  revision: f38e3ef
   specs:
-    mongoid (2.0.0.beta9)
-      activemodel (~> 3.0.0.beta)
-      bson (~> 1.0.3)
-      mongo (~> 1.0.3)
+    mongoid (2.0.0.beta.16)
+      activemodel (~> 3.0.0)
+      bson (= 1.0.4)
+      mongo (= 1.0.7)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
 
-PATH
-  remote: /Users/jose/Work/github/rails
-  specs:
-    actionmailer (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      mail (~> 2.2.5)
-    actionpack (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.9)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.22)
-    activemodel (3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      arel (~> 0.4.0)
-      tzinfo (~> 0.3.22)
-    activeresource (3.0.0.beta4)
-      activemodel (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-    activesupport (3.0.0.beta4)
-    rails (3.0.0.beta4)
-      actionmailer (= 3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activerecord (= 3.0.0.beta4)
-      activeresource (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      bundler (>= 1.0.0.beta.10)
-      railties (= 3.0.0.beta4)
-    railties (3.0.0.beta4)
-      actionpack (= 3.0.0.beta4)
-      activesupport (= 3.0.0.beta4)
-      rake (>= 0.8.3)
-      thor (~> 0.14.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    arel (0.4.0)
+    actionmailer (3.0.0.rc2)
+      actionpack (= 3.0.0.rc2)
+      mail (~> 2.2.5)
+    actionpack (3.0.0.rc2)
+      activemodel (= 3.0.0.rc2)
+      activesupport (= 3.0.0.rc2)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.0.rc2)
+      activesupport (= 3.0.0.rc2)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0.rc2)
+      activemodel (= 3.0.0.rc2)
+      activesupport (= 3.0.0.rc2)
+      arel (~> 1.0.0.rc1)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0.rc2)
+      activemodel (= 3.0.0.rc2)
+      activesupport (= 3.0.0.rc2)
+    activesupport (3.0.0.rc2)
+    arel (1.0.0.rc1)
       activesupport (>= 3.0.0.beta)
     bcrypt-ruby (2.1.2)
     bson (1.0.4)
@@ -74,15 +57,28 @@ GEM
     mime-types (1.16)
     mocha (0.9.8)
       rake
-    mongo (1.0.5)
+    mongo (1.0.7)
       bson (>= 1.0.4)
-    nokogiri (1.4.2)
+    nokogiri (1.4.3.1)
     polyglot (0.3.1)
     rack (1.2.1)
-    rack-mount (0.6.9)
+    rack-mount (0.6.12)
       rack (>= 1.0.0)
     rack-test (0.5.4)
       rack (>= 1.0)
+    rails (3.0.0.rc2)
+      actionmailer (= 3.0.0.rc2)
+      actionpack (= 3.0.0.rc2)
+      activerecord (= 3.0.0.rc2)
+      activeresource (= 3.0.0.rc2)
+      activesupport (= 3.0.0.rc2)
+      bundler (>= 1.0.0.rc.6)
+      railties (= 3.0.0.rc2)
+    railties (3.0.0.rc2)
+      actionpack (= 3.0.0.rc2)
+      activesupport (= 3.0.0.rc2)
+      rake (>= 0.8.3)
+      thor (~> 0.14.0)
     rake (0.8.7)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
@@ -93,14 +89,14 @@ GEM
     thor (0.14.0)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.22)
+    tzinfo (0.3.23)
     warden (0.10.7)
       rack (>= 1.0.0)
     webrat (0.7.0)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (3.0.pre)
+    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
@@ -111,7 +107,7 @@ DEPENDENCIES
   mocha
   mongo
   mongoid!
-  rails!
+  rails (= 3.0.0.rc2)
   ruby-debug (>= 0.10.3)
   sqlite3-ruby
   warden (= 0.10.7)

devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise}
-  s.version = "1.1.0"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
-  s.date = %q{2010-07-26}
+  s.date = %q{2010-08-25}
   s.description = %q{Flexible authentication solution for Rails with Warden}
   s.email = %q{contact@plataformatec.com.br}
   s.extra_rdoc_files = [
@@ -97,12 +97,12 @@ Gem::Specification.new do |s|
      "lib/generators/devise/devise_generator.rb",
      "lib/generators/devise/install_generator.rb",
      "lib/generators/devise/orm_helpers.rb",
-     "lib/generators/devise/templates/README",
-     "lib/generators/devise/templates/devise.rb",
      "lib/generators/devise/views_generator.rb",
      "lib/generators/devise_install_generator.rb",
      "lib/generators/devise_views_generator.rb",
-     "lib/generators/mongoid/devise_generator.rb"
+     "lib/generators/mongoid/devise_generator.rb",
+     "lib/generators/templates/README",
+     "lib/generators/templates/devise.rb"
   ]
   s.homepage = %q{http://github.com/plataformatec/devise}
   s.rdoc_options = ["--charset=UTF-8"]

lib/devise/rails/routes.rb

@@ -202,10 +202,10 @@ module ActionDispatch::Routing
     protected
 
       def devise_session(mapping, controllers) #:nodoc:
-        scope :controller => controllers[:sessions], :as => :session do
-          get  :new,     :path => mapping.path_names[:sign_in]
-          post :create,  :path => mapping.path_names[:sign_in], :as => ""
-          get  :destroy, :path => mapping.path_names[:sign_out]
+        resource :session, :only => [], :controller => controllers[:sessions], :path => "" do
+          get  :new,     :path => mapping.path_names[:sign_in],  :as => "new"
+          post :create,  :path => mapping.path_names[:sign_in]
+          get  :destroy, :path => mapping.path_names[:sign_out], :as => "destroy"
         end
       end
  

lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.2".freeze
 end

lib/generators/devise/install_generator.rb

@@ -3,7 +3,7 @@ require 'active_support/secure_random'
 module Devise
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("../../templates", __FILE__)
 
       desc "Creates a Devise initializer and copy locale files to your application."
       class_option :orm
@@ -13,11 +13,11 @@ module Devise
       end
 
       def copy_locale
-        copy_file "../../../../config/locales/en.yml", "config/locales/devise.en.yml"
+        copy_file "../../../config/locales/en.yml", "config/locales/devise.en.yml"
       end
 
       def show_readme
-        readme "README"
+        readme "README" if behavior == :invoke
       end
     end
   end