muck-users 0.3.4 → 0.3.6

data/README.rdoc

@@ -104,6 +104,19 @@ By default when a user logs out they are sent to the login page.  You can add a
 
 muck-users sends out emails that need to be able to generate links.  Be sure to set a value for application_url in global_config.yml
 
+=== Helpers
+Muck users provides an autocomplete login search.  To enable this functionality create a text box with the class 'login-search' and add 
+the following code to include the needed javascript and css:
+
+  <% content_for :head do -%>
+  <%= javascript_include_tag 'jquery/jquery.autocomplete.min' %>
+  <%= javascript_include_tag 'muck-users' %>
+  <%= stylesheet_link_tag 'jquery/jquery.autocomplete' %>
+  <% end -%>
+
+If you override the users controller you will also need to include login_search in your routes:
+  map.resources :users, :collection => { :login_search => :get }
+
 
 == General information
 This engine implements authlogic.  Some of the code contained was taken from here:

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.6

data/app/controllers/muck/users_controller.rb

@@ -77,6 +77,16 @@ class Muck::UsersController < ApplicationController
     after_destroy_response
   end
 
+  def login_search
+    if params[:q]
+      @users = User.by_login_alpha.by_login(params[:q], :limit => params[:limit] || 100)
+    end
+    respond_to do |format|
+      format.js { render :text => @users.collect{|user| user.login }.join("\n") }
+      format.json { render :json => @users.collect{|user| { :login => user.login } }.to_json }
+    end
+  end
+  
   def is_login_available
     result = t('muck.users.username_not_available')
     if params[:user_login].nil?
@@ -85,13 +95,9 @@ class Muck::UsersController < ApplicationController
       result = t('muck.users.login_empty')
     elsif !User.login_exists?(params[:user_login])
       @user = User.new(:login => params[:user_login])
-      if !@user.validate_attributes(:only => [:login])
-        result = t('muck.users.invalid_username')
-        @user.errors.full_messages.each do |message|
-          if !message.include? 'blank'
-            result += "<br />#{message}"
-          end
-        end
+      @user.valid? # we aren't interested in the output of this.
+      if @user.errors.on(:login)
+        result = "#{t('muck.users.invalid_username')} <br /> #{t('muck.users.username')} #{@user.errors.on(:login)}"
       else
         result = t('muck.users.username_available')
       end

data/config/muck_users_routes.rb

@@ -3,7 +3,7 @@ ActionController::Routing::Routes.draw do |map|
   # users
   map.resources :users, :controller => 'muck/users',
                         :member => { :enable => :put, :welcome => :get, :activation_instructions => :get },
-                        :collection => { :is_login_available => :post, :is_email_available => :post }
+                        :collection => { :is_login_available => :post, :is_email_available => :post, :login_search => :get }
   
   map.with_options(:controller => 'muck/users') do |users| 
     users.signup "/signup",  :action => 'new', :requirements => {:protocol => muck_routes_protocol}

data/lib/active_record/acts/muck_user.rb

@@ -16,6 +16,8 @@ module ActiveRecord
           named_scope :active, :conditions => "activated_at IS NOT NULL"
           named_scope :inactive, :conditions => "activated_at IS NULL"    
           named_scope :recent, lambda { { :conditions => ['created_at > ?', 1.week.ago] } }
+          named_scope :by_login_alpha, :order => "login ASC"
+          named_scope :by_login, lambda { |*args| { :conditions => ["login LIKE ?", args.first + '%'] } }
           
           belongs_to :access_code
           accepts_nested_attributes_for :access_code

data/locales/en.yml

@@ -62,6 +62,7 @@ en:
       access_code_delete_link: Delete Access Code
       request_access_code: Request Access Code
       first_name: First Name
+      username: Username
       forgot_username: Forgot Username
       updated_permissions: Updated Permissions
       account_activated: Your account has been activated! You can now login.

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.3.4"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-10}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

data/public/javascripts/muck-users.js

@@ -15,4 +15,10 @@ jQuery(document).ready(function() {
 	jQuery("#user_email").keydown(function() {
 	  jQuery("#email-availibility").html('');
 	});
+	jQuery(".login-search").autocomplete('/users/login_search.js', {
+		minChars: 1,
+		delay: 200,
+		autoFill: true,
+		mustMatch: false
+	});
 });

data/test/rails_root/app/controllers/application_controller.rb

@@ -13,12 +13,13 @@ class ApplicationController < ActionController::Base
       access_denied unless admin?
     end
   
-    # only require ssl if we are in production
+    # only require ssl if it is turned on
     def ssl_required?
-      return ENV['SSL'] == 'on' ? true : false if defined? ENV['SSL']
-      return false if local_request?
-      return false if RAILS_ENV == 'test'
-      ((self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)) && (RAILS_ENV == 'production' || RAILS_ENV == 'staging')
+      if GlobalConfig.enable_ssl
+        (self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)
+      else
+        false
+      end
     end
-  
+
 end

data/test/rails_root/public/javascripts/jquery/jquery.autocomplete.js.readme

@@ -1,4 +1,4 @@
-NOTE: the jquery.autocomplete.pack.js file is modified from the original to work with luvfoo.  Specifically line
+NOTE: the jquery.autocomplete.pack.js file has been modified.  Specifically line
  314 was changed from
    if ( data && data.length && hasFocus ) {
  to

data/test/rails_root/public/javascripts/muck-users.js

@@ -15,4 +15,10 @@ jQuery(document).ready(function() {
 	jQuery("#user_email").keydown(function() {
 	  jQuery("#email-availibility").html('');
 	});
+	jQuery(".login-search").autocomplete('/users/login_search.js', {
+		minChars: 1,
+		delay: 200,
+		autoFill: true,
+		mustMatch: false
+	});
 });

data/test/rails_root/test/functional/users_controller_test.rb

@@ -232,32 +232,91 @@ class Muck::UsersControllerTest < ActionController::TestCase
       should_redirect_to("login") { login_path }
     end
   end
-
-  context "on GET to is_email_available" do
+  
+  context "GET to login_search" do
+    setup do
+      @auser = Factory(:user, :login => 'aaaa')
+      @zuser = Factory(:user, :login => 'zzzz')
+    end
+    context "valid params" do
+      setup do
+        get :login_search, :q => 'a', :format => 'js'
+      end
+      should_respond_with :success
+      should "find a user" do
+        assert @response.body.include?('aaaa')
+        assert assigns(:users).include?(@auser)
+      end
+      should "not find a non-matching user" do
+        assert !@response.body.include?('zzzz')
+      end
+    end
+  end
+  
+  context "POST to is_login_available" do
+    context "no params" do
+      setup do
+        post :is_login_available
+      end
+      should_respond_with :success
+      should_render_text ""
+    end
+    context "empty login" do
+      setup do
+        post :is_login_available, :user_login => ''
+      end
+      should_respond_with :success
+      should_render_text I18n.t('muck.users.login_empty')
+    end
+    context "valid login" do
+      setup do
+        post :is_login_available, :user_login => 'testdude1945'
+      end
+      should_respond_with :success
+      should_render_text I18n.t('muck.users.username_available')
+    end
+    context "invalid login" do
+      setup do
+        post :is_login_available, :user_login => 'testdude1945@example.comm'
+      end
+      should_respond_with :success
+      should_render_partial_text I18n.t('muck.users.invalid_username')
+    end
+    context "login not available" do
+      setup do
+        @user = Factory(:user)
+        post :is_login_available, :user_login => @user.login
+      end
+      should_respond_with :success
+      should_render_partial_text I18n.t('muck.users.username_not_available')
+    end
+  end
+  
+  context "POST to is_email_available" do
     context "no params" do
       setup do
-        get :is_email_available
+        post :is_email_available
       end
       should_respond_with :success
       should_render_text ""
     end
     context "empty email" do
       setup do
-        get :is_email_available, :user_email => ''
+        post :is_email_available, :user_email => ''
       end
       should_respond_with :success
       should_render_text I18n.t('muck.users.email_empty')
     end
     context "valid email" do
       setup do
-        get :is_email_available, :user_email => 'testdude1945@example.com'
+        post :is_email_available, :user_email => 'testdude1945@example.com'
       end
       should_respond_with :success
       should_render_text I18n.t('muck.users.email_available')
     end
     context "invalid email" do
       setup do
-        get :is_email_available, :user_email => 'testdude1945@com'
+        post :is_email_available, :user_email => 'testdude1945@com'
       end
       should_respond_with :success
       should_render_text I18n.t('muck.users.email_invalid')
@@ -265,7 +324,7 @@ class Muck::UsersControllerTest < ActionController::TestCase
     context "email not available" do
       setup do
         @user = Factory(:user)
-        get :is_email_available, :user_email => @user.email
+        post :is_email_available, :user_email => @user.email
       end
       should_respond_with :success
       should_render_partial_text I18n.t('muck.users.email_not_available', :reset_password_help => '')

data/test/rails_root/test/unit/user_test.rb

@@ -75,6 +75,31 @@ class UserTest < ActiveSupport::TestCase
           assert !User.inactive.include?(@active_user)
         end
       end
+      context "by_login_alpha" do
+        setup do
+          @user1 = Factory(:user, :login => 'atest')
+          @user2 = Factory(:user, :login => 'btest')
+        end
+        should "order by login" do
+          users = User.by_login_alpha
+          assert users.index(@user1) < users.index(@user2)
+        end
+      end
+      context "by_login" do
+        setup do
+          @zuser = Factory(:user, :login => 'zasdf')
+          @xuser = Factory(:user, :login => 'xasdf')
+        end
+        should "find login by character match" do
+          assert User.by_login('z').include?(@zuser)
+        end
+        should "not find login that doesn't match" do
+          assert !User.by_login('x').include?(@zuser)
+        end
+        should "not find login that start with a matching character" do
+          assert User.by_login('asdf').blank?
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 -07:00
+date: 2010-02-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency