muck-users 0.1.5 → 0.1.6

data/README.rdoc

@@ -5,12 +5,19 @@
 The muck users engine is part of the muck framework and relies upon the muck_engine as well as authlogic.  Both gems should be installed automatically when you install the muck_users engine.
 
   sudo gem install muck_users
+
+Use search logic for searching users.  Add this to environment.rb:
+
+  config.gem "binarylogic-searchlogic",
+      :lib     => 'searchlogic',
+      :source  => 'http://gems.github.com',
+      :version => '~> 2.0.0'
+
   
 In addition, you will need to install the ssl_requirement plugin (http://github.com/rails/ssl_requirement/tree/master) into your Rails project:
 
   ruby script/plugin install ssl_requirement
 
-
 == General information
 This engine implements authlogic.  Some of the code contained was taken from here:
 http://railsforum.com/viewtopic.php?id=14216 and here

data/Rakefile

@@ -13,6 +13,7 @@ begin
     gem.authors = ["Justin Ball"]
     gem.rubyforge_project = "muck-users"
     gem.add_dependency "authlogic"
+    gem.add_dependency "binarylogic-searchlogic"
     gem.add_dependency "bcrypt-ruby"
     gem.add_dependency "muck-engine"
     gem.files.include %w( tasks/*

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/app/controllers/admin/muck/users_controller.rb

@@ -1,6 +1,6 @@
 class Admin::Muck::UsersController < Admin::Muck::BaseController
   unloadable
-  
+    
   before_filter :get_user, :only => [:update, :destroy]
   
   def index
@@ -40,7 +40,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   def search_results
     @users = User.do_search( params[:query] ).paginate(:page => @page, :per_page => @per_page )
   end
-  
+
   def search
     search_results
     respond_to do |format|

data/lib/active_record/acts/muck_user.rb

@@ -22,6 +22,8 @@ module ActiveRecord
           domain_tld_regex  = '(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|mobi|name|aero|jobs|museum)'.freeze
           email_regex       = /\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i
 
+          before_save :lower_login
+          
           class_eval <<-EOV
             validates_format_of :login, :with => /^[a-z0-9-]+$/i, :message => 'may only contain letters, numbers or a hyphen.'
             validates_format_of :email, :with => email_regex, :message => 'does not look like a valid email address.'
@@ -40,8 +42,8 @@ module ActiveRecord
 
       # class methods
       module SingletonMethods
-        def do_search( query )           
-           User.find(:all, :conditions => [ "email LIKE ? OR first_name LIKE ? OR last_name LIKE ?", '%' + query + '%', '%' + query + '%', '%' + query + '%' ])
+        def do_search(query)
+          User.search(query)
         end
         
         def inactive_count
@@ -159,6 +161,11 @@ module ActiveRecord
         # def confirmed?
         # end
         
+        #lowercase all logins
+        def lower_login
+          self.login = self.login.nil? ? nil : self.login.downcase 
+        end
+                
         def activate!
           self.update_attribute(:activated_at, Time.now.utc)
         end

data/muck-users.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
@@ -186,7 +186,9 @@ Gem::Specification.new do |s|
      "locales/zh-TW.yml",
      "locales/zh.yml",
      "locales/zh.yml",
+     "muck-users-0.1.4.gem",
      "muck-users.gemspec",
+     "pkg/muck-users-0.1.6.gem",
      "public/images/profile_default.jpg",
      "rails/init.rb",
      "rails/init.rb",
@@ -426,6 +428,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/muck_user_mailer_test.rb",
      "test/rails_root/test/unit/permission_test.rb",
      "test/rails_root/test/unit/role_test.rb",
+     "test/rails_root/test/unit/user_test.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/README",
      "test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb",
@@ -477,6 +480,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/unit/muck_user_mailer_test.rb",
      "test/rails_root/test/unit/permission_test.rb",
      "test/rails_root/test/unit/role_test.rb",
+     "test/rails_root/test/unit/user_test.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb"
   ]
@@ -487,15 +491,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<authlogic>, [">= 0"])
+      s.add_runtime_dependency(%q<binarylogic-searchlogic>, [">= 0"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 0"])
       s.add_runtime_dependency(%q<muck-engine>, [">= 0"])
     else
       s.add_dependency(%q<authlogic>, [">= 0"])
+      s.add_dependency(%q<binarylogic-searchlogic>, [">= 0"])
       s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
       s.add_dependency(%q<muck-engine>, [">= 0"])
     end
   else
     s.add_dependency(%q<authlogic>, [">= 0"])
+    s.add_dependency(%q<binarylogic-searchlogic>, [">= 0"])
     s.add_dependency(%q<bcrypt-ruby>, [">= 0"])
     s.add_dependency(%q<muck-engine>, [">= 0"])
   end

data/rails/init.rb

@@ -14,5 +14,19 @@ else
   end
 end
 
+if config.respond_to?(:gems)
+  config.gem "binarylogic-searchlogic", :lib => 'searchlogic', :source  => 'http://gems.github.com', :version => "~> 2.0.0"
+else
+  begin
+    require 'binarylogic-searchlogic'
+  rescue LoadError
+    begin
+      gem 'binarylogic-searchlogic'
+    rescue Gem::LoadError
+      puts "Please install the binarylogic-searchlogic gem"
+    end
+  end
+end
+
 require 'muck_users'
-require 'muck_users/initialize_routes'
+require 'muck_users/initialize_routes'

data/rdoc/classes/ActiveRecord/Acts/MuckUser/ClassMethods.html

@@ -138,14 +138,8 @@
           <span class="ruby-identifier">domain_head_regex</span> = <span class="ruby-value str">'(?:[A-Z0-9\-]+\.)+'</span>.<span class="ruby-identifier">freeze</span>
           <span class="ruby-identifier">domain_tld_regex</span>  = <span class="ruby-value str">'(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|mobi|name|aero|jobs|museum)'</span>.<span class="ruby-identifier">freeze</span>
           <span class="ruby-identifier">email_regex</span>       = <span class="ruby-node">/\A#{email_name_regex}@#{domain_head_regex}#{domain_tld_regex}\z/i</span>
-          
-          <span class="ruby-identifier">has_attached_file</span> <span class="ruby-identifier">:photo</span>, 
-                            <span class="ruby-identifier">:styles</span> =<span class="ruby-operator">&gt;</span> { <span class="ruby-identifier">:medium</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;300x300&gt;&quot;</span>,
-                                         <span class="ruby-identifier">:thumb</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;100x100&gt;&quot;</span>,
-                                         <span class="ruby-identifier">:icon</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;50x50&gt;&quot;</span> },
-                            <span class="ruby-identifier">:default_url</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;/images/profile_default.jpg&quot;</span>
-                            
-          <span class="ruby-identifier">class_eval</span> <span class="ruby-value str">&quot;validates_format_of :login, :with =&gt; /^[a-z0-9-]+$/i, :message =&gt; 'may only contain letters, numbers or a hyphen.'\nvalidates_format_of :email, :with =&gt; email_regex, :message =&gt; 'does not look like a valid email address.'\n\n# prevents a user from submitting a crafted form that bypasses activation\nattr_protected :crypted_password, :password_salt, :persistence_token, :single_access_token, :perishable_token, :login_count,\n:failed_login_count, :last_request_at, :last_login_at, :current_login_at, :current_login_ip, :last_login_ip,\n:terms_of_service, :time_zone, :disabled_at, :activated_at, :created_at, :updated_at, :photo_file_name,\n:photo_content_type, :photo_file_size\n&quot;</span>
+
+          <span class="ruby-identifier">class_eval</span> <span class="ruby-value str">&quot;validates_format_of :login, :with =&gt; /^[a-z0-9-]+$/i, :message =&gt; 'may only contain letters, numbers or a hyphen.'\nvalidates_format_of :email, :with =&gt; email_regex, :message =&gt; 'does not look like a valid email address.'\n\n# prevents a user from submitting a crafted form that bypasses activation\nattr_protected :crypted_password, :password_salt, :persistence_token, :single_access_token, :perishable_token, :login_count,\n:failed_login_count, :last_request_at, :last_login_at, :current_login_at, :current_login_ip, :last_login_ip,\n:terms_of_service, :time_zone, :disabled_at, :activated_at, :created_at, :updated_at\n&quot;</span>
 
           <span class="ruby-identifier">include</span> <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Acts</span><span class="ruby-operator">::</span><span class="ruby-constant">MuckUser</span><span class="ruby-operator">::</span><span class="ruby-constant">InstanceMethods</span>
           <span class="ruby-identifier">extend</span> <span class="ruby-constant">ActiveRecord</span><span class="ruby-operator">::</span><span class="ruby-constant">Acts</span><span class="ruby-operator">::</span><span class="ruby-constant">MuckUser</span><span class="ruby-operator">::</span><span class="ruby-constant">SingletonMethods</span>

data/rdoc/classes/ActiveRecord/Acts/MuckUser/InstanceMethods.html

@@ -143,7 +143,7 @@ def confirmed? end
             onclick="toggleCode('M000042-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000042-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 170</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 163</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">activate!</span>
           <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">update_attribute</span>(<span class="ruby-identifier">:activated_at</span>, <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>.<span class="ruby-identifier">utc</span>)
         <span class="ruby-keyword kw">end</span>
@@ -169,7 +169,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000041-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000041-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 160</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 153</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">active?</span>
           <span class="ruby-operator">!</span><span class="ruby-identifier">activated_at</span>.<span class="ruby-identifier">blank?</span>
         <span class="ruby-keyword kw">end</span>
@@ -192,7 +192,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000038-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000038-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 142</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 135</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">admin?</span>
           <span class="ruby-identifier">has_role?</span>(<span class="ruby-value str">'administrator'</span>)
         <span class="ruby-keyword kw">end</span>
@@ -215,7 +215,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000039-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000039-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 146</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 139</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">can_edit?</span>(<span class="ruby-identifier">user</span>)
           <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">user</span>.<span class="ruby-identifier">nil?</span>
           <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">id</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">user</span>.<span class="ruby-identifier">id</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">user</span>.<span class="ruby-identifier">admin?</span>
@@ -239,7 +239,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000032-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000032-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 104</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 97</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">deliver_activation_confirmation!</span>
           <span class="ruby-identifier">reset_perishable_token!</span>
           <span class="ruby-constant">MuckUserMailer</span>.<span class="ruby-identifier">deliver_activation_confirmation</span>(<span class="ruby-keyword kw">self</span>)
@@ -263,7 +263,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000033-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000033-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 109</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 102</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">deliver_activation_instructions!</span>
           <span class="ruby-identifier">reset_perishable_token!</span>
           <span class="ruby-constant">MuckUserMailer</span>.<span class="ruby-identifier">deliver_activation_instructions</span>(<span class="ruby-keyword kw">self</span>)
@@ -287,7 +287,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000034-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000034-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 114</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 107</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">deliver_password_reset_instructions!</span>
           <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">active?</span>
             <span class="ruby-identifier">reset_perishable_token!</span>  
@@ -315,7 +315,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000035-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000035-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 123</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 116</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">deliver_username_request!</span>
           <span class="ruby-constant">MuckUserMailer</span>.<span class="ruby-identifier">deliver_username_request</span>(<span class="ruby-keyword kw">self</span>)
         <span class="ruby-keyword kw">end</span>
@@ -338,7 +338,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000031-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000031-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 100</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 93</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">deliver_welcome_email</span>
           <span class="ruby-constant">MuckUserMailer</span>.<span class="ruby-identifier">deliver_welcome_notification</span>(<span class="ruby-keyword kw">self</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-constant">GlobalConfig</span>.<span class="ruby-identifier">send_welcome</span>
         <span class="ruby-keyword kw">end</span>
@@ -361,7 +361,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000045-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000045-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 186</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 179</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">display_name</span>
           <span class="ruby-constant">CGI</span><span class="ruby-operator">::</span><span class="ruby-identifier">escapeHTML</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">login</span>)
         <span class="ruby-keyword kw">end</span>
@@ -384,7 +384,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000044-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000044-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 178</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 171</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">full_name</span>
           <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">first_name</span>.<span class="ruby-identifier">blank?</span> <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">last_name</span>.<span class="ruby-identifier">blank?</span>
             <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">display_name</span> <span class="ruby-keyword kw">rescue</span> <span class="ruby-value str">'Deleted user'</span>
@@ -411,7 +411,7 @@ Authlogic automatically executes the following methods
             onclick="toggleCode('M000037-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000037-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 136</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 129</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">has_role?</span>(<span class="ruby-identifier">rolename</span>)
           <span class="ruby-ivar">@roles</span> <span class="ruby-operator">||=</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">roles</span>.<span class="ruby-identifier">map</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">role</span><span class="ruby-operator">|</span> <span class="ruby-identifier">role</span>.<span class="ruby-identifier">rolename</span>}
           <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@roles</span>
@@ -440,7 +440,7 @@ save without block as usual.
             onclick="toggleCode('M000036-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000036-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 130</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 123</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">reset_password!</span>(<span class="ruby-identifier">user</span>)
           <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">password</span> = <span class="ruby-identifier">user</span>[<span class="ruby-identifier">:password</span>]
           <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">password_confirmation</span> = <span class="ruby-identifier">user</span>[<span class="ruby-identifier">:password_confirmation</span>]
@@ -465,7 +465,7 @@ save without block as usual.
             onclick="toggleCode('M000043-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000043-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 174</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 167</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">short_name</span>
           <span class="ruby-constant">CGI</span><span class="ruby-operator">::</span><span class="ruby-identifier">escapeHTML</span>(<span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">first_name</span>) <span class="ruby-operator">||</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">display_name</span>
         <span class="ruby-keyword kw">end</span>
@@ -488,7 +488,7 @@ save without block as usual.
             onclick="toggleCode('M000040-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000040-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 151</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 144</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_xml</span>(<span class="ruby-identifier">options</span> = {})
           <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:except</span>] <span class="ruby-operator">||=</span> []
           <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:except</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">:email</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">:crypted_password</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">:salt</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">:remember_token</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">:remember_token_expires_at</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">:activation_code</span>

data/rdoc/classes/ActiveRecord/Acts/MuckUser/SingletonMethods.html

@@ -127,7 +127,7 @@ class methods
             onclick="toggleCode('M000026-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000026-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 59</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 52</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">activate_all</span>
           <span class="ruby-constant">User</span>.<span class="ruby-identifier">update_all</span>(<span class="ruby-node">&quot;activated_at = '#{Time.now}'&quot;</span>, <span class="ruby-value str">'activated_at IS NULL'</span>)
         <span class="ruby-keyword kw">end</span>
@@ -150,7 +150,7 @@ class methods
             onclick="toggleCode('M000024-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000024-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 51</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 44</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">do_search</span>( <span class="ruby-identifier">query</span> )           
            <span class="ruby-constant">User</span>.<span class="ruby-identifier">find</span>(<span class="ruby-identifier">:all</span>, <span class="ruby-identifier">:conditions</span> =<span class="ruby-operator">&gt;</span> [ <span class="ruby-value str">&quot;email LIKE ? OR first_name LIKE ? OR last_name LIKE ?&quot;</span>, <span class="ruby-value str">'%'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">query</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'%'</span>, <span class="ruby-value str">'%'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">query</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'%'</span>, <span class="ruby-value str">'%'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">query</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'%'</span> ])
         <span class="ruby-keyword kw">end</span>
@@ -176,7 +176,7 @@ checks to see if a given email is already in the database
             onclick="toggleCode('M000029-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000029-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 87</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 80</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">email_exists?</span>(<span class="ruby-identifier">email</span>)
           <span class="ruby-keyword kw">if</span> <span class="ruby-constant">User</span>.<span class="ruby-identifier">find_by_email</span>(<span class="ruby-identifier">email</span>).<span class="ruby-identifier">nil?</span>
             <span class="ruby-keyword kw">false</span>
@@ -214,7 +214,7 @@ Raises:
             onclick="toggleCode('M000027-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000027-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 68</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 61</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">find_and_activate!</span>(<span class="ruby-identifier">activation_code</span>)
           <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">activation_code</span>.<span class="ruby-identifier">nil?</span>
           <span class="ruby-identifier">user</span> = <span class="ruby-identifier">find_by_activation_code</span>(<span class="ruby-identifier">activation_code</span>)
@@ -242,7 +242,7 @@ Raises:
             onclick="toggleCode('M000025-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000025-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 55</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 48</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">inactive_count</span>
           <span class="ruby-constant">User</span>.<span class="ruby-identifier">count</span> <span class="ruby-identifier">:conditions</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;activated_at is null&quot;</span>
         <span class="ruby-keyword kw">end</span>
@@ -268,7 +268,7 @@ checks to see if a given login is already in the database
             onclick="toggleCode('M000028-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000028-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 78</span>
+<span class="ruby-comment cmt"># File lib/active_record/acts/muck_user.rb, line 71</span>
         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">login_exists?</span>(<span class="ruby-identifier">login</span>)
           <span class="ruby-keyword kw">if</span> <span class="ruby-constant">User</span>.<span class="ruby-identifier">find_by_login</span>(<span class="ruby-identifier">login</span>).<span class="ruby-identifier">nil?</span>
             <span class="ruby-keyword kw">false</span>

data/rdoc/created.rid

@@ -1 +1 @@
-Tue, 16 Jun 2009 23:12:42 -0600
+Thu, 18 Jun 2009 11:28:24 -0600

data/rdoc/files/lib/active_record/acts/muck_user_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Jun 11 21:11:00 -0600 2009</td>
+      <td>Thu Jun 18 10:47:26 -0600 2009</td>
     </tr>
     </table>
   </div>

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

@@ -3,4 +3,10 @@ class ApplicationController < ActionController::Base
   helper :all
   protect_from_forgery
 
+  # called by Admin::Muck::BaseController to check whether or not the
+  # user should have access to the admin UI
+  def admin_access?
+    admin?
+  end
+  
 end

data/test/rails_root/app/models/user.rb

@@ -3,8 +3,7 @@ class User < ActiveRecord::Base
     c.crypto_provider = Authlogic::CryptoProviders::BCrypt
   end
   acts_as_muck_user
-  has_activities
-  
+    
   def admin?
     false
   end

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

@@ -4,11 +4,9 @@ class Admin::Muck::UsersControllerTest < ActionController::TestCase
 
   tests Admin::Muck::UsersController
 
+  should_require_role(:admin, '/login', :index)
   should_require_login :index => :get, :inactive => :get, :inactive_emails => :get, :activate_all => :get, :search => :get, :login_url => '/login'
-  
-  #:enable => :get, :disable => :get, :update => :post
-  #should_require_role(:admin, '/login', :index)
-  
+
   context "logged in as admin" do
     setup do
       @admin = Factory(:user)
@@ -52,4 +50,4 @@ class Admin::Muck::UsersControllerTest < ActionController::TestCase
 
   end
 
-end
+end

data/test/rails_root/test/shoulda_macros/controller.rb

@@ -1,6 +1,6 @@
-ActiveSupport::TestCase.class_eval do
+module MuckControllerMacros
 
-  def self.should_require_login(*args)
+  def should_require_login(*args)
     args = Hash[*args]
     login_url = args.delete :login_url
     args.each do |action, verb|
@@ -11,7 +11,7 @@ ActiveSupport::TestCase.class_eval do
     end
   end
 
-  def self.should_require_role(role, redirect_url, *actions)
+  def should_require_role(role, redirect_url, *actions)
     actions.each do |action|
       should "require role for '#{action}' action" do
         get(action)
@@ -22,7 +22,7 @@ ActiveSupport::TestCase.class_eval do
   end
   
   #from: http://blog.internautdesign.com/2008/9/11/more-on-custom-shoulda-macros-scoping-of-instance-variables
-  def self.should_not_allow action, object, url= "/login", msg=nil
+  def should_not_allow action, object, url= "/login", msg=nil
     msg ||= "a #{object.class.to_s.downcase}" 
     should "not be able to #{action} #{msg}" do
       object = eval(object, self.send(:binding), __FILE__, __LINE__)
@@ -31,7 +31,7 @@ ActiveSupport::TestCase.class_eval do
     end
   end
 
-  def self.should_allow action, object, msg=nil
+  def should_allow action, object, msg=nil
     msg ||= "a #{object.class.to_s.downcase}" 
     should "be able to #{action} #{msg}" do
       object = eval(object, self.send(:binding), __FILE__, __LINE__)
@@ -41,3 +41,5 @@ ActiveSupport::TestCase.class_eval do
   end
 
 end
+
+ActionController::TestCase.extend(MuckControllerMacros)

data/test/rails_root/test/shoulda_macros/forms.rb

@@ -1,4 +1,4 @@
-class ActiveSupport::TestCase
+module ShouldaFormMacros
   def self.should_have_form(opts)
     model = self.name.gsub(/ControllerTest$/, '').singularize.downcase
     model = model[model.rindex('::')+2..model.size] if model.include?('::')
@@ -26,3 +26,7 @@ class ActiveSupport::TestCase
     end
   end  
 end
+
+class ActiveSupport::TestCase
+  extend ShouldaFormMacros
+end

data/test/rails_root/test/shoulda_macros/models.rb

@@ -1,4 +1,4 @@
-ActiveSupport::TestCase.class_eval do
+module ShouldaModelMacros
 
   def self.should_whitelist(*attributes)
     bad_scripts = [
@@ -31,4 +31,20 @@ ActiveSupport::TestCase.class_eval do
     end
   end
 
+  def should_accept_nested_attributes_for(*attr_names)
+    klass = self.name.gsub(/Test$/, '').constantize
+ 
+    context "#{klass}" do
+      attr_names.each do |association_name|
+        should "accept nested attrs for #{association_name}" do
+          assert  klass.instance_methods.include?("#{association_name}_attributes="),
+                  "#{klass} does not accept nested attributes for #{association_name}"
+        end
+      end
+    end
+  end
+end
+
+class ActiveSupport::TestCase
+  extend ShouldaModelMacros
 end

data/test/rails_root/test/shoulda_macros/pagination.rb

@@ -1,4 +1,4 @@
-class ActiveSupport::TestCase
+module ShouldaPaginationMacros
   # Example:
   #  context "a GET to index logged in as admin" do
   #    setup do
@@ -46,3 +46,8 @@ class ActiveSupport::TestCase
     end
   end
 end
+
+
+class ActiveSupport::TestCase
+  extend ShouldaPaginationMacros
+end

data/test/rails_root/test/shoulda_macros/plugins.rb

@@ -1,4 +1,4 @@
-class ActiveSupport::TestCase
+module ShouldaPluginMacros
 
   def self.should_act_as_taggable_on_steroids
     klass = self.name.gsub(/Test$/, '').constantize
@@ -27,4 +27,8 @@ class ActiveSupport::TestCase
     should_have_instance_methods :acts_as_list_class, :position_column, :scope_condition
   end
 
-end
+end
+
+ActiveSupport::TestCase.extend(ShouldaPluginMacros)
+Test::Unit::TestCase.extend(ShouldaPluginMacros)
+ActionController::TestCase.extend(ShouldaPluginMacros)

data/test/rails_root/test/test_helper.rb

@@ -9,6 +9,7 @@ require 'authlogic/test_case'
 require 'redgreen' rescue LoadError
 require File.expand_path(File.dirname(__FILE__) + '/factories')
 require File.join(File.dirname(__FILE__), 'shoulda_macros', 'controller')
+require File.join(File.dirname(__FILE__), 'shoulda_macros', 'models')
 
 class ActiveSupport::TestCase 
   self.use_transactional_fixtures = true

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

@@ -0,0 +1,139 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class UserTest < ActiveSupport::TestCase
+
+  context 'A user instance' do
+    should_have_many :permissions
+    should_have_many :roles
+    
+    should_have_named_scope :by_newest
+    should_have_named_scope :active
+    should_have_named_scope :inactive
+    should_have_named_scope :recent
+    
+    should_ensure_length_in_range :email, 6..100 #, :short_message => 'does not look like a valid email address.', :long_message => 'does not look like a valid email address.'
+    should_allow_values_for :email, 'a@x.com', 'de.veloper@example.com'
+    should_not_allow_values_for :email, 'example.com', '@example.com', 'developer@example', 'developer', :message => 'does not look like a valid email address.'
+
+    should_not_allow_values_for :login, 'test guy', 'test.guy', 'testguy!', 'test@guy.com', :message => 'may only contain letters, numbers or a hyphen.'
+    should_allow_values_for :login, 'testguy', 'test-guy'
+    
+    
+    should_protect_attributes :crypted_password, :password_salt, :persistence_token, :single_access_token, :perishable_token, :login_count,
+                   :failed_login_count, :last_request_at, :last_login_at, :current_login_at, :current_login_ip, :last_login_ip, 
+                   :terms_of_service, :time_zone, :disabled_at, :activated_at, :created_at, :updated_at
+  end
+
+  context "search" do
+    setup do
+      @user = Factory(:user, :first_name => 'john', :last_name => 'smith', :email => 'john.smith@example.com') 
+    end
+    should "find john" do
+      assert User.do_search(:first_name => 'john').include?(@user)
+    end
+    should "find smith" do
+      assert User.do_search(:first_name => 'john').include?(@user)
+    end
+    should "find john.smith@example.com" do
+      assert User.do_search(:email => 'john.smith@example.com').include?(@user)
+    end
+  end
+  
+  context "a user" do
+    should "have full name" do
+      assert_difference 'User.count' do
+        user = Factory(:user, :first_name => 'quent', :last_name => 'smith')
+        assert !user.new_record?, "#{user.errors.full_messages.to_sentence}"
+        assert user.full_name == 'quent smith'
+      end
+    end
+    
+    should "Create a new user and lowercase the login" do
+      assert_difference 'User.count' do
+        user = Factory(:user, :login => 'TESTGUY')
+        assert !user.new_record?, "#{user.errors.full_messages.to_sentence}"
+        assert user.login == 'testguy'
+      end
+    end
+
+    should "Not allow login with dot" do
+      user = Factory.build(:user, :login => 'test.guy')
+      assert !user.valid?
+    end
+
+    should "Not allow login with dots" do
+      user = Factory.build(:user, :login => 'test.guy.guy')
+      assert !user.valid?
+    end
+
+    should "Allow login with dash" do
+      user = Factory.build(:user, :login => 'test-guy')
+      assert user.valid?
+    end
+
+    should "Not allow login with '@'" do
+      user = Factory.build(:user, :login => 'testguy@example.com')
+      assert !user.valid?
+    end         
+
+    should "Not allow login with '!'" do
+      user = Factory.build(:user, :login => 'testguy!')
+      assert !user.valid?
+    end
+
+    should "require login" do
+      assert_no_difference 'User.count' do
+        u = Factory.build(:user, :login => nil)
+        assert !u.valid?
+        assert u.errors.on(:login)
+      end
+    end
+
+    should "require password" do
+      assert_no_difference 'User.count' do
+        u = Factory.build(:user, :password => nil)
+        assert !u.valid?
+        assert u.errors.on(:password)
+      end
+    end
+
+    should "require password confirmation" do
+      assert_no_difference 'User.count' do
+        u = Factory.build(:user, :password_confirmation => nil)
+        assert !u.valid?
+        assert u.errors.on(:password_confirmation)
+      end
+    end
+
+    should "require require email" do
+      assert_no_difference 'User.count' do
+        u = Factory.build(:user, :email => nil)
+        assert !u.valid?
+        assert u.errors.on(:email)
+      end
+    end
+    
+  end
+  
+  context "inactive users" do
+    setup do
+      @user = Factory(:user, :activated_at => nil)
+    end
+    should "have at least one inactive user" do
+      assert User.inactive_count > 0
+    end
+  end
+  
+  context "user exists" do
+    setup do
+      @user = Factory(:user, :login => 'atestguytoo', :email => 'atestguytoo@example.com')
+    end
+    should "find user with login" do
+      assert User.login_exists?('atestguytoo')
+    end
+    should "find user with email" do
+      assert User.email_exists?('atestguytoo@example.com')
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Justin Ball
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: binarylogic-searchlogic
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: bcrypt-ruby
   type: :runtime
@@ -140,7 +150,9 @@ files:
 - locales/zh-CN.yml
 - locales/zh-TW.yml
 - locales/zh.yml
+- muck-users-0.1.4.gem
 - muck-users.gemspec
+- pkg/muck-users-0.1.6.gem
 - public/images/profile_default.jpg
 - rails/init.rb
 - rdoc/classes/ActionController.html
@@ -378,6 +390,7 @@ files:
 - test/rails_root/test/unit/muck_user_mailer_test.rb
 - test/rails_root/test/unit/permission_test.rb
 - test/rails_root/test/unit/role_test.rb
+- test/rails_root/test/unit/user_test.rb
 - test/rails_root/vendor/plugins/ssl_requirement/README
 - test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
 - test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
@@ -447,5 +460,6 @@ test_files:
 - test/rails_root/test/unit/muck_user_mailer_test.rb
 - test/rails_root/test/unit/permission_test.rb
 - test/rails_root/test/unit/role_test.rb
+- test/rails_root/test/unit/user_test.rb
 - test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
 - test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb