occams 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f36d04aa7fd573bb40f6a209c41b7bd49386f3124355425551b984e01e439e9
-  data.tar.gz: a45311a36a5eb674f2b0bbb30eecf702db38d7828debd69277b62a8d8af9e08a
+  metadata.gz: f030fa6c8dd687cc40cba6d81f64035f233c93ffd6b0b7c7f63b5ca90846c5d6
+  data.tar.gz: 3e739fe2c866bd741e2f5c7b2901bbc2ef898a6891d6d0c5c54d7a0037a2d8b8
 SHA512:
-  metadata.gz: 38fa2734074d1b7415f4a3f00bb6e471a8da1294cf57aead091f5754d020e9f5cd1945eef342b6a1545eb7ee4a3a8d1c8253e9176920bb147c40e236ab581b17
-  data.tar.gz: 958e68e0579f56d27709f35b012c197c835a3ab7b14a3b220ff14d4c0c85afdac6787499d3e9b1574cc77af9382c2c245822d29734a1aeedf44978db06c0a087
+  metadata.gz: ae30e9cb660dcf2a31980a5d0de6d2da4d007ea5973d8e86a91e85c409bd2733d1554e64d8085d821745d37820c5e1a9a8b6c49ebde9254247fec315c9a9bac7
+  data.tar.gz: 7d18607b4253d86bff9cf8e3be92541385b33d474d188e1a5da22c94f3e339dc62bf86548a564838867d068d6c847ecda379b516c65b4f01d4f6fe03da6fb79b

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,5 +1,18 @@
 # Changelog
 
+## v1.0.3 - 8/15/2023
+
+- Added a [cms:audio tag](https://github.com/avonderluft/occams/wiki/Content-Tags#audio) for an embedded audio player
+- Some formatting of admin menu footer
+
+## v1.0.2 - 8/14/2023
+
+- 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

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+
+- Rails 7 is recommended, since performance is noticably better
 
 ## Installation
 
@@ -89,27 +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
-- 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.
@@ -117,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](https://github.com/avonderluft/occams) Copyright 2023 Andrew vonderLuft, following suit, 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
+- add feature to resize file_link'd images
+- get the original [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) tests working
+- add and update documentation to Occams to replace ComfortableMexicanSofa 

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

@@ -16,5 +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

@@ -28,7 +28,7 @@ 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")
+      flash[:danger] = I18n.t('occams.admin.cms.base.site_not_found')
       redirect_to(new_occams_admin_cms_site_path)
     end
   end
@@ -41,14 +41,14 @@ protected
   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/files_controller.rb

@@ -16,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),
@@ -41,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
@@ -51,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)
@@ -59,33 +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
@@ -96,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
@@ -109,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
@@ -124,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
 

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

@@ -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,13 +52,13 @@ 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
 

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

@@ -15,7 +15,7 @@ class Occams::Admin::Cms::PagesController < Occams::Admin::Cms::BaseController
   def index
     return redirect_to action: :new if site_has_no_pages?
 
-    return index_for_redactor if params[:source] == "redactor"
+    return index_for_redactor if params[:source] == 'redactor'
 
     @pages_by_parent = pages_grouped_by_parent
 
@@ -37,25 +37,25 @@ class Occams::Admin::Cms::PagesController < Occams::Admin::Cms::BaseController
 
   def create
     @page.save!
-    flash[:success] = I18n.t("occams.admin.cms.pages.created")
+    flash[:success] = I18n.t('occams.admin.cms.pages.created')
     redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t("occams.admin.cms.pages.creation_failure")
+    flash.now[:danger] = I18n.t('occams.admin.cms.pages.creation_failure')
     render action: :new
   end
 
   def update
     @page.save!
-    flash[:success] = I18n.t("occams.admin.cms.pages.updated")
+    flash[:success] = I18n.t('occams.admin.cms.pages.updated')
     redirect_to action: :edit, id: @page
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t("occams.admin.cms.pages.update_failure")
+    flash.now[:danger] = I18n.t('occams.admin.cms.pages.update_failure')
     render action: :edit
   end
 
   def destroy
     @page.destroy
-    flash[:success] = I18n.t("occams.admin.cms.pages.deleted")
+    flash[:success] = I18n.t('occams.admin.cms.pages.deleted')
     redirect_to action: :index
   end
 
@@ -64,7 +64,7 @@ class Occams::Admin::Cms::PagesController < Occams::Admin::Cms::BaseController
     @page.layout = @site.layouts.find_by(id: params[:layout_id])
 
     render(
-      partial: "occams/admin/cms/fragments/form_fragments",
+      partial: 'occams/admin/cms/fragments/form_fragments',
       locals: { record: @page, scope: :page },
       layout: false
     )
@@ -95,7 +95,7 @@ protected
     end
 
     page_select_options = [{
-      name: I18n.t("occams.admin.cms.pages.form.choose_link"),
+      name: I18n.t('occams.admin.cms.pages.form.choose_link'),
       url: false
     }] + tree_walker.call(@site.pages.root, [], 0)
 
@@ -111,10 +111,10 @@ protected
   end
 
   def check_for_layouts
-    if @site.layouts.count.zero?
-      flash[:danger] = I18n.t("occams.admin.cms.pages.layout_not_found")
-      redirect_to new_occams_admin_cms_site_layout_path(@site)
-    end
+    return unless @site.layouts.count.zero?
+
+    flash[:danger] = I18n.t('occams.admin.cms.pages.layout_not_found')
+    redirect_to new_occams_admin_cms_site_layout_path(@site)
   end
 
   def build_page
@@ -127,26 +127,26 @@ protected
     @page = @site.pages.find(params[:id])
     @page.attributes = page_params
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t("occams.admin.cms.pages.not_found")
+    flash[:danger] = I18n.t('occams.admin.cms.pages.not_found')
     redirect_to action: :index
   end
 
   def preview_page
-    if params[:preview]
-      layout = @page.layout.app_layout.blank? ? false : @page.layout.app_layout
-      @cms_site   = @page.site
-      @cms_layout = @page.layout
-      @cms_page   = @page
+    return unless params[:preview]
 
-      # Make sure to use the site locale to render the preview becaue it might
-      # be different from the admin locale.
-      I18n.locale = @cms_site.locale
+    layout = @page.layout.app_layout.blank? ? false : @page.layout.app_layout
+    @cms_site   = @page.site
+    @cms_layout = @page.layout
+    @cms_page   = @page
 
-      # Chrome chokes on content with iframes. Issue #434
-      response.headers["X-XSS-Protection"] = "0"
+    # Make sure to use the site locale to render the preview becaue it might
+    # be different from the admin locale.
+    I18n.locale = @cms_site.locale
 
-      render inline: @page.render, layout: layout, content_type: "text/html"
-    end
+    # Chrome chokes on content with iframes. Issue #434
+    response.headers['X-XSS-Protection'] = '0'
+
+    render inline: @page.render, layout: layout, content_type: 'text/html'
   end
 
   def page_params

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

@@ -20,29 +20,29 @@ class Occams::Admin::Cms::Revisions::BaseController < Occams::Admin::Cms::BaseCo
     @current_content    = @record.revision_fields.each_with_object({}) { |f, c| c[f] = @record.send(f) }
     @versioned_content  = @record.revision_fields.each_with_object({}) { |f, c| c[f] = @revision.data[f] }
 
-    render "occams/admin/cms/revisions/show"
+    render 'occams/admin/cms/revisions/show'
   end
 
   def revert
     @record.restore_from_revision(@revision)
-    flash[:success] = I18n.t("occams.admin.cms.revisions.reverted")
+    flash[:success] = I18n.t('occams.admin.cms.revisions.reverted')
     redirect_to record_path
   end
 
 protected
 
   def load_record
-    raise "not implemented"
+    raise 'not implemented'
   end
 
   def load_revision
     @revision = @record.revisions.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t("occams.admin.cms.revisions.not_found")
+    flash[:danger] = I18n.t('occams.admin.cms.revisions.not_found')
     redirect_to record_path
   end
 
   def record_path
-    raise "no implemented"
+    raise 'no implemented'
   end
 end

data/app/controllers/occams/admin/cms/revisions/layout_controller.rb

@@ -6,7 +6,7 @@ private
   def load_record
     @record = @site.layouts.find(params[:layout_id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t("occams.admin.cms.revisions.record_not_found")
+    flash[:danger] = I18n.t('occams.admin.cms.revisions.record_not_found')
     redirect_to occams_admin_cms_site_layouts_path(@site)
   end
 

data/app/controllers/occams/admin/cms/revisions/page_controller.rb

@@ -6,11 +6,11 @@ class Occams::Admin::Cms::Revisions::PageController < Occams::Admin::Cms::Revisi
       c[b.identifier] = b.content
     end
     @versioned_content = @record.fragments.each_with_object({}) do |b, c|
-      d = @revision.data["fragments_attributes"].detect { |r| r[:identifier] == b.identifier }
+      d = @revision.data['fragments_attributes'].detect { |r| r[:identifier] == b.identifier }
       c[b.identifier] = d.try(:[], :content)
     end
 
-    render "occams/admin/cms/revisions/show"
+    render 'occams/admin/cms/revisions/show'
   end
 
 private
@@ -18,7 +18,7 @@ private
   def load_record
     @record = @site.pages.find(params[:page_id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t("occams.admin.cms.revisions.record_not_found")
+    flash[:danger] = I18n.t('occams.admin.cms.revisions.record_not_found')
     redirect_to occams_admin_cms_site_pages_path(@site)
   end