jeremydurham-restful_authentication 1.1.5 → 1.1.6

data/generators/authenticated/authenticated_generator.rb

@@ -244,11 +244,20 @@ class AuthenticatedGenerator < Rails::Generator::NamedBase
       unless options[:skip_routes]
         # Note that this fails for nested classes -- you're on your own with setting up the routes.
         m.route_resource  controller_singular_name
-        m.route_resources model_controller_plural_name
+        if options[:stateful]
+          m.route_resources model_controller_plural_name, :member => { :suspend   => :put,
+                                                                       :unsuspend => :put,
+                                                                       :purge     => :delete }
+        else        
+          m.route_resources model_controller_plural_name
+        end
         m.route_name('signup',   '/signup',   {:controller => model_controller_plural_name, :action => 'new'})
         m.route_name('register', '/register', {:controller => model_controller_plural_name, :action => 'create'})
         m.route_name('login',    '/login',    {:controller => controller_controller_name, :action => 'new'})
         m.route_name('logout',   '/logout',   {:controller => controller_controller_name, :action => 'destroy'})
+        if options[:include_activation]
+          m.route_name('activate', '/activate/:activation_code', { :controller => model_controller_plural_name, :action => 'activate', :activation_code => nil })
+        end
       end
     end
 

data/generators/authenticated/lib/insert_routes.rb

@@ -11,13 +11,28 @@ Rails::Generator::Commands::Create.class_eval do
     end
   end
   
+  def route_resources(*resources)
+    resource_options = resources.last.is_a?(Hash) ? resources.pop : nil    
+    resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
+    sentinel = 'ActionController::Routing::Routes.draw do |map|'
+
+    resource_list << ", #{resource_options.inspect}" if resource_options
+    logger.route "map.resources #{resource_list}"
+    unless options[:pretend]
+      gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+        "#{match}\n  map.resources #{resource_list}\n"
+      end
+    end
+  end
+  
   def route_name(name, path, route_options = {})
     sentinel = 'ActionController::Routing::Routes.draw do |map|'
     
-    logger.route "map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
+    routing_options = route_options.map { |k,v| ":#{k} => '#{v}'" }.join(', ')
+    logger.route "map.#{name} '#{path}', #{routing_options}"
     unless options[:pretend]
       gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-        "#{match}\n  map.#{name} '#{path}', :controller => '#{route_options[:controller]}', :action => '#{route_options[:action]}'"
+        "#{match}\n  map.#{name} '#{path}', #{routing_options}"
       end
     end
   end

data/generators/authenticated/templates/migration.rb

@@ -1,26 +1,24 @@
 class <%= migration_name %> < ActiveRecord::Migration
   def self.up
-    create_table "<%= table_name %>", :force => true do |t|
-      t.column :login,                     :string, :limit => 40
-      t.column :name,                      :string, :limit => 100, :default => '', :null => true
-      t.column :email,                     :string, :limit => 100
-      t.column :crypted_password,          :string, :limit => 40
-      t.column :salt,                      :string, :limit => 40
-      t.column :created_at,                :datetime
-      t.column :updated_at,                :datetime
-      t.column :remember_token,            :string, :limit => 40
-      t.column :remember_token_expires_at, :datetime
+    create_table :<%= table_name %>, :force => true do |t|
+      t.string :login, :crypted_password, :salt, :remember_token, :limit => 40
+      t.datetime :remember_token_expires_at
+      t.string :name,                      :limit => 100, :default => '', :null => true
+      t.string :email,                     :limit => 100
 <% if options[:include_activation] -%>
-      t.column :activation_code,           :string, :limit => 40
-      t.column :activated_at,              :datetime<% end %>
+      t.string :activation_code,           :limit => 40
+      t.datetime :activated_at
+<% end -%>
 <% if options[:stateful] -%>
-      t.column :state,                     :string, :null => :no, :default => 'passive'
-      t.column :deleted_at,                :datetime<% end %>
+      t.string :state,                     :null => :no, :default => 'passive'
+      t.datetime :deleted_at
+<% end -%>
+      t.timestamps
     end
     add_index :<%= table_name %>, :login, :unique => true
   end
 
   def self.down
-    drop_table "<%= table_name %>"
+    drop_table :<%= table_name %>
   end
 end

data/generators/authenticated/templates/model_controller.rb

@@ -22,20 +22,29 @@ class <%= model_controller_class_name %>Controller < ApplicationController
     success = @<%= file_name %> && @<%= file_name %>.save
 <% end -%>
     if success && @<%= file_name %>.errors.empty?
-      <% if !options[:include_activation] -%>
+<% if !options[:include_activation] -%>
       # Protects against session fixation attacks, causes request forgery
       # protection if visitor resubmits an earlier form using back
       # button. Uncomment if you understand the tradeoffs.
       # reset session
       self.current_<%= file_name %> = @<%= file_name %> # !! now logged in
       <% end -%>redirect_back_or_default('/')
+<% if options[:include_activation] -%>
       flash[:notice] = "Thanks for signing up!  We're sending you an email with your activation code."
+<% else -%>
+      flash[:notice] = "Thanks for signing up!"
+<% end -%>
     else
-      flash[:error]  = "We couldn't set up that account, sorry.  Please try again, or contact an admin (link is above)."
+<% if options[:include_activation] -%>
+      flash[:error] = "We couldn't set up that account, sorry.  Please try again, or contact an admin (link is above)."
+<% else -%>
+      flash[:error] = "We couldn't create your account, sorry."
+<% end -%>
       render :action => 'new'
     end
   end
-<% if options[:include_activation] %>
+  
+<% if options[:include_activation] -%>
   def activate
     logout_keeping_session!
     <%= file_name %> = <%= class_name %>.find_by_activation_code(params[:activation_code]) unless params[:activation_code].blank?
@@ -52,7 +61,9 @@ class <%= model_controller_class_name %>Controller < ApplicationController
       redirect_back_or_default('/')
     end
   end
-<% end %><% if options[:stateful] %>
+<% end -%>
+
+<% if options[:stateful] -%>
   def suspend
     @<%= file_name %>.suspend! 
     redirect_to <%= model_controller_routing_name %>_path

data/restful_authentication.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jeremydurham-restful_authentication}
-  s.version = "1.1.5"
+  s.version = "1.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RailsJedi", "Rick Olson"]
-  s.date = %q{2009-11-30}
+  s.date = %q{2009-12-09}
   s.description = %q{This widely-used plugin provides a foundation for securely managing user.}
   s.email = %q{railsjedi@gmail.com}
   s.extra_rdoc_files = ["README.textile"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremydurham-restful_authentication
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors: 
 - RailsJedi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -05:00
+date: 2009-12-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency