comfortable_mexican_sofa 2.0.2 → 2.0.3

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

@@ -1,7 +1,6 @@
-# encoding: utf-8
-
 class Comfy::Cms::Layout < ActiveRecord::Base
-  self.table_name = 'comfy_cms_layouts'
+
+  self.table_name = "comfy_cms_layouts"
 
   cms_acts_as_tree
   cms_has_revisions_for :content, :css, :js
@@ -23,29 +22,29 @@ class Comfy::Cms::Layout < ActiveRecord::Base
     presence:   true
   validates :identifier,
     presence:   true,
-    uniqueness: {scope: :site_id},
-    format:     {with: /\A\w[a-z0-9_-]*\z/i}
+    uniqueness: { scope: :site_id },
+    format:     { with: %r{\A\w[a-z0-9_-]*\z}i }
 
   # -- Class Methods -----------------------------------------------------------
   # Tree-like structure for layouts
-  def self.options_for_select(site, layout = nil, current_layout = nil, depth = 0, spacer = '. . ')
+  def self.options_for_select(site, layout = nil, current_layout = nil, depth = 0, spacer = ". . ")
     out = []
-    [current_layout || site.layouts.roots].flatten.each do |l|
+    [current_layout || site.layouts.roots.order(:position)].flatten.each do |l|
       next if layout == l
-      out << [ "#{spacer*depth}#{l.label}", l.id ]
-      l.children.each do |child|
+      out << ["#{spacer * depth}#{l.label}", l.id]
+      l.children.order(:position).each do |child|
         out += options_for_select(site, layout, child, depth + 1, spacer)
       end
     end
-    return out.compact
+    out.compact
   end
 
   # List of available application layouts
   def self.app_layouts_for_select(view_paths)
     view_paths.map(&:to_s).select { |path| path.start_with?(Rails.root.to_s) }.flat_map do |full_path|
       Dir.glob("#{full_path}/layouts/**/*.html.*").collect do |filename|
-        filename.gsub!("#{full_path}/layouts/", '')
-        filename.split('/').last[0...1] == '_' ? nil : filename.split('.').first
+        filename.gsub!("#{full_path}/layouts/", "")
+        filename.split("/").last[0...1] == "_" ? nil : filename.split(".").first
       end.compact.sort
     end.compact.uniq.sort
   end
@@ -55,9 +54,9 @@ class Comfy::Cms::Layout < ActiveRecord::Base
   # and merges on the {{cms:fragment content}} tag (if parent layout has that).
   # Returns a list of tokens that can be fed into the renderer.
   def content_tokens
+    renderer  = ComfortableMexicanSofa::Content::Renderer.new(nil)
+    tokens    = renderer.tokenize(content)
 
-    renderer = ComfortableMexicanSofa::Content::Renderer.new(nil)
-    tokens = renderer.tokenize(self.content)
     if parent
       fragment_tags = ComfortableMexicanSofa::Content::Tag::Fragment.subclasses.map do |c|
         c.to_s.demodulize.underscore
@@ -66,7 +65,7 @@ class Comfy::Cms::Layout < ActiveRecord::Base
       replacement_position = parent_tokens.index do |n|
         n.is_a?(Hash) &&
         fragment_tags.member?(n[:tag_class]) &&
-        n[:tag_params].split(/\s/).first == "content"
+        n[:tag_params].split(%r{\s}).first == "content"
       end
       if replacement_position
         parent_tokens[replacement_position] = tokens
@@ -74,28 +73,29 @@ class Comfy::Cms::Layout < ActiveRecord::Base
       end
     end
 
-    return tokens
+    tokens
   end
 
   def cache_buster
     updated_at.to_i
   end
 
+  # Forcing page content reload
+  def clear_page_content_cache
+    Comfy::Cms::Page.where(id: pages.pluck(:id)).update_all(content_cache: nil)
+    children.each(&:clear_page_content_cache)
+  end
+
 protected
 
   def assign_label
-    self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
+    self.label = label.blank? ? identifier.try(:titleize) : label
   end
 
   def assign_position
-    return if self.position.to_i > 0
-    max = self.site.layouts.where(parent_id: self.parent_id).maximum(:position)
+    return if position.to_i > 0
+    max = site.layouts.where(parent_id: parent_id).maximum(:position)
     self.position = max ? max + 1 : 0
   end
 
-  # Forcing page content reload
-  def clear_page_content_cache
-    Comfy::Cms::Page.where(id: self.pages.pluck(:id)).update_all(content_cache: nil)
-    self.children.each{ |child_layout| child_layout.clear_page_content_cache }
-  end
 end

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

@@ -1,5 +1,6 @@
 class Comfy::Cms::Page < ActiveRecord::Base
-  self.table_name = 'comfy_cms_pages'
+
+  self.table_name = "comfy_cms_pages"
 
   include Comfy::Cms::WithFragments
   include Comfy::Cms::WithCategories
@@ -10,7 +11,7 @@ class Comfy::Cms::Page < ActiveRecord::Base
   # -- Relationships -----------------------------------------------------------
   belongs_to :site
   belongs_to :target_page,
-    class_name: 'Comfy::Cms::Page',
+    class_name: "Comfy::Cms::Page",
     optional:   true
 
   has_many :translations,
@@ -30,9 +31,9 @@ class Comfy::Cms::Page < ActiveRecord::Base
     presence:   true
   validates :slug,
     presence:   true,
-    uniqueness: {scope: :parent_id},
-    unless:     -> (p) {
-      p.site && (p.site.pages.count == 0 || p.site.pages.root == self)
+    uniqueness: { scope: :parent_id },
+    unless:     ->(p) {
+      p.site && (p.site.pages.count.zero? || p.site.pages.root == self)
     }
   validate :validate_target_page
   validate :validate_format_of_unescaped_slug
@@ -42,37 +43,51 @@ class Comfy::Cms::Page < ActiveRecord::Base
 
   # -- Class Methods -----------------------------------------------------------
   # Tree-like structure for pages
-  def self.options_for_select(site, page = nil, current_page = nil, depth = 0, exclude_self = true, spacer = '. . ')
+  def self.options_for_select(site:, page: nil, current_page: nil, depth: 0, exclude_self: true, spacer: ". . ")
     return [] if (current_page ||= site.pages.root) == page && exclude_self || !current_page
     out = []
-    out << [ "#{spacer*depth}#{current_page.label}", current_page.id ] unless current_page == page
-    current_page.children.each do |child|
-      out += options_for_select(site, page, child, depth + 1, exclude_self, spacer)
-    end if current_page.children_count.nonzero?
-    return out.compact
+
+    unless current_page == page
+      out << ["#{spacer * depth}#{current_page.label}", current_page.id]
+    end
+
+    if current_page.children_count.nonzero?
+      current_page.children.each do |child|
+        out += options_for_select(
+          site:         site,
+          page:         page,
+          current_page: child,
+          depth:        depth + 1,
+          exclude_self: exclude_self,
+          spacer:       spacer
+        )
+      end
+    end
+
+    out.compact
   end
 
   # -- Instance Methods --------------------------------------------------------
   # For previewing purposes sometimes we need to have full_path set. This
   # full path take care of the pages and its childs but not of the site path
   def full_path
-    self.read_attribute(:full_path) || self.assign_full_path
+    read_attribute(:full_path) || assign_full_path
   end
 
   # Somewhat unique method of identifying a page that is not a full_path
   def identifier
-    self.parent_id.blank?? 'index' : self.full_path[1..-1].parameterize
+    parent_id.blank? ? "index" : full_path[1..-1].parameterize
   end
 
   # Full url for a page
   def url(relative: false)
-    [self.site.url(relative: relative), self.full_path].compact.join
+    [site.url(relative: relative), full_path].compact.join
   end
 
   # This method will mutate page object by transfering attributes from translation
   # for a given locale.
   def translate!(locale)
-    translation = self.translations.published.find_by!(locale: locale)
+    translation = translations.published.find_by!(locale: locale)
     self.layout        = translation.layout
     self.label         = translation.label
     self.content_cache = translation.content_cache
@@ -81,54 +96,57 @@ class Comfy::Cms::Page < ActiveRecord::Base
     # This has odd side-effect of preserving page's fragments and just replacing
     # them from the translation. Not an issue if all fragments match.
     self.fragments_attributes = translation.fragments_attributes
-    self.readonly!
+    readonly!
 
-    return self
+    self
   end
 
 protected
 
   def assigns_label
-    self.label = self.label.blank?? self.slug.try(:titleize) : self.label
+    self.label = label.blank? ? slug.try(:titleize) : label
   end
 
   def assign_parent
     return unless site
-    self.parent ||= site.pages.root unless self == site.pages.root || site.pages.count == 0
+    self.parent ||= site.pages.root unless self == site.pages.root || site.pages.count.zero?
   end
 
   def assign_full_path
-    self.full_path = self.parent ?
-      [CGI::escape(self.parent.full_path).gsub('%2F', '/'), self.slug].join('/').squeeze('/') :
-      '/'
+    self.full_path =
+      if self.parent
+        [CGI.escape(self.parent.full_path).gsub("%2F", "/"), slug].join("/").squeeze("/")
+      else
+        "/"
+      end
   end
 
   def assign_position
     return unless self.parent
-    return if self.position.to_i > 0
+    return if position.to_i > 0
     max = self.parent.children.maximum(:position)
     self.position = max ? max + 1 : 0
   end
 
   def validate_target_page
-    return unless self.target_page
+    return unless target_page
     p = self
-    while p.target_page do
+    while p.target_page
       if (p = p.target_page) == self
-        return self.errors.add(:target_page_id, 'Invalid Redirect')
+        return errors.add(:target_page_id, "Invalid Redirect")
       end
     end
   end
 
   def validate_format_of_unescaped_slug
     return unless slug.present?
-    unescaped_slug = CGI::unescape(self.slug)
-    errors.add(:slug, :invalid) unless unescaped_slug =~ /^\p{Alnum}[\.\p{Alnum}\p{Mark}_-]*$/i
+    unescaped_slug = CGI.unescape(slug)
+    errors.add(:slug, :invalid) unless unescaped_slug =~ %r{^\p{Alnum}[\.\p{Alnum}\p{Mark}_-]*$}i
   end
 
   # Forcing re-saves for child pages so they can update full_paths
   def sync_child_full_paths!
-    return unless self.full_path_previously_changed?
+    return unless full_path_previously_changed?
     children.each do |p|
       p.update_attribute(:full_path, p.send(:assign_full_path))
     end
@@ -136,12 +154,13 @@ protected
 
   # Escape slug unless it's nonexistent (root)
   def escape_slug
-    self.slug = CGI::escape(self.slug) unless self.slug.nil?
+    self.slug = CGI.escape(slug) unless slug.nil?
   end
 
   # Unescape the slug and full path back into their original forms unless they're nonexistent
   def unescape_slug_and_path
-    self.slug       = CGI::unescape(self.slug)      unless self.slug.nil?
-    self.full_path  = CGI::unescape(self.full_path) unless self.full_path.nil?
+    self.slug       = CGI.unescape(slug)      unless slug.nil?
+    self.full_path  = CGI.unescape(full_path) unless full_path.nil?
   end
+
 end

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

@@ -1,5 +1,6 @@
 class Comfy::Cms::Revision < ActiveRecord::Base
-  self.table_name = 'comfy_cms_revisions'
+
+  self.table_name = "comfy_cms_revisions"
 
   serialize :data
 

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

@@ -1,5 +1,6 @@
 class Comfy::Cms::Site < ActiveRecord::Base
-  self.table_name = 'comfy_cms_sites'
+
+  self.table_name = "comfy_cms_sites"
 
   # -- Relationships -----------------------------------------------------------
   with_options dependent: :destroy do |site|
@@ -20,13 +21,13 @@ class Comfy::Cms::Site < ActiveRecord::Base
   validates :identifier,
     presence:   true,
     uniqueness: true,
-    format:     {with: /\A\w[a-z0-9_-]*\z/i}
+    format:     { with: %r{\A\w[a-z0-9_-]*\z}i }
   validates :label,
     presence:   true
   validates :hostname,
     presence:   true,
-    uniqueness: {scope: :path},
-    format:     {with: /\A[\w\.\-]+(?:\:\d+)?\z/}
+    uniqueness: { scope: :path },
+    format:     { with: %r{\A[\w.-]+(?:\:\d+)?\z} }
 
   # -- Class Methods -----------------------------------------------------------
   # returning the Comfy::Cms::Site instance based on host and path
@@ -34,56 +35,56 @@ class Comfy::Cms::Site < ActiveRecord::Base
     return Comfy::Cms::Site.first if Comfy::Cms::Site.count == 1
     cms_site = nil
 
-
     public_cms_path = ComfortableMexicanSofa.configuration.public_cms_path
-    path.gsub!(/\A#{public_cms_path}/, '') unless path.nil? || public_cms_path == '/'
+    path.gsub!(%r{\A#{public_cms_path}}, "") unless path.nil? || public_cms_path == "/"
 
     Comfy::Cms::Site.where(hostname: real_host_from_aliases(host)).each do |site|
       if site.path.blank?
         cms_site = site
-      elsif "#{path.to_s.split('?')[0]}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
+      elsif "#{path.to_s.split('?')[0]}/" =~ %r{^/#{Regexp.escape(site.path.to_s)}/}
         cms_site = site
         break
       end
     end
-    return cms_site
+    cms_site
+  end
+
+  def self.real_host_from_aliases(host)
+    if (aliases = ComfortableMexicanSofa.config.hostname_aliases)
+      aliases.each do |alias_host, hosts|
+        return alias_host if hosts.include?(host)
+      end
+    end
+    host
   end
 
   # -- Instance Methods --------------------------------------------------------
   def url(relative: false)
-    public_cms_path = ComfortableMexicanSofa.config.public_cms_path || '/'
-    host = "//#{self.hostname}"
-    path = ['/', public_cms_path, self.path].compact.join('/').squeeze('/').chomp('/')
+    public_cms_path = ComfortableMexicanSofa.config.public_cms_path || "/"
+    host = "//#{hostname}"
+    path = ["/", public_cms_path, self.path].compact.join("/").squeeze("/").chomp("/")
     relative ? path.presence : [host, path].join
   end
 
 protected
 
-  def self.real_host_from_aliases(host)
-    if aliases = ComfortableMexicanSofa.config.hostname_aliases
-      aliases.each do |alias_host, aliases|
-        return alias_host if aliases.include?(host)
-      end
-    end
-    host
-  end
-
   def assign_identifier
-    self.identifier = self.identifier.blank?? self.hostname.try(:parameterize) : self.identifier
+    self.identifier = identifier.blank? ? hostname.try(:parameterize) : identifier
   end
 
   def assign_hostname
-    self.hostname ||= self.identifier
+    self.hostname ||= identifier
   end
 
   def assign_label
-    self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
+    self.label = label.blank? ? identifier.try(:titleize) : label
   end
 
   def clean_path
-    self.path ||= ''
-    self.path.squeeze!('/')
-    self.path.gsub!(/\/$/, '')
+    self.path ||= ""
+    self.path.squeeze!("/")
+    self.path.gsub!(%r{/$}, "")
     self.path = nil if self.path.blank?
   end
+
 end

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

@@ -1,5 +1,6 @@
 class Comfy::Cms::Snippet < ActiveRecord::Base
-  self.table_name = 'comfy_cms_snippets'
+
+  self.table_name = "comfy_cms_snippets"
 
   include Comfy::Cms::WithCategories
 
@@ -19,13 +20,13 @@ class Comfy::Cms::Snippet < ActiveRecord::Base
     presence:   true
   validates :identifier,
     presence:   true,
-    uniqueness: {scope: :site_id},
-    format:     {with: /\A\w[a-z0-9_-]*\z/i}
+    uniqueness: { scope: :site_id },
+    format:     { with: %r{\A\w[a-z0-9_-]*\z}i }
 
 protected
 
   def assign_label
-    self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
+    self.label = label.blank? ? identifier.try(:titleize) : label
   end
 
   # When snippet is changed or removed we need to blow away all page caches as
@@ -35,7 +36,8 @@ protected
   end
 
   def assign_position
-    max = self.site.snippets.maximum(:position)
+    max = site.snippets.maximum(:position)
     self.position = max ? max + 1 : 0
   end
+
 end

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

@@ -1,4 +1,5 @@
 class Comfy::Cms::Translation < ActiveRecord::Base
+
   self.table_name = "comfy_cms_translations"
 
   include Comfy::Cms::WithFragments
@@ -20,18 +21,19 @@ class Comfy::Cms::Translation < ActiveRecord::Base
 
   validates :locale,
     presence:   true,
-    uniqueness: {scope: :page_id}
+    uniqueness: { scope: :page_id }
 
   validate :validate_locale
 
 private
 
   def validate_locale
-    return unless self.page
-    errors.add(:locale) if self.locale == self.page.site.locale
+    return unless page
+    errors.add(:locale) if locale == page.site.locale
   end
 
   def assign_layout
-    self.layout ||= self.page.layout if self.page.present?
+    self.layout ||= page.layout if page.present?
   end
+
 end

data/app/models/concerns/comfy/cms/with_categories.rb

@@ -1,4 +1,5 @@
 module Comfy::Cms::WithCategories
+
   extend ActiveSupport::Concern
 
   included do
@@ -14,25 +15,26 @@ module Comfy::Cms::WithCategories
 
     after_save :sync_categories
 
-    scope :for_category, -> (*categories) {
+    scope :for_category, ->(*categories) {
       if (categories = [categories].flatten.compact).present?
-        self.distinct.
-          joins(categorizations: :category).
-          where("comfy_cms_categories.label" => categories)
+        distinct
+          .joins(categorizations: :category)
+          .where("comfy_cms_categories.label" => categories)
       end
     }
   end
 
   def sync_categories
-    (self.category_ids || {}).each do |category_id, flag|
+    (category_ids || {}).each do |category_id, flag|
       case flag.to_i
       when 1
-        if category = Comfy::Cms::Category.find_by_id(category_id)
+        if (category = Comfy::Cms::Category.find_by_id(category_id))
           category.categorizations.create(categorized: self)
         end
       when 0
-        self.categorizations.where(category_id: category_id).destroy_all
+        categorizations.where(category_id: category_id).destroy_all
       end
     end
   end
+
 end

data/app/models/concerns/comfy/cms/with_fragments.rb

@@ -1,14 +1,15 @@
 module Comfy::Cms::WithFragments
+
   extend ActiveSupport::Concern
 
   included do
     attr_accessor :fragments_attributes_changed
 
     belongs_to :layout,
-      class_name: 'Comfy::Cms::Layout'
+      class_name: "Comfy::Cms::Layout"
 
     has_many :fragments,
-      class_name: 'Comfy::Cms::Fragment',
+      class_name: "Comfy::Cms::Fragment",
       as:         :record,
       autosave:   true,
       dependent:  :destroy
@@ -40,8 +41,8 @@ module Comfy::Cms::WithFragments
       identifier = frag_attrs.delete(:identifier)
 
       fragment =
-        self.fragments.detect{|f| f.identifier == identifier} ||
-        self.fragments.build(identifier: identifier)
+        fragments.detect { |f| f.identifier == identifier } ||
+        fragments.build(identifier: identifier)
 
       fragment.attributes = frag_attrs
 
@@ -52,9 +53,9 @@ module Comfy::Cms::WithFragments
 
   # Snapshop of page fragments data used primarily for saving revisions
   def fragments_attributes(was = false)
-    self.fragments.collect do |frag|
+    fragments.collect do |frag|
       attrs = {}
-      %i(identifier tag content datetime boolean).each do |column|
+      %i[identifier tag content datetime boolean].each do |column|
         attrs[column] = frag.send(was ? "#{column}_was" : column)
       end
       # TODO: save files against revision (not on db though)
@@ -75,8 +76,8 @@ module Comfy::Cms::WithFragments
   # duplicate tags on the layout. That's wierd (but still works).
   def fragment_nodes
     nodes
-      .select{|n| n.is_a?(ComfortableMexicanSofa::Content::Tag::Fragment)}
-      .uniq{|n| n.identifier}
+      .select { |n| n.is_a?(ComfortableMexicanSofa::Content::Tag::Fragment) }
+      .uniq(&:identifier)
   end
 
   # Rendered content of the page. We grab whatever layout is associated with the
@@ -90,15 +91,15 @@ module Comfy::Cms::WithFragments
   # page.
   def content_cache
     if (cache = read_attribute(:content_cache)).nil?
-      cache = self.render
-      update_column(:content_cache, cache) unless self.new_record?
+      cache = render
+      update_column(:content_cache, cache) unless new_record?
     end
     cache
   end
 
   # Nuking content cache so it can be regenerated.
   def clear_content_cache!
-    self.update_column(:content_cache, nil)
+    update_column(:content_cache, nil)
   end
 
   # Blanking cache on page saves so it can be regenerated on access
@@ -113,9 +114,10 @@ protected
   end
 
   def nodes
-    return [] unless self.layout.present?
+    return [] unless layout.present?
 
-    tokens = self.layout.content_tokens
+    tokens = layout.content_tokens
     renderer.nodes(tokens)
   end
+
 end

data/app/views/comfy/admin/cms/categories/_categories.html.haml

@@ -1,4 +1,4 @@
 - object ||= categories
 - object.categories.each do |category|
-  .btn.btn-sm.btn-light
+  %span.badge.badge-primary.mr-1.mb-1
     = category.label

data/app/views/comfy/admin/cms/files/_file.html.haml

@@ -1,6 +1,6 @@
 %li{id: dom_id(file)}
   .row
-    .col-md-7.item
+    .col-md-5.item
       .item-controls.d-none.d-lg-block
         - if !params[:categories].present? && @site.files.count > 1
           .dragger
@@ -19,8 +19,8 @@
           .file-size
             = number_to_human_size(file.attachment.byte_size)
 
-      .item-categories.d-flex.align-items-center.ml-auto
-        = render partial: "comfy/admin/cms/categories/categories", object: file
+    .col-md-2.item-categories.d-flex.align-items-center
+      = render partial: "comfy/admin/cms/categories/categories", object: file
 
     .col-md-2.d-flex.align-items-center
       - file_tag = "{{cms:file_link #{file.id} }}"

data/app/views/comfy/admin/cms/files/_modal.html.haml

@@ -1,4 +1,4 @@
-.modal.fade.cms-files-modal{'aria-hidden' => 'true', 'data-iframe-src' => comfy_admin_cms_site_files_path(@site), :role => 'dialog', :tabindex => "-1"}
+.modal.fade.cms-files-modal{'aria-hidden' => 'true', 'data-iframe-src' => comfy_admin_cms_site_files_path(@site), role: 'dialog', tabindex: "-1"}
   .modal-dialog.modal-lg
     .modal-content
-      %iframe{:src => ''}
+      %iframe{src: ''}

data/app/views/comfy/admin/cms/layouts/_index_branch.html.haml

@@ -4,7 +4,7 @@
 %li{id: dom_id(layout)}
   .row
     .col-md-8.item
-      .item-controls.d-none.d-lg-block
+      .item-controls.d-none.d-md-block
         - if has_siblings
           .dragger
             = fa_icon("bars")
@@ -22,5 +22,5 @@
         = link_to t('.delete'), comfy_admin_cms_site_layout_path(@site, layout), method: :delete, data: {confirm: t('.are_you_sure')}, class: "btn btn-danger"
 
   - if layout.children.present?
-    %ul.list.children.sortable
+    %ul.list.children.sortable.pl-md-3
       = render partial: "index_branch", collection: layout.children.order(:position)