tb_core 1.3.10 → 1.4.beta1

data/app/helpers/tb_core/application_helper.rb

@@ -15,16 +15,20 @@ module TbCore::ApplicationHelper
 
   def tb_form_errors(record, *fields_to_display)
     if record.errors.any?
-      content_tag :div, :class => 'form-errors' do
-        concat(tb_form_error_header(record))
-        concat(raw "<ul>")
-        if fields_to_display.any?
-          messages = fields_to_display.collect{ |field| record.errors.full_messages_for(field) }.flatten()
-        else
-          messages = record.errors.full_messages
-        end
-        concat(raw messages.collect{ |msg| "<li>#{msg}</li>" }.join())
-        concat(raw "</ul>")
+      content_tag :div, class: 'form-errors test' do
+        concat(
+          tb_form_error_header(record) +
+          content_tag(:ul) do
+            if fields_to_display.any?
+              messages = fields_to_display.collect{ |field| record.errors.full_messages_for(field) }.flatten()
+            else
+              messages = record.errors.full_messages
+            end
+            messages.each do |msg|
+              concat content_tag(:li, msg)
+            end
+          end
+        )
       end
     end
   end
@@ -32,22 +36,22 @@ module TbCore::ApplicationHelper
   def tb_form_error_header(record)
     if record.errors.any?
       message = "Please correct the following #{'error'.pluralize(record.errors.size)}:"
-      return content_tag :h4, message, :class => 'form-field-error'
+      return content_tag :h4, message, class: 'form-field-error'
     end
   end
 
   def tb_form_error_field(record, attribute)
     message = record.errors[attribute].first
     if message
-      return content_tag :p, message, :class => 'help-block form-field-error'
+      return content_tag :p, message, class: 'help-block form-field-error'
     end
   end
 
   def tb_form_field(attribute)
-    content_tag :div, :class => 'form-group' do
-      concat label_tag attribute, attribute, :class => 'col-sm-2 control-label'
-      concat(content_tag(:div, :class => 'col-sm-10') do
-        text_field_tag attribute, :placeholder => attribute, :class => 'form-control'
+    content_tag :div, class: 'form-group' do
+      concat label_tag attribute, attribute, class: 'col-sm-2 control-label'
+      concat(content_tag(:div, class: 'col-sm-10') do
+        text_field_tag attribute, placeholder: attribute, class: 'form-control'
       end)
     end
   end

data/app/mailers/tb_core_mailer.rb

@@ -1,17 +1,23 @@
 class TbCoreMailer < ActionMailer::Base
-
+  default from: Spud::Core.from_address
   layout 'mailer'
 
   def forgot_password_notification(user, url)
     @user = user
     @url = url
-    mail(:from =>Spud::Core.from_address, :to => to_address_for_user(user), :subject => default_i18n_subject(:site_name => Spud::Core.site_name))
+    mail(
+      to: to_address_for_user(user),
+      subject: default_i18n_subject(site_name: Spud::Core.site_name)
+    )
   end
 
   def user_credentials(user, password)
     @user = user
     @password = password
-    mail(:from => Spud::Core.from_address, :to => to_address_for_user(user), :subject => default_i18n_subject(:site_name => Spud::Core.site_name))
+    mail(
+      to: to_address_for_user(user),
+      subject: default_i18n_subject(site_name: Spud::Core.site_name)
+    )
   end
 
 private

data/app/models/spud/spud_user_model.rb

@@ -1,7 +1,7 @@
 class Spud::SpudUserModel < ActiveRecord::Base
   self.table_name = 'spud_users'
   self.abstract_class = true
-  
+
   acts_as_authentic do |c|
     c.transition_from_crypto_providers = Authlogic::CryptoProviders::Sha512
     c.crypto_provider = Authlogic::CryptoProviders::SCrypt
@@ -11,11 +11,11 @@ class Spud::SpudUserModel < ActiveRecord::Base
     end
   end
 
-  belongs_to :role, :class_name => 'SpudRole', :foreign_key => 'spud_role_id'
+  belongs_to :role, class_name: 'SpudRole', foreign_key: 'spud_role_id'
   has_many :spud_user_settings
 
-  validates :first_name, :last_name, :presence => true
-  before_validation :set_login_to_email, :if => ->{ Spud::Core.config.use_email_as_login }
+  validates :first_name, :last_name, presence: true
+  before_validation :set_login_to_email, if: ->{ Spud::Core.config.use_email_as_login }
   before_update :unset_requires_password_change
 
   scope :admins, ->{
@@ -36,12 +36,6 @@ class Spud::SpudUserModel < ActiveRecord::Base
     return "#{self.first_name} #{self.last_name}"
   end
 
-  def email_formatted
-    address = Mail::Address.new(email)
-    address.display_name = full_name
-    return address.format
-  end
-
   def full_name_with_email
     return "#{full_name} (#{email})"
   end
@@ -110,11 +104,11 @@ class Spud::SpudUserModel < ActiveRecord::Base
   # * tag - Desired permission tag string (required)
   # * include_supers - Whether to include super user (default: true)
   def self.with_permission(tag, include_supers:true)
-    role_ids = SpudRolePermission.where(:spud_permission_tag => tag).pluck(:spud_role_id).uniq()
+    role_ids = SpudRolePermission.where(spud_permission_tag: tag).pluck(:spud_role_id).uniq()
     if include_supers
       return SpudUser.where('super_admin = 1 OR spud_role_id IN (?)', role_ids)
     else
-      return SpudUser.where(:spud_role_id => role_ids)
+      return SpudUser.where(spud_role_id: role_ids)
     end
   end
 
@@ -137,7 +131,7 @@ private
   end
 
   def unset_requires_password_change
-    if password_changed? && !requires_password_change_changed?(:to => true)
+    if password_changed? && !requires_password_change_changed?(to: true)
       self.requires_password_change = false
     end
     return true

data/app/models/spud_role.rb

@@ -1,9 +1,9 @@
 class SpudRole < ActiveRecord::Base
 
-  has_many :spud_role_permissions, :dependent => :destroy
-  has_many :users, :class_name => 'SpudUser'
+  has_many :spud_role_permissions, dependent: :destroy
+  has_many :users, class_name: 'SpudUser'
 
-  validates :name, :presence => true, :uniqueness => true
+  validates :name, presence: true, uniqueness: true
 
   def permissions
     self.spud_role_permissions.collect(&:permission).reject(&:blank?)
@@ -21,7 +21,7 @@ class SpudRole < ActiveRecord::Base
         tags.delete(role_permission.permission.tag)
       end
     end
-    self.spud_role_permissions += tags.collect{ |tag| SpudRolePermission.new(:spud_permission_tag => tag) }
+    self.spud_role_permissions += tags.collect{ |tag| SpudRolePermission.new(spud_permission_tag: tag) }
   end
 
   def permission_tags

data/app/models/spud_user_setting.rb

@@ -1,6 +1,6 @@
 class SpudUserSetting < ActiveRecord::Base
   belongs_to :spud_user
 
-  validates :key,:presence=>true
-  validates_uniqueness_of :key,:scope => :spud_user_id
+  validates :key,presence: true
+  validates_uniqueness_of :key,scope: :spud_user_id
 end

data/config/routes.rb

@@ -11,7 +11,7 @@ Rails.application.routes.draw do
     put 'settings' => 'settings#update'
     put 'change_sort' => 'dashboard#change_sort'
 
-    root :to => "dashboard#index"
+    root :to => "dashboard#index", as: :root
     resources :users do
       get 'export', :on => :collection
     end
@@ -20,8 +20,8 @@ Rails.application.routes.draw do
     get 'setup' => 'setup#new'
     post 'setup' => 'setup#create'
   end
-  
-  # Non-admin login paths 
+
+  # Non-admin login paths
   get 'login' => 'user_sessions#new', :as => 'login'
   post 'login' => 'user_sessions#create'
   match 'logout' => 'user_sessions#destroy', :as => 'logout', :via => [:get, :post]

data/lib/generators/spud/controller_spec_generator.rb

@@ -1,9 +1,9 @@
 class Spud::ControllerSpecGenerator < ::Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
-  argument :name, :type => :string
-  argument :string_attribute, :type => :string
-  argument :editable, :type => :numeric, :default => 0
+  argument :name, type: :string
+  argument :string_attribute, type: :string
+  argument :editable, type: :numeric, default: 0
 
   def controller
     template 'controller_spec.rb.erb', "spec/controllers/#{name.downcase}_controller_spec.rb"
@@ -31,4 +31,7 @@ private
     return editable == 1
   end
 
+  def include_user_session?
+    return name.match('Admin/')
+  end
 end

data/lib/generators/spud/module_generator.rb

@@ -1,44 +1,53 @@
 require 'rails/generators/migration'
 
 class Spud::ModuleGenerator < ::Rails::Generators::Base
-  desc "Creates a new model, dashboard module, and frontend route"
-  argument :module_name, :type => :string
-  argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
+  desc 'Creates a new model, dashboard module, and frontend route'
+  argument :module_name, type: :string
+  argument :attributes, type: :array, default: [], banner: 'field[:type][:index] field[:type][:index]'
 
   source_root File.expand_path('../templates', __FILE__)
 
   def create_module
-    template "admin_controller.rb.erb", "app/controllers/admin/#{module_name_formatted}_controller.rb"
-    template "controller.rb.erb", "app/controllers/#{module_name_formatted}_controller.rb"
-    template "assets/module.js.erb", "app/assets/javascripts/#{module_name_formatted}.js"
-    template "assets/admin/module.js.erb", "app/assets/javascripts/admin/#{module_name_formatted}.js"
-    create_file "app/assets/stylesheets/admin/#{module_name_formatted}.scss", "// Place #{module_name} admin styles here\n\n"
-    create_file "app/assets/stylesheets/#{module_name_formatted}.scss", "// Place #{module_name} styles here\n\n"
-    template "views/admin/index.html.erb", "app/views/admin/#{module_name_formatted}/index.html.erb"
-    template "views/admin/show.html.erb", "app/views/admin/#{module_name_formatted}/show.html.erb"
-    template "views/admin/new.html.erb", "app/views/admin/#{module_name_formatted}/new.html.erb"
-    template "views/admin/edit.html.erb", "app/views/admin/#{module_name_formatted}/edit.html.erb"
-    template "views/admin/_form.html.erb", "app/views/admin/#{module_name_formatted}/_form.html.erb"
-    template "views/frontend/index.html.erb", "app/views/#{module_name_formatted}/index.html.erb"
-    template "views/frontend/show.html.erb", "app/views/#{module_name_formatted}/show.html.erb"
-    environment("Spud::Core.config.admin_applications += [{:name => '#{module_name_formatted.humanize.titlecase}', :thumbnail => \"admin/module_icon.png\", :url => \"/admin/#{module_name_formatted}\"}]")
+    install_templates
+    install_assets
+    inject_code
     create_routes
-    Rails::Generators.invoke "model", [module_name_formatted.singularize] + attributes, :behavior => behavior
-    Rails::Generators.invoke 'helper', [module_name], :behavior => behavior
-    Rails::Generators.invoke 'helper', ["Admin/#{module_name}"], :behavior => behavior
-
-    if defined?(RSpec)
-      string_attribute = find_first_string_attr()
-      Rails::Generators.invoke 'spud:controller_spec', ["#{module_name}", string_attribute, 0], :behavior => behavior
-      Rails::Generators.invoke 'spud:controller_spec', ["Admin/#{module_name}", string_attribute, 1], :behavior => behavior
-    end
+    create_specs if defined?(RSpec)
+    create_model_scopes() if self.behavior == :invoke
+  end
 
-    if self.behavior == :invoke
-      create_model_scopes()
-    end
+  private
+
+  def install_templates
+    template 'admin_controller.rb.erb', "app/controllers/admin/#{module_name_formatted}_controller.rb"
+    template 'controller.rb.erb', "app/controllers/#{module_name_formatted}_controller.rb"
+    template 'assets/module.js.erb', "app/assets/javascripts/#{module_name_formatted}.js"
+    template 'assets/admin/module.js.erb', "app/assets/javascripts/admin/#{module_name_formatted}.js"
+    template 'views/admin/index.html.erb', "app/views/admin/#{module_name_formatted}/index.html.erb"
+    template 'views/admin/show.html.erb', "app/views/admin/#{module_name_formatted}/show.html.erb"
+    template 'views/admin/new.html.erb', "app/views/admin/#{module_name_formatted}/new.html.erb"
+    template 'views/admin/edit.html.erb', "app/views/admin/#{module_name_formatted}/edit.html.erb"
+    template 'views/admin/_form.html.erb', "app/views/admin/#{module_name_formatted}/_form.html.erb"
+    template 'views/frontend/index.html.erb', "app/views/#{module_name_formatted}/index.html.erb"
+    template 'views/frontend/show.html.erb', "app/views/#{module_name_formatted}/show.html.erb"
   end
 
-private
+  def install_assets
+    create_file "app/assets/stylesheets/admin/#{module_name_formatted}.scss",
+      "// Place #{module_name} admin styles here\n\n"
+    create_file "app/assets/stylesheets/#{module_name_formatted}.scss",
+      "// Place #{module_name} styles here\n\n"
+  end
+
+  def inject_code
+    environment(
+      "Spud::Core.config.admin_applications += [{name: '#{module_name_formatted.humanize.titlecase}',
+      thumbnail: \"admin/module_icon.png\", url: \"/admin/#{module_name_formatted}\"}]"
+    )
+    Rails::Generators.invoke 'model', [module_name_formatted.singularize] + attributes, behavior: behavior
+    Rails::Generators.invoke 'helper', [module_name], behavior: behavior
+    Rails::Generators.invoke 'helper', ["Admin/#{module_name}"], behavior: behavior
+  end
 
   def module_name_formatted
     module_name.pluralize.underscore
@@ -53,12 +62,18 @@ namespace :admin do
 EOF
   end
 
+  def create_specs
+    string_attribute = find_first_string_attr()
+    Rails::Generators.invoke 'spud:controller_spec', ["#{module_name}", string_attribute, 0], behavior: behavior
+    Rails::Generators.invoke 'spud:controller_spec', ["Admin/#{module_name}", string_attribute, 1], behavior: behavior
+  end
+
   def field_for_attribute(type, name)
     case type
       when 'integer'
         "<%= f.tb_number_field :#{name} %>"
       when 'text'
-        "<%= f.tb_text_area :#{name}, :rows => 4 %>"
+        "<%= f.tb_text_area :#{name}, rows: 4 %>"
       when 'boolean'
         "<%= f.tb_check_box :#{name} %>"
       when 'date'
@@ -77,29 +92,29 @@ EOF
   end
 
   def create_model_scopes
-    sort_field = ask("What field would you like to sort by?", :default => 'created_at')
-    search_field = ask("What field would you like to search by?", :default => attributes.first.split(':').first)
-    inject_into_file "app/models/#{module_name.singularize.underscore}.rb", after: "ActiveRecord::Base\n" do <<-RUBY
-  scope :ordered, ->{ order('#{sort_field} desc') }
-  scope :search, ->(term){ where('#{search_field} LIKE ?', "%\#{term}%") }
+    sort_field = ask('What field would you like to sort by?', default: 'created_at')
+    search_field = ask('What field would you like to search by?', default: attributes.first.split(':').first)
+    inject_into_file "app/models/#{module_name.singularize.underscore}.rb", after: "ApplicationRecord\n" do <<-RUBY
+  scope :ordered, -> { order(#{sort_field}: :desc) }
+  scope :search, ->(term) { where('#{search_field} LIKE ?', "%\#{term}%") }
 RUBY
     end
   end
 
   # NOT CURRENTLY USED
   #
-  # Call this method from the create_module generator to automatically build length validators for string columns. The idea here is to protect against
-  # database exceptions when long strings are entered by a user.
+  # Call this method from the create_module generator to automatically build length validators for string columns.
+  # The idea here is to protect against database exceptions when long strings are entered by a user.
   #
-  # TODO: This doesn't take in to account any custom :limit values on the string column. Assumes 255 as the default limit.
+  # Assumes 255 as the default limit
   #
   #
   def add_string_maximums
     string_attrs = attributes.select{ |att| att.split(':')[1] == 'string' }.collect{ |att| att.split(':')[0] }
     if string_attrs.any?
       string_attrs_as_symbols = string_attrs.collect{ |att| ":#{att.to_s}" }.join(', ')
-      inject_into_file "app/models/#{module_name.singularize.underscore}.rb", :before => 'end' do <<-RUBY
-    
+      inject_into_file "app/models/#{module_name.singularize.underscore}.rb", before: 'end' do <<-RUBY
+
   validates #{string_attrs_as_symbols}, :length => {:maximum => 255}
 
   RUBY

data/lib/generators/spud/setup_generator.rb

@@ -3,41 +3,45 @@ class Spud::SetupGenerator < ::Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   def setup
-    if ask('NOTICE: Setup will now attempt to delete and/or overwrite existing files. Continue?', :limited_to => ['y', 'n']) == 'n'
+    if ask(
+      'NOTICE: Setup will now attempt to delete and/or overwrite existing files. Continue?',
+      limited_to: ['y', 'n']
+    ) == 'n'
       return
     end
 
-    template "views/layouts/application.html.erb", "app/views/layouts/application.html.erb"
-    template "views/layouts/error_page.html.erb", "app/views/layouts/error_page.html.erb"
-
-    template "application_controller.rb", "app/controllers/application_controller.rb"
-    template 'assets/admin.scss', 'app/assets/stylesheets/admin/application.scss'
-
-    remove_file 'app/assets/stylesheets/application.css'
-    template 'assets/application.scss', 'app/assets/stylesheets/application.scss'
-    template 'assets/application.js', 'app/assets/javascripts/application.js'
-    template 'assets/admin/application.js', 'app/assets/javascripts/admin/application.js'
-
-    if defined?(Bootstrap)
-      theme_file = Bootstrap::Rails::Engine.root.join('templates', 'project', '_bootstrap-variables.sass')
-      template theme_file, 'app/assets/stylesheets/imports/bootstrap_theme.scss' if File.exist?(theme_file)
-      
-      modules_file = Bootstrap::Rails::Engine.root.join('assets', 'stylesheets', '_bootstrap.scss')
-      template modules_file, 'app/assets/stylesheets/imports/bootstrap_modules.scss' if File.exist?(modules_file)
-
-      template 'assets/bootstrap.js', 'app/assets/javascripts/bootstrap_modules.js'
-    end
+    install_templates()
+    install_bootstrap() if defined?(Bootstrap)
 
     environment(spud_core_configs())
     rake('railties:install:migrations')
 
-    if ask("Migrate the database?", :limited_to => ['y', 'n']).downcase == 'y'
+    if ask('Migrate the database?', limited_to: ['y', 'n']).downcase == 'y'
       rake('db:migrate')
     end
   end
 
 private
 
+  def install_templates
+    template 'views/layouts/application.html.erb', 'app/views/layouts/application.html.erb'
+    template 'views/layouts/error_page.html.erb', 'app/views/layouts/error_page.html.erb'
+    template 'application_controller.rb', 'app/controllers/application_controller.rb'
+    template 'assets/admin.scss', 'app/assets/stylesheets/admin/application.scss'
+    remove_file 'app/assets/stylesheets/application.css'
+    template 'assets/application.scss', 'app/assets/stylesheets/application.scss'
+    template 'assets/application.js', 'app/assets/javascripts/application.js'
+    template 'assets/admin/application.js', 'app/assets/javascripts/admin/application.js'
+  end
+
+  def install_bootstrap
+    theme_file = Bootstrap::Rails::Engine.root.join('templates', 'project', '_bootstrap-variables.sass')
+    template theme_file, 'app/assets/stylesheets/imports/bootstrap_theme.scss' if File.exist?(theme_file)
+    modules_file = Bootstrap::Rails::Engine.root.join('assets', 'stylesheets', '_bootstrap.scss')
+    template modules_file, 'app/assets/stylesheets/imports/bootstrap_modules.scss' if File.exist?(modules_file)
+    template 'assets/bootstrap.js', 'app/assets/javascripts/bootstrap_modules.js'
+  end
+
   def spud_core_configs
     site_name = application_name().titleize
     domain_name = application_name().dasherize

data/lib/generators/spud/templates/admin_controller.rb.erb

@@ -1,14 +1,11 @@
 class Admin::<%= module_name_formatted.camelize%>Controller < Admin::ApplicationController
-
   belongs_to_app :<%= module_name_formatted %>
-  add_breadcrumb "<%= module_name_formatted.humanize.titlecase %>", :admin_<%= module_name_formatted %>_path
-  before_action :load_<%= module_name_formatted.singularize %>, :only => [:show, :edit, :update, :destroy]
+  add_breadcrumb '<%= module_name_formatted.humanize.titlecase %>', :admin_<%= module_name_formatted %>_path
+  before_action :load_<%= module_name_formatted.singularize %>, only: [:show, :edit, :update, :destroy]
 
   def index
-    @<%= module_name_formatted %> = <%= module_name_formatted.singularize.camelize %>.ordered.paginate(:page => params[:page])
-    if params[:search]
-      @<%= module_name_formatted %> = @<%= module_name_formatted %>.search(params[:search])
-    end
+    @<%= module_name_formatted %> = <%= module_name_formatted.singularize.camelize %>.ordered.paginate(page: params[:page])
+    @<%= module_name_formatted %> = @<%= module_name_formatted %>.search(params[:search]) if params[:search]
     respond_with @<%= module_name_formatted %>
   end
 
@@ -24,7 +21,7 @@ class Admin::<%= module_name_formatted.camelize%>Controller < Admin::Application
   def create
     @<%= module_name_formatted.singularize %> = <%= module_name_formatted.singularize.camelize %>.new(<%= module_name_formatted.singularize %>_params)
     flash[:notice] = '<%= module_name_formatted.singularize.camelize %> created successfully' if @<%= module_name_formatted.singularize %>.save
-    respond_with @<%= module_name_formatted.singularize %>, :location => admin_<%= module_name_formatted %>_path
+    respond_with @<%= module_name_formatted.singularize %>, location: admin_<%= module_name_formatted %>_path
   end
 
   def edit
@@ -35,22 +32,21 @@ class Admin::<%= module_name_formatted.camelize%>Controller < Admin::Application
     if @<%= module_name_formatted.singularize%>.update_attributes(<%= module_name_formatted.singularize %>_params)
       flash[:notice] = '<%= module_name_formatted.singularize.camelize %> updated successfully'
     end
-    respond_with @<%= module_name_formatted.singularize %>, :location => admin_<%= module_name_formatted %>_path
+    respond_with @<%= module_name_formatted.singularize %>, location: admin_<%= module_name_formatted %>_path
   end
 
   def destroy
     flash[:notice] = '<%= module_name_formatted.singularize.camelize %> deleted successfully' if @<%= module_name_formatted.singularize %>.destroy
-    respond_with @<%= module_name_formatted.singularize %>, :location => admin_<%= module_name_formatted %>_path
+    respond_with @<%= module_name_formatted.singularize %>, location: admin_<%= module_name_formatted %>_path
   end
 
-private
+  private
 
   def load_<%= module_name_formatted.singularize %>
-    @<%= module_name_formatted.singularize %> = <%= module_name_formatted.singularize.camelize %>.find_by!(:id => params[:id])
+    @<%= module_name_formatted.singularize %> = <%= module_name_formatted.singularize.camelize %>.find_by!(id: params[:id])
   end
 
   def <%= module_name_formatted.singularize %>_params
     params.require(:<%= module_name_formatted.singularize %>).permit(<%= attribute_names.collect{ |att| ":#{att}" }.join(', ') %>)
   end
-
 end

data/lib/generators/spud/templates/controller.rb.erb

@@ -1,10 +1,9 @@
 class <%=module_name_formatted.camelize%>Controller < ApplicationController
-
   respond_to :html, :json
-  before_action :load_<%=module_name_formatted.singularize%>, :only => [:show]
+  before_action :load_<%=module_name_formatted.singularize%>, only: [:show]
 
   def index
-    @<%=module_name_formatted%> = <%=module_name_formatted.singularize.camelize%>.ordered.paginate(:page => params[:page])
+    @<%=module_name_formatted%> = <%=module_name_formatted.singularize.camelize%>.ordered.paginate(page: params[:page])
     respond_with @<%=module_name_formatted%>
   end
 
@@ -12,10 +11,9 @@ class <%=module_name_formatted.camelize%>Controller < ApplicationController
     respond_with @<%=module_name_formatted.singularize%>
   end
 
-private
+  private
 
   def load_<%=module_name_formatted.singularize%>
-    @<%=module_name_formatted.singularize%> = <%=module_name_formatted.singularize.camelize%>.find_by!(:id => params[:id])
+    @<%=module_name_formatted.singularize%> = <%=module_name_formatted.singularize.camelize%>.find_by!(id: params[:id])
   end
-
 end

data/lib/generators/spud/templates/controller_spec.rb.erb

@@ -1,56 +1,52 @@
 require 'rails_helper'
 
-RSpec.describe <%= controller_class_name %>, :type => :controller do
-
+RSpec.describe <%= controller_class_name %>, type: :controller do
   before(:each) do
-    # activate_session(admin: true)
+    <%- if include_user_session? -%>
+    activate_session(admin: true)
+    <%- end -%>
   end
 
   describe 'index' do
     it 'should render the index' do
       get :index
       expect(response).to have_http_status :success
-      expect(response).to render_template :index
     end
   end
 
   describe 'show' do
     it 'should render the show page' do
       <%= model_variable_name %> = FactoryGirl.create(:<%= model_variable_name %>)
-      get :show, :id => <%= model_variable_name %>.id
+      get :show, id: <%= model_variable_name %>.id
       expect(response).to have_http_status :success
-      expect(response).to render_template :show
     end
 
     it 'should return a 404 error' do
-      get :show, :id => 1
+      get :show, id: 1
       expect(response).to have_http_status :not_found
     end
   end
-
   <%- if include_edit_actions? -%>
   describe 'new' do
     it 'should render the new page' do
       get :new
       expect(response).to have_http_status :success
-      expect(response).to render_template :new
     end
   end
 
   describe 'edit' do
     it 'should render the edit page' do
       <%= model_variable_name %> = FactoryGirl.create(:<%= model_variable_name %>)
-      get :edit, :id => <%= model_variable_name %>.id
+      get :edit, id: <%= model_variable_name %>.id
       expect(response).to have_http_status :success
-      expect(response).to render_template :edit
     end
   end
 
   describe 'create' do
     it 'should create the record' do
-      expect{
-        post :create, :<%= model_variable_name %> => FactoryGirl.attributes_for(:<%= model_variable_name %>)  
-      }.to change(<%= model_class_name %>, :count).by(1)
+      expect do
+        post :create, <%= model_variable_name %>: FactoryGirl.attributes_for(:<%= model_variable_name %>)
+      end.to change(<%= model_class_name %>, :count).by(1)
     end
   end
 
@@ -59,21 +55,20 @@ RSpec.describe <%= controller_class_name %>, :type => :controller do
       <%= model_variable_name %> = FactoryGirl.create(:<%= model_variable_name %>)
       current_value = <%= model_variable_name %>.<%= model_string_attribute_name %>
       new_value = current_value + '-Updated'
-      expect{
-        patch :update, :id => <%= model_variable_name %>.id, :<%= model_variable_name %> => {:<%= model_string_attribute_name %> => new_value}
+      expect do
+        patch :update, id: <%= model_variable_name %>.id, <%= model_variable_name %>: { <%= model_string_attribute_name %>: new_value }
         <%= model_variable_name %>.reload
-      }.to change(<%= model_class_name %>, :<%= model_string_attribute_name %>).to(new_value)
+      end.to change(<%= model_variable_name %>, :<%= model_string_attribute_name %>).to(new_value)
     end
   end
 
   describe 'destroy' do
     it 'should destroy the record' do
       <%= model_variable_name %> = FactoryGirl.create(:<%= model_variable_name %>)
-      expect{
-        delete :destroy, :id => <%= model_variable_name %>.id
-      }.to change(<%= model_class_name %>, :count).by(-1)
+      expect do
+        delete :destroy, id: <%= model_variable_name %>.id
+      end.to change(<%= model_class_name %>, :count).by(-1)
     end
   end
   <%- end -%>
-
 end

data/lib/generators/spud/templates/views/layouts/application.html.erb

@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <%%= tb_page_title() %>
   <%%= stylesheet_link_tag "application", :media => "all" %>
-  <%%= javascript_include_tag "application" %>
+  <%%= javascript_include_tag "application", async: Rails.env.production? %>
   <%%= csrf_meta_tags %>
   <%%= yield :head %>
 </head>

data/lib/spud_core/catch_all_route.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  get "*any" => 'spud/application#not_found'
+  get '*any' => 'spud/application#not_found'
 end