tb_core 1.2.4 → 1.2.6

data/app/assets/stylesheets/admin/core/application.css.scss

@@ -1,7 +1,6 @@
 //= require bootstrap/css/bootstrap
 //= require datepicker/css/datepicker
-//= require jquery-ui/css/flick/jquery-ui-1.9.1.custom
-//= require codemirror
+//= require jquery-ui//jquery-ui
 //= require_self
 //= require admin/core/login
 //= require admin/core/users
@@ -180,6 +179,11 @@ div.admin_application:hover {
 	position:relative;
 	padding-right:20px;
 }
+.data_controls{
+	.form-search{
+		display: inline-block;
+	}
+}
 #details {
 	padding:0 10px;
 	clear:both;

data/app/controllers/admin/application_controller.rb

@@ -7,10 +7,6 @@ class Admin::ApplicationController < Spud::ApplicationController
   respond_to :html, :json, :xml, :js
   unloadable
 
-  rescue_from Spud::AccessDeniedError do |exception|
-    redirect_to admin_root_path, :flash => {:error => exception.message}
-  end
-
   def current_admin_site
     if(session[:admin_site] == nil)
       return 0
@@ -28,8 +24,7 @@ private
       redirect_to admin_login_path
       return false
     elsif !current_user.has_admin_rights?
-      flash[:notice] = "You do not have permission to access the requested page"
-      redirect_to root_path
+      raise Spud::AccessDeniedError.new(:item => 'module', :template => '/layouts/admin/error_page')
       return false
     else
       return true

data/app/controllers/spud/application_controller.rb

@@ -12,8 +12,9 @@ class Spud::ApplicationController < ActionController::Base
   include Spud::ApplicationHelper
   before_action :set_mailer_default_url
 
-  rescue_from Spud::NotFoundError, :with => :handle_not_found
-
+  rescue_from Spud::RequestError, :with => :handle_request_error
+  rescue_from ActionController::UnknownFormat, :with => :handle_unknown_format_error
+  
   def not_found
     raise Spud::NotFoundError
   end
@@ -52,6 +53,14 @@ private
     return true
   end
 
+  def require_admin_user
+    if current_user.blank? || !current_user.has_admin_rights?
+      store_location()
+      raise Spud::AccessDeniedError.new()
+      return false
+    end
+  end
+
   def store_location
     if request.format.html? && !request.xhr?
       session[:return_to] = request.url
@@ -89,17 +98,26 @@ private
     end
   end
 
-  def handle_not_found(exception)
-    @exception = exception
-    @exception.request_url = request.original_url
+  def handle_request_error(error)
+    error.request_url = request.original_url
     respond_to do |format|
-      format.json{ render :json => {:errors => "The #{@exception.item} you were looking for could not be found."}, :status => 404 }
-      format.xml{ render :xml => {:errors => "The #{@exception.item} you were looking for could not be found."}, :status => 404 }
+      format.json{ render :json => {:errors => error.message}, :status => error.code }
+      format.xml{ render :xml => {:errors => error.message}, :status => error.code }
       format.all{
-        template = @exception.template || Spud::Core.not_found_template
-        render :template => template, :layout => nil, :formats => [:html], :status => 404, :content_type => 'text/html'
+        @error = error
+        render :template => error.template, :layout => nil, :formats => [:html], :status => error.code, :content_type => 'text/html'
       }
     end
   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)
+  end
+
 end

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

@@ -0,0 +1,12 @@
+<%= content_for :content do %>
+  <div class="detail_wrapper">
+    <h2>
+      <%= @error.code %>: <%= @error.title %>!
+    </h2>
+    <div id="details">
+      <p><%= @error.message %></p>
+      <p>Requested URL: <%= @error.request_url %></p>
+    </div>
+  </div>
+<% end %>
+<%= render :template => 'layouts/admin/application' %>

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

@@ -0,0 +1,6 @@
+<%= content_for :body do %>
+  <h1><%= @error.code %>: <%= @error.title %>!</h1>
+  <p><%= @error.message %></p>
+  <p>Requested URL: <%= @error.request_url %></p>
+<% end %>
+<%= render :template => 'layouts/application' %>

data/lib/generators/spud/module_generator.rb

@@ -24,6 +24,10 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
     environment("Spud::Core.config.admin_applications += [{:name => '#{module_name_formatted.humanize.titlecase}', :thumbnail => \"admin/module_icon.png\", :url => \"/admin/#{module_name_formatted}\"}]")
     create_routes
     invoke "model", [module_name_formatted.singularize] + attributes
+    
+    if self.behavior == :invoke
+      create_model_scopes()
+    end
   end
 
 private
@@ -62,4 +66,14 @@ EOF
     attributes.collect{ |att| att.split(':')[0] }
   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}%") }
+RUBY
+    end
+  end
+
 end

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

@@ -5,12 +5,15 @@ class Admin::<%= module_name_formatted.camelize%>Controller < Admin::Application
   add_breadcrumb "<%= module_name_formatted.humanize.titlecase %>", :admin_<%= module_name_formatted %>_path
 
   def index
-    @<%= module_name_formatted %> = <%= module_name_formatted.singularize.camelize %>.paginate(:page => params[:page])
+    @<%= 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
     respond_with @<%= module_name_formatted %>
   end
 
   def show
-    respond_with @<%= module_name_formatted %>
+    respond_with @<%= module_name_formatted.singularize %>
   end
 
   def new
@@ -43,7 +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 %>.where(:id => params[:id]).first
+    @<%= 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

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

@@ -4,7 +4,7 @@ class <%=module_name_formatted.camelize%>Controller < ApplicationController
   before_action :load_<%=module_name_formatted.singularize%>, :only => [:show]
 
   def index
-    @<%=module_name_formatted%> = <%=module_name_formatted.singularize.camelize%>.paginate(:page => params[:page])
+    @<%=module_name_formatted%> = <%=module_name_formatted.singularize.camelize%>.ordered.paginate(:page => params[:page])
     respond_with @<%=module_name_formatted%>
   end
 
@@ -15,7 +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%>.where(:id => params[:id]).first
+    @<%=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

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

@@ -1,4 +1,10 @@
 <%% content_for :data_controls do %>
+  <%%= form_tag admin_<%= module_name_formatted %>_path, :method => :get, :class => 'form-search' do %>
+    <%%= text_field_tag 'search', params[:search], :placeholder => 'Search', :class => 'input-medium search-query' %>
+  <%% end %>
+  <%% if params[:search] %>
+    <%%= link_to 'Clear', admin_<%= module_name_formatted %>_path, :class => 'btn' %>
+  <%% end %>
   <%%= link_to "New <%=module_name_formatted.singularize.humanize.titlecase%>", new_admin_<%=module_name_formatted.singularize%>_path, :class => "btn btn-primary", :title => "New <%=module_name_formatted.singularize.humanize.titlecase%>" %>
 <%% end %>
 
@@ -16,7 +22,7 @@
           <%-attribute_names.each do |attribute|-%>
           <td><%%= <%=module_name_formatted.singularize%>.<%=attribute%> %></td>
           <%-end-%>
-          <td align="right" width="150">
+          <td align="right" width="150" class="no-wrap">
             <%%= link_to 'Details', admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :class => 'btn btn-mini' %>
             <%%= link_to 'Edit', edit_admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :class => 'btn btn-mini' %>
             <%%= link_to 'Delete', admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this <%=module_name_formatted.singularize.humanize%>?'}, :class => 'btn btn-danger btn-mini' %>

data/lib/spud_core/belongs_to_app.rb

@@ -21,7 +21,7 @@ module Spud::BelongsToApp
           @page_name = self.class.page_title
 
           if !current_user.can_view_app?(self.class.page_application)
-            raise Spud::AccessDeniedError.new("You do not have access to this area.")
+            raise Spud::AccessDeniedError.new(:item => 'module', :template => '/layouts/admin/error_page')
           end
 
           if controller.action_name == 'new' || controller.action_name == 'create'

data/lib/spud_core/catch_all_route.rb

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

data/lib/spud_core/configuration.rb

@@ -1,7 +1,7 @@
 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, :not_found_template, :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
     self.admin_applications = []
     self.site_name = "Company Name"
     self.site_id = 0
@@ -15,7 +15,6 @@ module Spud
     self.permissions = []
     self.admin_javascripts = ['admin/core/application', 'admin/application']
     self.admin_stylesheets = ['admin/core/application', 'admin/application']
-    self.not_found_template = 'layouts/not_found'
     self.production_alert_domain = nil
 
     def self.site_config_for_host(host)

data/lib/spud_core/engine.rb

@@ -2,14 +2,13 @@ require 'jquery-rails'
 require 'authlogic'
 require 'breadcrumbs_on_rails'
 require 'will_paginate'
-require 'codemirror-rails'
 require 'tinymce-rails'
 
 module Spud
   module Core
     class Engine < ::Rails::Engine
       require "#{root}/lib/spud_core/belongs_to_app"
-      require "#{root}/lib/spud_core/exceptions"
+      require "#{root}/lib/spud_core/errors"
       require "#{root}/lib/spud_core/searchable"
       require "#{root}/lib/responds_to_parent"
 
@@ -52,6 +51,14 @@ module Spud
           Spud::Core.permissions.push(SpudPermission.new(tag, name, apps))
         end
       end
+
+      initializer 'tb_core.catch_all_route' do |config|
+        # Handle 404 errors if Spud::Cms is not installed
+        if !defined?(Spud::Cms)
+          config.routes_reloader.paths << File.expand_path('../catch_all_route.rb', __FILE__)
+        end
+      end
+
     end
   end
 end

data/lib/spud_core/errors.rb

@@ -0,0 +1,29 @@
+class Spud::RequestError < StandardError
+  attr_accessor :request_url, :item, :template
+  attr_reader :code, :title
+
+  def initialize(message)
+    @template ||= 'layouts/error_page'
+    super(message)
+  end
+end
+
+class Spud::AccessDeniedError < Spud::RequestError
+  def initialize(opts={})
+    @item = opts[:item] || 'page'
+    @template = opts[:template]
+    @code = 403
+    @title = "Access Denied"
+    super("You are not authorized to view the requested #{item.downcase}.")
+  end
+end
+
+class Spud::NotFoundError < Spud::RequestError
+  def initialize(opts={})
+    @item = opts[:item] || 'page'
+    @template = opts[:template]
+    @code = 404
+    @title = "Not Found"
+    super("The #{item.downcase} you were looking for could not be found.")
+  end
+end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.2.4"
+    VERSION = "1.2.6"
   end
 end

data/spec/controllers/admin/application_controller_spec.rb

@@ -45,7 +45,8 @@ describe Admin::ApplicationController do
       @user.save
       get :index
       
-      response.should redirect_to(root_url)
+      response.code.should eq("403")
+      response.should render_template('layouts/admin/error_page')
     end
     
   end

data/spec/controllers/admin/users_controller_spec.rb

@@ -27,7 +27,8 @@ describe Admin::UsersController do
       SpudUserSession.create(FactoryGirl.build(:spud_user, :super_admin => false))
       get :index
       
-      response.should redirect_to(root_url)   
+      response.code.should eq("403")
+      response.should render_template('layouts/admin/error_page')
     end
     
     it "should allow access to users with the correct permissions" do
@@ -41,33 +42,36 @@ describe Admin::UsersController do
       response.should be_success
     end
 
-    it "should not allow access to users without a role, and redirect to root_url if the user has no permissions" do
+    it "should not allow access to users without a role, and redirect to render error page if the user has no permissions" do
       u = FactoryGirl.create(:spud_user, :super_admin => false)
       u.role = nil
       SpudUserSession.create(u)
       get :index
       
-      response.should redirect_to(root_url)
+      response.code.should eq("403")
+      response.should render_template('layouts/admin/error_page')
     end
 
-    it "should not allow access to users with a role that contains no permissions, and redirect to root_url if the users has no other admin modules" do
+    it "should not allow access to users with a role that contains no permissions, and render error page if the users has no other admin modules" do
       u = FactoryGirl.create(:spud_user, :super_admin => false)
       u.role = @role
       @role.spud_role_permissions = []
       SpudUserSession.create(u)
       get :index
       
-      response.should redirect_to(root_url)
+      response.code.should eq("403")
+      response.should render_template('layouts/admin/error_page')
     end
     
-    it "should not allow access to users without permission and redirect to admin_root if the users has other admin modules" do
+    it "should not allow access to users without permission and render error page if the users has other admin modules" do
       u = FactoryGirl.create(:spud_user, :super_admin => false)
       @role.permission_tags = ['admin.test.full_access']
       u.role = @role
       SpudUserSession.create(u)
       get :index
       
-      response.should redirect_to(admin_root_path)
+      response.code.should eq("403")
+      response.should render_template('layouts/admin/error_page')
     end
   end
   

data/spec/controllers/sitemap_controllers_spec.rb

@@ -11,11 +11,5 @@ describe SitemapsController do
       
       assigns(:sitemap_urls).should == Spud::Core.sitemap_urls
     end
-    
-    it "should only respond to an XML format" do
-      expect {
-        get :show
-      }.to raise_exception(ActionController::UnknownFormat)
-    end
   end
 end

data/spec/controllers/spud/application_controller_spec.rb

@@ -8,7 +8,7 @@ describe Spud::ApplicationController do
     it 'throws a 404 error' do
       get :not_found
       response.code.should eq("404")
-      response.should render_template(Spud::Core.not_found_template)
+      response.should render_template('layouts/error_page')
     end
   end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codemirror-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +126,16 @@ dependencies:
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.9
+        version: 4.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.9
+        version: 4.1.3
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -326,24 +312,39 @@ files:
 - app/assets/libs/datepicker/css/datepicker.css
 - app/assets/libs/datepicker/js/bootstrap-datepicker.js
 - app/assets/libs/datepicker/less/datepicker.less
-- app/assets/libs/jquery-ui/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-bg_flat_55_ffffff_40x100.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-bg_flat_75_ffffff_40x100.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-bg_glass_65_ffffff_1x400.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-icons_0073ea_256x240.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-icons_454545_256x240.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-icons_666666_256x240.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-icons_ff0084_256x240.png
-- app/assets/libs/jquery-ui/css/flick/images/ui-icons_ffffff_256x240.png
-- app/assets/libs/jquery-ui/css/flick/jquery-ui-1.9.1.custom.css
-- app/assets/libs/jquery-ui/css/flick/jquery-ui-1.9.1.custom.min.css
-- app/assets/libs/jquery-ui/js/jquery-ui-1.9.1.custom.js
-- app/assets/libs/jquery-ui/js/jquery-ui-1.9.1.custom.min.js
-- app/assets/libs/tinymce/plugins/tableDropdown/editor_plugin.js
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-bg_flat_0_aaaaaa_40x100.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-bg_flat_0_eeeeee_40x100.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-bg_flat_55_ffffff_40x100.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-bg_flat_75_ffffff_40x100.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-bg_glass_65_ffffff_1x400.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-bg_highlight-soft_25_0073ea_1x100.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-bg_highlight-soft_50_dddddd_1x100.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-icons_0073ea_256x240.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-icons_454545_256x240.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-icons_666666_256x240.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-icons_ff0084_256x240.png
+- app/assets/libs/jquery-ui-old/css/flick/images/ui-icons_ffffff_256x240.png
+- app/assets/libs/jquery-ui-old/css/flick/jquery-ui-1.9.1.custom.css
+- app/assets/libs/jquery-ui-old/css/flick/jquery-ui-1.9.1.custom.min.css
+- app/assets/libs/jquery-ui-old/js/jquery-ui-1.9.1.custom.js
+- app/assets/libs/jquery-ui-old/js/jquery-ui-1.9.1.custom.min.js
+- app/assets/libs/jquery-ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+- app/assets/libs/jquery-ui/images/ui-bg_diagonals-thick_20_666666_40x40.png
+- app/assets/libs/jquery-ui/images/ui-bg_flat_10_000000_40x100.png
+- app/assets/libs/jquery-ui/images/ui-bg_glass_100_f6f6f6_1x400.png
+- app/assets/libs/jquery-ui/images/ui-bg_glass_100_fdf5ce_1x400.png
+- app/assets/libs/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
+- app/assets/libs/jquery-ui/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+- app/assets/libs/jquery-ui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+- app/assets/libs/jquery-ui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+- app/assets/libs/jquery-ui/images/ui-icons_222222_256x240.png
+- app/assets/libs/jquery-ui/images/ui-icons_228ef1_256x240.png
+- app/assets/libs/jquery-ui/images/ui-icons_ef8c08_256x240.png
+- app/assets/libs/jquery-ui/images/ui-icons_ffd27a_256x240.png
+- app/assets/libs/jquery-ui/images/ui-icons_ffffff_256x240.png
+- app/assets/libs/jquery-ui/jquery-ui.css.scss
+- app/assets/libs/jquery-ui/jquery-ui.js
 - app/assets/stylesheets/admin/application.css
 - app/assets/stylesheets/admin/core/application.css.scss
 - app/assets/stylesheets/admin/core/login.css.scss
@@ -398,8 +399,9 @@ files:
 - app/views/core_mailer/forgot_password_notification.text.erb
 - app/views/layouts/admin/application.html.erb
 - app/views/layouts/admin/detail.html.erb
+- app/views/layouts/admin/error_page.html.erb
 - app/views/layouts/admin/login.html.erb
-- app/views/layouts/not_found.html.erb
+- app/views/layouts/error_page.html.erb
 - app/views/layouts/spud/admin/detail.html.erb
 - app/views/password_resets/index.html.erb
 - app/views/password_resets/show.html.erb
@@ -436,9 +438,10 @@ files:
 - lib/generators/spud/templates/views/layouts/application.html.erb
 - lib/responds_to_parent.rb
 - lib/spud_core/belongs_to_app.rb
+- lib/spud_core/catch_all_route.rb
 - lib/spud_core/configuration.rb
 - lib/spud_core/engine.rb
-- lib/spud_core/exceptions.rb
+- lib/spud_core/errors.rb
 - lib/spud_core/searchable.rb
 - lib/spud_core/test_files.rb
 - lib/spud_core/version.rb