tb_core 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9077f254c8e4707711b4b8a4bb521f0824ba95a
-  data.tar.gz: f858ff8a950238aa2f6f1cf050d5a78fcaab46ea
+  metadata.gz: 71aea9ddb3c9316dc739b01f90a9d4fc691de43f
+  data.tar.gz: 2c6513d8c1deca712ffee16191abc4a60d1d0ace
 SHA512:
-  metadata.gz: d671387317ffd0777cc42c41e17b86dda448e4651b90e6a10aab842073aab993a7864125856f87fe7672ddf5df7fe32a81dc7e1a118d2c4827661d60d60d0895
-  data.tar.gz: b187eb595c18f78588d03c45b0c2dbc308493e18c0773992713e216643d4009d639111e73ff2637f8b0bf5a3f5b4b31bdc304484ecbc592c94fedd68d7ec89dc
+  metadata.gz: eab1674d55e9a78198f6b740e1e3ba26bb62805e0dde9382c68f110794b81db84bc70865d26c4a3e18a1ca98d4761aa9d71759552ceb6d04e0e43a1747428147
+  data.tar.gz: cd40971446fe52fdeafedfa2e653701ced4d23843b0592902c2e2d1f56a771585db6b413f5b08e7fc66bc363710b4caefbcfe8720f18f83eb2e774d5d3273687

data/README.md

@@ -52,11 +52,19 @@ The core engine provides various configuration options.
 Adding Apps to the Dashboard
 ----------------------------
 
-The fastest way to add an app to the dashboard is via the geneator. The generator will take care of creating a model as well as a set of controllers/views. 
+### Using the Module Generator
+
+The fastest way to add an app to the dashboard is via the geneator. The generator is best suited for situations where you are also creating a new ActiveRecord model, and you want to create a standard set of CRUD actions to manage it.
 
     rails g spud:module Cars make:string model:string year:integer classic:boolean notes:text
 
-Admin apps are added via the `Spud::Core.config.admin_applications` array. We recommend you perform this action in either an initializer or within your `application.rb` file. 
+Running the example above would create an ActiveRecord model, migration, admin controller with CRUD actions, and a set of front end views.
+
+### Adding Manually
+
+Sometimes you want to create a dashboard app without all the magic described above. Start by building your controllers and views under the `admin` namespace. Extend your controller from `Admin::ApplicationController` in order to inherit the default admin behaviors, and look at the core admin controllers for example implementations.
+
+Then, add your module to the `Spud::Core.config.admin_applications` array. We recommend you perform this action in either an initializer or within your `application.rb` file.
 
     Spud::Core.config.admin_applications += [{
       # Required:
@@ -67,43 +75,7 @@ Admin apps are added via the `Spud::Core.config.admin_applications` array. We re
       :badge => ->(user){ Client.where(:is_pending => true).count() }
     }]
 
-Build out your RESTful controller and views like you normally would in any Rails app. Extend your controller from `Admin::ApplicationController` in order to inherit the default admin behaviors, and look at the core admin controllers for example implementations.
-
-Roles & Permissions
--------------------
-
-A user can be assigned to a role, which itself has one or more permissions. These permissions serve two distinct purposes: Determining what dashboard apps a user has access to (if any), and being used within your application logic to establish fine-grained user abilities.
-
-Checking permissions is easy. Each permission has a `tag` which is a unique, namespaced identifier. Use the `has_permission?` and `has_any_permission?` methods on the user object to check for their existence. Keep in mind that these calls will always return true for users who have the `super_admin` flag set.
-
-    if !@spud_user.has_permission?('my_website.clients.my_clients')
-      redirect_to root_path, :notice => 'Permission Denied!'
-    end
-
-Permissions are created one of two ways:
-
-1. Every dashboard app automatically generates a "Full Access" permission, with a tag of `admin.(app name).full_access`. 
-2. You as the developer may append custom permissions to the `Spud::Core.permissions` array. 
-
-Create custom permissions whenever you need to permit an action that falls outside of the standard "full access to an app" use case; For example, turning on/off the ability for a user to upload an avatar.
-
-    // application.rb
-    Spud::Core.permissions += [
-      {:tag => 'my_website.profile.avatar', :name => 'Upload an avatar to my profile'}
-    ]
-    // some_view.html.erb
-    <% if current_user.has_permission?('my_website.profile.avatar') %>
-      <%= link_to 'Upload Avatar', upload_avatar_path %>
-    <% end %>
-
-Finally, custom permissions may optionally be tied to one or more dashboard apps. A user who has the permission shown below would have access to the the Clients and Projects dashboard apps. After that is is up to you to code your view and controller logic in accorance to what permissions the user has. 
-
-    // application.rb
-    Spud::Core.permissions += [{
-      :tag => 'my_website.projects.project_management',
-      :name => 'Manage clients and projects, but cannot delete them or view private info',
-      :apps => [:clients, :projects]
-    }]  
+Restart your application, and the new module should appear on the dashboard.
 
 Extending the User Model
 ------------------------
@@ -144,28 +116,111 @@ Create a file in your app at `app/views/admin/users/_show_additions.html.erb`.
       </dd>
     <% end %>
 
-404 Handling
+Error Handling
 ------------
 
-The base `Spud::ApplicationController` will automatically rescue from any `Spud::NotFoundError` and `Spud::AccessDeniedError` errors by rendering out the `layouts/error_page.html` template. To customize this view, create a template by that name in your own project.
+The base `Spud::ApplicationController` will automatically rescue from any `Spud::NotFoundError` and `Spud::AccessDeniedError` errors by rendering out the `layouts/error_page.html` template. If you ran the `spud:setup` generator, a template of that name will have been created for you automatically.
 
-When building your own apps you may raise a `Spud::NotFoundError` at any time to halt further execution and cause the 404 page to render. For example:
+When building your own apps you may raise a `Spud::NotFoundError` or `Spud::AccessDeniedError` error at any time to halt further execution and cause the error page to render. For example:
 
     class CarsController
       before_action :get_record
       # ... actions here
       def get_record
-        @car = Car.where(:id => params[:id]).first
+        @car = Car.find_by(:id => params[:id])
         if @car.blank?
-          raise Spud::NotFoundError.new(:item => 'car')
+          raise Spud::NotFoundError.new('car')
         end
       end
     end
 
+Error messages also support localization. Add the following to `en.yml`, as well as any other locales you are using:
+
+    en:
+      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}."
+
+Form Builder
+------------
+
+The `TbCore::FormBuilder` class is designed to output a Bootstrap form in the `form-horizontal` style. Use it to quickly build simple forms with lots of fields. Validation errors will appear automatically next to their input fields.
+
+You can specificy the `:builder` attribute in a `form_for`, or you can just use the provided `tb_form_for` helper to use it automatically.
+
+### Example
+
+    <%= tb_form_for @widget do |f| %>
+      <%= f.tb_text_field :name %>
+      <%= f.tb_number_field :age %>
+      <%= f.tb_save_buttons('Widget', widgets_path) %>
+    <% end %>
+
+See `form_builder.rb` for the full details.
+
+Remote Forms
+--------------
+
+If you choose to include the `tb_core` JavaScript file in your project, we provide a couple additional features on top of the standard [jquery-ujs](https://github.com/rails/jquery-ujs) adapter. Use the following data attributes on your remote forms.
+
+- `data-errors`: Set to `inline` for inline form errors, or `alert` for a browser alert window.
+- `data-success`: Set to a path you would like to redirect to. For example, redirecting back to an index after a successful post.
+
+This feature works with `tb_form_for` or standard `form_for` forms.
+
+### Example
+
+    <%= tb_form_for @widget, :remote => true, :data => {:errors => :inline, :success => widgets_path} do |f| %>
+      <!--input fields here -->
+    <% end %>
+
+See `remote.js` for the full details.
+
+Roles & Permissions
+-------------------
+
+A user can be assigned to a role, which itself has one or more permissions. These permissions serve two distinct purposes: Determining what dashboard apps a user has access to (if any), and being used within your application logic to establish fine-grained user abilities.
+
+Checking permissions is easy. Each permission has a `tag` which is a unique, namespaced identifier. Use the `has_permission?` and `has_any_permission?` methods on the user object to check for their existence. Keep in mind that these calls will always return true for users who have the `super_admin` flag set.
+
+    if !@spud_user.has_permission?('my_website.clients.my_clients')
+      redirect_to root_path, :notice => 'Permission Denied!'
+    end
+
+Permissions are created one of two ways:
+
+1. Every dashboard app automatically generates a "Full Access" permission, with a tag of `admin.(app name).full_access`. 
+2. You as the developer may append custom permissions to the `Spud::Core.permissions` array. 
+
+Create custom permissions whenever you need to permit an action that falls outside of the standard "full access to an app" use case; For example, turning on/off the ability for a user to upload an avatar.
+
+    // application.rb
+    Spud::Core.permissions += [
+      {:tag => 'my_website.profile.avatar', :name => 'Upload an avatar to my profile'}
+    ]
+    // some_view.html.erb
+    <% if current_user.has_permission?('my_website.profile.avatar') %>
+      <%= link_to 'Upload Avatar', upload_avatar_path %>
+    <% end %>
+
+Finally, custom permissions may optionally be tied to one or more dashboard apps. A user who has the permission shown below would have access to the the Clients and Projects dashboard apps. After that is is up to you to code your view and controller logic in accorance to what permissions the user has. 
+
+    // application.rb
+    Spud::Core.permissions += [{
+      :tag => 'my_website.projects.project_management',
+      :name => 'Manage clients and projects, but cannot delete them or view private info',
+      :apps => [:clients, :projects]
+    }]
+
 Testing
 -----------------
 
-Twice Baked uses RSpec, Capybara and Jasmine for testing. Get the tests running with a few short commands:
+Twice Baked uses RSpec for testing. Get the tests running with a few short commands:
 
 1. Create and migrate the databases:
    
@@ -182,9 +237,4 @@ Twice Baked uses RSpec, Capybara and Jasmine for testing. Get the tests running
 
 After the tests have completed the current code coverage stats is available by opening `/coverage/index.html` in a browser.
 
-### Jasmine
-
-For running the javascript unit tets:
-
-        rake jasmine:ci
-
+You can include a few basic test helpers in your own twice baked applications by requiring `tb_core/test_helper` in your specs.

data/app/assets/javascripts/admin/core/application.js

@@ -37,8 +37,4 @@ $(document).ready(function() {
     return false;
   });
 
-  $('a.button').button();
-
-  $('input[type=submit].btn').click(function() {$(this).button('loading');});
-
-} );
+});

data/app/assets/javascripts/tb_core/remote.js

@@ -0,0 +1,179 @@
+(function(){
+
+/*
+* jQuery UJS Handlers
+*
+* These handlers are designed to work with the Rails/jQuery UJS adapter. This applies
+* to things like data-remote forms, data-method links, etc.
+*
+* For more info see the following lnks:
+* - https://github.com/rails/jquery-ujs/wiki/ajax
+* - http://guides.rubyonrails.org/working_with_javascript_in_rails.html
+*
+*/
+tb.remote = {
+  init: function(){
+    $('body').on('ajax:before', 'form', onRemoteFormBefore);
+    $('body').on('ajax:complete', 'form', onRemoteFormComplete);
+    $('body').on('ajax:success', 'form[data-success]', onRemoteFormSuccess);
+    $('body').on('ajax:error', 'form[data-errors]', onRemoteFormErrors);
+    $('body').on('ajax:success', 'tr a[data-method=delete][data-remote=true]', onRemoteDeleteTableRow);
+  }
+};
+
+/*
+* UJS likes to request application/javascript by default, but Twice Baked prefers JSON.
+*/
+var onRemoteFormBefore = function(xhr, settings){
+  if($(this).data('type') === undefined){
+    $(this).data('type', 'json');  
+  }
+};
+
+/*
+* Runs any time a remote form completes and assigns a true/false value
+* to lastRemoteSuccess depending on if the post was succesful. This is
+* referenced later on in enableFormElement
+*/
+var onRemoteFormComplete = function(event, jqXHR, textStatus){
+  var success = jqXHR.status >= 200 && jqXHR.status < 300;
+  $(this).data('lastRemoteSuccess', success);
+};
+
+/*
+* Called when a remote form is submitted with a data-success configured
+* Simply redirects to the configured path, or reloads the page if "reload" is passed
+*
+* ie:
+* <form action="..." data-remote="true" data-success="/path/for/success/:id">
+*/
+var onRemoteFormSuccess = function(event, json, textStatus, jqXHR){
+  var successPath = $(this).data('success');
+  if(successPath == 'reload'){
+    window.location.reload();
+  }
+  else{
+    if(json && json.id){
+      successPath = successPath.replace(':id', json.id);
+    }
+    window.location = successPath;
+  }
+};
+
+/*
+* Called when a remote form is submitted and the server has returned an error, only
+* if the form has a data-errors attribute
+*
+* ie:
+* <form action="..." data-remote="true" data-errors="inline">
+*   - OR - 
+* <form action="..." data-remote="true" data-errors="alert">
+*/
+var onRemoteFormErrors = function(event, jqXHR, textStatus, errorThrown){
+  var $form = $(this);
+  var errorType = $form.data('errors');
+  if(jqXHR.status == 422){
+    if(errorType == 'inline'){
+      displayErrorsInline($form, jqXHR.responseJSON.errors);
+    }
+    else{
+      displayErrorsAlert(jqXHR.responseJSON.full_messages);
+    }
+  }
+  else if(jqXHR.status == 401 || jqXHR.status == 403){
+    window.alert('Error: Access denied.');
+  }
+  else{
+    window.alert('An unexpected error occurred: ' + errorThrown);
+  }
+};
+
+/*
+* Append error text to form input fields and scroll to the first error
+*/
+var displayErrorsInline = function($form, errors){
+  $form.find('.form-error-inline, .form-error-base').remove();
+  for(var key in errors){
+    if(key == 'base'){
+      for(var i=0; i<errors[key].length; i++){
+        $form.prepend('<p class="form-error form-error-base">'+errors[key][i]+'</p>');
+      }
+    }
+    else{
+      var inputName, $input;
+
+      keyArr = key.split('.');
+
+      if (keyArr.length === 2) {
+        keyArr[0] += '_attributes';
+        $input = $("[name$='[" + keyArr.join('][') + "]']");
+      } else {
+        $input = $("[name$='[" + key + "]']");
+      }
+
+      if($input.length > 0){
+        var message = errors[key][0];
+        $input.after('<p class="form-error form-error-inline">'+message+'</p>');
+      }
+      else{
+        console.warn('Missing input field for key:', key);
+      }
+    }
+  }
+  var $firstError = $form.find('.form-error-inline, .form-error-base').first().parent('div');
+  if($firstError.length > 0){
+    $('body, html').animate({
+      scrollTop: $firstError.offset().top
+    });
+  }
+};
+
+/*
+* Display errors in a standard window.alert dialog
+*/
+var displayErrorsAlert = function(errors){
+  var text = "Please correct the following errors:\n";
+  var len = errors.length;
+  for(var i=0; i<len; i++){
+    text += " - " + errors[i] + "\n";
+  }
+  window.alert(text);
+};
+
+/*
+* Used for deleting table rows
+* Add a link with data-remote=true and data-method=delete to your table to trigger this callback
+*/
+var onRemoteDeleteTableRow = function(){
+  var row = $(this).parents('tr');
+  row.fadeOut(200, function(){
+    row.remove();
+  });
+};
+
+/*
+* Monkeypatch the base $.rails.enableFormElement function to add a
+* delay and a success text value to the button before returning to 
+* default state.
+*/
+var originalEnableFormElement = $.rails.enableFormElement;
+
+$.rails.enableFormElement = function(element){
+  var success = $(element).parents('form').data('lastRemoteSuccess');
+  var message = element.data('enableWith');
+
+  if(success && message){
+    var method = element.is('button') ? 'html' : 'val';
+    element[method](message);
+    setTimeout(function(){
+      originalEnableFormElement(element);
+    }, 1000);
+  }
+  else{
+    originalEnableFormElement(element); 
+  }
+};
+
+$(document).ready(tb.remote.init);
+
+})();

data/app/assets/libs/jquery-ui/jquery-ui.scss

@@ -404,7 +404,7 @@
 }
 .ui-widget-content {
 	border: 1px solid #aaaaaa;
-	background: #ffffff image-url("jquery-ui/images//ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
+	background: #ffffff image-url("jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png") 50% 50% repeat-x;
 	color: #222222;
 }
 .ui-widget-content a {
@@ -412,7 +412,7 @@
 }
 .ui-widget-header {
 	border: 1px solid #aaaaaa;
-	background: #cccccc image-url("jquery-ui/images//ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
+	background: #cccccc image-url("jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png") 50% 50% repeat-x;
 	color: #222222;
 	font-weight: bold;
 }
@@ -426,7 +426,7 @@
 .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
 	border: 1px solid #d3d3d3;
-	background: #e6e6e6 image-url("jquery-ui/images//ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
+	background: #e6e6e6 image-url("jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png") 50% 50% repeat-x;
 	font-weight: normal;
 	color: #555555;
 }
@@ -443,7 +443,7 @@
 .ui-widget-content .ui-state-focus,
 .ui-widget-header .ui-state-focus {
 	border: 1px solid #999999;
-	background: #dadada image-url("jquery-ui/images//ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
+	background: #dadada image-url("jquery-ui/images/ui-bg_glass_75_dadada_1x400.png") 50% 50% repeat-x;
 	font-weight: normal;
 	color: #212121;
 }
@@ -462,7 +462,7 @@
 .ui-widget-content .ui-state-active,
 .ui-widget-header .ui-state-active {
 	border: 1px solid #aaaaaa;
-	background: #ffffff image-url("jquery-ui/images//ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
+	background: #ffffff image-url("jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;
 	font-weight: normal;
 	color: #212121;
 }
@@ -479,7 +479,7 @@
 .ui-widget-content .ui-state-highlight,
 .ui-widget-header .ui-state-highlight {
 	border: 1px solid #fcefa1;
-	background: #fbf9ee image-url("jquery-ui/images//ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
+	background: #fbf9ee image-url("jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png") 50% 50% repeat-x;
 	color: #363636;
 }
 .ui-state-highlight a,
@@ -491,7 +491,7 @@
 .ui-widget-content .ui-state-error,
 .ui-widget-header .ui-state-error {
 	border: 1px solid #cd0a0a;
-	background: #fef1ec image-url("jquery-ui/images//ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
+	background: #fef1ec image-url("jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png") 50% 50% repeat-x;
 	color: #cd0a0a;
 }
 .ui-state-error a,
@@ -537,27 +537,27 @@
 }
 .ui-icon,
 .ui-widget-content .ui-icon {
-	background-image: image-url("jquery-ui/images//ui-icons_222222_256x240.png");
+	background-image: image-url("jquery-ui/images/ui-icons_222222_256x240.png");
 }
 .ui-widget-header .ui-icon {
-	background-image: image-url("jquery-ui/images//ui-icons_222222_256x240.png");
+	background-image: image-url("jquery-ui/images/ui-icons_222222_256x240.png");
 }
 .ui-state-default .ui-icon {
-	background-image: image-url("jquery-ui/images//ui-icons_888888_256x240.png");
+	background-image: image-url("jquery-ui/images/ui-icons_888888_256x240.png");
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon {
-	background-image: image-url("jquery-ui/images//ui-icons_454545_256x240.png");
+	background-image: image-url("jquery-ui/images/ui-icons_454545_256x240.png");
 }
 .ui-state-active .ui-icon {
-	background-image: image-url("jquery-ui/images//ui-icons_454545_256x240.png");
+	background-image: image-url("jquery-ui/images/ui-icons_454545_256x240.png");
 }
 .ui-state-highlight .ui-icon {
-	background-image: image-url("jquery-ui/images//ui-icons_2e83ff_256x240.png");
+	background-image: image-url("jquery-ui/images/ui-icons_2e83ff_256x240.png");
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-	background-image: image-url("jquery-ui/images//ui-icons_cd0a0a_256x240.png");
+	background-image: image-url("jquery-ui/images/ui-icons_cd0a0a_256x240.png");
 }
 
 // positioning */
@@ -770,14 +770,14 @@
 
 // Overlays */
 .ui-widget-overlay {
-	background: #aaaaaa image-url("jquery-ui/images//ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
+	background: #aaaaaa image-url("jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
 	opacity: .3;
 	filter: Alpha(Opacity=30); // support: IE8 */
 }
 .ui-widget-shadow {
 	margin: -8px 0 0 -8px;
 	padding: 8px;
-	background: #aaaaaa image-url("jquery-ui/images//ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
+	background: #aaaaaa image-url("jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png") 50% 50% repeat-x;
 	opacity: .3;
 	filter: Alpha(Opacity=30); // support: IE8 */
 	border-radius: 8px;

data/app/assets/stylesheets/admin/core/{application.css.scss → application.scss}

@@ -72,6 +72,9 @@ body {
 }
 
 // Detail
+.nav-tabs{
+	margin-bottom: 20px;
+}
 .admin-search-form{
 	display: inline;
 }
@@ -102,12 +105,31 @@ body {
 }
 
 // Forms
+
+// Old Errors
 div.field_with_errors {
   display: inline;
 }
 div.field_with_errors label, .form-field-error, .form-errors {
 	color: crimson;
 }
+
+// New (Remote) Errors
+p.form-error{
+	color: crimson;
+	font-size: 12px;
+	font-style: italic;
+	line-height: normal;
+	margin: 4px 0 0;
+}
+p.form-error-base{
+	margin: 0 0 10px;
+}
+@media (min-width: $screen-sm){
+	.form-horizontal .form-error-base{
+		margin-left: 17.3%;
+	}
+}
 .date-select{
 	&.form-control{
 		display: inline-block;	

data/app/controllers/admin/application_controller.rb

@@ -4,9 +4,15 @@ class Admin::ApplicationController < Spud::ApplicationController
   add_breadcrumb "Dashboard", :admin_root_path
   layout 'admin/detail'
   respond_to :html, :json
+  # self.responder = TbCore::Responder
 
 private
 
+  def handle_request_error(error)
+    error.template = '/layouts/admin/error_page'
+    super(error)
+  end
+
   def require_admin_user
     if current_user.blank?
       flash[:notice] = "You must be logged in to access the requested page"

data/app/controllers/admin/users_controller.rb

@@ -23,12 +23,8 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def create
-    @user = SpudUser.new(user_params)
-    if @user.save
-      render 'show', :status => 200
-    else
-      render 'new', :status => 422
-    end
+    @user = SpudUser.create(user_params)
+    respond_with @user, :location => admin_users_path
   end
 
   def edit
@@ -48,12 +44,10 @@ class Admin::UsersController < Admin::ApplicationController
 private
 
   def load_user
-    @user = SpudUser.where(:id => params[:id]).first
+    @user = SpudUser.find(params[:id])
     if @user.blank?
-      flash[:error] = "User not found!"
-      redirect_to admin_users_path and return false
+      raise Spud::NotFoundError.new('user')
     end
-    return true
   end
 
   # attr_accessible :login,:email,:first_name,:last_name,:password,:password_confirmation,:password_salt,:last_login_at,:last_request_at,:last_login_ip,:failed_login_count,:current_login_at,:login_count,:persistence_token,:perishable_token,:single_access_token,:crypted_password, :current_login_ip, :created_at, :updated_at,:time_zone, :as => [:default, :admin]

data/app/controllers/spud/application_controller.rb

@@ -6,12 +6,13 @@ class Spud::ApplicationController < ActionController::Base
   helper_method :current_user_session, :current_user, :current_user_id
   around_filter :set_time_zone
 
-  include Spud::ApplicationHelper
+  include TbCore::ApplicationHelper
   before_action :set_mailer_default_url
 
   rescue_from Spud::RequestError, :with => :handle_request_error
+  rescue_from ActiveRecord::RecordNotFound, :with => :handle_record_not_found
   rescue_from ActionController::UnknownFormat, :with => :handle_unknown_format_error
-  
+
   def not_found
     raise Spud::NotFoundError
   end
@@ -91,6 +92,11 @@ private
     end
   end
 
+  def handle_record_not_found(error)
+    error = Spud::NotFoundError.new('record')
+    handle_request_error(error)
+  end
+
   def handle_unknown_format_error(error)
     error = Spud::NotFoundError.new()
     handle_request_error(error)

data/app/controllers/user_sessions_controller.rb

@@ -21,7 +21,7 @@ class UserSessionsController < ApplicationController
   def destroy
     current_user_session.destroy unless current_user_session.blank?
     flash[:notice] = "Logout successful!"
-    redirect_to login_path
+    redirect_back_or_default(login_path)
   end
 
 end