salted_login_generator 1.0.9 → 1.1.0

data/templates/README

@@ -185,7 +185,7 @@ automatically on startup.
 
 == Changelog
 
-1.0.9 Fixed hardcoded generator name (in controller test) and README fixes
+1.0.9 Fixed hardcoded generator name (in controller test and schema) and README
 1.0.8 Generator/schema fixes and some README fixes/improvements
 1.0.7 Fixed bad bug with missing attr_accessor :new_password in user class
 1.0.6 Proper delete support and bug fixes

data/templates/controller.rb

@@ -69,6 +69,7 @@ class <%= class_name %>Controller < ApplicationController
     when :get
       @<%= singular_name %> = <%= class_name %>.new
       render
+      return
     end
 
     # Handle the :post
@@ -84,7 +85,10 @@ class <%= class_name %>Controller < ApplicationController
           url += "?<%= singular_name %>[id]=#{<%= singular_name %>.id}&key=#{key}"
           <%= class_name %>Notify.deliver_forgot_password(<%= singular_name %>, url)
           flash['notice'] = l(:<%= singular_name %>_forgotten_password_emailed, "#{@params['<%= singular_name %>']['email']}")
-          redirect_to :action => 'login' unless <%= singular_name %>?
+          unless <%= singular_name %>?
+            redirect_to :action => 'login'
+            return
+          end
           redirect_back_or_default :action => 'welcome'
         end
       rescue
@@ -129,7 +133,6 @@ class <%= class_name %>Controller < ApplicationController
         destroy(@<%= singular_name %>)
       end
       logout
-      redirect_to :action => 'login'
     rescue
       flash.now['message'] = l(:<%= singular_name %>_delete_email_error, "#{@<%= singular_name %>['email']}")
       redirect_back_or_default :action => 'welcome'
@@ -172,6 +175,7 @@ class <%= class_name %>Controller < ApplicationController
     when :get
       @<%= singular_name %> = <%= class_name %>.new
       render
+      return
     end
   end
 
@@ -181,6 +185,7 @@ class <%= class_name %>Controller < ApplicationController
     case @request.method
     when :get
       render
+      return
     end
   end
 end

data/templates/controller_test.rb

@@ -22,7 +22,7 @@ class <%= class_name %>ControllerTest < Test::Unit::TestCase
 
     assert_equal @bob, @response.session["<%= singular_name %>"]
     
-    assert_redirect_url "/bogus/location"
+    assert_redirect_url "http://#{@request.host}/bogus/location"
   end
   
   def do_test_signup(bad_password, bad_email)

data/templates/mock_notify.rb

@@ -4,15 +4,13 @@ ActionMailer::Base.class_eval {
   @@inject_one_error = false
   cattr_accessor :inject_one_error
 
-  class << self
-    private
-    def perform_delivery_test(mail)
-      if inject_one_error
-        ActionMailer::Base::inject_one_error = false
-        raise "Failed to send email" if raise_delivery_errors
-      else
-        deliveries << mail
-      end
+  private
+  def perform_delivery_test(mail)
+    if inject_one_error
+      ActionMailer::Base::inject_one_error = false
+      raise "Failed to send email" if raise_delivery_errors
+    else
+      deliveries << mail
     end
   end
 }

data/templates/user.rb

@@ -1,23 +1,5 @@
 require 'digest/sha1'
 
-ActiveRecord::Validations::ClassMethods.module_eval {
-  public
-  def validate_on_virtual(*methods, &block)
-    methods << block if block_given?
-    write_inheritable_set(:validate_on_virtual, methods)
-  end
-
-  private
-  def validation_method(on)
-    case on
-    when :save   then :validate
-    when :create then :validate_on_create
-    when :update then :validate_on_update
-    when :virtual then :validate_on_virtual
-    end
-  end
-}
-
 # this model expects a certain database layout and its based on the name/login pattern. 
 class <%= class_name %> < ActiveRecord::Base
 
@@ -79,17 +61,11 @@ class <%= class_name %> < ActiveRecord::Base
     @new_password = true
   end
     
-  def valid?
-    super
-    run_validations(:validate_on_virtual) if virtual_validations?
-    errors.empty?
-  end
-
   protected
 
   attr_accessor :password, :password_confirmation
 
-  def virtual_validations?
+  def validate_password?
     @new_password
   end
 
@@ -130,9 +106,9 @@ class <%= class_name %> < ActiveRecord::Base
   validates_uniqueness_of :login, :on => :create
   validates_uniqueness_of :email, :on => :create
 
-  validates_presence_of :password, :on => :virtual
-  validates_confirmation_of :password, :on => :virtual
-  validates_length_of :password, { :minimum => 5, :on => :virtual }
-  validates_length_of :password, { :maximum => 40, :on => :virtual }
+  validates_presence_of :password, :if => :validate_password?
+  validates_confirmation_of :password, :if => :validate_password?
+  validates_length_of :password, { :minimum => 5, :if => :validate_password? }
+  validates_length_of :password, { :maximum => 40, :if => :validate_password? }
 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.0.9
-date: 2005-05-19
+  version: 1.1.0
+date: 2005-07-31
 summary: "[Rails] Login generator with salted passwords."
 require_paths: 
   - "."
@@ -74,5 +74,5 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.10.0
+            version: 0.13.1
       version: