Changeset 446

Timestamp:

08/24/06 02:43:25 (2 years ago)

Author:

snowblink

Message:

Merged LoginEngine? rb_1.0 changes r362:443 into trunk.
Corresponds to tagged release LoginEngine? 1.0.3

Files:

• login_engine/trunk/CHANGELOG (modified) (1 diff)
• login_engine/trunk/README (modified) (4 diffs)
• login_engine/trunk/app/controllers/user_controller.rb (modified) (3 diffs)
• login_engine/trunk/app/views/user/_edit.rhtml (modified) (1 diff)
• login_engine/trunk/app/views/user/edit.rhtml (modified) (1 diff)
• login_engine/trunk/app/views/user/forgot_password.rhtml (modified) (1 diff)
• login_engine/trunk/app/views/user/login.rhtml (modified) (2 diffs)
• login_engine/trunk/init_engine.rb (modified) (1 diff)
• login_engine/trunk/lib/login_engine.rb (modified) (1 diff)
• login_engine/trunk/lib/login_engine/authenticated_system.rb (modified) (1 diff)
• login_engine/trunk/lib/login_engine/authenticated_user.rb (modified) (3 diffs)
• login_engine/trunk/tasks (deleted)
• login_engine/trunk/test/fixtures/users.yml (modified) (1 diff)
• login_engine/trunk/test/functional/user_controller_test.rb (modified) (1 diff)
• login_engine/trunk/test/unit/user_test.rb (modified) (1 diff)

login_engine/trunk/CHANGELOG

@@ -1 @@
-1.0
-
-
-
-
-
+0.3 (2006-08-22)
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

login_engine/trunk/README

@@ -102 +102 @@
-=== Create the DB schema
-
-An ActiveRecord schema.rb file is provided in login_engine/db/schema.rb, along with m
+M
-
-You *MUST* check that these files aren't going to interfere with anything in your application. 
@@ -117 +117 @@
-...to the LoginEngine configuration in <tt>environment.rb</tt>. Then run from the root of your project:
-
-engine_migrate
+db:migrate:engines
-
-to import the schema into your database.
@@ -238 +238 @@
-+default_home+:: Determines the target of the login redirection when back is not possible, or there are no 
-                 stored values.  This must be a Hash of options or String, as used in +url_for+. 
++password_minimum+:: Set your minimum password length.
+                     Defaults to 5.
+
-== Overriding controllers and views
-
@@ -251 +254 @@
-  A: You can get the user object from the session using session[:user]
-     Example: 
-
+full_
-
-    You can also use the 'current_user' method provided by UserHelper:
-    Example:
-
+full_
-
-

login_engine/trunk/app/controllers/user_controller.rb

@@ -57 +57 @@
-    return if generate_blank
-    params[:user].delete('form')
+    params[:user].delete('verified') # you CANNOT pass this as part of the request
-    @user = User.new(params[:user])
-    begin
@@ -67 +68 @@
-          key = @user.generate_security_token
-          url = url_for(:action => 'home', :user_id => @user.id, :key => key)
- Please log in.
+
-          if LoginEngine.config(:use_email_notification) and LoginEngine.config(:confirm_account)
-            UserNotify.deliver_signup(@user, params[:user][:password], url)
-            flash[:notice] << ' Please check your registered email account to verify your account registration and continue with the login.'
+          else
+            flash[:notice] << ' Please log in.'
-          end
-          redirect_to :action => 'login'
@@ -85 +88 @@
-  def logout
-    session[:user] = nil
+    reset_session
-    redirect_to :action => 'login'
-  end

login_engine/trunk/app/views/user/_edit.rhtml

@@ -3 +3 @@
-    <%= form_input changeable(user, "firstname"), "First Name", "firstname" %>
-    <%= form_input changeable(user, "lastname"), "Last Name","lastname" %>
-, :size => 30 %><br/
+ %
-    <%= form_input changeable(user, "email"), "Email", "email" %>
-    <% if submit %>

login_engine/trunk/app/views/user/edit.rhtml

@@ -16 +16 @@
-    <div class="user_delete">
-      <%= hidden_field 'user', 'form', :value => 'delete' %>
-
-
+
-    </div>
-  <%= end_form_tag %>

login_engine/trunk/app/views/user/forgot_password.rhtml

@@ -11 +11 @@
-
-      <div class="button-bar">
-Submit request
+Reset Password
-        <%= link_to 'Cancel', :action => 'login' %>
-      </div>

login_engine/trunk/app/views/user/login.rhtml

@@ -5 +5 @@
-    <%= start_form_tag :action => 'login'  %>
-      <table>
-<br/>
-<br/>
+
+
-      </table>
-
@@ -12 +12 @@
-        <%= submit_tag 'Login' %>
-        <%= link_to 'Register for an account', :action => 'signup' %> |
-
+
+
-    <%= end_form_tag %>
-  </div>

login_engine/trunk/init_engine.rb

@@ -6 +6 @@
-  Major = 1 # change implies compatibility breaking with previous versions
-  Minor = 0 # change implies backwards-compatible change to API
-1
+3
-end
-
-Engines.current.version = LoginEngine::Version
-
-# send the helpers and modules automatically....?
-#ApplicationController.send(:include, LoginEngine)
-#ApplicationHelper.send(:include, LoginEngine)

login_engine/trunk/lib/login_engine.rb

@@ -45 +45 @@
-  # Default is one week
-  config :delayed_delete_days, 7
+
+  # Default minimum password length
+  config :password_minimum, 5
-  
-  # the table to store user information in

login_engine/trunk/lib/login_engine/authenticated_system.rb

@@ -55 +55 @@
-      # call overwriteable reaction to unauthorized access
-      access_denied
+      
+      # Return false to halt the filter chain
+      return false
-    end
-

login_engine/trunk/lib/login_engine/authenticated_user.rb

@@ -24 +24 @@
-
-        validates_confirmation_of :password, :if => :validate_password?
-5
+LoginEngine.config(:password_minimum)
-        validates_length_of :password, { :maximum => 40, :if => :validate_password? }
-  
@@ -49 +49 @@
-        # Allow logins for deleted accounts, but only via this method (and
-        # not the regular authenticate call)
-id
+#{User.primary_key}
-        return nil if u.nil? or u.token_expired?
-        return nil if false == u.update_expiry
@@ -123 +123 @@
-    end
-    
+    def full_name
+      "#{self.firstname} #{self.lastname}"
+    end
+    
-    protected
-

login_engine/trunk/test/fixtures/users.yml

@@ -4 +4 @@
-  id: 1000001
-  login: bob
+  firstname: bob
+  lastname: roberts
-  salted_password: b1de1d1d2aec05df2be6f02995537c1783f08490 # atest
-  salt: bf3c47e71c0bfeb6288c9b6b5e24e15256a0e407

login_engine/trunk/test/functional/user_controller_test.rb

@@ -62 +62 @@
-    get :logout
-    assert_session_has_no :user
+    assert_equal Hash.new, session
-
-  end

login_engine/trunk/test/unit/user_test.rb

@@ -113 +113 @@
-    assert u.save
-  end
+  
+  def test_should_respond_to_full_name
+    assert_equal 'bob roberts', users(:bob).full_name
+  end
+
+  def test_password_too_short
+    assert LoginEngine::config(:password_minimum), "Password minimum not defined"
+    u = User.new
+    u.login = 'password_test'
+    u.email = 'bobs@email.com'
+    u.change_password('a'*(LoginEngine::config(:password_minimum)-1))
+    assert !u.save
+  end
+
+  def test_password_minimum_length
+    u = User.new
+    u.login = 'password_test'
+    u.email = 'bobs@email.com'
+    u.change_password('a'*(LoginEngine::config(:password_minimum)))
+    assert u.save
+  end
-
-end