muck-users 3.2.0 → 3.2.1

data/README.rdoc

@@ -126,7 +126,7 @@ Calling rake muck:sync:users will pull in images, javascript and other assets.
 The javascript is automatically included when needed and does not need to be added to the head of your document.
 It is recommended that you include muck-users.css or copy it's content's and modify it as needed.
 
-=== Beta Codes
+=== Access Codes
 muck-users includes the ability to require a code to sign up. Add a sign up form to collect emails:
 
   <%= muck_form_for :access_code_request, :url => access_code_requests_path, :html => { :class => 'ajax beta_code_request_form' } do |f| -%>
@@ -142,17 +142,20 @@ All emails will be stored in the database. Access the admin to send out beta cod
   http://yoursite.com/admin/access_codes
 
 === 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:
+muck-users provides helpers that will build your signup form (@user is a new empty user):
 
-  <% content_for :head do -%>
-  <%= javascript_include_tag 'jquery/jquery.autocomplete.min.js' %>
-  <%= javascript_include_tag 'muck-users' %>
-  <%= stylesheet_link_tag 'jquery/jquery.autocomplete.js' %>
-  <% end -%>
+  <%= signup_form(@user) %>
+
+This will build a sign in form:
+
+  <%= signin_form %>
+
+If you need a random access code in a page just call (@user is optional but if set it should be the user sharing the access code with another user):
+
+  <%= random_access_code(@user) %>
 
-If you override the users controller you will also need to include login_search in your routes:
-  map.resources :users, :collection => { :login_search => :get }
+=== Notes
+If you override any of the controllers in muck-users be sure to include the appropriate routes in your project. Look at lib/config/routes.rb for examples.
 
 
 == General information

data/VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

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

@@ -1,7 +1,7 @@
 class Admin::Muck::AccessCodesController < Admin::Muck::BaseController
   
   def index
-    @codes = AccessCode.by_alpha.paginate(:page => @page, :per_page => @per_page)
+    @codes = AccessCode.by_newest.includes(:provided_by, :users).paginate(:page => @page, :per_page => @per_page)
     render :template => 'admin/access_codes/index'
   end
 

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

@@ -20,6 +20,13 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
     end
   end
 
+  def show
+    @user = User.find(params[:id])
+    respond_to do |format|
+      format.html { render :template => 'admin/users/show' }
+    end
+  end
+  
   def inactive
     @user_inactive_count = User.inactive_count
     @users = User.inactive.paginate(:page => @page, :per_page => @per_page)
@@ -46,7 +53,8 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   end
 
   def search
-    @users = User.where("first_name LIKE ? OR last_name LIKE ? OR email LIKE ?", params[:query], params[:query], params[:query] ).paginate(:page => @page, :per_page => @per_page )
+    @is_search = true
+    @users = User.where("first_name LIKE ? OR last_name LIKE ? OR email LIKE ?", params[:query], params[:query], params[:query] ).paginate(:page => @page, :per_page => @per_page )    
     respond_to do |format|
       format.html { render :template => 'admin/users/index' }
       format.js { render :partial => 'admin/users/table', :layout => false }

data/app/controllers/muck/users_controller.rb

@@ -90,7 +90,10 @@ class Muck::UsersController < ApplicationController
   end
   
   def is_login_available
-    result = t('muck.users.username_not_available')
+    @available = 'unavailable'
+    @output_element = 'username'    
+    recover_password_prompt = render_to_string :partial => 'users/recover_password_via_email_link', :locals => { :email => params[:user_email] }
+    result = t('muck.users.username_not_available', :reset_password_help => recover_password_prompt.html_safe).html_safe
     if params[:user_login].nil?
       result = ''
     elsif params[:user_login].empty?
@@ -104,21 +107,18 @@ class Muck::UsersController < ApplicationController
         result = t('muck.users.username_available')
       end
     end
+    if !@user.blank? && @user.errors[:login].blank? && !result.blank?
+      @available = 'available'
+    end
     respond_to do |format|
-      if !@user.blank? && @user.errors[:login].blank? && !result.blank?
-        format.html { render :partial => 'users/available', :locals => { :message => result } }
-        format.js { render :partial => 'users/available', :locals => { :message => result } }
-      else
-        format.html { render :partial => 'users/unavailable', :locals => { :message => result } }
-        format.js { render :partial => 'users/unavailable', :locals => { :message => result } }
-      end
-      
-      #format.html { render :text => result }
-      #format.js { render :text => result }
+      format.html { render :partial => 'users/availability', :locals => { :message => result } }
+      format.js { render :partial => 'users/availability', :locals => { :message => result } }
     end
   end
 
   def is_email_available
+    @available = 'unavailable'
+    @output_element = 'email'
     if params[:user_email].nil?
       result = ''
     elsif params[:user_email].empty?
@@ -134,19 +134,17 @@ class Muck::UsersController < ApplicationController
       recover_password_prompt = render_to_string :partial => 'users/recover_password_via_email_link', :locals => { :email => params[:user_email] }
       result = t('muck.users.email_not_available', :reset_password_help => recover_password_prompt.html_safe).html_safe
       respond_to do |format|
-        format.html { render :partial => 'users/unavailable', :locals => { :message => result.html_safe } }
-        format.js { render :partial => 'users/unavailable', :locals => { :message => result } }
+        format.html { render :partial => 'users/availability', :locals => { :message => result } }
+        format.js { render :partial => 'users/availability', :locals => { :message => result } }
       end
       return
+    end  
+    if errors.blank? && ! result.nil?
+      @available = 'available'
     end
     respond_to do |format|
-      if errors.blank? && ! result.nil?
-        format.html { render :partial => 'users/available', :locals => { :message => result } }
-        format.js { render :partial => 'users/available', :locals => { :message => result } }
-      else
-        format.html { render :partial => 'users/unavailable', :locals => { :message => result } }
-        format.js { render :partial => 'users/unavailable', :locals => { :message => result } }
-      end
+      format.html { render :partial => 'users/availability', :locals => { :message => result } }
+      format.js { render :partial => 'users/availability', :locals => { :message => result } }
     end
   end
 

data/app/helpers/muck_users_helper.rb

@@ -16,6 +16,13 @@ module MuckUsersHelper
       end
     end
     
+    if params[:access_code].blank?
+      @access_code_help = '<p id="access_code_help" class="attention">' + 
+        translate('muck.users.access_code_help', 
+          :access_request_anchor => %Q{<a class="fancy-access-request iframe" href="#{new_access_code_request_path}">},
+          :access_request_anchor_end => "</a>") + '<p>'.html_safe
+	  end
+	  
     raw_block_to_partial('users/signup_form', options.merge(:user => user, :redirect_to => redirect_to), &block)
   end
   
@@ -42,4 +49,17 @@ module MuckUsersHelper
     end
   end
   
+  # Generates a new random access code. If provided_by is provided then the provided_by user
+  # will be attached to the access code as the providing user.
+  def random_access_code(provided_by)
+    access_code = AccessCode.new(:expires_at => 1.year.since)
+    access_code.provided_by = provided_by
+    access_code.unlimited = false
+    access_code.use_limit = 1
+    access_code.uses = 0
+    access_code.code = AccessCode.random_code
+    access_code.save!
+    access_code
+  end
+  
 end

data/app/views/admin/access_codes/_access_code.html.erb

@@ -4,6 +4,12 @@
   <td><%= access_code.use_limit %></td>
   <td><%= access_code.unlimited %></td>
   <td><%= access_code.sent_to %></td>
+  <td><%= link_to(access_code.provided_by.display_name, admin_user_path(access_code.provided_by)) if access_code.provided_by %></td>
+  <td>
+    <% access_code.users.each do |user| %>
+      <%= link_to(user.display_name, admin_user_path(user))%>
+    <% end -%>
+  </td>
   <td><%= format_date(access_code.expires_at) %></td>
   <td><%= format_date(access_code.created_at) %></td>
   <td><%= link_to(translate('muck.users.edit'), edit_admin_access_code_path(access_code.id), { :class => 'dialog-pop', :title => translate('muck.users.edit_access_code_title') }) %></td>

data/app/views/admin/access_codes/index.html.erb

@@ -7,7 +7,9 @@
       <th><%=translate('muck.users.access_code_uses') %></th>
       <th><%=translate('muck.users.access_code_use_limit') %></th>
       <th><%=translate('muck.users.access_code_unlimited') %></th>      
-      <th><%=translate('muck.users.access_code_sent_to') %></th>      
+      <th><%=translate('muck.users.access_code_sent_to') %></th>
+      <th><%=translate('muck.users.access_code_provided_by') %></th>
+      <th><%=translate('muck.users.access_code_used_by') %></th>      
       <th><%=translate('muck.users.access_code_expires') %></th>
       <th><%=translate('muck.users.access_code_created') %></th>
       <th></th>

data/app/views/admin/users/_row.html.erb

@@ -1,5 +1,5 @@
 <tr id="<%=user.dom_id('row')%>" class="<%= cycle('odd','even') %> <%=active_class(user)%>">
-  <td><%= link_to h(user.full_name), user %></td>
+  <td><%= link_to h(user.full_name), admin_user_path(user) %></td>
   <td><%= mail_to h(user.email), user.email %></td>
   <td>
 	<ul id="<%=user.dom_id('permissions')%>" class="permissions inline">

data/app/views/admin/users/_search_box.html.erb

@@ -1,5 +1,5 @@
 <div id="search_box" class="search-box">
-  <%= form_tag search_admin_users_path, :class => 'ajax' do -%>
+  <%= form_tag search_admin_users_path do -%>
     <%= text_field_tag :query, '', :class => 'span-5' %>
     <%= submit_tag t("muck.users.admin.search_users") %>
   <% end -%>

data/app/views/admin/users/index.html.erb

@@ -1,5 +1,8 @@
 <div>
   <h2><%= t('muck.users.admin_users_title') %></h2>
-  <%= link_to 'Download Users', admin_users_path(:format => 'csv')%>
+  <% if !@is_search -%>
+    <%= link_to 'Download Users', admin_users_path(:format => 'csv')%>
+    <%=translate('muck.users.total_users', :total => User.count) %>
+  <% end -%>
   <%= render :partial => 'admin/users/table' -%>
 </div>

data/app/views/admin/users/show.html.erb

@@ -0,0 +1,17 @@
+<h2><%= link_to @user.full_name, @user %></h2>
+<%= mail_to @user.email, @user.email %>
+<%= link_to t('muck.users.public_profile'), @user %>
+<div>
+	<ul id="<%=@user.dom_id('permissions')%>" class="permissions inline">
+	  <%= render :partial => 'admin/permissions/permission', :collection => @user.permissions, :locals => { :user => @user } %>
+	</ul>
+</div>
+
+<div>
+  <ul class="drop-menu"> 
+  	<li><%= link_to(translate('muck.users.change_permissions'), permissions_admin_user_path(@user), { :title => translate('muck.users.change_permissions_for', :user => @user.full_name), :class => 'dialog-pop', :alt => 'pop' }) %></li> 
+  	<li><%= render :partial => 'admin/users/activate', :locals => { :user => @user }, :alt => 'pop' %></li> 
+  	<li><%= link_to(t("muck.users.edit"), edit_admin_user_path(@user.id), { :title =>t('muck.users.edit_this_user'), :class => 'dialog-pop', :alt => 'pop'}) -%></li> 
+  	<li><%= link_to(t("muck.general.delete"), admin_user_path(@user.id), { :title => t('muck.users.delete_this_user'), :class => 'delete-user ajax-delete' }) -%></li> 
+  </ul> 
+</div>

data/app/views/users/_availability.html.erb

@@ -0,0 +1,2 @@
+jQuery("#<%=@output_element%>-availibility").html('<span class="<%= @available %>"><%= message.html_safe %></span>');
+

data/app/views/users/_signup_form.html.erb

@@ -20,12 +20,9 @@
               :access_request_anchor => %Q{<a class="fancy-access-request iframe" href="#{new_access_code_request_path}">},
               :access_request_anchor_end => "</a>").html_safe %>
         </p>
-  	  <% end -%>
+  	  <% end -%>            
       <%= f.text_field :access_code_code, { :label => translate('muck.users.access_code'), 
-                                            :extra_html => '<p id="access_code_help" class="attention">' + 
-                                              translate('muck.users.access_code_help', 
-                                                :access_request_anchor => %Q{<a class="fancy-access-request iframe" href="#{new_access_code_request_path}">},
-                                                :access_request_anchor_end => "</a>") + '<p>'.html_safe } -%>
+                                            :extra_html => @access_code_help } -%>
     <% end -%>
 
   	<%= f.text_field :login, { :label => t('muck.users.choose_member_name'), 

data/app/views/users/_signup_form_javascript.html.erb

@@ -1,5 +1,7 @@
-<% content_for :head do -%>
+<% content_for :javascript do -%>
   <%= javascript_include_tag 'jquery/jquery.autocomplete.min.js' %>
   <%= javascript_include_tag 'muck-users' %>
+<% end -%>
+<% content_for :head do -%>
   <%= stylesheet_link_tag 'jquery/jquery.autocomplete.css' %>
 <% end -%>

data/config/locales/en.yml

@@ -2,6 +2,7 @@
 en: 
   muck: 
     users: 
+      public_profile: Public Profile
       add_access_code: Add Access Code
       cant_delete_admin: You can't delete a user that is in the admin role.  Remove the user from the administrator role and then try again.  Please be careful when deleting administrators.  If you delete all administrator accounts you will no longer be able to login to the administration system.
       sign_in_now: Sign in now!
@@ -24,7 +25,8 @@ en:
       bulk_access_code_message: Message
       view_your_account: View Your Account
       password_mismatch: Password mismatch.
-      username_not_available: Username not available
+      username_not_available: Username already in use. %{reset_password_help}
+      email_not_available: Email already in use. %{reset_password_help}
       admin: 
         activate_all_inactive_users_confirm: Are you sure you want to activate all inactive users in the system?  This cannot be undone!
         activate_all_inactive_users: Activate All Inactive Users
@@ -37,7 +39,6 @@ en:
       confirm_select_new_password: Confirm Password Change
       email_invalid: Invalid email
       user_disable_problem: There was a problem disabling this user.
-      email_not_available: Email already in use. %{reset_password_help}
       total_users: "Total Users: %{total}"
       add_role_dialog_title: Add Role
       submit: Submit
@@ -91,6 +92,8 @@ en:
         search_users: Search Users
       access_code_uses: Uses
       access_code_sent_to: Sent To
+      access_code_provided_by: Provided By
+      access_code_used_by: Used By
       select_new_password: Select a New Password
       login: Login
       access_code_requests_code_sent_on: Code Sent on

data/db/migrate/20110420153714_add_provided_by_to_access_codes.rb

@@ -0,0 +1,9 @@
+class AddProvidedByToAccessCodes < ActiveRecord::Migration
+  def self.up
+    add_column :access_codes, :provided_by_id, :integer
+  end
+
+  def self.down
+    remove_column :access_codes, :provided_by_id
+  end
+end

data/lib/muck-users/models/access_code.rb

@@ -10,7 +10,8 @@ module MuckUsers
         validates_uniqueness_of :code
 
         has_many :users
-
+        belongs_to :provided_by, :class_name => "User"
+        
         scope :by_newest, order('access_codes.created_at DESC')
         scope :by_alpha, order('access_codes.code ASC')
         scope :active, where('access_codes.expires_at > Now() AND access_codes.uses <= use_limit')

data/lib/muck-users/models/user.rb

@@ -21,6 +21,7 @@ module MuckUsers
         scope :by_login_alpha, order("users.login ASC")
         scope :by_login, lambda { |*args| { :conditions => ["users.login LIKE ?", args.first + '%'] } }
         
+        has_many :provided_access_codes, :class_name => "AccessCode", :foreign_key => "provided_by_id"
         belongs_to :access_code
         accepts_nested_attributes_for :access_code
         attr_accessor :access_code_code
@@ -33,7 +34,7 @@ module MuckUsers
         before_save :lower_login
         
         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.'
+        #validates_format_of :email, :with => email_regex, :message => 'does not look like a valid email address.'
         
         # prevents a user from submitting a crafted form that bypasses activation
         attr_protected :crypted_password, :password_salt, :persistence_token, :single_access_token, :perishable_token, :login_count,

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.2.0"
+  s.version = "3.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-04-20}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
     "app/views/admin/users/row.js.erb",
     "app/views/admin/users/search.html.erb",
     "app/views/admin/users/search.js.erb",
+    "app/views/admin/users/show.html.erb",
     "app/views/password_resets/edit.html.erb",
     "app/views/password_resets/new.html.erb",
     "app/views/user_mailer/access_code.ar.html.erb",
@@ -408,11 +409,10 @@ Gem::Specification.new do |s|
     "app/views/user_sessions/_form.erb",
     "app/views/user_sessions/new.html.erb",
     "app/views/username_request/new.html.erb",
-    "app/views/users/_available.html.erb",
+    "app/views/users/_availability.html.erb",
     "app/views/users/_recover_password_via_email_link.html.erb",
     "app/views/users/_signup_form.html.erb",
     "app/views/users/_signup_form_javascript.html.erb",
-    "app/views/users/_unavailable.html.erb",
     "app/views/users/_user.html.erb",
     "app/views/users/activation_confirmation.html.erb",
     "app/views/users/activation_instructions.html.erb",
@@ -472,6 +472,7 @@ Gem::Specification.new do |s|
     "db/migrate/20100123233654_create_access_code_requests.rb",
     "db/migrate/20101117172951_add_name_to_access_code_requests.rb",
     "db/migrate/20110303183433_add_sent_to_to_access_codes.rb",
+    "db/migrate/20110420153714_add_provided_by_to_access_codes.rb",
     "lib/muck-users.rb",
     "lib/muck-users/config.rb",
     "lib/muck-users/controllers/authentic_application.rb",

data/public/javascripts/muck-users.js

@@ -1,16 +1,12 @@
 jQuery(document).ready(function() {
 	jQuery("#user_login").blur(function(){
-	  jQuery.post("/users/is_login_available",{ user_login:jQuery(this).val(), format:'js' },function(data){
-	    jQuery("#username-availibility").html(data);
-	  });
+	  jQuery.post("/users/is_login_available",{ user_login:jQuery(this).val(), format:'js' },function(data){});
 	});
 	jQuery("#user_login").keydown(function() {
 	  jQuery("#username-availibility").html('');
 	});
 	jQuery("#user_email").blur(function(){
-	  jQuery.post("/users/is_email_available",{ user_email:jQuery(this).val(), format:'js' },function(data){
-	    jQuery("#email-availibility").html(data);
-	  });
+	  jQuery.post("/users/is_email_available",{ user_email:jQuery(this).val(), format:'js' },function(data){});
 	});
 	jQuery("#user_email").keydown(function() {
 	  jQuery("#email-availibility").html('');

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 2
-  - 0
-  version: 3.2.0
+  - 1
+  version: 3.2.1
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -06:00
+date: 2011-04-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,6 +147,7 @@ files:
 - app/views/admin/users/row.js.erb
 - app/views/admin/users/search.html.erb
 - app/views/admin/users/search.js.erb
+- app/views/admin/users/show.html.erb
 - app/views/password_resets/edit.html.erb
 - app/views/password_resets/new.html.erb
 - app/views/user_mailer/access_code.ar.html.erb
@@ -476,11 +477,10 @@ files:
 - app/views/user_sessions/_form.erb
 - app/views/user_sessions/new.html.erb
 - app/views/username_request/new.html.erb
-- app/views/users/_available.html.erb
+- app/views/users/_availability.html.erb
 - app/views/users/_recover_password_via_email_link.html.erb
 - app/views/users/_signup_form.html.erb
 - app/views/users/_signup_form_javascript.html.erb
-- app/views/users/_unavailable.html.erb
 - app/views/users/_user.html.erb
 - app/views/users/activation_confirmation.html.erb
 - app/views/users/activation_instructions.html.erb
@@ -540,6 +540,7 @@ files:
 - db/migrate/20100123233654_create_access_code_requests.rb
 - db/migrate/20101117172951_add_name_to_access_code_requests.rb
 - db/migrate/20110303183433_add_sent_to_to_access_codes.rb
+- db/migrate/20110420153714_add_provided_by_to_access_codes.rb
 - lib/muck-users.rb
 - lib/muck-users/config.rb
 - lib/muck-users/controllers/authentic_application.rb

data/app/views/users/_available.html.erb

@@ -1 +0,0 @@
-<span class="available"><%= message %></span>

data/app/views/users/_unavailable.html.erb

@@ -1 +0,0 @@
-<span class="unavailable"><%= message %></span>