comfortable_mexican_sofa 2.0.2 → 2.0.3

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

@@ -16,15 +16,15 @@ class Comfy::Admin::Cms::Revisions::BaseController < Comfy::Admin::Cms::BaseCont
   end
 
   def show
-    @current_content    = @record.revision_fields.inject({}){|c, f| c[f] = @record.send(f); c }
-    @versioned_content  = @record.revision_fields.inject({}){|c, f| c[f] = @revision.data[f]; c }
+    @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 "comfy/admin/cms/revisions/show"
   end
 
   def revert
     @record.restore_from_revision(@revision)
-    flash[:success] = I18n.t('comfy.admin.cms.revisions.reverted')
+    flash[:success] = I18n.t("comfy.admin.cms.revisions.reverted")
     redirect_to record_path
   end
 
@@ -37,11 +37,12 @@ protected
   def load_revision
     @revision = @record.revisions.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.revisions.not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.revisions.not_found")
     redirect_to record_path
   end
 
   def record_path
     raise "no implemented"
   end
+
 end

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

@@ -5,11 +5,12 @@ private
   def load_record
     @record = @site.layouts.find(params[:layout_id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.revisions.record_not_found")
     redirect_to comfy_admin_cms_site_layouts_path(@site)
   end
 
   def record_path
     edit_comfy_admin_cms_site_layout_path(@site, @record)
   end
+
 end

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

@@ -1,8 +1,13 @@
 class Comfy::Admin::Cms::Revisions::PageController < Comfy::Admin::Cms::Revisions::BaseController
 
   def show
-    @current_content    = @record.fragments.inject({}){|c, b| c[b.identifier] = b.content; c }
-    @versioned_content  = @record.fragments.inject({}){|c, b| c[b.identifier] = @revision.data['fragments_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
+    @current_content = @record.fragments.each_with_object({}) do |b, c|
+      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 }
+      c[b.identifier] = d.try(:[], :content)
+    end
 
     render "comfy/admin/cms/revisions/show"
   end
@@ -12,11 +17,12 @@ private
   def load_record
     @record = @site.pages.find(params[:page_id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.revisions.record_not_found")
     redirect_to comfy_admin_cms_site_pages_path(@site)
   end
 
   def record_path
     edit_comfy_admin_cms_site_page_path(@site, @record)
   end
+
 end

data/app/controllers/comfy/admin/cms/revisions/snippet_controller.rb

@@ -5,11 +5,12 @@ private
   def load_record
     @record = @site.snippets.find(params[:snippet_id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.revisions.record_not_found")
     redirect_to comfy_admin_cms_site_snippets_path(@site)
   end
 
   def record_path
     edit_comfy_admin_cms_site_snippet_path(@site, @record)
   end
+
 end

data/app/controllers/comfy/admin/cms/revisions/translation_controller.rb

@@ -1,8 +1,13 @@
 class Comfy::Admin::Cms::Revisions::TranslationController < Comfy::Admin::Cms::Revisions::BaseController
 
   def show
-    @current_content    = @record.fragments.inject({}){|c, b| c[b.identifier] = b.content; c }
-    @versioned_content  = @record.fragments.inject({}){|c, b| c[b.identifier] = @revision.data['fragments_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
+    @current_content = @record.fragments.each_with_object({}) do |b, c|
+      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 }
+      c[b.identifier] = d.try(:[], :content)
+    end
 
     render "comfy/admin/cms/revisions/show"
   end
@@ -13,11 +18,12 @@ private
     @page   = @site.pages.find(params[:page_id])
     @record = @page.translations.find(params[:translation_id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.revisions.record_not_found")
     redirect_to comfy_admin_cms_site_pages_path(@site)
   end
 
   def record_path
     edit_comfy_admin_cms_site_page_translation_path(@site, @page, @record)
   end
+
 end

data/app/controllers/comfy/admin/cms/sites_controller.rb

@@ -3,12 +3,12 @@ class Comfy::Admin::Cms::SitesController < Comfy::Admin::Cms::BaseController
   skip_before_action  :load_admin_site,
                       :load_seeds
 
-  before_action :build_site,  only: [:new, :create]
-  before_action :load_site,   only: [:edit, :update, :destroy]
+  before_action :build_site,  only: %i[new create]
+  before_action :load_site,   only: %i[edit update destroy]
   before_action :authorize
 
   def index
-    return redirect_to action: :new if ::Comfy::Cms::Site.count == 0
+    return redirect_to action: :new if ::Comfy::Cms::Site.count.zero?
     @site = ::Comfy::Cms::Site.find_by_id(session[:site_id])
     @sites ||= ::Comfy::Cms::Site.all
   end
@@ -23,25 +23,25 @@ class Comfy::Admin::Cms::SitesController < Comfy::Admin::Cms::BaseController
 
   def create
     @site.save!
-    flash[:success] = I18n.t('comfy.admin.cms.sites.created')
+    flash[:success] = I18n.t("comfy.admin.cms.sites.created")
     redirect_to comfy_admin_cms_site_layouts_path(@site)
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.sites.creation_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.sites.creation_failure")
     render action: :new
   end
 
   def update
     @site.update_attributes!(site_params)
-    flash[:success] = I18n.t('comfy.admin.cms.sites.updated')
+    flash[:success] = I18n.t("comfy.admin.cms.sites.updated")
     redirect_to action: :edit, id: @site
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.sites.update_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.sites.update_failure")
     render action: :edit
   end
 
   def destroy
     @site.destroy
-    flash[:success] = I18n.t('comfy.admin.cms.sites.deleted')
+    flash[:success] = I18n.t("comfy.admin.cms.sites.deleted")
     redirect_to action: :index
   end
 
@@ -56,11 +56,12 @@ protected
     @site = ::Comfy::Cms::Site.find(params[:id])
     I18n.locale = ComfortableMexicanSofa.config.admin_locale || @site.locale
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.sites.not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.sites.not_found")
     redirect_to action: :index
   end
 
   def site_params
     params.fetch(:site, {}).permit!
   end
+
 end

data/app/controllers/comfy/admin/cms/snippets_controller.rb

@@ -1,11 +1,11 @@
 class Comfy::Admin::Cms::SnippetsController < Comfy::Admin::Cms::BaseController
 
-  before_action :build_snippet, only: [:new, :create]
-  before_action :load_snippet,  only: [:edit, :update, :destroy]
+  before_action :build_snippet, only: %i[new create]
+  before_action :load_snippet,  only: %i[edit update destroy]
   before_action :authorize
 
   def index
-    return redirect_to action: :new if @site.snippets.count == 0
+    return redirect_to action: :new if @site.snippets.count.zero?
     @snippets = @site.snippets.includes(:categories).for_category(params[:categories]).order(:position)
   end
 
@@ -19,25 +19,25 @@ class Comfy::Admin::Cms::SnippetsController < Comfy::Admin::Cms::BaseController
 
   def create
     @snippet.save!
-    flash[:success] = I18n.t('comfy.admin.cms.snippets.created')
+    flash[:success] = I18n.t("comfy.admin.cms.snippets.created")
     redirect_to action: :edit, id: @snippet
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.snippets.creation_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.snippets.creation_failure")
     render action: :new
   end
 
   def update
     @snippet.update_attributes!(snippet_params)
-    flash[:success] = I18n.t('comfy.admin.cms.snippets.updated')
+    flash[:success] = I18n.t("comfy.admin.cms.snippets.updated")
     redirect_to action: :edit, id: @snippet
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.snippets.update_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.snippets.update_failure")
     render action: :edit
   end
 
   def destroy
     @snippet.destroy
-    flash[:success] = I18n.t('comfy.admin.cms.snippets.deleted')
+    flash[:success] = I18n.t("comfy.admin.cms.snippets.deleted")
     redirect_to action: :index
   end
 
@@ -57,11 +57,12 @@ protected
   def load_snippet
     @snippet = @site.snippets.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.snippets.not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.snippets.not_found")
     redirect_to action: :index
   end
 
   def snippet_params
     params.fetch(:snippet, {}).permit!
   end
+
 end

data/app/controllers/comfy/admin/cms/translations_controller.rb

@@ -3,10 +3,10 @@ class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseControl
   helper_method :translation_select_options
 
   before_action :load_page
-  before_action :build_translation,   only: [:new, :create]
-  before_action :load_translation,    only: [:edit, :update, :destroy]
+  before_action :build_translation,   only: %i[new create]
+  before_action :load_translation,    only: %i[edit update destroy]
   before_action :authorize
-  before_action :preview_translation, only: [:create, :update]
+  before_action :preview_translation, only: %i[create update]
 
   def new
     render
@@ -18,25 +18,25 @@ class Comfy::Admin::Cms::TranslationsController < Comfy::Admin::Cms::BaseControl
 
   def create
     @translation.save!
-    flash[:success] = I18n.t('comfy.admin.cms.translations.created')
+    flash[:success] = I18n.t("comfy.admin.cms.translations.created")
     redirect_to action: :edit, id: @translation
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.translations.creation_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.translations.creation_failure")
     render action: :new
   end
 
   def update
     @translation.update_attributes!(translation_params)
-    flash[:success] = I18n.t('comfy.admin.cms.translations.updated')
+    flash[:success] = I18n.t("comfy.admin.cms.translations.updated")
     redirect_to action: :edit, id: @translation
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = I18n.t('comfy.admin.cms.translations.update_failure')
+    flash.now[:danger] = I18n.t("comfy.admin.cms.translations.update_failure")
     render action: :edit
   end
 
   def destroy
     @translation.destroy
-    flash[:success] = I18n.t('comfy.admin.cms.translations.deleted')
+    flash[:success] = I18n.t("comfy.admin.cms.translations.deleted")
     redirect_to edit_comfy_admin_cms_site_page_path(@site, @page)
   end
 
@@ -50,13 +50,13 @@ private
   def translation_select_options
     all = ComfortableMexicanSofa.config.locales
     taken = @page.translations.pluck(:locale) + [@site.locale] - [@translation.locale]
-    all.except(*taken).map{|k, v| ["#{v} (#{k})", k]}
+    all.except(*taken).map { |k, v| ["#{v} (#{k})", k] }
   end
 
   def load_page
     @page = @site.pages.find(params[:page_id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.pages.not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.pages.not_found")
     redirect_to comfy_admin_cms_site_pages_path(@site)
   end
 
@@ -69,7 +69,7 @@ private
     @translation = @page.translations.find(params[:id])
     @translation.attributes = translation_params
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.translations.not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.translations.not_found")
     redirect_to edit_comfy_admin_cms_site_page_path(@site, @page)
   end
 
@@ -79,7 +79,7 @@ private
 
   def preview_translation
     if params[:preview]
-      layout = @translation.layout.app_layout.blank?? false : @translation.layout.app_layout
+      layout = @translation.layout.app_layout.blank? ? false : @translation.layout.app_layout
       @cms_site   = @page.site
       @cms_layout = @translation.layout
       @cms_page   = @page
@@ -89,10 +89,11 @@ private
       I18n.locale = @translation.locale
 
       # Chrome chokes on content with iframes. Issue #434
-      response.headers['X-XSS-Protection'] = '0'
+      response.headers["X-XSS-Protection"] = "0"
 
       # raise
-      render inline: @translation.render, layout: layout, content_type: 'text/html'
+      render inline: @translation.render, layout: layout, content_type: "text/html"
     end
   end
+
 end

data/app/controllers/comfy/cms/assets_controller.rb

@@ -8,11 +8,11 @@ class Comfy::Cms::AssetsController < Comfy::Cms::BaseController
   after_action :set_cache_control_header
 
   def render_css
-    render body: @cms_layout.css, content_type: 'text/css'
+    render body: @cms_layout.css, content_type: "text/css"
   end
 
   def render_js
-    render body: @cms_layout.js, content_type: 'application/javascript'
+    render body: @cms_layout.js, content_type: "application/javascript"
   end
 
 protected
@@ -31,7 +31,8 @@ protected
 
   def set_cache_control_header
     if params[:cache_buster].present?
-      response.headers['Cache-Control'] = "public, max-age=#{1.year.to_i}"
+      response.headers["Cache-Control"] = "public, max-age=#{1.year.to_i}"
     end
   end
+
 end

data/app/controllers/comfy/cms/base_controller.rb

@@ -5,24 +5,25 @@ class Comfy::Cms::BaseController < ApplicationController
 protected
 
   def load_cms_site
-    @cms_site ||= if params[:site_id]
-      ::Comfy::Cms::Site.find_by_id(params[:site_id])
-    else
-      ::Comfy::Cms::Site.find_site(request.host_with_port.downcase, request.fullpath)
-    end
+    @cms_site ||=
+      if params[:site_id]
+        ::Comfy::Cms::Site.find_by_id(params[:site_id])
+      else
+        ::Comfy::Cms::Site.find_site(request.host_with_port.downcase, request.fullpath)
+      end
 
     if @cms_site
       if @cms_site.path.present? && !params[:site_id]
-        if params[:cms_path] && params[:cms_path].match(/\A#{@cms_site.path}/)
-          params[:cms_path].gsub!(/\A#{@cms_site.path}/, '')
-          params[:cms_path] && params[:cms_path].gsub!(/\A\//, '')
+        if params[:cms_path] && params[:cms_path].match(%r{\A#{@cms_site.path}})
+          params[:cms_path].gsub!(%r{\A#{@cms_site.path}}, "")
+          params[:cms_path] && params[:cms_path].gsub!(%r{\A/}, "")
         else
-          raise ActionController::RoutingError.new('Site Not Found')
+          raise ActionController::RoutingError, "Site Not Found"
         end
       end
     else
-      raise ActionController::RoutingError.new('Site Not Found')
+      raise ActionController::RoutingError, "Site Not Found"
     end
   end
 
-end
+end

data/app/controllers/comfy/cms/content_controller.rb

@@ -18,14 +18,14 @@ class Comfy::Cms::ContentController < Comfy::Cms::BaseController
     else
       respond_to do |format|
         format.html { render_page }
-        format.json {
+        format.json do
           json_page = @cms_page.as_json(except: [:content_cache])
-          json_page.merge!(content: render_to_string(
+          json_page[:content] = render_to_string(
             inline: @cms_page.content_cache,
             layout: false
-          ))
+          )
           render json: json_page
-        }
+        end
       end
     end
   end
@@ -41,13 +41,13 @@ protected
 
   # it's possible to control mimetype of a page by creating a `mime_type` field
   def mime_type
-    mime_block = @cms_page.fragments.detect{|f| f.identifier == "mime_type"}
+    mime_block = @cms_page.fragments.detect { |f| f.identifier == "mime_type" }
     mime_block && mime_block.content || "text/html"
   end
 
   def app_layout
     return false if request.xhr? || !@cms_layout
-    @cms_layout.app_layout.present?? @cms_layout.app_layout : false
+    @cms_layout.app_layout.present? ? @cms_layout.app_layout : false
   end
 
   def load_seeds
@@ -63,7 +63,7 @@ protected
         render_page(:not_found)
       else
         message = "Page Not Found at: \"#{params[:cms_path]}\""
-        raise ActionController::RoutingError.new(message)
+        raise ActionController::RoutingError, message
       end
     end
   end
@@ -86,4 +86,5 @@ protected
   rescue ActiveRecord::RecordNotFound
     nil
   end
+
 end

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

@@ -10,4 +10,5 @@ module Comfy::Paginate
       scope
     end
   end
-end
+
+end

data/app/helpers/comfy/cms_helper.rb

@@ -7,7 +7,7 @@ module Comfy
     #   cms_fragment_content(:left_column, CmsPage.first)
     #   cms_fragment_content(:left_column) # if @cms_page is present
     def cms_fragment_content(identifier, page = @cms_page)
-      frag = page && page.fragments.detect{|f| f.identifier == identifier.to_s}
+      frag = page && page.fragments.detect { |f| f.identifier == identifier.to_s }
       return "" unless frag
       case frag.tag
       when "date", "datetime"
@@ -25,7 +25,7 @@ module Comfy
     # it only if you know you got more stuff in the fragment content other than
     # text because this is a potentially expensive call.
     def cms_fragment_render(identifier, page = @cms_page)
-      node = page.fragment_nodes.detect{|n| n.identifier == identifier.to_s}
+      node = page.fragment_nodes.detect { |n| n.identifier == identifier.to_s }
       return "" unless node
       render inline: page.render([node])
     end
@@ -35,7 +35,10 @@ module Comfy
     #   cms_snippet_content(:my_snippet)
     def cms_snippet_content(identifier, cms_site = @cms_site)
       unless cms_site
-        host, path = request.host_with_port.downcase, request.fullpath if respond_to?(:request) && request
+        if respond_to?(:request) && request
+          host = request.host_with_port.downcase
+          path = request.fullpath
+        end
         cms_site = Comfy::Cms::Site.find_site(host, path)
       end
       snippet = cms_site && cms_site.snippets.find_by_identifier(identifier)

data/app/models/comfy/cms/categorization.rb

@@ -1,4 +1,5 @@
 class Comfy::Cms::Categorization < ActiveRecord::Base
+
   self.table_name = "comfy_cms_categorizations"
 
   # -- Relationships -----------------------------------------------------------
@@ -8,6 +9,6 @@ class Comfy::Cms::Categorization < ActiveRecord::Base
 
   # -- Validations -------------------------------------------------------------
   validates :category_id,
-    uniqueness: { scope: [:categorized_type, :categorized_id] }
+    uniqueness: { scope: %i[categorized_type categorized_id] }
 
 end

data/app/models/comfy/cms/category.rb

@@ -1,4 +1,5 @@
 class Comfy::Cms::Category < ActiveRecord::Base
+
   self.table_name = "comfy_cms_categories"
 
   # -- Relationships --------------------------------------------------------
@@ -9,12 +10,12 @@ class Comfy::Cms::Category < ActiveRecord::Base
   # -- Validations ----------------------------------------------------------
   validates :label,
     presence:   true,
-    uniqueness: { scope: [:categorized_type, :site_id] }
+    uniqueness: { scope: %i[categorized_type site_id] }
   validates :categorized_type,
     presence:   true
 
   # -- Scopes ---------------------------------------------------------------
-  scope :of_type, lambda { |type|
+  scope :of_type, ->(type) {
     where(categorized_type: type)
   }
 

data/app/models/comfy/cms/file.rb

@@ -1,13 +1,14 @@
 class Comfy::Cms::File < ActiveRecord::Base
-  self.table_name = 'comfy_cms_files'
+
+  self.table_name = "comfy_cms_files"
 
   include Comfy::Cms::WithCategories
 
   VARIANT_SIZE = {
-    redactor: {resize: "100x75^",   gravity: "center", crop: "100x75+0+0"},
-    thumb:    {resize: "200x150^",  gravity: "center", crop: "200x150+0+0"},
-    icon:     {resize: "28x28^",    gravity: "center", crop: "28x28+0+0"}
-  }
+    redactor: { resize: "100x75^",   gravity: "center", crop: "100x75+0+0" },
+    thumb:    { resize: "200x150^",  gravity: "center", crop: "200x150+0+0" },
+    icon:     { resize: "28x28^",    gravity: "center", crop: "28x28+0+0" }
+  }.freeze
 
   # temporary place to store attachment
   attr_accessor :file
@@ -35,7 +36,7 @@ class Comfy::Cms::File < ActiveRecord::Base
   def label
     l = read_attribute(:label)
     return l if l.present?
-    attachment.attached?? attachment.filename.to_s : nil
+    attachment.attached? ? attachment.filename.to_s : nil
   end
 
 protected
@@ -47,6 +48,7 @@ protected
 
   def process_attachment
     return if @file.blank?
-    self.attachment.attach(@file)
+    attachment.attach(@file)
   end
+
 end

data/app/models/comfy/cms/fragment.rb

@@ -1,5 +1,6 @@
 class Comfy::Cms::Fragment < ActiveRecord::Base
-  self.table_name = 'comfy_cms_fragments'
+
+  self.table_name = "comfy_cms_fragments"
 
   has_many_attached :attachments
 
@@ -17,7 +18,7 @@ class Comfy::Cms::Fragment < ActiveRecord::Base
   # -- Validations -------------------------------------------------------------
   validates :identifier,
     presence:   true,
-    uniqueness: {scope: :record}
+    uniqueness: { scope: :record }
 
   # -- Instance Methods --------------------------------------------------------
 
@@ -38,18 +39,19 @@ protected
 
   def remove_attachments
     return unless @file_ids_destroy.present?
-    self.attachments.where(id: @file_ids_destroy).destroy_all
+    attachments.where(id: @file_ids_destroy).destroy_all
   end
 
   def add_attachments
     return if @files.blank?
 
     # If we're dealing with a single file
-    if self.tag == "file"
+    if tag == "file"
       @files = [@files.first]
-      self.attachments.purge_later if self.attachments
+      attachments.purge_later if attachments
     end
 
-    self.attachments.attach(@files)
+    attachments.attach(@files)
   end
+
 end