occams 1.0.1 → 1.0.2

data/lib/occams/content/tags/file_link.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./mixins/file_content"
+require_relative 'mixins/file_content'
 
 # This is how you link previously uploaded file to anywhere. Good example may be
 # a header image you want to use on the layout level.
@@ -30,13 +30,13 @@ class Occams::Content::Tag::FileLink < Occams::Content::Tag
 
     options = params.extract_options!
     @identifier     = params[0]
-    @as             = options["as"] || "url"
-    @class          = options["class"]
-    @variant_attrs  = options.slice("resize", "gravity", "crop")
+    @as             = options['as'] || 'url'
+    @class          = options['class']
+    @variant_attrs  = options.slice('resize', 'gravity', 'crop')
 
-    unless @identifier.present?
-      raise Error, "Missing identifier for file link tag"
-    end
+    return if @identifier.present?
+
+    raise Error, 'Missing identifier for file link tag'
   end
 
   # @return [Occams::Cms::File]
@@ -51,7 +51,7 @@ class Occams::Content::Tag::FileLink < Occams::Content::Tag
 
   # @return [String]
   def label
-    return "" if file_record.nil?
+    return '' if file_record.nil?
 
     file_record.label.presence || file.filename.to_s
   end

data/lib/occams/content/tags/files.rb

@@ -7,21 +7,21 @@
 #
 class Occams::Content::Tag::Files < Occams::Content::Tag::File
   def content
-    return "" if fragment.attachments.blank?
+    return '' if fragment.attachments.blank?
 
     fragment.attachments.collect do |attachment|
       super(file: attachment, label: attachment.filename)
-    end.join(" ")
+    end.join(' ')
   end
 
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][files][]"
-    input   = view.send(:file_field_tag, name, id: form_field_id, multiple: true, class: "form-control")
+    input   = view.send(:file_field_tag, name, id: form_field_id, multiple: true, class: 'form-control')
 
     attachments_partial =
       if fragment.attachments
         view.render(
-          partial: "occams/admin/cms/fragments/form_fragment_attachments",
+          partial: 'occams/admin/cms/fragments/form_fragment_attachments',
           locals: {
             object_name: object_name,
             index: index,
@@ -32,7 +32,7 @@ class Occams::Content::Tag::Files < Occams::Content::Tag::File
         )
       end
 
-    yield view.safe_join([input, attachments_partial], "")
+    yield view.safe_join([input, attachments_partial], '')
   end
 end
 

data/lib/occams/content/tags/fragment.rb

@@ -25,8 +25,8 @@ class Occams::Content::Tag::Fragment < Occams::Content::Tag
       raise Error, "Missing identifier for fragment tag: #{source}"
     end
 
-    @namespace  = @options["namespace"] || "default"
-    @renderable = @options["render"].to_s.downcase != "false"
+    @namespace  = @options['namespace'] || 'default'
+    @renderable = @options['render'].to_s.downcase != 'false'
   end
 
   # Grabs existing fragment record or spins up a new instance if there's none
@@ -43,7 +43,7 @@ class Occams::Content::Tag::Fragment < Occams::Content::Tag
   # If `render: false` was passed in we won't render anything. Assuming that
   # that fragment content will be rendered manually
   def render
-    renderable ? content : ""
+    renderable ? content : ''
   end
 
   # Tag renders its own form inputs via `form_field(template, index)`
@@ -55,7 +55,7 @@ class Occams::Content::Tag::Fragment < Occams::Content::Tag
   #     end
   #   end
   def form_field
-    raise "Form field rendering not implemented for this Tag"
+    raise 'Form field rendering not implemented for this Tag'
   end
 
   def form_field_id

data/lib/occams/content/tags/helper.rb

@@ -16,9 +16,9 @@ class Occams::Content::Tag::Helper < Occams::Content::Tag
     super
     @method_name = params.shift
 
-    unless @method_name.present?
-      raise Error, "Missing method name for helper tag"
-    end
+    return if @method_name.present?
+
+    raise Error, 'Missing method name for helper tag'
   end
 
   # we output erb into rest of the content
@@ -30,11 +30,11 @@ class Occams::Content::Tag::Helper < Occams::Content::Tag
     helper_params = params.map do |p|
       case p
       when Hash
-        format("%<arg>s", arg: p)
+        format('%<arg>s', arg: p)
       else
-        format("%<arg>p", arg: p)
+        format('%<arg>p', arg: p)
       end
-    end.join(",")
+    end.join(',')
     "<%= #{method_name}(#{helper_params}) %>"
   end
 

data/lib/occams/content/tags/markdown.rb

@@ -5,12 +5,12 @@
 #
 class Occams::Content::Tag::Markdown < Occams::Content::Tag::Fragment
   def render
-    renderable ? Kramdown::Document.new(content.to_s).to_html : ""
+    renderable ? Kramdown::Document.new(content.to_s).to_html : ''
   end
 
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = { id: form_field_id, data: { "cms-cm-mode" => "text/x-markdown" } }
+    options = { id: form_field_id, data: { 'cms-cm-mode' => 'text/x-markdown' } }
     input   = view.send(:text_area_tag, name, content, options)
 
     yield input

data/lib/occams/content/tags/mixins/file_content.rb

@@ -9,7 +9,7 @@ module Occams::Content::Tag::Mixins
     # @param [String] label alt text for `as: "image"`, link text for `as: "link"`
     # @return [String]
     def content(file: self.file, as: self.as, variant_attrs: self.variant_attrs, label: self.label)
-      return "" unless file
+      return '' unless file
 
       url_helpers = Rails.application.routes.url_helpers
 
@@ -22,9 +22,9 @@ module Occams::Content::Tag::Mixins
         end
 
       case as
-      when "link"
+      when 'link'
         "<a href='#{attachment_url}'#{html_class_attribute} target='_blank'>#{label}</a>"
-      when "image"
+      when 'image'
         "<img src='#{attachment_url}'#{html_class_attribute} alt='#{label}'/>"
       else
         attachment_url

data/lib/occams/content/tags/number.rb

@@ -6,7 +6,7 @@
 class Occams::Content::Tag::Number < Occams::Content::Tag::Fragment
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = { id: form_field_id, class: "form-control" }
+    options = { id: form_field_id, class: 'form-control' }
     input   = view.send(:number_field_tag, name, content, options)
 
     yield input

data/lib/occams/content/tags/page_file_link.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./mixins/file_content"
+require_relative 'mixins/file_content'
 
 # This tag allows you to link page-level files from within the page content.
 #
@@ -43,14 +43,14 @@ class Occams::Content::Tag::PageFileLink < Occams::Content::Tag
 
     options = params.extract_options!
     @identifier     = params[0]
-    @as             = options["as"] || "url"
-    @class          = options["class"]
-    @variant_attrs  = options.slice("resize", "gravity", "crop")
-    @filename       = options["filename"]
+    @as             = options['as'] || 'url'
+    @class          = options['class']
+    @variant_attrs  = options.slice('resize', 'gravity', 'crop')
+    @filename       = options['filename']
 
-    unless @identifier.present?
-      raise Error, "Missing identifier for page file link tag"
-    end
+    return if @identifier.present?
+
+    raise Error, 'Missing identifier for page file link tag'
   end
 
   # @return [Occams::Cms::Fragment]

data/lib/occams/content/tags/partial.rb

@@ -14,9 +14,9 @@ class Occams::Content::Tag::Partial < Occams::Content::Tag
     @locals = params.extract_options!
     @path   = params[0]
 
-    unless @path.present?
-      raise Error, "Missing path for partial tag"
-    end
+    return if @path.present?
+
+    raise Error, 'Missing path for partial tag'
   end
 
   # we output erb into rest of the content
@@ -26,7 +26,7 @@ class Occams::Content::Tag::Partial < Occams::Content::Tag
 
   def content
     format(
-      "<%%= render partial: %<path>p, locals: %<locals>s %%>",
+      '<%%= render partial: %<path>p, locals: %<locals>s %%>',
       path: @path,
       locals: @locals
     )
@@ -35,7 +35,7 @@ class Occams::Content::Tag::Partial < Occams::Content::Tag
   def render
     whitelist = Occams.config.allowed_partials
     if whitelist.is_a?(Array)
-      whitelist.member?(@path) ? content : ""
+      whitelist.member?(@path) ? content : ''
     else
       content
     end

data/lib/occams/content/tags/snippet.rb

@@ -11,9 +11,9 @@ class Occams::Content::Tag::Snippet < Occams::Content::Tag
     super
     @identifier = params[0]
 
-    unless @identifier.present?
-      raise Error, "Missing identifier for snippet tag"
-    end
+    return if @identifier.present?
+
+    raise Error, 'Missing identifier for snippet tag'
   end
 
   def content

data/lib/occams/content/tags/template.rb

@@ -13,9 +13,9 @@ class Occams::Content::Tag::Template < Occams::Content::Tag
     super
     @path = params[0]
 
-    unless @path.present?
-      raise Error, "Missing template path for template tag"
-    end
+    return if @path.present?
+
+    raise Error, 'Missing template path for template tag'
   end
 
   # we output erb into rest of the content
@@ -24,13 +24,13 @@ class Occams::Content::Tag::Template < Occams::Content::Tag
   end
 
   def content
-    format("<%%= render template: %<path>p %%>", path: path)
+    format('<%%= render template: %<path>p %%>', path: path)
   end
 
   def render
     whitelist = Occams.config.allowed_templates
     if whitelist.is_a?(Array)
-      whitelist.member?(@path) ? content : ""
+      whitelist.member?(@path) ? content : ''
     else
       content
     end

data/lib/occams/content/tags/text.rb

@@ -6,7 +6,7 @@
 class Occams::Content::Tag::Text < Occams::Content::Tag::Fragment
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = { id: form_field_id, class: "form-control" }
+    options = { id: form_field_id, class: 'form-control' }
     input   = view.send(:text_field_tag, name, content, options)
 
     yield input

data/lib/occams/content/tags/textarea.rb

@@ -6,7 +6,7 @@
 class Occams::Content::Tag::TextArea < Occams::Content::Tag::Fragment
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = { id: form_field_id, data: { "cms-cm-mode" => "text/html" } }
+    options = { id: form_field_id, data: { 'cms-cm-mode' => 'text/html' } }
     input   = view.send(:text_area_tag, name, content, options)
 
     yield input

data/lib/occams/content/tags/wysiwyg.rb

@@ -8,7 +8,7 @@
 class Occams::Content::Tag::Wysiwyg < Occams::Content::Tag::Fragment
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = { id: form_field_id, data: { "cms-rich-text" => true } }
+    options = { id: form_field_id, data: { 'cms-rich-text' => true } }
     input   = view.send(:text_area_tag, name, content, options)
     yield input
   end

data/lib/occams/content.rb

@@ -4,28 +4,28 @@ module Occams::Content
   # ...
 end
 
-require_relative "content/renderer"
-require_relative "content/params_parser"
-require_relative "content/tag"
-require_relative "content/block"
+require_relative 'content/renderer'
+require_relative 'content/params_parser'
+require_relative 'content/tag'
+require_relative 'content/block'
 
-require_relative "content/tags/fragment"
+require_relative 'content/tags/fragment'
 
-require_relative "content/tags/wysiwyg"
-require_relative "content/tags/text"
-require_relative "content/tags/textarea"
-require_relative "content/tags/markdown"
-require_relative "content/tags/datetime"
-require_relative "content/tags/date"
-require_relative "content/tags/number"
-require_relative "content/tags/checkbox"
-require_relative "content/tags/file"
-require_relative "content/tags/files"
+require_relative 'content/tags/wysiwyg'
+require_relative 'content/tags/text'
+require_relative 'content/tags/textarea'
+require_relative 'content/tags/markdown'
+require_relative 'content/tags/datetime'
+require_relative 'content/tags/date'
+require_relative 'content/tags/number'
+require_relative 'content/tags/checkbox'
+require_relative 'content/tags/file'
+require_relative 'content/tags/files'
 
-require_relative "content/tags/snippet"
-require_relative "content/tags/asset"
-require_relative "content/tags/file_link"
-require_relative "content/tags/page_file_link"
-require_relative "content/tags/helper"
-require_relative "content/tags/partial"
-require_relative "content/tags/template"
+require_relative 'content/tags/snippet'
+require_relative 'content/tags/asset'
+require_relative 'content/tags/file_link'
+require_relative 'content/tags/page_file_link'
+require_relative 'content/tags/helper'
+require_relative 'content/tags/partial'
+require_relative 'content/tags/template'

data/lib/occams/engine.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require "occams"
-require "rails"
-require "rails-i18n"
-require "comfy_bootstrap_form"
-require "active_link_to"
-require "kramdown"
-require "jquery-rails"
-require "haml-rails"
-require "sassc-rails"
+require 'occams'
+require 'rails'
+require 'rails-i18n'
+require 'comfy_bootstrap_form'
+require 'active_link_to'
+require 'kramdown'
+require 'jquery-rails'
+require 'haml-rails'
+require 'sassc-rails'
 
 module Occams
   class Engine < ::Rails::Engine
-    initializer "occams.setup_assets" do
+    initializer 'occams.setup_assets' do
       ::Occams::Engine.config.assets.precompile += %w[
         occams/admin/cms/application.js
         occams/admin/cms/application.css

data/lib/occams/extensions/acts_as_tree.rb

@@ -8,7 +8,7 @@ module Occams::ActsAsTree
   module ClassMethods
     def cms_acts_as_tree(options = {})
       configuration = {
-        foreign_key: "parent_id",
+        foreign_key: 'parent_id',
         order: nil,
         counter_cache: nil,
         dependent: :destroy,

data/lib/occams/extensions/has_revisions.rb

@@ -14,7 +14,7 @@ module Occams::HasRevisions
       has_many :revisions,
                as: :record,
                dependent: :destroy,
-               class_name: "Occams::Cms::Revision"
+               class_name: 'Occams::Cms::Revision'
 
       before_save :prepare_revision
       after_save  :create_revision
@@ -31,7 +31,7 @@ module Occams::HasRevisions
       return if new_record?
 
       if (respond_to?(:fragments_attributes_changed) && fragments_attributes_changed) ||
-        !(changed & revision_fields).empty?
+         !(changed & revision_fields).empty?
         self.revision_data = revision_fields.each_with_object({}) do |field, c|
           c[field] = send("#{field}_was")
         end
@@ -51,7 +51,7 @@ module Occams::HasRevisions
 
       # blowing away old revisions
       ids = [0] + revisions.order(created_at: :desc).limit(limit).pluck(:id)
-      revisions.where("id NOT IN (?)", ids).destroy_all
+      revisions.where('id NOT IN (?)', ids).destroy_all
     end
 
     # Assigning whatever is found in revision data and attempting to save the object

data/lib/occams/form_builder.rb

@@ -32,10 +32,10 @@ class Occams::FormBuilder < ComfyBootstrapForm::FormBuilder
   #     = form.submit
   #
   def form_actions(&block)
-    content_tag(:div, class: "form-actions row bg-light") do
-      content_tag(:div, class: "col-lg-8 offset-lg-2") do
-        content_tag(:div, class: "form-group row mb-0") do
-          content_tag(:div, class: "col-sm-10 offset-sm-2", &block)
+    content_tag(:div, class: 'form-actions row bg-light') do
+      content_tag(:div, class: 'col-lg-8 offset-lg-2') do
+        content_tag(:div, class: 'form-group row mb-0') do
+          content_tag(:div, class: 'col-sm-10 offset-sm-2', &block)
         end
       end
     end

data/lib/occams/render_methods.rb

@@ -5,7 +5,7 @@ module Occams::RenderMethods
     # If application controller doesn't have template associated with it
     # CMS will attempt to find one. This is so you don't have to explicitly
     # call render cms_page: '/something'
-    base.rescue_from "ActionView::MissingTemplate" do |e|
+    base.rescue_from 'ActionView::MissingTemplate' do |e|
       render cms_page: request.path
     rescue Occams::MissingPage, Occams::MissingSite
       raise e
@@ -56,7 +56,7 @@ module Occams::RenderMethods
   end
 
   def render_cms_page(path, options = {}, locals = {}, &block)
-    path.gsub!(%r{^/#{@cms_site.path}}, "") if @cms_site.path.present?
+    path.gsub!(%r{^/#{@cms_site.path}}, '') if @cms_site.path.present?
 
     unless (@cms_page = @cms_site.pages.find_by_full_path(path))
       raise Occams::MissingPage, path

data/lib/occams/routes/cms.rb

@@ -6,10 +6,10 @@ class ActionDispatch::Routing::Mapper
 
     scope module: :occams, as: :occams do
       namespace :cms, path: options[:path] do
-        get "cms-css/:site_id/:identifier(/:cache_buster)" => "assets#render_css", as: "render_css"
-        get "cms-js/:site_id/:identifier(/:cache_buster)"  => "assets#render_js",  as: "render_js"
+        get 'cms-css/:site_id/:identifier(/:cache_buster)' => 'assets#render_css', as: 'render_css'
+        get 'cms-js/:site_id/:identifier(/:cache_buster)'  => 'assets#render_js',  as: 'render_js'
 
-        get "(*cms_path)" => "content#show", as: "render_page", action: "/:format"
+        get '(*cms_path)' => 'content#show', as: 'render_page', action: '/:format'
       end
     end
   end

data/lib/occams/routes/cms_admin.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 class ActionDispatch::Routing::Mapper
-  def occams_route_cms_admin(path: "admin")
+  def occams_route_cms_admin(path: 'admin')
     scope module: :occams, as: :occams do
       scope module: :admin do
         namespace :cms, as: :admin_cms, path: path, except: :show do
-          get "/", to: "base#jump"
+          get '/', to: 'base#jump'
 
           concern :with_revisions do |options|
             resources :revisions, options.merge(only: %i[index show]) do
@@ -25,13 +25,13 @@ class ActionDispatch::Routing::Mapper
             resources :pages do
               concerns :with_reorder
               concerns :with_form_fragments
-              concerns :with_revisions, controller: "revisions/page"
+              concerns :with_revisions, controller: 'revisions/page'
 
               get :toggle_branch, on: :member
 
               resources :translations, except: [:index] do
                 concerns :with_form_fragments
-                concerns :with_revisions, controller: "revisions/translation"
+                concerns :with_revisions, controller: 'revisions/translation'
               end
             end
 
@@ -39,12 +39,12 @@ class ActionDispatch::Routing::Mapper
 
             resources :layouts do
               concerns :with_reorder
-              concerns :with_revisions, controller: "revisions/layout"
+              concerns :with_revisions, controller: 'revisions/layout'
             end
 
             resources :snippets do
               concerns :with_reorder
-              concerns :with_revisions, controller: "revisions/snippet"
+              concerns :with_revisions, controller: 'revisions/snippet'
             end
 
             resources :categories

data/lib/occams/routing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative "routes/cms_admin"
-require_relative "routes/cms"
+require_relative 'routes/cms_admin'
+require_relative 'routes/cms'
 
 class ActionDispatch::Routing::Mapper
   def occams_route(identifier, options = {})

data/lib/occams/seeds/file/exporter.rb

@@ -4,7 +4,7 @@ module Occams::Seeds::File
   class Exporter < Occams::Seeds::Exporter
     def initialize(from, to = from)
       super
-      self.path = ::File.join(Occams.config.seeds_path, to, "files/")
+      self.path = ::File.join(Occams.config.seeds_path, to, 'files/')
     end
 
     def export!
@@ -14,19 +14,15 @@ module Occams::Seeds::File
         file_path = File.join(path, file.attachment.filename.to_s)
 
         # writing attributes
-        ::File.open(::File.join(path, "_#{file.attachment.filename}.yml"), "w") do |f|
-          f.write({
-            "label" => file.label,
-            "description" => file.description,
-            "categories" => file.categories.map(&:label)
-          }.to_yaml)
-        end
+        ::File.write(::File.join(path, "_#{file.attachment.filename}.yml"), {
+          'label' => file.label,
+          'description' => file.description,
+          'categories' => file.categories.map(&:label)
+        }.to_yaml)
 
         # writing content
         begin
-          ::File.open(::File.join(path, ::File.basename(file_path)), "wb") do |f|
-            f.write(file.attachment.download)
-          end
+          ::File.binwrite(::File.join(path, ::File.basename(file_path)), file.attachment.download)
         rescue Errno::ENOENT, OpenURI::HTTPError
           message = "[CMS SEEDS] No physical File \t #{file.attachment.filename}"
           Occams.logger.warn(message)

data/lib/occams/seeds/file/importer.rb

@@ -4,7 +4,7 @@ module Occams::Seeds::File
   class Importer < Occams::Seeds::Importer
     def initialize(from, to = from)
       super
-      self.path = ::File.join(Occams.config.seeds_path, from, "files/")
+      self.path = ::File.join(Occams.config.seeds_path, from, 'files/')
     end
 
     def import!
@@ -12,8 +12,8 @@ module Occams::Seeds::File
         filename = ::File.basename(file_path)
 
         file = site.files.with_attached_attachment
-          .where("active_storage_blobs.filename" => filename).references(:blob).first ||
-          site.files.new
+          .where('active_storage_blobs.filename' => filename).references(:blob).first ||
+               site.files.new
 
         # We need to track actual file and its attributes
         fresh_file = false
@@ -22,7 +22,7 @@ module Occams::Seeds::File
           fresh_file = true
 
           attrs = YAML.safe_load(File.read(attrs_path))
-          category_ids = category_names_to_ids(file, attrs.delete("categories"))
+          category_ids = category_names_to_ids(file, attrs.delete('categories'))
           file.attributes = attrs.merge(
             category_ids: category_ids
           )
@@ -53,7 +53,7 @@ module Occams::Seeds::File
       end
 
       # cleaning up
-      site.files.where("id NOT IN (?)", seed_ids).destroy_all
+      site.files.where('id NOT IN (?)', seed_ids).destroy_all
     end
   end
 end