muck-users 3.1.11 → 3.1.12

data/VERSION

@@ -1 +1 @@
-3.1.11
+3.1.12

data/app/controllers/muck/users_controller.rb

@@ -53,6 +53,8 @@ class Muck::UsersController < ApplicationController
     check_recaptcha
     success, path = setup_user
     after_create_response(success, path)
+  rescue MuckUsers::Exceptions::InvalidAccessCode, ActiveRecord::RecordInvalid => ex
+    after_create_response(false)
   end
 
   def update
@@ -200,7 +202,7 @@ class Muck::UsersController < ApplicationController
           @user.access_code = access_code
         else
           flash[:notice] = translate('muck.users.access_required_warning')
-          raise Exceptions::InvalidAccessCode
+          raise MuckUsers::Exceptions::InvalidAccessCode
         end
       end
     end

data/app/helpers/muck_users_helper.rb

@@ -4,6 +4,7 @@ module MuckUsersHelper
   def signup_form(user, redirect_to = nil, options = {}, &block)
     options[:html] = {} if options[:html].nil?
     options[:title] = nil if options[:title].blank?
+    options[:subtitle] = nil if options[:subtitle].blank?
     raw_block_to_partial('users/signup_form', options.merge(:user => user, :redirect_to => redirect_to), &block)
   end
   

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

@@ -1,15 +1,22 @@
 <div id="registration" class="common-form">
 	<h1><%= title || t('muck.users.register_account', :application_name => MuckEngine.configuration.application_name) %></h1>
-	<p><%= t('muck.users.already_registered') %> <a href="<%=login_url%>"><%= t('muck.users.sign_in_now') %></a></p>
+	<p>
+	  <% if subtitle -%>
+	    <%= subtitle.html_safe %>
+	  <% else -%>
+	    <%= t('muck.users.already_registered') %> <a href="<%=login_url%>"><%= t('muck.users.sign_in_now') %></a>
+	  <% end -%>
+	</p>
   <%= muck_form_for :user, :url => users_path, :html => {:id => "register-user-form", :name => 'register-user-form'} do |f| -%>
 
   	<%= output_errors(t('muck.users.problem_creating_account'), {:class => 'help-box'}, user) %>
 
   	<% if MuckUsers.configuration.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-access-request iframe" href="#{new_access_code_request_path}">},
-                                              :access_request_anchor_end => "</a>").html_safe } -%>                                        
+                                            :extra_html => '<p id="access_code_help">' + 
+                                              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 -%>
 
   	<%= f.text_field :login, { :label => t('muck.users.choose_member_name'), 

data/lib/muck-users/engine.rb

@@ -28,6 +28,7 @@ module MuckUsers
     initializer 'muck-users.controllers' do
       ActiveSupport.on_load(:action_controller) do
         include MuckUsers::AuthenticApplication
+        include MuckUsers::Exceptions
       end
     end
     

data/lib/muck-users/exceptions.rb

@@ -1,5 +1,6 @@
 module MuckUsers
   module Exceptions
     class InvalidPasswordResetCode < StandardError; end
+    class InvalidAccessCode < StandardError; 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.11"
+  s.version = "3.1.12"
 
   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-01}
+  s.date = %q{2011-03-02}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 3
   - 1
-  - 11
-  version: 3.1.11
+  - 12
+  version: 3.1.12
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -07:00
+date: 2011-03-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency