occams 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dcda75b6239c3fb7e71b35c45c3b5674373bd96d9c14457776af68ff8b1a391
-  data.tar.gz: 003f1604af55a848c28214b6fcccbb2863ec797adad4515580d933ddb9078c79
+  metadata.gz: ce680397bd166f37f751f3809e6bae83bfa630626d20e21d479631487ba03f59
+  data.tar.gz: 6b0bb13446c96370910182f7acdcb66ba9bc93cacb1815483fa182e1b51d9af5
 SHA512:
-  metadata.gz: 6a7f7f9b4317cefb3961cd916b75f4df6bd8247686f80224926bc5cde93f255e840b567cf506e03112c069e755ffa9810840eff605905fe39ec65471a9c17658
-  data.tar.gz: 68ed2b0e79500d11ac2c940f4b89c33a894a388b26eec05cfec13d6c28198bc61ec945ad49367df83546d7d40e0b36dab379e6dd4fa6bfca7f206b35424ce964
+  metadata.gz: 3389d7c086da5dd49d5a3e54c81e0036abd459b13c9885ff7159aa49d74d39ca0667b2618438edd8414c3a4d97f8b1ced0d5abd6bddf4ffdbb9b9f8bf28e538d
+  data.tar.gz: 9c47baa318396a1f77fc19cec2b0c8b7498a7946edb1ab6c0bbe66ca5df5de425211bcdf822758b4a8d752150327cfbbbf043031999bf410cfce97a1ed3ce304

data/.github/issue_template.md

@@ -1,16 +1,14 @@
-*Note:* For general questions and feature requests please leave a message
-on Gitter: https://gitter.im/comfy/comfortable-mexican-sofa
 
 ### Expected behavior
 Tell us what should happen
 
 ### Actual behavior
-Tell us what happens instead
+Tell us what does happen
 
 ### Steps to reproduce
 Things that help:
 
-* Describe issue in detail.
+* Describe the issue in detail.
 * Add relevant code snippets.
 * Create a failing test case.
 

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.7
+  NewCops: enable
   Exclude:
     - bin/*
     - db/schema.rb
@@ -11,77 +12,59 @@ AllCops:
 Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/MultilineHashBraceLayout:
-  Enabled: false
+Layout/LineLength:
+  Max: 148
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Layout/MultilineOperationIndentation:
-  Enabled: false
-
-Layout/ParameterAlignment:
-  Enabled: false
-
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
 # -- Metrics -------------------------------------------------------------------
-Metrics/PerceivedComplexity:
-  Enabled: false
-
-Metrics/MethodLength:
+Metrics/AbcSize:
   Enabled: false
 
-Metrics/MethodLength:
-  Enabled: false
+Metrics/BlockLength:
+  Max: 45
 
-Metrics/ParameterLists:
+Metrics/ClassLength:
   Enabled: false
 
-Metrics/LineLength:
-  Max: 120
-
 Metrics/CyclomaticComplexity:
-  Enabled: false
+  Max: 12
 
-Metrics/ClassLength:
-  Enabled: false
-
-Metrics/BlockLength:
+Metrics/MethodLength:
   Enabled: false
 
-Metrics/AbcSize:
-  Enabled: false
+Metrics/PerceivedComplexity:
+  Max: 12
 
 # -- Naming --------------------------------------------------------------------
 Naming/MethodParameterName:
   Enabled: false
 
 # -- Style ---------------------------------------------------------------------
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-Style/RegexpLiteral:
-  EnforcedStyle: percent_r
-
-Style/Lambda:
-  EnforcedStyle: literal
+Style/ClassAndModuleChildren:
+  Enabled: false
 
-Style/IfUnlessModifier:
+Style/Documentation:
   Enabled: false
 
-Style/GuardClause:
+Style/DocumentDynamicEvalDefinition:
   Enabled: false
 
-Style/Documentation:
+Style/IfUnlessModifier:
   Enabled: false
 
-Style/DateTime:
+Style/Lambda:
+  EnforcedStyle: literal
+
+Style/OptionalBooleanParameter:
   Enabled: false
 
-Style/ClassAndModuleChildren:
+Style/SafeNavigation:
   Enabled: false
 
-Style/AsciiComments:
-  Enabled: false
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r

data/CHANGELOG.md

@@ -1,7 +1,22 @@
 # Changelog
 
+## v1.0.2 - 
+
+- Fixed image rendering which rubocop broke in v1.0.1
+- Show unpublished pages in Rails development mode
+- Show Rails ENV at foot of Admin menu, along with versions of Occams, Rails and Ruby
+- Updated documentation at [Occams Wiki](https://github.com/avonderluft/occams/wiki) 
+- Comprehensive rubocop linting
+
+## v1.0.1 - 8/7/2023
+
+- Fixed image thumbnail hover for Rails 7
+- Added display of Rails and Ruby versions along with Occams version at foot of Admin menu
+- Refined gemspec dependencies
+- Tweaked with a bunch of rubocop linting
+
 ## v1.0.0 - 8/5/2023
 
-- Copies the original [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa)
-- Adds the changes from [Restarone's fork](https://github.com/restarone/comfortable-mexican-sofa) (23 commits)
-- Adds the ability to write snippets in Markdown
+- Copied the original [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa)
+- Added the changes from [Restarone's fork](https://github.com/restarone/comfortable-mexican-sofa) (23 commits)
+- Added the ability to write snippets in Markdown

data/Gemfile

@@ -1,30 +1,30 @@
 # frozen_string_literal: true
 
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
 group :development, :test do
-  gem "autoprefixer-rails", "~> 8.1.0"
-  gem "byebug",             "~> 10.0.0", platforms: %i[mri mingw x64_mingw]
-  gem "capybara",           "~> 3.39.0"
-  gem "image_processing",   ">= 1.2"
-  gem "kaminari",           "~> 1.1.1"
-  gem "puma",               "~> 3.12.2"
-  gem "rubocop",            "~> 0.55.0", require: false
-  gem "selenium-webdriver", "~> 4.9.0"
-  gem "sqlite3",            "~> 1.4.2"
+  gem 'autoprefixer-rails', '~> 8.1.0'
+  gem 'byebug',             '~> 10.0.0', platforms: %i[mri mingw x64_mingw]
+  gem 'capybara',           '~> 3.39.0'
+  gem 'image_processing',   '>= 1.2'
+  gem 'kaminari',           '~> 1.2', '>= 1.2.2'
+  gem 'puma',               '~> 3.12.2'
+  gem 'rubocop',            '~> 0.55.0', require: false
+  gem 'selenium-webdriver', '~> 4.9.0'
+  gem 'sqlite3',            '~> 1.4.2'
 end
 
 group :development do
-  gem "listen",       "~> 3.8.0"
-  gem "web-console",  "~> 3.5.1"
+  gem 'listen',       '~> 3.8.0'
+  gem 'web-console',  '~> 3.5.1'
 end
 
 group :test do
-  gem "coveralls",                "~> 0.8.21", require: false
-  gem "diffy",                    "~> 3.2.0"
-  gem "equivalent-xml",           "~> 0.6.0"
-  gem "mocha",                    "~> 1.3.0", require: false
-  gem "rails-controller-testing", "~> 1.0.2"
+  gem 'coveralls',                '~> 0.8.23', require: false
+  gem 'diffy',                    '~> 3.4.2'
+  gem 'equivalent-xml',           '~> 0.6.0'
+  gem 'mocha',                    '~> 2.1.0', require: false
+  gem 'rails-controller-testing', '~> 1.0.5'
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2023 Andrew vonderLuft
+Copyright (c) 2010-2019 Oleg Khabarov (ComfortableMexicanSofa), 2023 Andrew vonderLuft
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -26,8 +26,8 @@ ocCaM'S, pronounced "AH-kums" is a nod to [Occam's Razor](https://en.wikipedia.o
 
 Referring to the [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) documentation, substituting 'Occams' for 'ComfortableMexicanSofa' where appropriate.
 
-* Powerful page templating capability using [Content Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Content-Tags)
-* [Multiple Sites](https://github.com/ocms/comfortable-mexican-sofa/wiki/Docs:-Sites) from a single installation
+* Powerful page templating capability using [Content Tags](https://github.com/avonderluft/occams/wiki/Content-Tags)
+* [Multiple Sites](https://github.com/avonderluft/occams/wiki/Sites) from a single installation
 * Multi-Language Support (i18n) (ca, cs, da, de, en, es, fi, fr, gr, hr, it, ja, nb, nl, pl, pt-BR, ru, sv, tr, uk, zh-CN, zh-TW) and page localization.
 * [CMS Seeds](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-CMS-Seeds) for initial content population
 * [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Revisions) to revert changes
@@ -36,13 +36,13 @@ Referring to the [ComfortableMexicanSofa](https://github.com/comfy/comfortable-m
 ## Dependencies
 
 * File attachments are handled by [ActiveStorage](https://github.com/rails/rails/tree/master/activestorage). Make sure that you can run appropriate migrations by running: `rails active_storage:install` and then `rake db:migrate`
-* Image resizing is done with with [ImageMagick](http://www.imagemagick.org/script/download.php), so make sure it's installed.
+* Image resizing is done on Rails 7 or greater, with[ImageMagick](http://www.imagemagick.org/script/download.php), so make sure it's installed
 * Pagination is handled by [kaminari](https://github.com/amatsuda/kaminari) or [will_paginate](https://github.com/mislav/will_paginate). Please add one of those to your Gemfile.
 
 ## Compatibility
 
-- Install and basic functionality validated on Ruby 3.2.2. with Rails 6.1.7.4 and 7.0.6
-- >= Rails 7 is recommended, since performance is noticably better
+- Install and basic functionality validated on Ruby 3.2.2. with Rails 6.1.7.4 and 7.0.6 and 7.0.6
+- Rails 7 is recommended, since performance is noticably better
 
 ## Installation
 
@@ -89,28 +89,24 @@ After creating a Site, you need to make a Layout. Layout is the template of your
 
 Once you have a layout, you may start creating pages and populating content. It's that easy.
 
-## ToDos
-
-- Linting via current version of rubocop
-- Image file thumbnail hover not working on Rails 7
-- get the original [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) tests working
-- add documentation to Occams to replace ComfortableMexicanSofa 
-
 ## Documentation
 
-Refer to the [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) documentation, substituting 'Occams' for 'Comfy' where appropriate.
-
-For more information on how to use this CMS please refer to the [Wiki](https://github.com/comfy/comfortable-mexican-sofa/wiki). Section that might be of interest is the entry
-on [Content Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Docs:-Content-Tags).
+[Occams](https://github.com/avonderluft/occams)
 
-[Ocms Demo App](https://github.com/comfy/comfy-demo) also can be used as an
-example of a default Rails app with CMS installed.
+For more information on how to use this CMS please refer to the [Wiki](https://github.com/avonderluft/occams/wiki). Section that might be of interest is the entry
+on [Content Tags](https://github.com/comfy/avonderluft/occams/Content-Tags).
 
 #### Contributing
 
 The Occams repository can run like any Rails application in development. It's as easy to work on as any other Rails app.
 For more detail see [CONTRIBUTING](CONTRIBUTING.md)
 
+#### Testing
+
+- `bin/rails db:migrate`
+- `rake db:test:prepare`
+- `rake test`
+
 #### Acknowledgements
 
 - Obviously to Oleg Khabarov, the creator of [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa). This is his work, with just a few updates and additions.
@@ -118,4 +114,4 @@ For more detail see [CONTRIBUTING](CONTRIBUTING.md)
 
 ---
 - [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) Copyright 2010-2019 Oleg Khabarov. Released under the [MIT license](LICENSE)
-- [Occams](https://github.com/avonderluft/occams) follows suit, being also released under the [MIT license](LICENSE)
+- [Occams] Copyright 2023 Andrew vonderLuft (https://github.com/avonderluft/occams) follows suit, being also released under the [MIT license](LICENSE)

data/Rakefile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "config/application"
+require_relative 'config/application'
 
 Rails.application.load_tasks

data/TODOS.md

@@ -0,0 +1,6 @@
+# ToDos
+
+- add application console for testing
+- feature to resize file_link'd images
+- get the original [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) tests working
+- add documentation to Occams to replace ComfortableMexicanSofa 

data/app/controllers/application_controller.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
 class ApplicationController < ActionController::Base
-
   protect_from_forgery
-
 end

data/app/controllers/concerns/occams/paginate.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Occams::Paginate
-
   # Wrapper to deal with WillPaginate vs Kaminari nonsense
   def occams_paginate(scope, per_page: 50)
     if defined?(WillPaginate)
@@ -12,5 +11,4 @@ module Occams::Paginate
       scope
     end
   end
-
 end

data/app/controllers/concerns/occams/reorder_action.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Occams::ReorderAction
-
   extend ActiveSupport::Concern
 
   included do
@@ -15,5 +14,4 @@ module Occams::ReorderAction
     end
     head :ok
   end
-
 end

data/app/controllers/occams/admin/base_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::BaseController < Occams.config.admin_base_controller.to_s.constantize
-
   include Occams::Paginate
 
   # Authentication module must have `authenticate` method
@@ -17,6 +16,5 @@ class Occams::Admin::BaseController < Occams.config.admin_base_controller.to_s.c
 
   before_action :authenticate
 
-  layout "occams/admin/cms"
-
+  layout 'occams/admin/cms'
 end

data/app/controllers/occams/admin/cms/base_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::BaseController < Occams::Admin::BaseController
-
   before_action :load_admin_site,
                 :set_locale,
                 :load_seeds,
@@ -16,6 +15,7 @@ class Occams::Admin::Cms::BaseController < Occams::Admin::BaseController
   def jump
     path = Occams.config.admin_route_redirect
     return redirect_to(path) unless path.blank?
+
     load_admin_site
     redirect_to occams_admin_cms_site_pages_path(@site) if @site
   end
@@ -28,28 +28,27 @@ protected
       session[:site_id] = @site.id
     else
       I18n.locale = Occams.config.admin_locale || I18n.default_locale
-      flash[:danger] = I18n.t("occams.admin.cms.base.site_not_found")
-      return redirect_to(new_occams_admin_cms_site_path)
+      flash[:danger] = I18n.t('occams.admin.cms.base.site_not_found')
+      redirect_to(new_occams_admin_cms_site_path)
     end
   end
 
   def set_locale
-    I18n.locale = Occams.config.admin_locale || (@site&.locale)
+    I18n.locale = Occams.config.admin_locale || @site&.locale
     true
   end
 
   def load_seeds
     return unless Occams.config.enable_seeds
 
-    controllers = %w[layouts pages snippets files].collect { |c| "occams/admin/cms/" + c }
-    if controllers.member?(params[:controller]) && params[:action] == "index"
-      Occams::Seeds::Importer.new(@site.identifier).import!
-      flash.now[:warning] = I18n.t("occams.admin.cms.base.seeds_enabled")
-    end
+    controllers = %w[layouts pages snippets files].collect { |c| "occams/admin/cms/#{c}" }
+    return unless controllers.member?(params[:controller]) && params[:action] == 'index'
+
+    Occams::Seeds::Importer.new(@site.identifier).import!
+    flash.now[:warning] = I18n.t('occams.admin.cms.base.seeds_enabled')
   end
 
   def infer_layout
-    false if params[:layout] == "false"
+    false if params[:layout] == 'false'
   end
-
 end

data/app/controllers/occams/admin/cms/categories_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::CategoriesController < Occams::Admin::Cms::BaseController
-
   before_action :load_category, only: %i[edit update destroy]
   before_action :authorize
 
@@ -36,5 +35,4 @@ protected
   def category_params
     params.fetch(:category, {}).permit!
   end
-
 end

data/app/controllers/occams/admin/cms/files_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
-
   include ::Occams::ReorderAction
   self.reorder_action_resource = ::Occams::Cms::File
 
@@ -17,11 +16,11 @@ class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
     case params[:source]
 
     # Integration with Redactor 1.0 Wysiwyg
-    when "redactor"
+    when 'redactor'
       file_scope  = files_scope.limit(100).order(:position)
       file_hashes =
         case params[:type]
-        when "image"
+        when 'image'
           file_scope.with_images.collect do |file|
             { thumb: url_for(file.attachment.variant(combine_options: Occams::Cms::File::VARIANT_SIZE[:redactor])),
               image: url_for(file.attachment),
@@ -29,10 +28,10 @@ class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
           end
         else
           file_scope.collect do |file|
-            { title:  file.label,
-              name:   file.attachment.filename,
-              link:   url_for(file.attachment),
-              size:   number_to_human_size(file.attachment.byte_size) }
+            { title: file.label,
+              name: file.attachment.filename,
+              link: url_for(file.attachment),
+              size: number_to_human_size(file.attachment.byte_size) }
           end
         end
 
@@ -42,7 +41,7 @@ class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
       files_scope = files_scope
         .includes(:categories)
         .for_category(params[:categories])
-        .order("occams_cms_files.position")
+        .order('occams_cms_files.position')
       @files = occams_paginate(files_scope, per_page: 50)
     end
   end
@@ -52,7 +51,7 @@ class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
   end
 
   def create
-    categories_scope = @site.categories.of_type("Occams::Cms::File")
+    categories_scope = @site.categories.of_type('Occams::Cms::File')
 
     if params[:categories]
       ids = categories_scope.where(label: params[:categories]).pluck(:id)
@@ -60,34 +59,33 @@ class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
     end
 
     # Automatically tagging upload if it's done through redactor
-    if params[:source] == "redactor"
-      category = categories_scope.find_or_create_by(label: "wysiwyg")
+    if params[:source] == 'redactor'
+      category = categories_scope.find_or_create_by(label: 'wysiwyg')
       @file.category_ids = [category.id]
     end
 
     @file.save!
 
     case params[:source]
-    when "plupload"
-      render partial: "file", object: @file
-    when "redactor"
+    when 'plupload'
+      render partial: 'file', object: @file
+    when 'redactor'
       render json: {
         filelink: url_for(@file.attachment),
         filename: @file.attachment.filename
       }
     else
-      flash[:success] = I18n.t("occams.admin.cms.files.created")
+      flash[:success] = I18n.t('occams.admin.cms.files.created')
       redirect_to action: :edit, id: @file
     end
-
   rescue ActiveRecord::RecordInvalid
     case params[:source]
-    when "plupload"
+    when 'plupload'
       render body: @file.errors.full_messages.to_sentence, status: :unprocessable_entity
-    when "redactor"
+    when 'redactor'
       render body: nil, status: :unprocessable_entity
     else
-      flash.now[:danger] = I18n.t("occams.admin.cms.files.creation_failure")
+      flash.now[:danger] = I18n.t('occams.admin.cms.files.creation_failure')
       render action: :new
     end
   end
@@ -98,10 +96,10 @@ class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
 
   def update
     if @file.update(file_params)
-      flash[:success] = I18n.t("occams.admin.cms.files.updated")
+      flash[:success] = I18n.t('occams.admin.cms.files.updated')
       redirect_to action: :edit, id: @file
     else
-      flash.now[:danger] = I18n.t("occams.admin.cms.files.update_failure")
+      flash.now[:danger] = I18n.t('occams.admin.cms.files.update_failure')
       render action: :edit
     end
   end
@@ -111,7 +109,7 @@ class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
     respond_to do |format|
       format.js
       format.html do
-        flash[:success] = I18n.t("occams.admin.cms.files.deleted")
+        flash[:success] = I18n.t('occams.admin.cms.files.deleted')
         redirect_to action: :index
       end
     end
@@ -126,7 +124,7 @@ protected
   def load_file
     @file = @site.files.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t("occams.admin.cms.files.not_found")
+    flash[:danger] = I18n.t('occams.admin.cms.files.not_found')
     redirect_to action: :index
   end
 
@@ -138,5 +136,4 @@ protected
     end
     params.fetch(:file, {}).permit!
   end
-
 end

data/app/controllers/occams/admin/cms/layouts_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::LayoutsController < Occams::Admin::Cms::BaseController
-
   include ::Occams::ReorderAction
   self.reorder_action_resource = ::Occams::Cms::Layout
 
@@ -11,6 +10,7 @@ class Occams::Admin::Cms::LayoutsController < Occams::Admin::Cms::BaseController
 
   def index
     return redirect_to action: :new if @site.layouts.count.zero?
+
     @layouts = @site.layouts.roots.order(:position)
   end
 
@@ -24,25 +24,25 @@ class Occams::Admin::Cms::LayoutsController < Occams::Admin::Cms::BaseController
 
   def create
     @layout.save!
-    flash[:success] = I18n.t("occams.admin.cms.layouts.created")
+    flash[:success] = I18n.t('occams.admin.cms.layouts.created')
     redirect_to action: :edit, id: @layout
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t("occams.admin.cms.layouts.creation_failure")
+    flash.now[:danger] = I18n.t('occams.admin.cms.layouts.creation_failure')
     render action: :new
   end
 
   def update
     @layout.update!(layout_params)
-    flash[:success] = I18n.t("occams.admin.cms.layouts.updated")
+    flash[:success] = I18n.t('occams.admin.cms.layouts.updated')
     redirect_to action: :edit, id: @layout
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t("occams.admin.cms.layouts.update_failure")
+    flash.now[:danger] = I18n.t('occams.admin.cms.layouts.update_failure')
     render action: :edit
   end
 
   def destroy
     @layout.destroy
-    flash[:success] = I18n.t("occams.admin.cms.layouts.deleted")
+    flash[:success] = I18n.t('occams.admin.cms.layouts.deleted')
     redirect_to action: :index
   end
 
@@ -52,18 +52,17 @@ protected
     @layout = @site.layouts.new(layout_params)
     @layout.parent      ||= ::Occams::Cms::Layout.find_by_id(params[:parent_id])
     @layout.app_layout  ||= @layout.parent.try(:app_layout)
-    @layout.content     ||= "{{ cms:wysiwyg content }}"
+    @layout.content     ||= '{{ cms:wysiwyg content }}'
   end
 
   def load_layout
     @layout = @site.layouts.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t("occams.admin.cms.layouts.not_found")
+    flash[:danger] = I18n.t('occams.admin.cms.layouts.not_found')
     redirect_to action: :index
   end
 
   def layout_params
     params.fetch(:layout, {}).permit!
   end
-
 end