muck-users 3.1.10 → 3.1.11

data/VERSION

@@ -1 +1 @@
-3.1.10
+3.1.11

data/app/helpers/muck_users_helper.rb

@@ -1,8 +1,19 @@
 module MuckUsersHelper
   
   # Render a basic user registration form
-  def signup_form(user, redirect_to = nil)
-    render :partial => 'users/signup_form', :locals => { :user => user, :redirect_to => redirect_to}
+  def signup_form(user, redirect_to = nil, options = {}, &block)
+    options[:html] = {} if options[:html].nil?
+    options[:title] = nil if options[:title].blank?
+    raw_block_to_partial('users/signup_form', options.merge(:user => user, :redirect_to => redirect_to), &block)
+  end
+  
+  def signin_form(options = {}, &block)
+    options[:html] = {} if options[:html].nil?
+    options[:title] = nil if options[:title].blank?
+    options[:exclude_register_link] = false if options[:exclude_register_link].blank?    
+    options[:exclude_forgot_password_link] = false if options[:exclude_forgot_password_link].blank?
+    options[:exclude_forgot_username_link] = false if options[:exclude_forgot_username_link].blank?
+    raw_block_to_partial('user_sessions/form', options, &block)
   end
   
   # Sign up javascript is not required but will add script to the sign up form which will make ajax calls

data/app/views/user_sessions/_form.erb

@@ -0,0 +1,19 @@
+<div id="sign_in" class="common-form">
+  <%= muck_form_for :user_session, :url => user_session_path, :html => { :id => 'sign_in_form', :name => 'sign_in_form' } do |f| -%>
+    <h1><%= title || I18n.t('muck.users.login_title') %></h1>
+    <%= output_errors(t('muck.users.login_fail'), {:class => 'help-box'}) %>
+	  <%= f.text_field :login, { :label => I18n.t('muck.users.username'), :class => 'login', :hide_required => true, :hide_control_error => true } -%>
+	  <%= f.password_field :password, { :label => I18n.t('muck.users.password'), :class => 'password', :hide_required => true, :hide_control_error => true } -%>
+	  <%= capture(f, &block) if block -%>
+	  <%= f.check_box :remember_me, { :label => I18n.t('muck.users.remember_me'), :class => 'checkbox', :hide_required => true, :hide_control_error => true } %>
+    <div class="button form-row">
+      <%= submit_tag I18n.t('muck.users.sign_in'), :class => 'wait-button' %>
+      <div class="waiting" style="display:none;"><%=translate('muck.users.signin_wait') %></div>
+    </div>
+    <div class="form-row">
+      <% unless exclude_register_link -%><span class="instruction"><%= link_to I18n.t('muck.users.register_for_account'), signup_url  %></span> | <% end -%>
+  		<% unless exclude_forgot_password_link -%><span class="instruction"><%= link_to I18n.t('muck.users.forgot_your_password'), forgot_password_path %></span> | <% end -%>
+      <% unless exclude_forgot_username_link -%><span class="instruction"><%= link_to I18n.t('muck.users.forgot_your_username'), forgot_username_path %></span> <% end -%>
+  	</div>
+  <% end %>
+</div>

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

@@ -1,18 +1 @@
-<div id="sign_in" class="common-form">
-  <%= muck_form_for :user_session, :url => user_session_path, :html => { :id => 'sign_in_form', :name => 'sign_in_form' } do |f| -%>
-    <h1><%= I18n.t('muck.users.login_title') %></h1>
-    <%= output_errors(t('muck.users.login_fail'), {:class => 'help-box'}) %>
-	  <%= f.text_field :login, { :label => I18n.t('muck.users.username'), :class => 'login', :hide_required => true, :hide_control_error => true } -%>
-	  <%= f.password_field :password, { :label => I18n.t('muck.users.password'), :class => 'password', :hide_required => true, :hide_control_error => true } -%>
-	  <%= f.check_box :remember_me, { :label => I18n.t('muck.users.remember_me'), :class => 'checkbox', :hide_required => true, :hide_control_error => true } %>
-    <div class="button form-row">
-      <%= submit_tag I18n.t('muck.users.sign_in'), :class => 'wait-button' %>
-      <div class="waiting" style="display:none;"><%=translate('muck.users.signin_wait') %></div>
-    </div>
-    <div class="form-row">
-      <span class="instruction"><%= link_to I18n.t('muck.users.register_for_account'), signup_url  %></span> | 
-  		<span class="instruction"><%= link_to I18n.t('muck.users.forgot_your_password'), forgot_password_path %></span> |
-      <span class="instruction"><%= link_to I18n.t('muck.users.forgot_your_username'), forgot_username_path %></span>
-  	</div>
-  <% end %>
-</div>
+<%= signin_form -%>

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

@@ -1,42 +1,49 @@
-<%= 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 } -%>
-  <% end -%>
-  
-	<%= f.text_field :login, { :label => t('muck.users.choose_member_name'), 
-	                           :extra_html => '<span id="username-availibility"></span>', 
-	                           :tip => t('muck.users.username_help'),
-	                           :required_label => t('muck.users.username') } -%>
-	<%= f.text_field :email, { :label => t('muck.users.email_address'),
-	                           :tip => t('muck.users.email_help'),
-	                           :extra_html => '<span id="email-availibility"></span>' } -%>
-	<%= f.password_field :password, { :label => t('muck.users.password'),
-	                                  :tip => t('muck.users.password_help')} -%>
-	<%= f.password_field :password_confirmation, { :label => t('muck.users.confirm_password'),
-                                                 :tip => t('muck.users.password_confirmation_help') } -%>
-	
-	<% if MuckUsers.configuration.validate_terms_of_service -%>
-    <div class="checklist">
-      <%= f.check_box :terms_of_service, { :label => t('muck.users.terms_and_service', :tos_link_anchor => '<a href="/terms_of_service">', :link_end => '</a>').html_safe,
-     																		   :tip => t('muck.users.terms_and_service_tip') } -%>
+<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>
+  <%= 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 } -%>                                        
+    <% end -%>
+
+  	<%= f.text_field :login, { :label => t('muck.users.choose_member_name'), 
+  	                           :extra_html => '<span id="username-availibility"></span>', 
+  	                           :tip => t('muck.users.username_help'),
+  	                           :required_label => t('muck.users.username') } -%>
+  	<%= f.text_field :email, { :label => t('muck.users.email_address'),
+  	                           :tip => t('muck.users.email_help'),
+  	                           :extra_html => '<span id="email-availibility"></span>' } -%>
+  	<%= f.password_field :password, { :label => t('muck.users.password'),
+  	                                  :tip => t('muck.users.password_help')} -%>
+  	<%= f.password_field :password_confirmation, { :label => t('muck.users.confirm_password'),
+                                                   :tip => t('muck.users.password_confirmation_help') } -%>
+
+  	<%= capture(f, &block) if block -%>
+
+  	<% if MuckUsers.configuration.validate_terms_of_service -%>
+      <div class="checklist">
+        <%= f.check_box :terms_of_service, { :label => t('muck.users.terms_and_service', :tos_link_anchor => '<a href="/terms_of_service">', :link_end => '</a>').html_safe,
+       																		   :tip => t('muck.users.terms_and_service_tip') } -%>
+      </div>
+    <% end -%>
+
+  	<% if MuckUsers.configuration.use_recaptcha -%>
+    	<div class="recaptcha">
+    		<%= recaptcha_tags %>
+    	</div>
+  	<% end -%>
+
+  	<div class="button form-row">
+    	<%= f.submit t('muck.users.sign_up_now'), :class => 'wait-button' %>
+      <div class="waiting" style="display:none;"><%=translate('muck.users.signup_wait') %></div>
     </div>
+
   <% end -%>
-  
-	<% if MuckUsers.configuration.use_recaptcha -%>
-  	<div class="recaptcha">
-  		<%= recaptcha_tags %>
-  	</div>
-	<% end -%>
-	
-	<div class="button form-row">
-  	<%= f.submit t('muck.users.sign_up_now'), :class => 'wait-button' %>
-    <div class="waiting" style="display:none;"><%=translate('muck.users.signup_wait') %></div>
-  </div>
-  
-<% end -%>
+</div>
+<%= signup_form_javascript -%>

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

@@ -1,6 +1 @@
-<div id="registration" class="common-form">
-	<h1><%= 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>
-  <%= signup_form(@user) -%>
-</div>
-<%= signup_form_javascript -%>
+<%= signup_form(@user) -%>

data/lib/muck-users/controllers/authentic_application.rb

@@ -35,9 +35,11 @@ module MuckUsers
       def login_required
         unless logged_in?
           store_location
-          flash[:notice] = I18n.t('muck.users.login_requred')
           respond_to do |format|
-            format.html { redirect_to login_path }
+            format.html do
+              flash[:notice] = I18n.t('muck.users.login_requred')
+              redirect_to login_path
+            end
             format.json { render :json => { :success => false, :logged_in => false, :message => I18n.t('muck.users.login_requred') } }
           end
         end

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

@@ -74,6 +74,14 @@ module MuckUsers
         def validates_terms_of_service
           validate(:accepts_terms_of_service?, :on => :create)
         end
+        
+        def parse_name(name)
+          return '' if name.blank?
+          names = name.split(' ')
+          return '' if names.length <= 0
+          return [names[0], names[0]] if names.length == 1
+          [names[0], names.slice(1, names.length).join(' ')]
+        end
           
       end
       

data/muck-users.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.10"
+  s.version = "3.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
@@ -395,6 +395,7 @@ Gem::Specification.new do |s|
     "app/views/user_mailer/welcome_notification.zh-CN.html.erb",
     "app/views/user_mailer/welcome_notification.zh-TW.html.erb",
     "app/views/user_mailer/welcome_notification.zh.html.erb",
+    "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",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 1
-  - 10
-  version: 3.1.10
+  - 11
+  version: 3.1.11
 platform: ruby
 authors: 
 - Justin Ball
@@ -465,6 +465,7 @@ files:
 - app/views/user_mailer/welcome_notification.zh-CN.html.erb
 - app/views/user_mailer/welcome_notification.zh-TW.html.erb
 - app/views/user_mailer/welcome_notification.zh.html.erb
+- 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