muck-users 0.2.23 → 0.3.0

data/app/models/role.rb

@@ -11,10 +11,13 @@
 class Role < ActiveRecord::Base
   unloadable
   
-  has_many :permissions
+  has_many :permissions, :dependent => :destroy
   has_many :users, :through => :permissions
-
+  
   validates_presence_of :rolename
+  validates_uniqueness_of :rolename
+
+  named_scope :by_alpha, :order => 'roles.rolename ASC'
 
   # roles can be defined as symbols.  We want to store them as strings in the database
   def rolename= val

data/app/models/user_mailer.rb

@@ -43,4 +43,11 @@ class UserMailer < ActionMailer::Base
               :application_name => GlobalConfig.application_name
   end
 
+  def access_code(email, subject, message, code)
+    muck_setup_email(email)
+    subject       subject
+    body          :message => message, :code => code
+    content_type  "text/html"
+  end
+    
 end

data/app/views/access_code_requests/new.html.erb

@@ -0,0 +1,7 @@
+<h3><%=translate('muck.users.request_access_code') %></h3>
+<%= output_errors('Problem adding access code', {:class => 'help-box'}, @access_code_request) %>
+<% custom_form_for :access_code_request, :url => access_code_requests_path do |f| -%>
+  <%= f.text_field :email, { :label => translate('muck.users.email_address'),
+                             :tip => translate('muck.users.access_code_request_tip')  } -%>
+  <%= f.submit translate('muck.users.submit') %>
+<% end -%>

data/app/views/access_code_requests/show.html.erb

@@ -0,0 +1 @@
+<p><%= translate('muck.users.access_code_request_thank_you') %></p>

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

@@ -0,0 +1,8 @@
+<tr>
+  <td><%= link_to access_code.code, admin_access_code_path(access_code) %></td>
+  <td><%= access_code.uses %></td>
+  <td><%= access_code.use_limit %></td>
+  <td><%= access_code.unlimited %></td>
+  <td><%= format_date(access_code.expires_at) %></td>
+  <td><%= format_date(access_code.created_at) %></td>
+</tr>

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

@@ -0,0 +1,15 @@
+<%= f.text_field :code, { :label => translate('muck.users.access_code'),
+                          :tip => translate('muck.users.access_code_tip')  } -%>
+<%= f.text_field :use_limit, { :label => translate('muck.users.use_limit'),
+                               :tip => translate('muck.users.use_limit_tip') } -%>
+<%= f.check_box :unlimited, { :label => translate('muck.users.unlimited'),
+                              :tip => translate('muck.users.unlimited_tip') } -%>
+<%= f.text_field :expires_at, { :label => translate('muck.users.expiration_date'),
+                                :tip => translate('muck.users.expiration_date_tip'),
+                                :class => 'date_pick' } -%>
+
+<script type="text/javascript" language="JavaScript">
+  jQuery(document).ready(function(){
+    jQuery('.date_pick').datepicker();
+  });
+</script>

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

@@ -0,0 +1,6 @@
+<tr>
+  <td><%= link_to user.login, profile_path(user) %></td>
+  <td><%= user.email %></td>
+  <td><%= user.first_name %></td>
+  <td><%= user.last_name %></td>
+</tr>

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

@@ -0,0 +1,12 @@
+<h2><%=translate('muck.users.bulk_access_codes_title') %></h2>
+<p><%=translate('muck.users.bulk_access_codes_description') %></p>
+
+<%= output_errors(translate('muck.users.bulk_access_code_problem'), {:class => 'help-box'}, @access_code) %>
+
+<% custom_form_for :access_code, :url => bulk_create_admin_access_codes_path, :html => {:class => "standard-form alt"} do |f| -%>
+  <%= render :partial => 'admin/access_codes/form', :locals => {:f => f} %>
+  <%= text_field_tag :subject, params[:subject], :label => {:text => "Subject"} %>
+  <%= text_area_tag :message, params[:message], :label => {:text => "Message"} %>
+  <%= text_area_tag :emails, params[:emails], :label => {:text =>"Emails"}, :tip => translate('muck.users.bulk_access_code_emails_tip') %>
+  <%= f.submit translate('muck.users.save') %>
+<% end -%>

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

@@ -0,0 +1,6 @@
+<h3><%=translate('muck.users.edit_access_code') %></h3>
+<%= output_errors(translate('muck.users.access_code_edit_problem'), {:class => 'help-box'}, @access_code) %>
+<% custom_form_for @access_code, :url => admin_access_code_path(@access_code), :html => { :method => :put } do |f| -%>
+  <%= render :partial => 'admin/access_codes/form', :locals => { :f => f } %>
+  <%= f.submit translate('muck.users.save') %>
+<% end -%>

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

@@ -0,0 +1,18 @@
+<h2><%=translate('muck.users.access_codes') %></h2>
+<div>
+  <%= link_to translate('muck.users.access_code_new'), new_admin_access_code_path %>
+</div>
+<table class="adminTable" cellspacing="0" cellpadding="0">
+  <thead>
+    <tr>
+      <th><%=translate('muck.users.access_code') %></th>
+      <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_expires') %></th>
+      <th><%=translate('muck.users.access_code_created') %></th>
+    </tr>
+  </thead>
+  <%= render :partial => 'admin/access_codes/access_code', :collection => @codes %>
+</table>
+<%= will_paginate @codes %>

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

@@ -0,0 +1,6 @@
+<h3><%=translate('muck.users.add_access_code') %></h3>
+<%= output_errors(translate('muck.users.access_code_add_problem'), {:class => 'help-box'}, @access_code) %>
+<% custom_form_for :access_code, :url => admin_access_codes_path do |f| -%>
+  <%= render :partial => 'admin/access_codes/form', :locals => {:f => f} %>
+  <%= f.submit translate('muck.users.save') %>
+<% end -%>

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

@@ -0,0 +1,30 @@
+<h2><%=translate('muck.users.access_code') %></h2>
+<%= link_to(translate('muck.users.access_code_edit_link'), edit_admin_access_code_path(@access_code.id)) %>
+<%= link_to(translate('muck.users.access_code_delete_link'), admin_access_code_path(@access_code.id), :method => :delete, :confirm => translate('muck.users.access_code_delete_confirm')) %>
+
+<table class="adminTable" cellspacing="0" cellpadding="0">
+  <thead>
+    <tr>
+      <th><%=translate('muck.users.access_code') %></th>
+      <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_expires') %></th>
+      <th><%=translate('muck.users.access_code_created') %></th>
+    </tr>
+  </thead>
+  <%= render :partial => 'admin/access_codes/access_code', :object => @access_code %>
+</table>
+
+<h3><%=translate('muck.users.access_code_related_users') %></h3>
+<table class="adminTable" cellspacing="0" cellpadding="0">
+  <thead>
+    <tr>
+      <th><%=translate('muck.users.login') %></th>
+      <th><%=translate('muck.users.email') %></th>
+      <th><%=translate('muck.users.first_name') %></th>
+      <th><%=translate('muck.users.last_name') %></th>
+    </tr>
+  </thead>
+  <%= render :partial => 'admin/access_codes/user', :collection => @access_code.users %>
+</table>

data/app/views/admin/permissions/_permission.html.erb

@@ -0,0 +1,3 @@
+<li id="<%=permission.dom_id%>">
+  <%= link_to(permission.role.rolename, admin_role_path(permission.role)) %>
+</li>

data/app/views/admin/roles/_role.html.erb

@@ -1,9 +1,5 @@
-<li>
-  <%= role.rolename %>
-  <% if @user.has_role?(role.rolename) %>
-    <%= link_to I18n.t('muck.roles.remove_role'), user_role_url(:id => role.id, :user_id => @user.id), :method => :delete %>
-  <% else %>
-    <%= link_to I18n.t('muck.roles.assign_role'), user_role_url(:id => role.id, :user_id => @user.id), :method => :put %>
-  <% end %>
-</li>
-
+<tr id="<%=role.dom_id%>">
+  <td><%= link_to(role.rolename, admin_role_path(role)) %></td>
+  <td><%= link_to(translate('muck.users.edit'), edit_admin_role_path(role), { :class => 'dialog-pop', :title => translate('muck.users.edit_role_dialog_title') } ) %></td>
+  <td><%= link_to(translate('muck.users.delete'), admin_role_path(role), { :class => 'ajax-delete', :confirm => translate('muck.users.role_delete_confirm') } ) %></td>
+</tr>

data/app/views/admin/roles/edit.html.erb

@@ -1,17 +1,4 @@
-<h1><%= I18n.t('Editing role') %></h1>
-
-<%= error_messages_for :role %>
-
-<% form_for(admin_roles_path(@role)) do |f| %>
-  <p>
-    <b><%= I18n.t('Rolename') %></b><br />
-    <%= f.text_field :rolename %>
-  </p>
-
-  <p>
-    <%= f.submit I18n.t('Update') %>
-  </p>
-<% end %>
-
-<%= link_to I18n.t('Show'), @role %> |
-<%= link_to I18n.t('Back'), admin_roles_path %>
+<% custom_form_for @role, :url => admin_role_path(@role), :html => { :class => 'ajax', :method => :put } do |f| %>
+  <%= f.text_field :rolename %>
+  <%= f.submit translate('muck.users.update') %>
+<% end %>

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

@@ -1,8 +1,16 @@
-<h2><%= I18n.t('Roles for %{user}') % {:user => h(@user.login.capitalize)} %></h2>
- 
-<h3><%= I18n.t('Roles assigned:') %></h3>
-<ul><%= render :partial => 'role', :collection => @user.roles %></ul>
- 
-<h3><%= I18n.t('Roles available:') %></h3>
-<ul><%= render :partial => 'role', :collection => (@all_roles - @user.roles) %></ul>
-
+<h2><%=translate('muck.users.roles') %></h2>
+<p>
+  <%= link_to translate('muck.users.add_role'), new_admin_role_path, { :class => 'dialog-pop', :title => translate('muck.users.add_role_dialog_title') } %>
+</p>
+<table class="adminTable">
+  <thead>
+    <tr>
+      <th><%=translate('muck.users.role') %></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody id="current-roles">
+    <%= render :partial => 'admin/roles/role', :collection => @roles %>
+  </tbody>
+</table>

data/app/views/admin/roles/new.html.erb

@@ -1,16 +1,4 @@
-<h1><%= I18n.t('New role') %></h1>
-
-<%= error_messages_for :role %>
-
-<% form_for @role, :url => admin_role_path(@role) do |f| %>
-  <p>
-    <b><%= I18n.t('Rolename') %></b><br />
-    <%= f.text_field :rolename %>
-  </p>
-
-  <p>
-    <%= f.submit I18n.t('Create') %>
-  </p>
-<% end %>
-
-<%= link_to I18n.t('Back'), admin_roles_path %>
+<% custom_form_for @role, :url => admin_roles_path, :html => { :class => 'ajax' } do |f| %>
+  <%= f.text_field :rolename %>
+  <%= f.submit translate('muck.users.add') %>
+<% end %>

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

@@ -1,7 +1,3 @@
-<p>
-  <b><%= I18n.t('Rolename:') %></b>
-  <%=h @role.rolename %>
-</p>
-
-<%= link_to I18n.t('Edit'), edit_role_path(@role) %> |
-<%= link_to I18n.t('Back'), admin_roles_path %>
+<h2><%= @role.rolename %></h2>
+<h3><%=translate('muck.users.users_in_role') %></h3>
+<%= render :partial => 'admin/users/table' -%>

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

@@ -1,5 +1,5 @@
 <% if user.active? -%>
-	<%= link_to_remote I18n.t('muck.general.deactivate'), { :url => admin_user_path(user, :format => 'js'), :method => :put } -%>
+	<%= link_to I18n.t('muck.general.deactivate'), admin_user_path(user, :deactivate => 'true'), :class => 'ajax-update' -%>
 <% else -%>
-	<%= link_to_remote I18n.t('muck.general.activate'), { :url => admin_user_path(user, :format => 'js'), :method => :put } -%>
+	<%= link_to I18n.t('muck.general.activate'), admin_user_path(user, :activate => 'true'), :class => 'ajax-update' -%>
 <% end -%>

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

@@ -1,6 +1,12 @@
 <tr id="<%=user.dom_id('row')%>" class="<%= cycle('odd','even') %>">
 	<td><%= link_to h(user.full_name), user %></td>
 	<td><%= mail_to h(user.email), user.email %></td>
-	<td id="<%=user.dom_id('link')%>"><%= render :partial => 'admin/users/activate', :locals => { :user => user } %></td>
-	<td><%= link_to_remote t("muck.general.delete"), { :url => admin_user_path(user.id), :method => :delete }, { :title => t('muck.users.delete_this_user'), :class => 'delete-user' } -%></td>
+	<td>
+	  <ul id="<%=user.dom_id('permissions')%>" class="permissions inline">
+	    <%= render :partial => 'admin/permissions/permission', :collection => user.permissions, :locals => { :user => user } %>
+	  </ul>
+	</td>
+	<td><%= 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' }) %></td>
+  <td id="<%=user.dom_id('link')%>"><%= render :partial => 'admin/users/activate', :locals => { :user => user } %></td>
+	<td><%= link_to(t("muck.general.delete"), { :url => admin_user_path(user.id) }, { :title => t('muck.users.delete_this_user'), :class => 'delete-user ajax-delete' }) -%></td>
 </tr>

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

@@ -1,21 +1,16 @@
-<table id="manage" class="manage">
+<table class="adminTable">
 	<thead>
-	<tr>
-		<th><%= t('muck.users.name') %></th>
-		<th><%= t('muck.users.email_address') %></th>
-		<th></th>
-		<th></th>
-	</tr>
+  	<tr>
+  		<th><%= t('muck.users.name') %></th>
+  		<th><%= t('muck.users.email_address') %></th>
+  		<th><%= t('muck.users.roles') %></th>
+  		<th></th>
+  		<th></th>
+  		<th></th>
+  	</tr>
 	</thead>
 	<tbody>
 	  <%= render :partial => 'admin/users/row', :collection => @users, :as => :user %>
 	</tbody>
 </table>
-<%= will_paginate @users %>
-<script type="text/javascript" language="JavaScript">
-jQuery(document).ready(function() {	
-	jQuery(".delete-user").click(function() {
-		jQuery(this).parent().html('deleting user...');
-	});
-});
-</script>
+<%= will_paginate @users %>

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

@@ -0,0 +1,8 @@
+<% custom_form_for @user, :url => admin_user_path(@user), :html => { :class => 'ajax', :method => :put } do |f| %>
+  <ul class="checkbox-list">
+    <% Role.all.each do |role| -%>
+      <li><%= check_box_tag "user[role_ids][]", role.id, @user.has_role?(role.rolename) -%> <%= role.rolename -%></li>
+    <% end -%>
+  </ul>
+  <%= f.submit translate('muck.users.save') %>
+<% end %>

data/app/views/user_mailer/access_code.text.html.erb

@@ -0,0 +1,3 @@
+<p><%= @message %></p>
+<p>Access Code: <%= @code %></p>
+<p><%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %></p>

data/app/views/user_mailer/access_code.text.plain.erb

@@ -0,0 +1,5 @@
+<%= @message %>
+
+Access Code: <%= @code %>
+
+<%= link_to translate('muck.users.click_to_sign_up_now'), signup_url(:access_code => @code) %>

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

@@ -2,6 +2,13 @@
 
 	<%= output_errors(t('muck.users.problem_creating_account'), {:class => 'help-box'}, user) %>
 	
+	<% if GlobalConfig.require_access_code -%>
+    <%= f.text_field :access_code_code, { :label => translate('muck.users.access_code'), 
+                                        :extra_html => translate('muck.users.access_code_help', 
+                                                          :access_request_anchor => %Q{<a class="fancy-pop iframe" href="#{new_access_code_request_path}">},
+                                                          :access_request_anchor_end => "</a>") } -%>
+  <% end -%>
+  
 	<%= f.text_field :login, { :label => t('muck.users.choose_member_name'), 
 	                           :extra_html => '<span id="username-availibility" class="availability"></span>', 
 	                           :tip => t('muck.users.username_help'),

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

@@ -1,5 +1,5 @@
 <div id="welcome" class="common-content">
   <%= output_errors('', {:class => 'help-box'}) %>
   <%= t('muck.users.welcome_message') %>
-  <%= link_to 'View Your Account', user_path(current_user) %>
+  <%= link_to translate('muck.users.view_your_account'), user_path(current_user) %>
 </div>

data/config/muck_users_routes.rb

@@ -45,14 +45,17 @@ ActionController::Routing::Routes.draw do |map|
     user_sessions.signup_complete_login_required '/signup_complete_login/:id', :action => 'new'
   end
   
+  # Access codes
+  map.resources :access_code_requests, :controller => 'muck/access_code_requests'
+
   # page a user is taken to when they log out
   map.logout_complete '/login', :controller => 'user_session', :action => 'new'
   
   # admin
   map.namespace :admin do |a|
-    a.resources :users, :controller => 'muck/users', :collection => { :inactive => :get, :inactive_emails => :get, :activate_all => :get, :search => :post, :ajax_search => :post }
+    a.resources :users, :controller => 'muck/users', :member => { :permissions => :get }, :collection => { :inactive => :get, :inactive_emails => :get, :activate_all => :get, :search => :post, :ajax_search => :post }
     a.resources :roles, :controller => 'muck/roles'
-    a.resources :permissions, :controller => 'muck/permissions'
+    a.resources :access_codes, :controller => 'muck/access_codes', :collection => {:bulk => :get, :bulk_create => :post}
   end
 
 end

data/db/migrate/20100123035450_create_access_codes.rb

@@ -0,0 +1,19 @@
+class CreateAccessCodes < ActiveRecord::Migration
+  def self.up
+    create_table :access_codes do |t|
+      t.string    :code
+      t.integer   :uses,       :default => 0,     :null => false
+      t.boolean   :unlimited,  :default => false, :null => false
+      t.datetime  :expires_at
+      t.integer   :use_limit,  :default => 1,     :null => false
+      t.timestamps
+    end
+    add_index :access_codes, :code
+    add_column :users, :access_code_id, :integer
+  end
+
+  def self.down
+    drop_table :access_codes
+    remove_column :users, :access_code_id
+  end
+end

data/db/migrate/20100123233654_create_access_code_requests.rb

@@ -0,0 +1,14 @@
+class CreateAccessCodeRequests < ActiveRecord::Migration
+  def self.up
+    create_table :access_code_requests do |t|
+      t.string    :email
+      t.datetime  :code_sent_at
+      t.timestamps
+    end
+    add_index :access_code_requests, :email
+  end
+
+  def self.down
+    drop_table :access_code_requests
+  end
+end

data/lib/action_controller/authentic_application.rb

@@ -111,7 +111,7 @@ module ActionController
       end
 
       def can_access?(user, object, roles, &block)
-        if logged_in? && user.is_in_role?(event, roles)
+        if logged_in? && user.is_in_role?(object, roles)
           content = capture(&block)
           concat(content, block.binding)
         end

data/lib/active_record/acts/muck_access_code.rb

@@ -0,0 +1,75 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module MuckAccessCode #:nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+
+        def acts_as_muck_access_code(options = {})
+
+          validates_presence_of :code, :uses, :use_limit, :expires_at
+          validates_uniqueness_of :code
+
+          has_many :users
+
+          named_scope :newest, :order => 'access_codes.created_at DESC'
+          named_scope :by_alpha, :order => 'access_codes.code ASC'
+          named_scope :active, :conditions => 'access_codes.expires_at > Now() AND access_codes.uses <= use_limit'
+
+          include ActiveRecord::Acts::MuckAccessCode::InstanceMethods
+          extend ActiveRecord::Acts::MuckAccessCode::SingletonMethods
+          
+        end
+      end
+
+      # class methods
+      module SingletonMethods
+
+        def valid_code?(code)
+          access_code = find_by_code(code)
+          valid_code = access_code ? !access_code.overused? : false
+          [access_code, valid_code]
+        end
+        
+        def random_code
+          code_length = 14 # will generate a code 15 chars long
+          letters = ['B', 'C', 'D', 'F', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'V', 'W', 'X', 'Y', 'Z']
+          numbers = [2, 3, 4, 7, 9]
+          promo_set = letters | numbers # combine arrays
+          begin
+            promo_code = promo_set.sort_by{rand}[0..code_length].to_s # randomize array and take the first 15 elements and make them a string
+          end until !self.active_code?(promo_code)
+          promo_code
+        end
+        
+        # Checks the database to ensure the specified code is not taken
+        def active_code?(code)
+          AccessCode.find_by_code(code)
+        end
+        
+      end
+      
+      module InstanceMethods
+        
+        def use_code
+          self.update_attribute(:uses, self.uses + 1)
+        end
+
+        def invalid?
+          expired? || overused?
+        end
+        
+        def overused?
+          (self.uses >= self.use_limit) && !self.unlimited
+        end
+        
+        def expired?
+          self.expires_at? && self.expires_at < Time.now
+        end
+        
+      end
+    end
+  end
+end