occams 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dcda75b6239c3fb7e71b35c45c3b5674373bd96d9c14457776af68ff8b1a391
-  data.tar.gz: 003f1604af55a848c28214b6fcccbb2863ec797adad4515580d933ddb9078c79
+  metadata.gz: 2f36d04aa7fd573bb40f6a209c41b7bd49386f3124355425551b984e01e439e9
+  data.tar.gz: a45311a36a5eb674f2b0bbb30eecf702db38d7828debd69277b62a8d8af9e08a
 SHA512:
-  metadata.gz: 6a7f7f9b4317cefb3961cd916b75f4df6bd8247686f80224926bc5cde93f255e840b567cf506e03112c069e755ffa9810840eff605905fe39ec65471a9c17658
-  data.tar.gz: 68ed2b0e79500d11ac2c940f4b89c33a894a388b26eec05cfec13d6c28198bc61ec945ad49367df83546d7d40e0b36dab379e6dd4fa6bfca7f206b35424ce964
+  metadata.gz: 38fa2734074d1b7415f4a3f00bb6e471a8da1294cf57aead091f5754d020e9f5cd1945eef342b6a1545eb7ee4a3a8d1c8253e9176920bb147c40e236ab581b17
+  data.tar.gz: 958e68e0579f56d27709f35b012c197c835a3ab7b14a3b220ff14d4c0c85afdac6787499d3e9b1574cc77af9382c2c245822d29734a1aeedf44978db06c0a087

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/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 
+## 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/README.md

@@ -92,7 +92,6 @@ Once you have a layout, you may start creating pages and populating content. It'
 ## 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 
 

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
@@ -18,5 +17,4 @@ class Occams::Admin::BaseController < Occams.config.admin_base_controller.to_s.c
   before_action :authenticate
 
   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
@@ -29,12 +29,12 @@ protected
     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)
+      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
 
@@ -51,5 +51,4 @@ protected
   def infer_layout
     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
 
@@ -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
 
@@ -79,7 +78,6 @@ class Occams::Admin::Cms::FilesController < Occams::Admin::Cms::BaseController
       flash[:success] = I18n.t("occams.admin.cms.files.created")
       redirect_to action: :edit, id: @file
     end
-
   rescue ActiveRecord::RecordInvalid
     case params[:source]
     when "plupload"
@@ -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
 
@@ -65,5 +65,4 @@ protected
   def layout_params
     params.fetch(:layout, {}).permit!
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::PagesController < Occams::Admin::Cms::BaseController
-
   include ::Occams::ReorderAction
   self.reorder_action_resource = ::Occams::Cms::Page
 
@@ -65,9 +64,9 @@ 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",
-      locals:   { record: @page, scope: :page },
-      layout:   false
+      partial: "occams/admin/cms/fragments/form_fragments",
+      locals: { record: @page, scope: :page },
+      layout: false
     )
   end
 
@@ -86,6 +85,7 @@ protected
   def index_for_redactor
     tree_walker = ->(page, list, offset) do
       return unless page.present?
+
       label = "#{'. . ' * offset}#{page.label}"
       list << { name: label, url: page.url(relative: true) }
       page.children.each do |child_page|
@@ -152,5 +152,4 @@ protected
   def page_params
     params.fetch(:page, {}).permit!
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::Revisions::BaseController < Occams::Admin::Cms::BaseController
-
   helper_method :record_path
 
   before_action :load_record
@@ -46,5 +45,4 @@ protected
   def record_path
     raise "no implemented"
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::Revisions::LayoutController < Occams::Admin::Cms::Revisions::BaseController
-
 private
 
   def load_record
@@ -14,5 +13,4 @@ private
   def record_path
     edit_occams_admin_cms_site_layout_path(@site, @record)
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::Revisions::PageController < Occams::Admin::Cms::Revisions::BaseController
-
   def show
     @current_content = @record.fragments.each_with_object({}) do |b, c|
       c[b.identifier] = b.content
@@ -26,5 +25,4 @@ private
   def record_path
     edit_occams_admin_cms_site_page_path(@site, @record)
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::Revisions::SnippetController < Occams::Admin::Cms::Revisions::BaseController
-
 private
 
   def load_record
@@ -14,5 +13,4 @@ private
   def record_path
     edit_occams_admin_cms_site_snippet_path(@site, @record)
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::Revisions::TranslationController < Occams::Admin::Cms::Revisions::BaseController
-
   def show
     @current_content = @record.fragments.each_with_object({}) do |b, c|
       c[b.identifier] = b.content
@@ -27,5 +26,4 @@ private
   def record_path
     edit_occams_admin_cms_site_page_translation_path(@site, @page, @record)
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::SitesController < Occams::Admin::Cms::BaseController
-
   skip_before_action  :load_admin_site,
                       :load_seeds
 
@@ -11,6 +10,7 @@ class Occams::Admin::Cms::SitesController < Occams::Admin::Cms::BaseController
 
   def index
     return redirect_to action: :new if ::Occams::Cms::Site.count.zero?
+
     @site   = ::Occams::Cms::Site.find_by_id(session[:site_id])
     @sites  = ::Occams::Cms::Site.all
   end
@@ -65,5 +65,4 @@ protected
   def site_params
     params.fetch(:site, {}).permit!
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::SnippetsController < Occams::Admin::Cms::BaseController
-
   include ::Occams::ReorderAction
   self.reorder_action_resource = ::Occams::Cms::Snippet
 
@@ -11,6 +10,7 @@ class Occams::Admin::Cms::SnippetsController < Occams::Admin::Cms::BaseControlle
 
   def index
     return redirect_to action: :new if @site.snippets.count.zero?
+
     @snippets = @site.snippets.includes(:categories).for_category(params[:categories]).order(:position)
   end
 
@@ -62,5 +62,4 @@ protected
   def snippet_params
     params.fetch(:snippet, {}).permit!
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Admin::Cms::TranslationsController < Occams::Admin::Cms::BaseController
-
   helper_method :translation_select_options
 
   before_action :load_page
@@ -47,9 +46,9 @@ class Occams::Admin::Cms::TranslationsController < Occams::Admin::Cms::BaseContr
     @translation.layout = @site.layouts.find_by(id: params[:layout_id])
 
     render(
-      partial:  "occams/admin/cms/fragments/form_fragments",
-      locals:   { record: @translation, scope: :translation },
-      layout:   false
+      partial: "occams/admin/cms/fragments/form_fragments",
+      locals: { record: @translation, scope: :translation },
+      layout: false
     )
   end
 
@@ -103,5 +102,4 @@ private
       render inline: @translation.render, layout: layout, content_type: "text/html"
     end
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::AssetsController < Occams::Cms::BaseController
-
   skip_before_action :verify_authenticity_token, raise: false
 
   before_action :load_cms_layout,
@@ -36,5 +35,4 @@ protected
       response.headers["Cache-Control"] = "public, max-age=#{1.year.to_i}"
     end
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::BaseController < Occams.config.public_base_controller.to_s.constantize
-
   before_action :load_cms_site
 
   helper Occams::CmsHelper
@@ -29,5 +28,4 @@ protected
       raise ActionController::RoutingError, "Site Not Found"
     end
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::ContentController < Occams::Cms::BaseController
-
   # Authentication module must have `authenticate` method
   include Occams.config.public_auth.to_s.constantize
 
@@ -35,9 +34,9 @@ class Occams::Cms::ContentController < Occams::Cms::BaseController
 protected
 
   def render_page(status = :ok)
-    render  inline:       @cms_page.content_cache,
-            layout:       app_layout,
-            status:       status,
+    render  inline: @cms_page.content_cache,
+            layout: app_layout,
+            status: status,
             content_type: mime_type
   end
 
@@ -49,11 +48,13 @@ protected
 
   def app_layout
     return false if request.xhr? || !@cms_layout
+
     @cms_layout.app_layout.present? ? @cms_layout.app_layout : false
   end
 
   def load_seeds
     return unless Occams.config.enable_seeds
+
     Occams::Seeds::Importer.new(@cms_site.identifier).import!
   end
 
@@ -79,9 +80,7 @@ protected
     @cms_layout = @cms_page.layout
 
     @cms_page
-
   rescue ActiveRecord::RecordNotFound
     nil
   end
-
 end

data/app/helpers/occams/admin/cms_helper.rb

@@ -3,7 +3,6 @@
 module Occams
   module Admin
     module CmsHelper
-
       # Wrapper around Occams::FormBuilder
       def occams_form_with(**options, &block)
         form_options = options.merge(builder: Occams::FormBuilder)
@@ -43,7 +42,6 @@ module Occams
         as = ", as: image" if file.attachment.image?
         "{{ cms:file_link #{file.id}#{as} }}"
       end
-
     end
   end
 end

data/app/helpers/occams/cms_helper.rb

@@ -2,7 +2,6 @@
 
 module Occams
   module CmsHelper
-
     # Raw content of a page fragment. This is how you get content from unrenderable
     # tags like {{cms:fragment meta, render: false}}
     # Example:
@@ -11,6 +10,7 @@ module Occams
     def cms_fragment_content(identifier, page = @cms_page)
       frag = page&.fragments&.detect { |f| f.identifier == identifier.to_s }
       return "" unless frag
+
       case frag.tag
       when "date", "datetime"
         frag.datetime
@@ -29,6 +29,7 @@ module Occams
     def cms_fragment_render(identifier, page = @cms_page)
       node = page.fragment_nodes.detect { |n| n.identifier == identifier.to_s }
       return "" unless node
+
       node.renderable = true
       render inline: page.render([node])
     end
@@ -40,6 +41,7 @@ module Occams
       cms_site ||= cms_site_detect
       snippet = cms_site&.snippets&.find_by_identifier(identifier)
       return "" unless snippet
+
       snippet.content
     end
 
@@ -49,6 +51,7 @@ module Occams
       cms_site ||= cms_site_detect
       snippet = cms_site&.snippets&.find_by_identifier(identifier)
       return "" unless snippet
+
       r = Occams::Content::Renderer.new(snippet)
       render inline: r.render(r.nodes(r.tokenize(snippet.content)))
     end
@@ -62,12 +65,12 @@ module Occams
     # Wrapper to deal with Kaminari vs WillPaginate
     def occams_paginate(collection)
       return unless collection
+
       if defined?(WillPaginate)
         will_paginate collection
       elsif defined?(Kaminari)
         paginate collection, theme: "occams"
       end
     end
-
   end
 end

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

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
 module Occams::Cms::WithCategories
-
   extend ActiveSupport::Concern
 
   included do
     has_many :categorizations,
-      as:         :categorized,
-      class_name: "Occams::Cms::Categorization",
-      dependent:  :destroy
+             as: :categorized,
+             class_name: "Occams::Cms::Categorization",
+             dependent: :destroy
     has_many :categories,
-      through:    :categorizations,
-      class_name: "Occams::Cms::Category"
+             through: :categorizations,
+             class_name: "Occams::Cms::Category"
 
     attr_writer :category_ids
 
@@ -49,5 +48,4 @@ module Occams::Cms::WithCategories
     ids_to_remove = existing_ids - ids_to_add
     categorizations.where(category_id: ids_to_remove).destroy_all
   end
-
 end

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

@@ -1,25 +1,24 @@
 # frozen_string_literal: true
 
 module Occams::Cms::WithFragments
-
   extend ActiveSupport::Concern
 
   included do
     attr_accessor :fragments_attributes_changed
 
     belongs_to :layout,
-      class_name: "Occams::Cms::Layout"
+               class_name: "Occams::Cms::Layout"
 
     has_many :fragments,
-      class_name: "Occams::Cms::Fragment",
-      as:         :record,
-      autosave:   true,
-      dependent:  :destroy
+             class_name: "Occams::Cms::Fragment",
+             as: :record,
+             autosave: true,
+             dependent: :destroy
 
     before_save :clear_content_cache
 
     validates :layout,
-      presence: true
+              presence: true
   end
 
   # Array of fragment hashes in the following format:
@@ -54,7 +53,7 @@ module Occams::Cms::WithFragments
   end
 
   # Snapshop of page fragments data used primarily for saving revisions
-  def fragments_attributes(was = false)
+  def fragments_attributes(was: false)
     fragments.collect do |frag|
       attrs = {}
       %i[identifier tag content datetime boolean].each do |column|
@@ -121,5 +120,4 @@ protected
     tokens = layout.content_tokens
     renderer.nodes(tokens)
   end
-
 end

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

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Categorization < ActiveRecord::Base
-
   self.table_name = "occams_cms_categorizations"
 
   # -- Relationships -----------------------------------------------------------
   belongs_to :category
   belongs_to :categorized,
-    polymorphic: true
+             polymorphic: true
 
   # -- Validations -------------------------------------------------------------
   validates :category_id,
-    uniqueness: { scope: %i[categorized_type categorized_id] }
-
+            uniqueness: { scope: %i[categorized_type categorized_id] }
 end

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

@@ -1,24 +1,22 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Category < ActiveRecord::Base
-
   self.table_name = "occams_cms_categories"
 
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   has_many :categorizations,
-    dependent: :destroy
+           dependent: :destroy
 
   # -- Validations ----------------------------------------------------------
   validates :label,
-    presence:   true,
-    uniqueness: { scope: %i[categorized_type site_id] }
+            presence: true,
+            uniqueness: { scope: %i[categorized_type site_id] }
   validates :categorized_type,
-    presence:   true
+            presence:   true
 
   # -- Scopes ---------------------------------------------------------------
   scope :of_type, ->(type) {
     where(categorized_type: type)
   }
-
 end