tb_core 1.3.2 → 1.3.3

data/app/helpers/tb_core/application_helper.rb

@@ -0,0 +1,88 @@
+module TbCore::ApplicationHelper
+
+  def tb_form_for(record, options = {}, &block)
+    options[:builder] = TbCore::FormBuilder
+
+    options[:html] ||= {}
+    if options[:html][:class]
+      options[:html][:class] += ' form-horizontal'
+    else
+      options[:html][:class] = 'form-horizontal'
+    end
+
+    return form_for(record, options, &block)
+  end
+
+  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>")
+      end
+    end
+  end
+
+  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'
+    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'
+    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'
+      end)
+    end
+  end
+
+  def tb_page_title
+    if content_for?(:title)
+      title = content_for(:title) + ' : ' + Spud::Core.site_name
+    elsif @page_title
+      title = @page_title + ' : ' + Spud::Core.site_name
+    else
+      title = Spud::Core.site_name
+    end
+    return content_tag :title, title
+  end
+
+  def current_site_name
+    return Spud::Core.config.site_name
+  end
+
+  def cache_key_for_spud_collection(collection, key:'view', cache_params:[], for_user:false)
+    cache_keys = [controller_name, action_name, key]
+    cache_keys << collection.collect(&:updated_at).max().try(:utc).try(:to_i)
+    if for_user
+      cache_keys << current_user_id
+    end
+    if cache_params.any?
+      cache_keys += cache_params.collect{ |cache_param| params[cache_param] || 'nil' }
+    end
+    cache_keys += collection.collect(&:id)
+    cache_key = cache_keys.join('/')
+    if cache_key.length > 250
+      return Digest::SHA1.hexdigest(cache_key)
+    else
+      return cache_key
+    end
+  end
+
+end

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

@@ -1,25 +1,29 @@
-<%= tb_form_error_header(f.object) %>
+<%= tb_form_for @user, :url => path, :remote => true, :data => {:errors => :inline, :success => admin_users_path} do |f| %>
+  
+  <%= tb_form_error_header(f.object) %>
 
-<h4>User Details</h4>
+  <h4>User Details</h4>
 
-<% if !Spud::Core.config.use_email_as_login %>
-  <%= f.tb_text_field :login %>
-<% end %>
-<%= f.tb_text_field :email %>
-<%= f.tb_text_field :first_name %>
-<%= f.tb_text_field :last_name %>
-<%= f.tb_time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones, {:default => Rails.application.config.time_zone} %>
+  <% if !Spud::Core.config.use_email_as_login %>
+    <%= f.tb_text_field :login %>
+  <% end %>
+  <%= f.tb_text_field :email %>
+  <%= f.tb_text_field :first_name %>
+  <%= f.tb_text_field :last_name %>
+  <%= f.tb_time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones, {:default => Rails.application.config.time_zone} %>
+
+  <%= render :partial => 'form_additions', :locals => {:f => f} %>
 
-<%= render :partial => 'form_additions', :locals => {:f => f} %>
+  <h4>Credentials</h4>
 
-<h4>Credentials</h4>
+  <%= f.tb_password_field :password %>
+  <%= f.tb_password_field :password_confirmation %>
 
-<%= f.tb_password_field :password %>
-<%= f.tb_password_field :password_confirmation %>
+  <h4>Permissions</h4>
 
-<h4>Permissions</h4>
+  <%= f.tb_check_box :super_admin, :help_block => 'The super administrator bypasses all permissions and roles.' %>
+  <%= f.tb_select :spud_role_id, options_from_collection_for_select(SpudRole.all, :id, :name, f.object.spud_role_id), {:include_blank => 'No Role'} %>
 
-<%= f.tb_check_box :super_admin, :help_block => 'The super administrator bypasses all permissions and roles.' %>
-<%= f.tb_select :spud_role_id, options_from_collection_for_select(SpudRole.all, :id, :name, f.object.spud_role_id), {:include_blank => 'No Role'} %>
+  <%= f.tb_save_buttons('User', @user.new_record? ? admin_users_path : admin_user_path(@user)) %>
 
-<%= f.tb_save_buttons('User', @user.new_record? ? admin_users_path : admin_user_path(@user)) %>
+<% end %>

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

@@ -1,3 +1 @@
-<%= form_for @user, :url => admin_user_path(@user), :builder => TbCore::FormBuilder, :html => {:class => "form-horizontal"} do |f| %>
-  <%= render :partial => "form", :locals => {:f => f} %>
-<% end %>
+<%= render :partial => "form", :locals => {:path => admin_user_path(@user)} %>

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

@@ -1,3 +1 @@
-<%= form_for @user, :url => admin_users_path, :builder => TbCore::FormBuilder, :html=> {:class => "form-horizontal admin-user-form"} do |f| %>
-  <%= render :partial => "form", :locals => {:f => f} %>
-<% end %>
+<%= render :partial => "form", :locals => {:path => admin_users_path} %>

data/app/views/layouts/admin/_search.html.erb

@@ -8,6 +8,9 @@
           <%= link_to raw('<span class="glyphicon glyphicon-remove"></span>'), search_path %>
         </div>
       <% end %>
+      <% if params[:tab] %>
+        <%= hidden_field_tag :tab, params[:tab] %>
+      <% end %>
     </div>
   </div>
 <% end %>

data/app/views/layouts/admin/detail.html.erb

@@ -6,7 +6,7 @@
     <h2 class="detail-title">
       <% if @page_thumbnail %>
         <%= image_tag(@page_thumbnail, :class => 'app-thumbnail') %>
-      <% end%>
+      <% end %>
       <%= @page_name %>
     </h2>
     <div class="details">

data/app/views/layouts/admin/error_page.html.erb

@@ -1,13 +1,11 @@
-<%= content_for :content do %>
-  <div class="detail-wrapper">
-    <h2>
-      <%= @error.code %>: <%= @error.title %>!
-    </h2>
-    <div id="details">
-      <p><%= @error.message %></p>
-      <p>Your user might not have admin rights, or you might be trying to access a module that you have not been granted permission to.</p>
-      <p>Requested URL: <%= @error.request_url %></p>
-    </div>
-  </div>
+<% @page_name = "#{@error.code}: #{@error.title}!" %>
+
+<%= content_for :detail do %>
+  <p><%= @error.message %></p>
+  <% if @error.code == 403 %>
+    <p>Your user might not have admin rights, or you might be trying to access a module that you have not been granted permission to.</p>
+  <% end %>
+  <p>Requested URL: <%= @error.request_url %></p>
 <% end %>
-<%= render :template => 'layouts/admin/application' %>
+
+<%= render :template => 'layouts/admin/detail' %>

data/config/locales/en.yml

@@ -3,6 +3,14 @@
 
 en:
   hello: "Hello world"
+  tb_core:
+    errors:
+      not_found:
+        title: "Not Found"
+        message: "The %{item} you were looking for could not be found."
+      access_denied:
+        title: "Access Denied"
+        message: "You are not authorized to view the requested %{item}."
   activerecord:
     attributes:
       spud_user:

data/lib/generators/spud/controller_spec_generator.rb

@@ -0,0 +1,34 @@
+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
+
+  def controller
+    template 'controller_spec.rb.erb', "spec/controllers/#{name.downcase}_controller_spec.rb"
+  end
+
+private
+
+  def controller_class_name
+    return name.camelize + 'Controller'
+  end
+
+  def model_variable_name
+    return name.split('/').last.downcase.singularize
+  end
+
+  def model_class_name
+    return name.split('/').last.camelize.singularize
+  end
+
+  def model_string_attribute_name
+    return string_attribute.downcase
+  end
+
+  def include_edit_actions?
+    return editable == 1
+  end
+
+end

data/lib/generators/spud/module_generator.rb

@@ -26,6 +26,13 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
     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
+
     if self.behavior == :invoke
       create_model_scopes()
     end
@@ -79,4 +86,34 @@ 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.
+  #
+  # TODO: This doesn't take in to account any custom :limit values on the string column. 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
+    
+  validates #{string_attrs_as_symbols}, :length => {:maximum => 255}
+
+  RUBY
+      end
+    end
+  end
+
+  def find_first_string_attr
+    found = attributes.find{ |att| att.split(':')[1] == 'string' }
+    if found
+      return found.split(':')[0]
+    else
+      return 'string_not_found'
+    end
+  end
+
 end

data/lib/generators/spud/setup_generator.rb

@@ -18,6 +18,11 @@ class Spud::SetupGenerator < ::Rails::Generators::Base
     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)
+    end
+
     environment(spud_core_configs())
     rake('railties:install:migrations')
 

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

@@ -1,8 +1,8 @@
 class Admin::<%= module_name_formatted.camelize%>Controller < Admin::ApplicationController
 
-  before_action :load_<%= module_name_formatted.singularize %>, :only => [:show, :edit, :update, :destroy]
   belongs_to_spud_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]
 
   def index
     @<%= module_name_formatted %> = <%= module_name_formatted.singularize.camelize %>.ordered.paginate(:page => params[:page])
@@ -46,12 +46,7 @@ class Admin::<%= module_name_formatted.camelize%>Controller < Admin::Application
 private
 
   def load_<%= module_name_formatted.singularize %>
-    @<%= module_name_formatted.singularize %> = <%= module_name_formatted.singularize.camelize %>.find_by(:id => params[:id])
-    if @<%= module_name_formatted.singularize %>.blank?
-      flash[:error] = "Could not find the requested <%= module_name_formatted.singularize.camelize %>"
-      redirect_to admin_<%= module_name_formatted %>_path
-      return false
-    end
+    @<%= module_name_formatted.singularize %> = <%= module_name_formatted.singularize.camelize %>.find_by!(:id => params[:id])
   end
 
   def <%= module_name_formatted.singularize %>_params

data/lib/generators/spud/templates/assets/application.scss

@@ -1,5 +1,6 @@
 //= require_self
 //= require_directory .
 
+@import "imports/bootstrap_theme";
 @import "bootstrap-sprockets";
 @import "bootstrap";

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

@@ -15,11 +15,7 @@ class <%=module_name_formatted.camelize%>Controller < ApplicationController
 private
 
   def load_<%=module_name_formatted.singularize%>
-    @<%=module_name_formatted.singularize%> = <%=module_name_formatted.singularize.camelize%>.find_by(:id => params[:id])
-    if @<%=module_name_formatted.singularize%>.blank?
-      raise Spud::NotFoundError.new(:item => '<%= module_name_formatted.singularize %>')
-      return false
-    end
+    @<%=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

@@ -0,0 +1,79 @@
+require 'rails_helper'
+
+RSpec.describe <%= controller_class_name %>, :type => :controller do
+
+  before(:each) do
+    # activate_session(admin: true)
+  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
+      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
+      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
+      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)
+    end
+  end
+
+  describe 'update' do
+    it 'should update the record' 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}
+        <%= model_variable_name %>.reload
+      }.to change(<%= model_class_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)
+    end
+  end
+  <%- end -%>
+
+end

data/lib/generators/spud/templates/views/admin/_form.html.erb

@@ -1,10 +1,10 @@
-<%%= form_for [:admin, @<%=module_name_formatted.singularize%>], :builder => TbCore::FormBuilder, :html => {:class => 'form-horizontal'} do |f| %>
+<%%= tb_form_for [:admin, @<%=module_name_formatted.singularize%>], :remote => true, :data => {:errors => :inline, :success => admin_<%= module_name_formatted %>_path} do |f| %>
   
   <%%= tb_form_errors(f.object, :base) %>
   <%- attributes.collect{ |att| att.split(':') }.each do |arg_0, arg_1| %>
   <%= field_for_attribute(arg_1, arg_0) %>
   <%- end %>
-  <%%= f.tb_save_buttons('<%= module_name_formatted.singularize.humanize.titlecase %>', @<%= module_name_formatted.singularize %>.new_record? ? admin_<%= module_name_formatted %>_path : admin_<%= module_name_formatted.singularize %>_path(@<%= module_name_formatted.singularize %>)) %>
+  <%%= f.tb_save_buttons('<%= module_name_formatted.singularize.humanize.titlecase %>', admin_<%= module_name_formatted %>_path) %>
 
 <%% end %>
 

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

@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="viewport" content="width=device-width"/>
   <%%= tb_page_title() %>
   <%%= stylesheet_link_tag "application", :media => "all" %>
   <%%= javascript_include_tag "application" %>
@@ -16,12 +15,12 @@
 
     <%% if flash[:notice] %>
       <div class="alert alert-info alert-dismissible">
-        <%%= flash[:notice] %> <a href="#" class="flash-remove">X</a>
+        <%%= flash[:notice] %>
         <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
       </div>
     <%% elsif flash[:error] %>
       <div class="alert alert-danger alert-dismissible">
-        <%%= flash[:error] %> <a href="#" class="flash-remove">X</a>
+        <%%= flash[:error] %>
         <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
       </div>
     <%% end %>

data/lib/spud_core/belongs_to_app.rb

@@ -29,7 +29,7 @@ module Spud::BelongsToApp
           elsif controller.action_name == 'edit' || controller.action_name == 'update'
               @page_name = "Edit #{@page_name.singularize}"
           elsif controller.action_name == 'show'
-            @page_name = "Show #{@page_name.singularize}"
+            @page_name = "#{@page_name.singularize} Detail"
           end
         end
       end

data/lib/spud_core/engine.rb

@@ -70,3 +70,5 @@ module Spud
     end
   end
 end
+
+TbCore::Engine = Spud::Core::Engine

data/lib/spud_core/errors.rb

@@ -2,30 +2,39 @@ class Spud::RequestError < StandardError
   attr_accessor :request_url, :item, :template
   attr_reader :code, :title
 
-  def initialize(message)
+  # For compatability reasons, this method accepts multiple styles of inputs
+  # Going forward the expected input will be:
+  # 
+  # * item: The item that could not be found. String. (default = page)
+  # * template (named): ERB template you wish to render
+  #
+  def initialize(item_or_opts='page', opts={})
+    if item_or_opts.is_a?(Hash)
+      # ActiveSupport::Deprecation.warn("Passing the :item as a key/value pair to #{self.class.to_s} is deprecated; Pass it as the first argument instead.")
+      @item = item_or_opts[:item]
+      @template = item_or_opts[:template]
+    else
+      @item = item_or_opts
+      @template = opts[:template]
+    end
     @template ||= 'layouts/error_page'
-    super(message)
+    @title = I18n.t(:title, :scope => [:tb_core, :errors, @i18n])
+    super(I18n.t(:message, :scope => [:tb_core, :errors, @i18n], :item => @item))
   end
 end
 
 class Spud::AccessDeniedError < Spud::RequestError
-  def initialize(opts={})
-    @item = opts[:item] || 'page'
-    @template = opts[:template]
+  def initialize(item_or_opts='page', opts={})
     @code = 403
-    @title = "Access Denied"
-    message = opts[:message] || "You are not authorized to view the requested #{item.downcase}."
-    super(message)
+    @i18n = 'access_denied'
+    super(item_or_opts, opts)
   end
 end
 
 class Spud::NotFoundError < Spud::RequestError
-  def initialize(opts={})
-    @item = opts[:item] || 'page'
-    @template = opts[:template]
+  def initialize(item_or_opts='page', opts={})
     @code = 404
-    @title = "Not Found"
-    message = opts[:message] || "The #{item.downcase} you were looking for could not be found."
-    super(message)
+    @i18n = 'not_found'
+    super(item_or_opts, opts)
   end
 end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.3.2"
+    VERSION = "1.3.3"
   end
 end

data/lib/tb_core/form_builder.rb

@@ -112,7 +112,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   def tb_save_buttons(model_name, cancel_path)
     content_tag :div, :class => 'form-group' do
       content_tag :div, :class => 'col-sm-offset-2 col-sm-10' do
-        concat submit "Save #{model_name}", :class => 'btn btn-primary'
+        concat submit "Save #{model_name}", :class => 'btn btn-primary', :data => {:disable_with => "Saving #{model_name}...", :enable_with => 'Saved!'}
         concat ' '
         concat @template.link_to 'Cancel', cancel_path, :class => 'btn btn-default'
       end
@@ -149,6 +149,7 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
   # Builds a text field group
   #
   def tb_text_field(attribute, options={})
+    options[:maxlength] ||= get_limit_for_column(attribute)
     tb_input_field(attribute, :text_field, options)
   end
 
@@ -262,4 +263,13 @@ private
     return :text_field
   end
 
+  def get_limit_for_column(attribute)
+    col = @object.class.columns.find{ |c| c.name == attribute.to_s }
+    if col.present? && col.sql_type.match(/^varchar/)
+      return col.limit
+    else
+      return nil
+    end
+  end
+
 end

data/lib/tb_core/responder.rb

@@ -0,0 +1,32 @@
+class TbCore::Responder < ActionController::Responder
+
+  def initialize(*)
+    super
+
+    # Don't require a :location parameter for redirecting
+    if !@options.has_key?(:location)
+      @options[:location] = nil
+    end
+  end
+
+  # Override the common behavior for formats associated with APIs, such as :xml and :json.
+  #
+  def api_behavior
+    raise MissingRenderer.new(format) unless has_renderer?
+    if get?
+      display resource
+    elsif post? || patch?
+      display resource, :status => :created, :location => api_location
+    else
+      head :no_content
+    end
+  end
+
+  # Default responder only sends the basic errors array
+  # This override also sends the full messages for convenience
+  #
+  def json_resource_errors
+    return {:errors => resource.errors, :full_messages => resource.errors.full_messages}
+  end
+
+end

data/lib/tb_core/test_helper.rb

@@ -0,0 +1,42 @@
+require 'authlogic/test_case'
+include Authlogic::TestCase
+
+module TbCore::SessionHelper
+
+  # Use this helper in controller specs to establish a login session
+  # - admin: Set to true to create a super_admin
+  # - permissions: One or more permissions you want to assign to the user (a role will be auto generated)
+  #
+  def activate_session(admin: false, permissions: nil)
+    activate_authlogic()
+    if permissions
+      permissions = [permissions] unless permissions.is_a?(Array)
+      role = SpudRole.create(:name => 'New Role', :permission_tags => permissions)
+    else
+      role = nil
+    end
+    @user = FactoryGirl.create(:spud_user, {super_admin: admin, role: role})
+    SpudUserSession.create(@user)
+    return @user
+  end
+
+  # Returns the current user
+  #  
+  def current_user
+    return @user
+  end
+end
+
+# Insert the session helper into RSpec if it is in use
+#
+if defined?(RSpec)
+  RSpec.configure do |config|
+    config.include TbCore::SessionHelper
+  end
+end
+
+# Auto load the spud_user factory if FactoryGirl is in use
+#
+if defined?(FactoryGirl)
+  Dir[TbCore::Engine.root.join('spec/factories/spud_user_factories.rb')].each{ |f| require f }
+end