muck-users 3.1.7 → 3.1.8

data/VERSION

@@ -1 +1 @@
-3.1.7
+3.1.8

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

@@ -0,0 +1,59 @@
+class Admin::Muck::AccessCodeRequestsController < Admin::Muck::BaseController
+  
+  def index
+    @unfullfilled_requests = AccessCodeRequest.unfullfilled.by_newest.paginate(:page => @page, :per_page => @per_page)
+    render :template => 'admin/access_code_requests/index'
+  end
+  
+  def edit
+    @access_code_request = AccessCodeRequest.find(params[:id])
+    render :template => "admin/access_code_requests/edit", :layout => false
+  end
+  
+  def send_code
+    @access_code_request = AccessCodeRequest.find(params[:id])
+    render :template => "admin/access_code_requests/send_code", :layout => false
+  end
+  
+  def update
+    debugger
+    @access_code_request = AccessCodeRequest.find(params[:id])
+    if params[:send_access_code]
+      @success = @access_code_request.send_access_code(params[:subject], params[:message])
+    else
+      @success = @access_code_request.update_attributes(params[:access_code_request])
+    end
+    
+    if @success
+      ajax_update_access_code_request
+    else
+      output_admin_messages(@access_code_request)
+    end
+    
+  rescue => ex
+    flash[:error] = ex
+    output_admin_messages
+  end
+  
+  def destroy
+    @access_code_request = AccessCodeRequest.find(params[:id])
+    @success = @access_code_request.destroy
+    respond_to do |format|
+      format.html { redirect_to admin_access_code_requests_path }
+      format.js do
+        if @success
+          render :template => 'admin/access_code_requests/destroy', :layout => false
+        else
+          output_admin_messages
+        end
+      end
+    end
+  end
+  
+  protected
+  
+    def ajax_update_access_code_request
+      render :template => 'admin/access_code_requests/ajax_update_access_code_request'
+    end
+    
+end

data/app/views/admin/access_code_requests/_access_code_request.html.erb

@@ -0,0 +1,14 @@
+<tr id="<%=access_code_request.dom_id('row')%>">
+  <td><%= access_code_request.name %></td>
+  <td><%= access_code_request.email %></td>
+  <td><%= format_date(access_code_request.created_at) %></td>
+  <td>
+    <% if access_code_request.code_sent_at -%>
+      <%= format_date(access_code_request.code_sent_at) %>
+    <% else -%>
+      <%= link_to(translate('muck.users.send_code'), send_code_admin_access_code_request_path(access_code_request.id), { :class => 'dialog-pop', :title => translate('muck.users.send_access_code_request_title') }) %>
+    <% end -%>
+  </td>
+  <td><%= link_to(translate('muck.users.edit'), edit_admin_access_code_request_path(access_code_request.id), { :class => 'dialog-pop', :title => translate('muck.users.edit_access_code_request_title') }) %></td>
+  <td><%= link_to(translate('muck.users.delete'), admin_access_code_request_path(access_code_request.id), :class => 'ajax-delete', :title => translate('muck.users.access_code_request_delete_confirm')) %></td>
+</tr>

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

@@ -0,0 +1,2 @@
+<%= f.text_field :email, { :label => translate('muck.users.access_code_requests_name') } -%>
+<%= f.text_field :name, { :label => translate('muck.users.access_code_requests_email') } -%>

data/app/views/admin/access_code_requests/ajax_update_access_code_request.js.erb

@@ -0,0 +1,2 @@
+jQuery('#<%=@access_code_request.dom_id('row')%>').replaceWith('<%=escape_javascript(render(:partial => 'admin/access_code_requests/access_code_request', :locals => { :access_code_request => @access_code_request } ))%>');
+jQuery('.dialog').dialog('close');

data/app/views/admin/access_code_requests/destroy.js.erb

@@ -0,0 +1,2 @@
+jQuery('#<%=@access_code_request.dom_id('row')%>').fadeOut();
+<%= hide_admin_messages %>

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

@@ -0,0 +1,6 @@
+<h3><%=translate('muck.users.edit_access_code_request') %></h3>
+<%= output_errors(translate('muck.users.access_code_request_edit_problem'), {:class => 'help-box'}, @access_code_request) %>
+<%= muck_form_for @access_code_request, :url => admin_access_code_request_path(@access_code_request), :html => { :method => :put, :class => 'ajax' } do |f| -%>
+  <%= render :partial => 'admin/access_code_requests/form', :locals => { :f => f } %>
+  <%= f.submit translate('muck.users.save') %>
+<% end -%>

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

@@ -0,0 +1,17 @@
+<h2><%=translate('muck.users.unfullfilled_access_code_requests') %></h2>
+<table class="adminTable" cellspacing="0" cellpadding="0">
+  <thead>
+    <tr>
+      <th><%=translate('muck.users.access_code_requests_name') %></th>
+      <th><%=translate('muck.users.access_code_requests_email') %></th>
+      <th><%=translate('muck.users.access_code_requests_signed_up_on') %></th>
+      <th><%=translate('muck.users.access_code_requests_code_sent_on') %></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody id="current-access-code-requests">
+    <%= render :partial => 'admin/access_code_requests/access_code_request', :collection => @unfullfilled_requests %>
+  </tbody>
+</table>
+<%= will_paginate @unfullfilled_requests %>

data/app/views/admin/access_code_requests/send_code.html.erb

@@ -0,0 +1,19 @@
+<div id="send-access-code-single">
+  <h3><%=translate('muck.users.send_access_code_request_title') %></h3>
+  <%= output_errors(translate('muck.users.access_code_request_send_problem'), {:class => 'help-box'}, @access_code_request) %>
+  <%= muck_form_for @access_code_request, :url => admin_access_code_request_path(@access_code_request), :html => { :method => :put, :class => 'ajax' } do |f| -%>
+    <p><%=translate('muck.users.send_access_code_instructions') %></p>
+    <div class="form-row">
+      <label><%= translate('muck.users.access_code_subject')%></label>
+      <%= text_field_tag :subject -%>
+    </div>
+    <div class="form-row">
+      <label><%= translate('muck.users.access_code_message')%></label>
+      <%= text_area_tag :message -%>  
+    </div>
+    <div class="form-row">
+      <%= f.submit translate('muck.users.send_access_code') %>
+    </div>
+    <%= hidden_field :send_access_code, true %>
+  <% end -%>
+</div>

data/config/locales/en.yml

@@ -6,6 +6,7 @@ en:
       old_password_incorrect: Your old password is incorrect.
       bulk_access_code_emails_tip: Separate emails with a comma
       join_application_name: Join and get it done
+      access_code_request_delete_confirm: Are you sure you want to cancel this access code request?
       email_help: Please use a valid, current e-mail address. We will never share or spam your e-mail address.
       logout_required: ""
       access_code_fullfill_invites_limit_tip: Enter a number to limit the number of requests sent out.  For example, entering 100 will limit the invites to the most recent 100 requests
@@ -52,6 +53,7 @@ en:
       access_request_name: Name
       thanks_sign_up_login: Thanks for signing up! You may login now
       already_activated: Your account has already been activated. You can log in below.
+      access_code_requests_signed_up_on: Signed up on
       access_request_email: Email
       password: Password
       account_not_activated: Your %{application_name} account has not yet been activated.
@@ -59,6 +61,7 @@ en:
       update_user_admin: Update User
       problem_changing_password: There was a problem changing your password. %{errors}
       access_code_delete_problem: Cannot delete access code it has users associated with it.
+      access_code_requests_email: Email
       user_enable_problem: There was a problem enabling this user.
       access_code_tip: Enter a access code.
       email_empty: Please enter an email address
@@ -75,6 +78,7 @@ en:
       validation_is_required: is required.
       user_disabled: User disabled
       invalid_username: Invalid username
+      access_code_requests_code_sent_on: Code Sent on
       update: Update
       could_not_find_user_with_email: Could not find a user with that email address.
       password_reset_email_subject: You have requested to change your %{application_name} password
@@ -94,6 +98,7 @@ en:
       my_dashboard: My Dashboard
       confirm_select_new_password: Confirm Password Change
       use_limit: Number of Uses
+      access_code_subject: Subject
       add_role: Add Role
       admin_users_title: User Administration
       edit_access_code: Edit Access Code
@@ -107,19 +112,20 @@ en:
       delete_this_user: Delete this user.
       username_help: You can use between 6 and 20 characters. If the name you want isn't available try adding numbers or punctuation.
       edit_role_dialog_title: Edit Role
-      request_access_code_instruction: Please provide the following information and we'll provide you with an access code as soon as possible.
+      change_permissions: Change Roles
+      send_access_code_request_title: Send Code
+      access_code_created: Created
       username_not_available: Username not available
       remove_my_account: Remove My Account
       email_available: Email available
-      user_enabled: User enabled
       thanks_sign_up_check: Your account has been created. Please check your e-mail for your account activation instructions!
+      user_enabled: User enabled
+      request_access_code_instruction: Please provide the following information and we'll provide you with an access code as soon as possible.
       delete_my_account: Delete my user account and all my data.
-      edit: Edit
       activation_instructions: Activation Instructions
-      access_code_created: Created
-      access_code_added: Access Code was successfully added
-      change_permissions: Change Roles
+      edit: Edit
       what_is_the_email: What is the email address used to create your account?
+      access_code_added: Access Code was successfully added
       password_reset: Password reset.
       register_account: Register for a %{application_name} account
       welcome_message: Welcome to muck.  This system provides the basic components to help you build your website.
@@ -149,6 +155,8 @@ en:
         search_users: Search Users
       user_marked_inactive: User has been marked as inactive
       access_code_request_thank_you: Thank you for your request.  We'll be in touch as soon as possible.
+      send_access_code_instructions: Provide a message and body that will be sent in the email along with the code that will let the user create an account.
+      access_code_requests_name: Name
       access_code_fullfill_invites_limit: Invite Request Limit
       bulk_access_code_tip: Optional. If a code is specified then that code will be sent to all users.  Leave this field empty to send a unique code to each user.
       role: Role
@@ -168,8 +176,10 @@ en:
       bulk_access_code_problem: Problem adding access code
       submit: Submit
       confirm_password: Confirm Password
+      edit_access_code_request_title: Edit Request
       add_user_to_role_title: Add user to a new role.
       expiration_date: Expiration Date
+      edit_access_code_request: Edit Access Code Request
       role_not_deleted: Role could not be deleted
       roles: Roles
       access_code_related_users: Users who signed up with this code
@@ -183,22 +193,28 @@ en:
       password_help: Your password should be at least six characters long. A Mix of upper and lower-case letters and numbers works well
       login_fail: We're sorry, but we couldn't recognize your login information.  Please try again.
       email_not_available: Email already in use. %{reset_password_help}
+      access_code_request_send_problem: There was a problem sending the code
+      access_code_request_edit_problem: Problem editing access code request
       access_code_add_problem: Problem adding access code
       sign_up: Sign up
       change_your_password: Change Your Password
       forgot_your_password: Forgot your password?
+      send_code: Send Code
       role_delete_confirm: Are you sure you want to delete this role?  All associated permissions will also be deleted!
       unlimited: Unlimited Uses
       remember_me: Remember me
       reset_your_password: Reset Your Password
+      access_code_message: Message
       access_code_use_limit: Use Limit
       access_code_help: If you received a access code from us, please enter it in the box above. You may also %{access_request_anchor}request a access code%{access_request_anchor_end}.
       email_address: Email Address
+      send_access_code: Send Code
       cant_delete_administrator_role: You can't delete the administrator role.
       view_your_account: View Your Account
       request_username_subject: Forgotten username
       could_not_find_reset_code: Could not find a password reset code.  Please try resetting your password again.
       register_for_account: Register for an account
+      unfullfilled_access_code_requests: Unfulfilled Access Code Requests
       access_code_request_count: There are currently %{access_code_requests_count} access code requests
       bulk_access_code_message: Message
       bulk_access_codes: Bulk Access Codes

data/config/routes.rb

@@ -59,6 +59,11 @@ Rails.application.routes.draw do
       end
     end
     resources :roles, :controller => 'muck/roles'
+    resources :access_code_requests, :controller => 'muck/access_code_requests' do
+      member do
+        get :send_code
+      end
+    end
     resources :access_codes, :controller => 'muck/access_codes' do
       collection do
         get :bulk

data/lib/muck-users/engine.rb

@@ -22,6 +22,7 @@ module MuckUsers
       MuckEngine.configuration.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_users'), '/admin/users')
       MuckEngine.configuration.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_roles'), '/admin/roles')
       MuckEngine.configuration.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_access_codes'), '/admin/access_codes')
+      MuckEngine.configuration.add_muck_admin_nav_item(I18n.translate('muck.engine.admin_access_code_requests'), '/admin/access_code_requests')
     end
             
     initializer 'muck-users.controllers' do

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

@@ -31,6 +31,15 @@ module MuckUsers
         
       end
 
+      def send_access_code(subject, message)
+        access_code = AccessCode.create!(:unlimited => false,
+                                         :use_limit => 1,
+                                         :uses => 0,
+                                         :code => AccessCode.random_code)
+        UserMailer.access_code(self.email, subject, message, access_code.code).deliver
+        success = AccessCodeRequest.mark_fullfilled(self)
+      end
+      
     end
   end
 end

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.7"
+  s.version = "3.1.8"
 
   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-02-22}
+  s.date = %q{2011-02-24}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/controllers/admin/muck/access_code_requests_controller.rb",
     "app/controllers/admin/muck/access_codes_controller.rb",
     "app/controllers/admin/muck/roles_controller.rb",
     "app/controllers/admin/muck/users_controller.rb",
@@ -35,6 +36,13 @@ Gem::Specification.new do |s|
     "app/views/access_code_requests/create.js.erb",
     "app/views/access_code_requests/new.html.erb",
     "app/views/access_code_requests/show.html.erb",
+    "app/views/admin/access_code_requests/_access_code_request.html.erb",
+    "app/views/admin/access_code_requests/_form.html.erb",
+    "app/views/admin/access_code_requests/ajax_update_access_code_request.js.erb",
+    "app/views/admin/access_code_requests/destroy.js.erb",
+    "app/views/admin/access_code_requests/edit.html.erb",
+    "app/views/admin/access_code_requests/index.html.erb",
+    "app/views/admin/access_code_requests/send_code.html.erb",
     "app/views/admin/access_codes/_access_code.html.erb",
     "app/views/admin/access_codes/_form.html.erb",
     "app/views/admin/access_codes/_user.html.erb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 19
   prerelease: 
   segments: 
   - 3
   - 1
-  - 7
-  version: 3.1.7
+  - 8
+  version: 3.1.8
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -07:00
+date: 2011-02-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/admin/muck/access_code_requests_controller.rb
 - app/controllers/admin/muck/access_codes_controller.rb
 - app/controllers/admin/muck/roles_controller.rb
 - app/controllers/admin/muck/users_controller.rb
@@ -105,6 +106,13 @@ files:
 - app/views/access_code_requests/create.js.erb
 - app/views/access_code_requests/new.html.erb
 - app/views/access_code_requests/show.html.erb
+- app/views/admin/access_code_requests/_access_code_request.html.erb
+- app/views/admin/access_code_requests/_form.html.erb
+- app/views/admin/access_code_requests/ajax_update_access_code_request.js.erb
+- app/views/admin/access_code_requests/destroy.js.erb
+- app/views/admin/access_code_requests/edit.html.erb
+- app/views/admin/access_code_requests/index.html.erb
+- app/views/admin/access_code_requests/send_code.html.erb
 - app/views/admin/access_codes/_access_code.html.erb
 - app/views/admin/access_codes/_form.html.erb
 - app/views/admin/access_codes/_user.html.erb