RubyGems - tb_core - Versions diffs - 1.4.3.1 → 1.4.4 - Mend

tb_core 1.4.3.1 → 1.4.4

Files changed (96) hide show

checksums.yaml +4 -4
data/README.md +18 -54
data/app/assets/javascripts/admin/core/application.js +8 -4
data/app/assets/javascripts/admin/core/dashboard.js +2 -3
data/app/assets/javascripts/admin/core/date_picker.js +2 -2
data/app/assets/javascripts/admin/core/editor.js +2 -2
data/app/assets/javascripts/admin/core/modal.js +1 -1
data/app/assets/javascripts/admin/core/users.js +5 -5
data/app/assets/javascripts/tb_core.js +8 -0
data/app/assets/libs/sortable/sortable.js +152 -91
data/app/controllers/admin/application_controller.rb +1 -2
data/app/controllers/admin/dashboard_controller.rb +2 -2
data/app/controllers/admin/settings_controller.rb +2 -2
data/app/controllers/admin/users_controller.rb +4 -7
data/app/controllers/concerns/tb_core/error_handling.rb +16 -7
data/app/controllers/concerns/tb_core/user_authentication.rb +5 -5
data/app/controllers/tb_core/application_controller.rb +1 -1
data/app/controllers/user_sessions_controller.rb +2 -2
data/app/helpers/tb_core/application_helper.rb +4 -36
data/app/mailers/tb_core_mailer.rb +3 -3
data/app/models/concerns/tb_core/user_model.rb +131 -0
data/app/models/spud/spud_user_model.rb +6 -138
data/app/models/spud_permission.rb +4 -4
data/app/models/spud_role.rb +1 -1
data/app/models/spud_user.rb +2 -1
data/app/views/admin/dashboard/index.html.erb +1 -1
data/app/views/admin/settings/_form.html.erb +1 -1
data/app/views/admin/settings/edit.html.erb +1 -1
data/app/views/admin/setup/new.html.erb +1 -1
data/app/views/admin/users/_form.html.erb +1 -1
data/app/views/admin/users/index.html.erb +2 -2
data/app/views/admin/users/show.html.erb +1 -1
data/app/views/layouts/admin/application.html.erb +6 -6
data/app/views/layouts/admin/login.html.erb +1 -1
data/app/views/tb_core_mailer/forgot_password_notification.html.erb +2 -2
data/app/views/tb_core_mailer/user_credentials.html.erb +2 -2
data/app/views/user_sessions/_form.html.erb +1 -1
data/app/views/user_sessions/new.html.erb +1 -1
data/lib/generators/spud/module_generator.rb +7 -7
data/lib/generators/spud/setup_generator.rb +6 -7
data/lib/generators/spud/templates/assets/admin/application.js +1 -1
data/lib/generators/spud/templates/assets/application.js +3 -4
data/lib/generators/spud/templates/controller_spec.rb.erb +5 -5
data/lib/generators/spud/templates/views/admin/_form.html.erb +1 -1
data/lib/generators/spud/templates/views/admin/index.html.erb +1 -1
data/lib/generators/spud/templates/views/admin/show.html.erb +1 -1
data/lib/generators/spud/templates/views/frontend/index.html.erb +1 -1
data/lib/generators/spud/templates/views/frontend/show.html.erb +1 -1
data/lib/tb_core.rb +3 -5
data/lib/tb_core/belongs_to_app.rb +47 -46
data/lib/tb_core/catch_all_route.rb +3 -0
data/lib/tb_core/configuration.rb +28 -0
data/lib/tb_core/engine.rb +61 -0
data/lib/tb_core/errors.rb +50 -0
data/lib/tb_core/responder.rb +0 -26
data/lib/{spud_core → tb_core}/searchable.rb +4 -1
data/lib/tb_core/spud_core.rb +23 -0
data/lib/{spud_core → tb_core}/test_files.rb +0 -0
data/lib/tb_core/test_helper.rb +3 -3
data/lib/tb_core/version.rb +3 -0
data/spec/controllers/admin/application_controller_spec.rb +5 -5
data/spec/controllers/admin/dashboard_controller_spec.rb +5 -5
data/spec/controllers/admin/password_reset_controller_spec.rb +1 -1
data/spec/controllers/admin/settings_controller_spec.rb +1 -1
data/spec/controllers/admin/setup_controller_spec.rb +2 -2
data/spec/controllers/admin/user_sessions_controller_spec.rb +2 -2
data/spec/controllers/admin/users_controller_spec.rb +17 -17
data/spec/dummy/app/assets/javascripts/admin/application.js +1 -1
data/spec/dummy/app/assets/javascripts/application.js +1 -1
data/spec/dummy/config/application.rb +1 -1
data/spec/factories/spud_admin_permission_factories.rb +2 -2
data/spec/factories/spud_role_factories.rb +2 -2
data/spec/factories/spud_user_factories.rb +6 -6
data/spec/helpers/spud/admin/application_helper_spec.rb +1 -1
data/spec/helpers/tb_core/application_helper_spec.rb +0 -35
data/spec/lib/spud_core/configuration_spec.rb +2 -2
data/spec/lib/tb_core/belongs_to_app_spec.rb +4 -3
data/spec/models/spud_role_spec.rb +2 -2
data/spec/models/spud_user_spec.rb +13 -13
data/spec/rails_helper.rb +1 -1
metadata +59 -67
data/app/assets/javascripts/tb_core.js.erb +0 -9
data/app/assets/javascripts/tb_core/configuration.js.erb +0 -9
data/app/assets/javascripts/tb_core/console.js +0 -12
data/app/assets/javascripts/tb_core/remote.js +0 -237
data/app/assets/javascripts/tb_core/utility.js +0 -55
data/app/controllers/concerns/tb_core/sortable_params.rb +0 -80
data/app/controllers/spud/application_controller.rb +0 -10
data/lib/generators/spud/templates/assets/bootstrap.js +0 -14
data/lib/spud_core/catch_all_route.rb +0 -3
data/lib/spud_core/configuration.rb +0 -56
data/lib/spud_core/engine.rb +0 -76
data/lib/spud_core/errors.rb +0 -47
data/lib/spud_core/version.rb +0 -5
data/lib/tb_core/table_header.rb +0 -92
data/spec/controllers/tb_core/sortable_params_spec.rb +0 -64

data/app/models/spud_permission.rb CHANGED

@@ -10,24 +10,24 @@ class SpudPermission
   # Find a permission by tag
   def self.find(tag)
-    return Spud::Core.permissions.find{ |p| p.tag == tag }
+    return TbCore.permissions.find{ |p| p.tag == tag }
   end
   # Returns hash of permissions, grouped by tag namespace
   def self.grouped_by_tag
-    return Spud::Core.permissions.group_by do |p|
+    return TbCore.permissions.group_by do |p|
       p.tag.split('.').first
     end
   end
   # Returns array permissions sorted by tag
   def self.sorted_by_tag
-    return Spud::Core.permissions.sort_by(&:tag)
+    return TbCore.permissions.sort_by(&:tag)
   end
   # Returns all permissions
   def self.all
-    return Spud::Core.permissions
+    return TbCore.permissions
   end
 end

data/app/models/spud_role.rb CHANGED

@@ -1,7 +1,7 @@
 class SpudRole < ActiveRecord::Base
   has_many :spud_role_permissions, dependent: :destroy
-  has_many :users, class_name: 'SpudUser'
+  has_many :users, class_name: 'SpudUser', dependent: :nullify
   validates :name, presence: true, uniqueness: true

data/app/models/spud_user.rb CHANGED

@@ -1,3 +1,4 @@
-class SpudUser < Spud::SpudUserModel
+class SpudUser < ActiveRecord::Base
+  include TbCore::UserModel
   # Copy this file to your app to extend the base SpudUser model
 end

data/app/views/admin/dashboard/index.html.erb CHANGED

@@ -10,5 +10,5 @@
   <% end %>
 </div>
 <script type="text/javascript">
-  $(document).ready(spud.admin.dashboard.init);
+  document.addEventListener('DOMContentLoaded', tb.dashboard.init);
 </script>

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

@@ -2,7 +2,7 @@
 <h4>User Details</h4>
-<% if !Spud::Core.config.use_email_as_login %>
+<% if !TbCore.config.use_email_as_login %>
 	<div class="form-group">
 		<%= f.label :login, :required => true, :class => "col-sm-2 control-label" %>
 		<div class="col-sm-10">

data/app/views/admin/settings/edit.html.erb CHANGED

@@ -9,6 +9,6 @@
   <%= render :partial => "form", :locals => {:f => f} %>
   <div class="form-actions">
   	<%= f.submit "Save Settings", :class=>"btn btn-primary"%> or
-    <%=link_to "cancel", (@current_user.has_admin_rights? ? admin_root_path : root_path), :class => "btn btn-default" %>
+    <%=link_to "cancel", (@current_user.admin_rights? ? admin_root_path : root_path), :class => "btn btn-default" %>
   </div>
 <% end %>

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

@@ -7,7 +7,7 @@
 	<% tb_form_for @spud_user, :url => admin_setup_path do |f| %>
 		<%= tb_form_errors f.object %>
-		<% if !Spud::Core.config.use_email_as_login %>
+		<% if !TbCore.config.use_email_as_login %>
 			<%= f.tb_text_field :login %>
 		<% end %>

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

@@ -4,7 +4,7 @@
   <%= f.tb_sub_title 'User Details' %>
-  <% if !Spud::Core.config.use_email_as_login %>
+  <% if !TbCore.config.use_email_as_login %>
     <%= f.tb_text_field :login %>
   <% end %>
   <%= f.tb_text_field :email %>

data/app/views/admin/users/index.html.erb CHANGED

@@ -8,7 +8,7 @@
 <%= content_for :detail do %>
   <div class="table-responsive">
     <table class="table table-striped table-hover">
-      <%= tb_table_header :admin_users_path, model: SpudUser do |t| %>
+      <%= sortable_table_header :admin_users_path, model: SpudUser do |t| %>
         <%= t.sortable :name %>
         <%= t.sortable :email %>
         <%= t.sortable :current_login_at %>
@@ -34,6 +34,6 @@
   <%= will_paginate @spud_users, :renderer => BootstrapPagination::Rails %>
   <script>
-    $(document).ready(spud.admin.users.index);
+    document.addEventListener('DOMContentLoaded', tb.users.index);
   </script>
 <% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 <dl class="dl-horizontal">
-  <% if !Spud::Core.config.use_email_as_login %>
+  <% if !TbCore.config.use_email_as_login %>
     <dt>Login</dt>
     <dd><%= @user.login %></dd>
   <% end %>

data/app/views/layouts/admin/application.html.erb CHANGED

@@ -1,24 +1,24 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title><%= Spud::Core.config.site_name %> Admin</title>
-  <%= stylesheet_link_tag *Spud::Core.config.admin_stylesheets %>
-  <%= javascript_include_tag *Spud::Core.config.admin_javascripts %>
+  <title><%= TbCore.config.site_name %> Admin</title>
+  <%= stylesheet_link_tag *TbCore.config.admin_stylesheets %>
+  <%= javascript_include_tag *TbCore.config.admin_javascripts %>
   <%= csrf_meta_tags %>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="viewport" content="width=device-width"/>
   <%= yield :head %>
 </head>
 <body>
-<% if Spud::Core.production_alert_domain %>
+<% if TbCore.production_alert_domain %>
   <div class="production-alert-header">
-    <p><strong>Notice:</strong> This is a staging version of your website. To update your live website, please <%= link_to 'log in to production.', "http://#{Spud::Core.production_alert_domain}/admin" %></p>
+    <p><strong>Notice:</strong> This is a staging version of your website. To update your live website, please <%= link_to 'log in to production.', "http://#{TbCore.production_alert_domain}/admin" %></p>
   </div>
 <% end %>
 <div id="header">
   <div class="container">
   	<%= link_to '/' do %>
-      <h1><%= Spud::Core.config.site_name %></h1>
+      <h1><%= TbCore.config.site_name %></h1>
     <% end %>
     <% if current_user %>
     	<div class="pull-right">

data/app/views/layouts/admin/login.html.erb CHANGED

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= Spud::Core.config.site_name %> Admin: Login</title>
+  <title><%= TbCore.config.site_name %> Admin: Login</title>
   <%= stylesheet_link_tag 'admin/core/application' %>
   <%= javascript_include_tag 'admin/core/application' %>
   <%= csrf_meta_tags %>

data/app/views/tb_core_mailer/forgot_password_notification.html.erb CHANGED

@@ -1,6 +1,6 @@
 <h1>Hello <%= @user.full_name %>,</h1>
-<p>A password reset has recently been requested for your user account on <strong><%= Spud::Core.config.site_name %></strong>. Click the link below to set your new password.</p>
+<p>A password reset has recently been requested for your user account on <strong><%= TbCore.config.site_name %></strong>. Click the link below to set your new password.</p>
 <p><%= link_to @url, @url %></p>
@@ -8,5 +8,5 @@
 <p>
   Thanks,<br/>
-  <strong><%= Spud::Core.config.site_name %></strong>
+  <strong><%= TbCore.config.site_name %></strong>
 </p>

data/app/views/tb_core_mailer/user_credentials.html.erb CHANGED

@@ -1,6 +1,6 @@
 <h1>Hello <%= @user.full_name %>,</h1>
-<p><%= t('tb_core_mailer.user_credentials.greeting', :site_name => Spud::Core.config.site_name) %></p>
+<p><%= t('tb_core_mailer.user_credentials.greeting', :site_name => TbCore.config.site_name) %></p>
 <ul>
   <li><strong>Username:</strong> <%= @user.login %></li>
@@ -15,5 +15,5 @@
 <p>
   Thanks,<br/>
-  <strong><%= Spud::Core.config.site_name %></strong>
+  <strong><%= TbCore.config.site_name %></strong>
 </p>

data/app/views/user_sessions/_form.html.erb CHANGED

@@ -5,7 +5,7 @@
   <%= tb_form_errors(@user_session) %>
   <%= hidden_field_tag :return_to, return_to %>
   <div class="form-group">
-    <% if Spud::Core.config.use_email_as_login %>
+    <% if TbCore.config.use_email_as_login %>
       <%= f.label :email %>
       <%= f.text_field :email, :placeholder => 'Email', :autofocus => 'autofocus', :autocomplete => 'username', :class => 'form-control' %>
     <% else %>

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

@@ -1,5 +1,5 @@
 <% @page_title = 'Login' %>
-<h1><%= Spud::Core.config.site_name %> Login</h1>
+<h1><%= TbCore.config.site_name %> Login</h1>
 <%= render 'form' %>

data/lib/generators/spud/module_generator.rb CHANGED

@@ -41,7 +41,7 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
   def inject_code
     environment(
-      "Spud::Core.config.admin_applications += [{name: '#{module_name_formatted.humanize.titlecase}',
+      "TbCore.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
@@ -54,12 +54,12 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
   end
   def create_routes
-    route <<EOF
-namespace :admin do
-    resources :#{module_name_formatted}
-  end
-  resources :#{module_name_formatted}, :only => [:index, :show]
-EOF
+    route <<~RUBY
+      namespace :admin do
+          resources :#{module_name_formatted}
+        end
+        resources :#{module_name_formatted}, :only => [:index, :show]
+RUBY
   end
   def create_specs

data/lib/generators/spud/setup_generator.rb CHANGED

@@ -39,18 +39,17 @@ private
     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
-    return <<EOF
-Spud::Core.configure do |config|
-      config.site_name = "#{site_name}"
-      config.from_address = "no-reply@#{domain_name}.com"
-    end
-EOF
+    return <<~RUBY
+      TbCore.configure do |config|
+            config.site_name = "#{site_name}"
+            config.from_address = "no-reply@#{domain_name}.com"
+          end
+RUBY
   end
   def application_name

data/lib/generators/spud/templates/assets/admin/application.js CHANGED

@@ -11,6 +11,6 @@ window.app = {
   }
 };
-$(document).ready(app.admin.init);
+document.addEventListener('DOMContentLoaded', app.admin.init);
 })();

data/lib/generators/spud/templates/assets/application.js CHANGED

@@ -1,6 +1,5 @@
-//= require jquery
-//= require tb_core
-//= require bootstrap_modules
+//= require rails-ujs
+//= require rails-validator
 //= require_self
 //= require_directory .
@@ -12,6 +11,6 @@ window.app = {
   }
 };
-$(document).ready(app.init);
+document.addEventListener('DOMContentLoaded', app.init);
 })();

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

@@ -16,7 +16,7 @@ RSpec.describe <%= controller_class_name %>, type: :controller do
   describe 'show' do
     it 'should render the show page' do
-      <%= model_variable_name %> = FactoryGirl.create(:<%= model_variable_name %>)
+      <%= model_variable_name %> = FactoryBot.create(:<%= model_variable_name %>)
       get :show, id: <%= model_variable_name %>.id
       expect(response).to have_http_status :success
     end
@@ -36,7 +36,7 @@ RSpec.describe <%= controller_class_name %>, type: :controller do
   describe 'edit' do
     it 'should render the edit page' do
-      <%= model_variable_name %> = FactoryGirl.create(:<%= model_variable_name %>)
+      <%= model_variable_name %> = FactoryBot.create(:<%= model_variable_name %>)
       get :edit, id: <%= model_variable_name %>.id
       expect(response).to have_http_status :success
     end
@@ -45,14 +45,14 @@ RSpec.describe <%= controller_class_name %>, type: :controller do
   describe 'create' do
     it 'should create the record' do
       expect do
-        post :create, <%= model_variable_name %>: FactoryGirl.attributes_for(:<%= model_variable_name %>)
+        post :create, <%= model_variable_name %>: FactoryBot.attributes_for(:<%= model_variable_name %>)
       end.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 %>)
+      <%= model_variable_name %> = FactoryBot.create(:<%= model_variable_name %>)
       current_value = <%= model_variable_name %>.<%= model_string_attribute_name %>
       new_value = current_value + '-Updated'
       expect do
@@ -64,7 +64,7 @@ RSpec.describe <%= controller_class_name %>, type: :controller do
   describe 'destroy' do
     it 'should destroy the record' do
-      <%= model_variable_name %> = FactoryGirl.create(:<%= model_variable_name %>)
+      <%= model_variable_name %> = FactoryBot.create(:<%= model_variable_name %>)
       expect do
         delete :destroy, id: <%= model_variable_name %>.id
       end.to change(<%= model_class_name %>, :count).by(-1)

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

@@ -9,5 +9,5 @@
 <%% end %>
 <script>
-  $(document).ready(app.admin.<%= module_name_formatted %>.edit);
+  document.addEventListener('DOMContentLoaded', app.admin.<%= module_name_formatted %>.edit);
 </script>

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

@@ -31,7 +31,7 @@
   <%%= will_paginate @<%=module_name_formatted%>, :renderer => BootstrapPagination::Rails %>
   <script>
-    $(document).ready(app.admin.<%= module_name_formatted %>.index);
+    document.addEventListener('DOMContentLoaded', app.admin.<%= module_name_formatted %>.index);
   </script>
 <%% end %>

data/lib/generators/spud/templates/views/admin/show.html.erb CHANGED

@@ -11,5 +11,5 @@
 </dl>
 <script>
-  $(document).ready(app.admin.<%= module_name_formatted %>.show);
+  document.addEventListener('DOMContentLoaded', app.admin.<%= module_name_formatted %>.show);
 </script>

data/lib/generators/spud/templates/views/frontend/index.html.erb CHANGED

@@ -27,5 +27,5 @@
 <%%= will_paginate @<%=module_name_formatted%> %>
 <script>
-  $(document).ready(app.<%= module_name_formatted %>.index);
+  document.addEventListener('DOMContentLoaded', app.<%= module_name_formatted %>.index);
 </script>

data/lib/generators/spud/templates/views/frontend/show.html.erb CHANGED

@@ -10,5 +10,5 @@
 <p><%%= link_to 'Back', <%=module_name_formatted.pluralize%>_path %></p>
 <script>
-  $(document).ready(app.<%= module_name_formatted %>.show);
+  document.addEventListener('DOMContentLoaded', app.<%= module_name_formatted %>.show);
 </script>

data/lib/tb_core.rb CHANGED

@@ -1,6 +1,4 @@
-module Tb
-   module Core
-    require 'spud_core/engine'
-    require 'spud_core/configuration'
-   end
+module TbCore
+  require 'tb_core/engine'
+  require 'tb_core/configuration'
 end

data/lib/tb_core/belongs_to_app.rb CHANGED

@@ -1,58 +1,59 @@
-module TbCore::BelongsToApp
-  extend ActiveSupport::Concern
+module TbCore
+  module BelongsToApp
+    extend ActiveSupport::Concern
-  module ClassMethods
-    def belongs_to_spud_app(name, options={})
-      ActiveSupport::Deprecation.warn(
-        'ApplicationController#belongs_to_spud_app is deprecated. Please use #belongs_to_app instead.',
-        caller
-      )
-      belongs_to_app(name, page_title: options[:page_title])
+    module ClassMethods
+      def belongs_to_spud_app(name, options={})
+        ActiveSupport::Deprecation.warn(
+          'ApplicationController#belongs_to_spud_app is deprecated. Please use #belongs_to_app instead.',
+          caller
+        )
+        belongs_to_app(name, page_title: options[:page_title])
+      end
+      # Adds a before action to the current controller to act like the specified twice baked app
+      #
+      # symbol: This should be the :key value for the app you want to use
+      # page_title: Override the base name value for the app (optional)
+      # only: An array of controller actions you want this to apply to (optional)
+      #
+      def belongs_to_app(name, page_title: nil, only: nil)
+        before_action ->(){
+          act_as_app(name, page_title: page_title)
+        }, only: only
+      end
     end
-    # Adds a before action to the current controller to act like the specified twice baked app
+  private
+    # Call the make the current controller behave as though it belongs to the specified twice baked app
     #
     # symbol: This should be the :key value for the app you want to use
     # page_title: Override the base name value for the app (optional)
-    # only: An array of controller actions you want this to apply to (optional)
     #
-    def belongs_to_app(name, page_title: nil, only: nil)
-      before_action ->(){
-        act_as_app(name, page_title: page_title)
-      }, only: only
+    def act_as_app(symbol, page_title: nil)
+      @page_application = TbCore.admin_applications.find{ |app| app[:key] == symbol }
+      if @page_application.blank?
+        raise "Requested application '#{symbol}' could not be found"
+      elsif !current_user.can_view_app?(@page_application)
+        raise AccessDeniedError.new(item: 'module', template: '/layouts/admin/error_page')
+      end
+      @page_thumbnail = @page_application[:thumbnail]
+      @page_name = determine_page_name(page_title || @page_application[:name], action_name)
     end
-  end
-private
-  # Call the make the current controller behave as though it belongs to the specified twice baked app
-  #
-  # symbol: This should be the :key value for the app you want to use
-  # page_title: Override the base name value for the app (optional)
-  #
-  def act_as_app(symbol, page_title: nil)
-    @page_application = Spud::Core.admin_applications.find{ |app| app[:key] == symbol }
-    if @page_application.blank?
-      raise "Requested application '#{symbol}' could not be found"
-    elsif !current_user.can_view_app?(@page_application)
-      raise Spud::AccessDeniedError.new(item: 'module', template: '/layouts/admin/error_page')
-    end
-    @page_thumbnail = @page_application[:thumbnail]
-    @page_name = determine_page_name(page_title || @page_application[:name], action_name)
-  end
-  # Takes a base app name and controller action name and returns an appropriate page title
-  #
-  def determine_page_name(base_name, action_name)
-    if action_name == 'new' || action_name == 'create'
-      return "New #{base_name.singularize}"
-    elsif action_name == 'edit' || action_name == 'update'
-      return "Edit #{base_name.singularize}"
-    elsif action_name == 'show'
-      return "#{base_name.singularize} Detail"
-    else
-      return base_name
+    # Takes a base app name and controller action name and returns an appropriate page title
+    #
+    def determine_page_name(base_name, action_name)
+      if ['new', 'create'].include?(action_name)
+        return "New #{base_name.singularize}"
+      elsif ['edit', 'update'].include?(action_name)
+        return "Edit #{base_name.singularize}"
+      elsif action_name == 'show'
+        return "#{base_name.singularize} Detail"
+      else
+        return base_name
+      end
     end
   end
 end