muck-users 3.1.12 → 3.1.13

data/README.rdoc

@@ -114,6 +114,11 @@ By default when a user logs out they are sent to the login page.  You can add a
 
 muck-users sends out emails that need to be able to generate links.  Be sure to set a value for MuckEngine.configuration.application_url.
 
+muck-users will let you require an access code to sign up. If you enable this option your sign up form will add a link for a beta code. 
+To make it a popup add this to your application.js
+
+  jQuery('a.fancy-access-request').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'width':375, 'height':300 });
+
 === Assets
 
 Calling rake muck:sync:users will pull in images, javascript and other assets. 

data/VERSION

@@ -1 +1 @@
-3.1.12
+3.1.13

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

@@ -1,7 +1,13 @@
 class Admin::Muck::AccessCodeRequestsController < Admin::Muck::BaseController
   
   def index
-    @unfullfilled_requests = AccessCodeRequest.unfullfilled.by_newest.paginate(:page => @page, :per_page => @per_page)
+    if params[:fullfilled]
+      @title = translate('muck.users.fullfilled_access_code_requests')
+      @access_code_requests = AccessCodeRequest.fullfilled.by_newest.paginate(:page => @page, :per_page => @per_page)
+    else
+      @title = translate('muck.users.unfullfilled_access_code_requests')
+      @access_code_requests = AccessCodeRequest.unfullfilled.by_newest.paginate(:page => @page, :per_page => @per_page)
+    end
     render :template => 'admin/access_code_requests/index'
   end
   

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

@@ -24,8 +24,7 @@ class Admin::Muck::AccessCodesController < Admin::Muck::BaseController
   end
   
   def bulk
-    @access_code = AccessCode.new
-    @access_code.code = AccessCode.random_code
+    @access_code = AccessCode.new(:expires_at => 1.year.since)
     @access_code_requests_count = AccessCodeRequest.unfullfilled.count
     render :template => 'admin/access_codes/bulk'
   end
@@ -48,6 +47,7 @@ class Admin::Muck::AccessCodesController < Admin::Muck::BaseController
         @access_code.use_limit = 1
         @access_code.uses = 0
         @access_code.code = AccessCode.random_code
+        @access_code.sent_to = email
         @access_code.save!
       end
       UserMailer.access_code(email, @access_code.subject, @access_code.message, @access_code.code).deliver

data/app/controllers/muck/users_controller.rb

@@ -34,7 +34,11 @@ class Muck::UsersController < ApplicationController
 
   def new
     @page_title = t('muck.users.register_account', :application_name => MuckEngine.configuration.application_name)
-    @user = User.new
+    @user = User.new(:access_code_code => params[:access_code])
+    if(params[:access_code])
+      @access_code = AccessCode.find_by_code(params[:access_code])
+      @user.email = @access_code.sent_to
+    end
     standard_response('new', true)
   end
   
@@ -198,6 +202,7 @@ class Muck::UsersController < ApplicationController
     def check_access_code
       if MuckUsers.configuration.require_access_code
         access_code, valid_code = AccessCode.valid_code?(params[:user][:access_code_code])
+        debugger
         if valid_code
           @user.access_code = access_code
         else

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

@@ -1,4 +1,6 @@
-<h2><%=translate('muck.users.unfullfilled_access_code_requests') %></h2>
+<h2><%=translate('muck.users.access_code_requests') %></h2>
+<%= render :partial => 'admin/access_codes/access_code_nav' %>
+<h3><%= @title %></h3>
 <table class="adminTable" cellspacing="0" cellpadding="0">
   <thead>
     <tr>
@@ -11,7 +13,7 @@
     </tr>
   </thead>
   <tbody id="current-access-code-requests">
-    <%= render :partial => 'admin/access_code_requests/access_code_request', :collection => @unfullfilled_requests %>
+    <%= render :partial => 'admin/access_code_requests/access_code_request', :collection => @access_code_requests %>
   </tbody>
 </table>
-<%= will_paginate @unfullfilled_requests %>
+<%= will_paginate @access_code_requests %>

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

@@ -3,6 +3,7 @@
   <td><%= access_code.uses %></td>
   <td><%= access_code.use_limit %></td>
   <td><%= access_code.unlimited %></td>
+  <td><%= access_code.sent_to %></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/_access_code_nav.html.erb

@@ -0,0 +1,7 @@
+<p>
+  <%= link_to translate('muck.users.list_access_codes'), admin_access_codes_path %> |
+  <%= link_to translate('muck.users.access_code_new'), new_admin_access_code_path, { :class => 'dialog-pop', :title => translate('muck.users.add_access_code_title') } %> |
+  <%= link_to translate('muck.users.bulk_access_codes'), bulk_admin_access_codes_path %> |
+  <%= link_to translate('muck.users.unfullfilled_access_code_requests'), admin_access_code_requests_path(:unfullfilled => true) %> |
+  <%= link_to translate('muck.users.fullfilled_access_code_requests'), admin_access_code_requests_path(:fullfilled => true) %>
+</p>

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

@@ -1,4 +1,5 @@
 <h2><%=translate('muck.users.bulk_access_codes_title') %></h2>
+<%= render :partial => 'admin/access_codes/access_code_nav' %>
 <p><%=translate('muck.users.bulk_access_codes_description') %></p>
 <%= output_errors(translate('muck.users.bulk_access_code_problem'), {:class => 'help-box'}, @access_code) %>
 <%= muck_form_for :access_code, :url => bulk_create_admin_access_codes_path, :html => {:class => "standard-form alt"} do |f| -%>
@@ -17,24 +18,36 @@
     <%= f.text_area :message, { :label => translate('muck.users.bulk_access_code_message') } -%>
   </div>
   <div class="span-11 column">
-    <%= f.text_area :emails, { :label => translate('muck.users.bulk_access_code_emails'),
-                                :tip => translate('muck.users.bulk_access_code_emails_tip')  } -%>
-
+    <div>
+      <% if @access_code_requests_count > 0 -%>
+        <%= f.check_box :send_requests, { :label => translate('muck.users.access_code_fullfill_invites'),
+                                          :tip => translate('muck.users.access_code_fullfill_invites_tip') } -%>
+        <p><%=translate('muck.users.access_code_request_count', :access_code_requests_count => @access_code_requests_count) %></p>                                  
+        <%= f.text_field :send_request_limit, { :label => translate('muck.users.access_code_fullfill_invites_limit'),
+                                                :tip => translate('muck.users.access_code_fullfill_invites_limit_tip') } -%>
+      <% end -%>
+    </div>
     <% if @access_code_requests_count > 0 -%>
-      <p><%=translate('muck.users.access_code_request_count', :access_code_requests_count => @access_code_requests_count) %></p>
-      <%= f.check_box :send_requests, { :label => translate('muck.users.access_code_fullfill_invites'),
-                                        :tip => translate('muck.users.access_code_fullfill_invites_tip') } -%>
-
-      <%= f.text_field :send_request_limit, { :label => translate('muck.users.access_code_fullfill_invites_limit'),
-                                              :tip => translate('muck.users.access_code_fullfill_invites_limit_tip') } -%>
+      <p style="text-align:center;font-weight:bold;font-size:24px;margin:15px;0"><%=translate('muck.users.bulk_access_codes_or') %></p>
     <% end -%>
+    <div id="email-list">
+      <%= f.text_area :emails, { :label => translate('muck.users.bulk_access_code_emails'),
+                                 :tip => translate('muck.users.bulk_access_code_emails_tip')  } -%>
+    </div>
+    <div id="email-list-not-included-message" style="display:none;">
+      <p>Fulfilling requests prevents you from sending out invites to a list of emails.</p>
+    </div>
   </div>
   <div class="span-24 column center">
-    <%= f.submit translate('muck.users.save') %>
+    <%= f.submit translate('muck.users.send_access_codes') %>
   </div>
 <% end -%>
 <script type="text/javascript" language="JavaScript">
   jQuery(document).ready(function(){
     jQuery('.date_pick').datepicker();
   });
+  jQuery("#access_code_send_requests").click(function(){
+		jQuery('#email-list').toggle();
+		jQuery('#email-list-not-included-message').toggle();
+	});
 </script>

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

@@ -1,15 +1,13 @@
 <h2><%=translate('muck.users.access_codes') %></h2>
-<p>
-  <%= link_to translate('muck.users.access_code_new'), new_admin_access_code_path, { :class => 'dialog-pop', :title => translate('muck.users.add_access_code_title') } %> 
-  <%= link_to translate('muck.users.bulk_access_codes'), bulk_admin_access_codes_path %>
-</p>
+<%= render :partial => 'admin/access_codes/access_code_nav' %>
 <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_unlimited') %></th>      
+      <th><%=translate('muck.users.access_code_sent_to') %></th>      
       <th><%=translate('muck.users.access_code_expires') %></th>
       <th><%=translate('muck.users.access_code_created') %></th>
       <th></th>

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

@@ -1,7 +1,5 @@
 <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), :class => 'ajax-delete', :title => translate('muck.users.access_code_delete_confirm')) %>
-
+<%= render :partial => 'admin/access_codes/access_code_nav' %>
 <table class="adminTable" cellspacing="0" cellpadding="0">
   <thead>
     <tr>
@@ -11,6 +9,8 @@
       <th><%=translate('muck.users.access_code_unlimited') %></th>
       <th><%=translate('muck.users.access_code_expires') %></th>
       <th><%=translate('muck.users.access_code_created') %></th>
+      <th></th>
+      <th></th>
     </tr>
   </thead>
   <%= render :partial => 'admin/access_codes/access_code', :object => @access_code %>

data/config/locales/en.yml

@@ -77,6 +77,7 @@ en:
       problem_editing_account: There was a problem updating your information.
       edit: Edit
       access_code_subject: Subject
+      bulk_access_codes_or: OR
       thanks_sign_up: Thanks for signing up!
       access_code_request_send_problem: There was a problem sending the code
       sign_in: Sign In
@@ -89,11 +90,12 @@ en:
         all_users: All Users
         search_users: Search Users
       access_code_uses: Uses
+      access_code_sent_to: Sent To
       select_new_password: Select a New Password
       login: Login
       access_code_requests_code_sent_on: Code Sent on
-      email_address: Email Address
       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
       delete: Delete
       bulk_access_codes_created: Bulk access codes created and emailed to %{email_count} emails.
       access_required_warning: Site access is currently restricted.  You need a valid access code to sign up.
@@ -107,8 +109,8 @@ en:
       problem_creating_account: "There was a problem creating your account.  Please correct the following errors:"
       welcome_message: Welcome to muck.  This system provides the basic components to help you build your website.
       what_is_the_email: What is the email address used to create your account?
-      delete_my_account: Delete my user account and all my data.
       change_permissions: Change Roles
+      delete_my_account: Delete my user account and all my data.
       access_code_requests_email: Email
       password_reset_link_sent: Instructions to reset your password have been emailed to you. Please check your email.
       access_code_add_problem: Problem adding access code
@@ -135,6 +137,7 @@ en:
       access_code_request_thank_you: Thank you for your request.  We'll be in touch as soon as possible.
       sign_up: Sign up
       access_code_requests_signed_up_on: Signed up on
+      list_access_codes: List Access Codes
       access_code_new: New Access Code
       access_code_requests_name: Name
       first_name: First Name
@@ -154,6 +157,7 @@ en:
       delete_this_user: Delete this user.
       use_limit: Number of Uses
       user_successfully_deleted: User %{login} was successfully deleted.
+      access_code_requests: Access Code Requests
       new_password_doesnt_match: New password does not match the password confirmation.
       password_confirmation_help: To ensure that your password is correct please enter it again here.
       add_permission: (Add Permission)
@@ -162,11 +166,11 @@ en:
       update_user: Update your user information
       sorry_invalid_reset_code: We're sorry, but we could not locate your account. If you are having issues try copying and pasting the URL from your email into your browser or restarting the reset password process.
       activation_not_found: Activation code not found. Please try creating a new account.
-      signin_wait: Signing you in. Please wait.
       bulk_access_codes: Bulk Access Codes
       access_code_request_edit_problem: Problem editing access code request
       admin_requred: You must be an administrator to access this feature.
       expiration_date_tip: Enter the date upon which the access code will become invalid
+      signin_wait: Signing you in. Please wait.
       remember_me: Remember me
       add_user_to_role_title: Add user to a new role.
       access_code_edit_link: Edit Access Code
@@ -179,6 +183,7 @@ en:
       join_application_name: Join and get it done
       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.
       bulk_access_code_emails_tip: Separate emails with a comma
+      send_access_codes: Send Codes
       password_updated: Password successfully updated.
       register_for_account: Register for an account
       recover_password_prompt: (If you forgot your password recover it here)
@@ -202,6 +207,7 @@ en:
       complete_profile: Complete Your Profile
       forgot_your_password: Forgot your password?
       request_access_code_instruction: Please provide the following information and we'll provide you with an access code as soon as possible.
+      fullfilled_access_code_requests: Fulfilled Access Code Requests
       update_profile: Update your profile
       username_help: You can use between 6 and 20 characters. If the name you want isn't available try adding numbers or punctuation.
       user_update_sucess: User was successfully updated
@@ -226,8 +232,8 @@ en:
       user_enable_problem: There was a problem enabling this user.
       access_code_delete_error: An error occured while trying to delete the access code
       email: Email
-      cant_delete_administrator_role: You can't delete the administrator role.
       reset_your_password: Reset Your Password
+      cant_delete_administrator_role: You can't delete the administrator role.
       access_code_edit_problem: Problem editing access code
       access_codes: Access Codes
       click_to_sign_up_now: Click here to sign up now.

data/db/migrate/20110303183433_add_sent_to_to_access_codes.rb

@@ -0,0 +1,9 @@
+class AddSentToToAccessCodes < ActiveRecord::Migration
+  def self.up
+    add_column :access_codes, :sent_to, :string
+  end
+
+  def self.down
+    remove_column :access_codes, :sent_to
+  end
+end

data/lib/muck-users/engine.rb

@@ -22,7 +22,6 @@ 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.rb

@@ -16,7 +16,7 @@ module MuckUsers
         scope :active, where('access_codes.expires_at > Now() AND access_codes.uses <= use_limit')
 
         # Used to make bulk access code easier to deal with
-        attr_accessor :emails, :subject, :message, :send_requests, :send_request_limit
+        attr_accessor :emails, :subject, :message, :send_request_limit
                   
       end
 
@@ -68,7 +68,17 @@ module MuckUsers
       def expired?
         self.expires_at? && self.expires_at < Time.now
       end
-        
-    end
+
+      def send_requests=(sr)
+        @send_request = sr
+      end
+
+      def send_requests
+        return false if @send_request == '0'
+        return false if @send_request == 'false'
+        return @send_request
+      end
+              
+    end    
   end
 end

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

@@ -6,9 +6,9 @@ module MuckUsers
     
       included do
         validates_presence_of :email
-        validates_uniqueness_of :email
         
         scope :unfullfilled, where('access_code_requests.code_sent_at IS NULL')
+        scope :fullfilled, where('access_code_requests.code_sent_at IS NOT NULL')
         scope :by_newest, order("created_at DESC")
         scope :by_oldest, order("created_at ASC")
       end

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.12"
+  s.version = "3.1.13"
 
   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-03-02}
+  s.date = %q{2011-03-03}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [
@@ -42,8 +42,9 @@ Gem::Specification.new do |s|
     "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_code_requests/send_code.erb",
     "app/views/admin/access_codes/_access_code.html.erb",
+    "app/views/admin/access_codes/_access_code_nav.html.erb",
     "app/views/admin/access_codes/_form.html.erb",
     "app/views/admin/access_codes/_user.html.erb",
     "app/views/admin/access_codes/ajax_create_access_code.js.erb",
@@ -460,6 +461,7 @@ Gem::Specification.new do |s|
     "db/migrate/20100123035450_create_access_codes.rb",
     "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",
     "lib/muck-users.rb",
     "lib/muck-users/config.rb",
     "lib/muck-users/controllers/authentic_application.rb",

data/public/javascripts/muck-users.js

@@ -21,5 +21,4 @@ jQuery(document).ready(function() {
 		autoFill: true,
 		mustMatch: false
 	});
-	jQuery('a.fancy-access-request').fancybox({'hideOnContentClick':false, 'overlayShow':true, 'width':375, 'height':300 });
 });

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 3
   - 1
-  - 12
-  version: 3.1.12
+  - 13
+  version: 3.1.13
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -07:00
+date: 2011-03-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,8 +112,9 @@ files:
 - 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_code_requests/send_code.erb
 - app/views/admin/access_codes/_access_code.html.erb
+- app/views/admin/access_codes/_access_code_nav.html.erb
 - app/views/admin/access_codes/_form.html.erb
 - app/views/admin/access_codes/_user.html.erb
 - app/views/admin/access_codes/ajax_create_access_code.js.erb
@@ -530,6 +531,7 @@ files:
 - db/migrate/20100123035450_create_access_codes.rb
 - 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
 - lib/muck-users.rb
 - lib/muck-users/config.rb
 - lib/muck-users/controllers/authentic_application.rb