salted_login_generator 1.1.0 → 1.1.1

data/templates/controller.rb

@@ -3,7 +3,7 @@ class <%= class_name %>Controller < ApplicationController
   layout  'scaffold'
 
   def login
-    generate_blank
+    return if generate_blank
     @<%= singular_name %> = <%= class_name %>.new(@params['<%= singular_name %>'])
     if @session['<%= singular_name %>'] = <%= class_name %>.authenticate(@params['<%= singular_name %>']['login'], @params['<%= singular_name %>']['password'])
       flash['notice'] = l(:<%= singular_name %>_login_succeeded)
@@ -15,7 +15,7 @@ class <%= class_name %>Controller < ApplicationController
   end
 
   def signup
-    generate_blank
+    return if generate_blank
     @params['<%= singular_name %>'].delete('form')
     @<%= singular_name %> = <%= class_name %>.new(@params['<%= singular_name %>'])
     begin
@@ -41,7 +41,7 @@ class <%= class_name %>Controller < ApplicationController
   end
 
   def change_password
-    generate_filled_in
+    return if generate_filled_in
     @params['<%= singular_name %>'].delete('form')
     begin
       <%= class_name %>.transaction(@<%= singular_name %>) do
@@ -64,13 +64,8 @@ class <%= class_name %>Controller < ApplicationController
       return
     end
 
-    case @request.method
-    # Render on :get
-    when :get
-      @<%= singular_name %> = <%= class_name %>.new
-      render
-      return
-    end
+    # Render on :get and render
+    return if generate_blank
 
     # Handle the :post
     if @params['<%= singular_name %>']['email'].empty?
@@ -98,7 +93,7 @@ class <%= class_name %>Controller < ApplicationController
   end
 
   def edit
-    generate_filled_in
+    return if generate_filled_in
     if @params['<%= singular_name %>']['form']
       form = @params['<%= singular_name %>'].delete('form')
       begin
@@ -175,8 +170,9 @@ class <%= class_name %>Controller < ApplicationController
     when :get
       @<%= singular_name %> = <%= class_name %>.new
       render
-      return
+      return true
     end
+    return false
   end
 
   # Generate a template <%= singular_name %> for certain actions on get
@@ -185,7 +181,8 @@ class <%= class_name %>Controller < ApplicationController
     case @request.method
     when :get
       render
-      return
+      return true
     end
+    return false
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: salted_login_generator
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2005-07-31
+  version: 1.1.1
+date: 2005-08-02
 summary: "[Rails] Login generator with salted passwords."
 require_paths: 
   - "."