tb_core 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b7fb2a20414e7e1f3c6231fc0d87d8884c770e0
-  data.tar.gz: 7abfcd98b5851a0d15b8a46b189c24e01e69f1b4
+  metadata.gz: 739d972307395196f258e7586655f5d3e4dc05f4
+  data.tar.gz: 4c96571597213dd796a09b8b7a2616a6987e69ee
 SHA512:
-  metadata.gz: 5b0a3a31e3129b89d02ea0b6b028f12fd2ad9d37f4a9bccebc9ffd19afc8db1d0ea81d403007875efea708912840727c5005a4b407356897780297b998e299f0
-  data.tar.gz: 2f49b1ae926d600e560287de6187bbf23c15e613af3c51bb7627ad564aa1caecc6a603e3ff542ef91a03856f49d0b9d83974bfdd3707efa78a5320b8f6518a70
+  metadata.gz: 1de99edf127c590639325dbf5b3241b329b2d5ec211eaff041e590db6a318707a297efa4909aa3354faca84a878ac1d84134dfc01d07d039c780e9ca0a4647a7
+  data.tar.gz: fde33ac415dd3fe5701d098a48f91a9f16191f3b82708776e923986c857e754efa02a18012537338020c3643403ad860785319b54f195c2e12c4b85833c76907

data/app/controllers/admin/password_resets_controller.rb

@@ -30,7 +30,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
     @user.password = params[:spud_user][:password]
     @user.password_confirmation = params[:spud_user][:password_confirmation]
     if @user.save
-      SpudUserSession.create(:login => @user.login, :password => params[:spud_user][:password])
+      SpudUserSession.create(@user)
       flash[:notice] = "Password successfully updated"
       redirect_to admin_login_path
     else

data/app/controllers/admin/settings_controller.rb

@@ -16,7 +16,7 @@ class Admin::SettingsController < Admin::ApplicationController
   def update
     if @current_user.update_attributes(user_params)
       if user_params.include?(:password)
-        SpudUserSession.create(:login => @current_user.login, :password => user_params[:password])
+        SpudUserSession.create(@current_user)
       end
       flash[:notice] = "User settings saved successfully."
       respond_with @current_user, :location => admin_settings_path

data/app/controllers/admin/setup_controller.rb

@@ -15,7 +15,7 @@ class Admin::SetupController < Admin::ApplicationController
     @spud_user = SpudUser.new(user_params)
     @spud_user.super_admin = true
     if @spud_user.save
-      SpudUserSession.create(:login => @spud_user.login, :password => user_params[:password])
+      SpudUserSession.create(@spud_user)
       redirect_to admin_root_path
     else
       render 'new', :status => 422
@@ -25,7 +25,7 @@ class Admin::SetupController < Admin::ApplicationController
 private
 
   def user_params
-    params.require(:spud_user).permit(:login, :email, :password, :password_confirmation)
+    params.require(:spud_user).permit(:login, :email, :password, :password_confirmation, :first_name, :last_name)
   end
 
 end

data/app/controllers/password_resets_controller.rb

@@ -32,7 +32,7 @@ class PasswordResetsController < ApplicationController
       @user.password = params[:spud_user][:password]
       @user.password_confirmation = params[:spud_user][:password_confirmation]
       if @user.save()
-        SpudUserSession.create(:login => @user.login, :password => params[:spud_user][:password])
+        SpudUserSession.create(@user)
         flash[:notice] = "Password successfully updated"
         redirect_back_or_default(root_path)
         return

data/app/controllers/spud/application_controller.rb

@@ -13,7 +13,7 @@ class Spud::ApplicationController < ActionController::Base
   before_action :set_mailer_default_url
 
   rescue_from Spud::RequestError, :with => :handle_request_error
-  rescue_from ActionController::UnknownFormat, :with => :handle_unknown_format_error
+  rescue_from ActionController::UnknownFormat, ActionView::MissingTemplate, :with => :handle_unknown_format_error
   
   def not_found
     raise Spud::NotFoundError
@@ -72,9 +72,13 @@ private
   end
 
   def back_or_default(default)
-    result = !session[:return_to].blank? ? session[:return_to] : default
-    session[:return_to] = nil
-    return result
+    if params[:return_to]
+      return params[:return_to]
+    elsif session[:return_to]
+      return session[:return_to]
+    else
+      return default
+    end
   end
 
   def set_time_zone
@@ -111,13 +115,10 @@ private
   end
 
   def handle_unknown_format_error(error)
-    error = Spud::NotFoundError.new()
-    handle_request_error(error)
-  end
-
-  def handle_routing_error(error)
-    error = Spud::NotFoundError.new()
-    handle_request_error(error)
+    if Rails.env.production?
+      error = Spud::NotFoundError.new()
+      handle_request_error(error)
+    end
   end
 
 end

data/app/controllers/user_sessions_controller.rb

@@ -11,7 +11,7 @@ class UserSessionsController < ApplicationController
     @user_session = SpudUserSession.new(params[:spud_user_session])
     if @user_session.save
       flash[:notice] = "Login successful!"
-      redirect_back_or_default(root_path)
+      redirect_back_or_default('/')
     else
       render 'new'
     end

data/app/models/spud/spud_user_model.rb

@@ -2,13 +2,17 @@ class Spud::SpudUserModel < ActiveRecord::Base
   self.table_name = 'spud_users'
   
   acts_as_authentic do |c|
-    c.transition_from_crypto_providers = Authlogic::CryptoProviders::Sha512,
+    c.transition_from_crypto_providers = Authlogic::CryptoProviders::Sha512
     c.crypto_provider = Authlogic::CryptoProviders::SCrypt
     c.logged_in_timeout = 24.hours
+    if Spud::Core.config.use_email_as_login
+      c.login_field = :email
+    end
   end
 
   belongs_to :role, :class_name => 'SpudRole', :foreign_key => 'spud_role_id'
   has_many :spud_user_settings
+  before_validation :set_login_to_email, :if => ->{ Spud::Core.config.use_email_as_login }
 
   def full_name
     if first_name.blank? && last_name.blank?
@@ -94,4 +98,13 @@ class Spud::SpudUserModel < ActiveRecord::Base
     end
   end
 
+private
+
+  def set_login_to_email
+    if self.email.present?
+      self.login = self.email
+    end
+    return true
+  end
+
 end

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

@@ -2,13 +2,15 @@
 <fieldset>
   <legend>User Details</legend>
 
-<div class="control-group">
-	<%= f.label :login, :required => true, :class => "control-label" %>
-	<div class="controls">
-		<%= f.text_field :login, :size => 25, :autocomplete => 'username' %>
-	</div>
-  
-</div>
+  <% if !Spud::Core.config.use_email_as_login %>
+		<div class="control-group">
+			<%= f.label :login, :required => true, :class => "control-label" %>
+			<div class="controls">
+				<%= f.text_field :login, :size => 25, :autocomplete => 'username' %>
+			</div>
+		</div>
+	<% end %>
+
 <div class="control-group">
 	<%=f.label :email,:class=>"control-label"%>
 	<div class="controls">

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

@@ -8,16 +8,30 @@
 		<%= error_messages_for f.object %>
 		<fieldset>
 			<legend>New Admin Account</legend>
+				<% if !Spud::Core.config.use_email_as_login %>
+					<div class="control-group">
+						<%= f.label :login, "Login", :class => "control-label" %>
+						<div class="controls">
+							<%= f.text_field :login %>
+						</div>
+					</div>
+				<% end %>
 				<div class="control-group">
-					<%= f.label :login, "Login", :class => "control-label" %>
+					<%= f.label :email, "Email", :class => "control-label" %>
 					<div class="controls">
-						<%= f.text_field :login %>
+						<%= f.text_field :email %>
 					</div>
 				</div>
 				<div class="control-group">
-					<%= f.label :email, "Email", :class => "control-label" %>
+					<%= f.label :first_name, :class => "control-label" %>
 					<div class="controls">
-						<%= f.text_field :email %>
+						<%= f.text_field :first_name %>
+					</div>
+				</div>
+				<div class="control-group">
+					<%= f.label :last_name, :class => "control-label" %>
+					<div class="controls">
+						<%= f.text_field :last_name %>
 					</div>
 				</div>
 				<div class="control-group">

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

@@ -3,12 +3,17 @@
   <%= error_messages_for(f.object) %>
 
   <div class="login-form-row">
-	  <%= f.label :login %>
-	  <%= f.text_field :login, :autofocus => 'autofocus', :autocomplete => 'username' %>
+    <% if Spud::Core.config.use_email_as_login %>
+      <%= f.label :email %>
+      <%= f.text_field :email, :placeholder => 'Email', :autofocus => 'autofocus', :autocomplete => 'username' %>
+    <% else %>
+      <%= f.label :login %>
+      <%= f.text_field :login, :placeholder => 'Username', :autofocus => 'autofocus', :autocomplete => 'username' %>
+    <% end %>
   </div>
   <div class="login-form-row">
   	<%= f.label :password %>
-  	<%= f.password_field :password, :autocomplete => 'current-password' %>
+  	<%= f.password_field :password, :placeholder => 'Password', :autocomplete => 'current-password' %>
   </div>
   <div class="login-form-row">
   	<%= f.submit "Login", :class => 'btn' %> or <%=link_to "Forgot Password?", admin_password_resets_path %>

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

@@ -3,14 +3,16 @@
 <fieldset>
   <legend>User Details</legend>
 
-<div class="control-group">
-  <%=f.label :login, :required=>true,:class=> "control-label"%>
-  <div class="controls">
-    <%=f.text_field :login,:title => "",:size=>25%>
-    <p class="help-block">This is the username used to login to the account.</p>
-  </div>
-  
-</div>
+  <% if !Spud::Core.config.use_email_as_login %>
+    <div class="control-group">
+      <%=f.label :login, :required=>true,:class=> "control-label"%>
+      <div class="controls">
+        <%=f.text_field :login,:title => "",:size=>25%>
+        <p class="help-block">This is the username used to login to the account.</p>
+      </div>
+    </div>
+  <% end %>
+
 <div class="control-group">
   <%=f.label :email,:class=> "control-label"%>
   <div class="controls">

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

@@ -12,8 +12,10 @@
   </div>
   <h2><%= @user.full_name %></h2>
   <dl>
-    <dt>Login</dt>
-    <dd><%= @user.login %></dd>
+    <% if !Spud::Core.config.use_email_as_login %>
+      <dt>Login</dt>
+      <dd><%= @user.login %></dd>
+    <% end %>
     <dt>Email</dt>
     <dd><%= mail_to @user.email %></dd>
     <dt>Last Login</dt>

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

@@ -4,6 +4,9 @@
 	<h1>Password Reset</h1>
 	<%= form_for @user, :url => password_reset_path(:id => @user.perishable_token), :html => {:class => 'password-reset-form'} do |f| %>
     <%= tb_form_errors(@user) %>
+		<% if params[:return_to] %>
+    	<%= hidden_field_tag :return_to, params[:return_to] %>
+  	<% end %>
 	  <div class="form-row">
 	  	<%= f.label :password %>
 	  	<%= f.password_field :password, :placeholder => 'password', :autofocus => 'autofocus' %>

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

@@ -4,13 +4,21 @@
 
 <%= form_for @user_session, :url => login_path, :html => {:class => 'login-form'} do |f| %>
   <%= tb_form_errors(@user_session) %>
+  <% if params[:return_to] %>
+    <%= hidden_field_tag :return_to, params[:return_to] %>
+  <% end %>
   <div class="form-row">
-    <%= f.label :login %>
-    <%= f.text_field :login, :placeholder => 'username', :autofocus => 'autofocus', :autocomplete => 'username' %>
+    <% if Spud::Core.config.use_email_as_login %>
+      <%= f.label :email %>
+      <%= f.text_field :email, :placeholder => 'Email', :autofocus => 'autofocus', :autocomplete => 'username' %>
+    <% else %>
+      <%= f.label :login %>
+      <%= f.text_field :login, :placeholder => 'Username', :autofocus => 'autofocus', :autocomplete => 'username' %>
+    <% end %>
   </div>
   <div class="form-row">
     <%= f.label :password %>
-    <%= f.password_field :password, :placeholder => 'password', :autocomplete => 'current-password' %>
+    <%= f.password_field :password, :placeholder => 'Password', :autocomplete => 'current-password' %>
   </div>
   <div class="form-row">
     <%= f.submit "Login", :class => 'btn btn-primary' %> <span>or</span> <%=link_to "Forgot Password?", password_resets_path %>

data/lib/spud_core/configuration.rb

@@ -1,7 +1,9 @@
 module Spud
   module Core
     include ActiveSupport::Configurable
-    config_accessor :site_name,:admin_applications,:sitemap_urls,:multisite_mode_enabled,:multisite_config,:from_address,:site_id,:short_name, :javascripts,:stylesheets, :admin_javascripts, :admin_stylesheets, :permissions, :production_alert_domain
+    config_accessor :site_name, :admin_applications, :sitemap_urls, :multisite_mode_enabled, :multisite_config,
+      :from_address, :site_id, :short_name, :javascripts, :stylesheets, :admin_javascripts, :admin_stylesheets, 
+      :permissions, :production_alert_domain, :use_email_as_login
     self.admin_applications = []
     self.site_name = "Company Name"
     self.site_id = 0
@@ -16,6 +18,7 @@ module Spud
     self.admin_javascripts = ['admin/core/application', 'admin/application']
     self.admin_stylesheets = ['admin/core/application', 'admin/application']
     self.production_alert_domain = nil
+    self.use_email_as_login = false
 
     def self.site_config_for_host(host)
       configs = Spud::Core.multisite_config.select{|p| p[:hosts].include?(host)}

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.2.7"
+    VERSION = "1.2.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails