occams 1.0.0 → 1.0.1

data/lib/occams/content/renderer.rb

@@ -15,17 +15,15 @@ require "strscan"
 #                   Resulting list is flattened and joined into a final rendered string.
 #
 class Occams::Content::Renderer
-
   class SyntaxError < StandardError; end
   class Error < StandardError; end
 
   MAX_DEPTH = 100
 
   # tags are in this format: {{ cms:tag_class params }}
-  TAG_REGEX = %r{\{\{\s*?cms:(?<class>\w+)(?<params>.*?)\}\}}
+  TAG_REGEX = %r{\{\{\s*?cms:(?<class>\w+)(?<params>.*?)\}\}}.freeze
 
   class << self
-
     # @return [Hash<String, Class<Occams::Content::Tag>>]
     def tags
       @tags ||= {}
@@ -36,7 +34,6 @@ class Occams::Content::Renderer
     def register_tag(name, klass)
       tags[name.to_s] = klass
     end
-
   end
 
   # @param [Occams::Cms::WithFragments, nil] context
@@ -83,9 +80,9 @@ class Occams::Content::Renderer
       text = string.sub(ss[0], "")
       tokens << text unless text.empty?
       tokens << {
-        tag_class:  ss[:class],
+        tag_class: ss[:class],
         tag_params: ss[:params].strip,
-        source:     ss[0]
+        source: ss[0]
       }
     end
     text = ss.rest
@@ -112,6 +109,7 @@ class Occams::Content::Renderer
           if nodes.count == 1
             raise SyntaxError, "closing unopened block"
           end
+
           nodes.pop
 
         else
@@ -121,9 +119,9 @@ class Occams::Content::Renderer
 
           # @type [Occams::Content::Tag]
           tag = klass.new(
-            context:  @context,
-            params:   Occams::Content::ParamsParser.new(token[:tag_params]).params,
-            source:   token[:source]
+            context: @context,
+            params: Occams::Content::ParamsParser.new(token[:tag_params]).params,
+            source: token[:source]
           )
           nodes.last << tag
 
@@ -145,5 +143,4 @@ class Occams::Content::Renderer
 
     nodes.flatten
   end
-
 end

data/lib/occams/content/tag.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Content::Tag
-
   class Error < StandardError; end
 
   # @type [Occams::Cms::WithFragments]
@@ -46,5 +45,4 @@ class Occams::Content::Tag
   def render
     content
   end
-
 end

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

@@ -8,7 +8,6 @@
 # `as`   - url (default) | tag - output url or wrap it in the appropriate tag
 #
 class Occams::Content::Tag::Asset < Occams::Content::Tag
-
   attr_reader :identifier, :type, :as
 
   def initialize(context:, params: [], source: nil)
@@ -51,7 +50,6 @@ class Occams::Content::Tag::Asset < Occams::Content::Tag
       out
     end
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -4,7 +4,6 @@
 #   {{ cms:checkbox identifier }}
 #
 class Occams::Content::Tag::Checkbox < Occams::Content::Tag::Fragment
-
   def content
     fragment.boolean
   end
@@ -21,7 +20,6 @@ class Occams::Content::Tag::Checkbox < Occams::Content::Tag::Fragment
 
     yield input
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -4,7 +4,6 @@
 #   {{ cms:date identifier }}
 #
 class Occams::Content::Tag::Date < Occams::Content::Tag::Datetime
-
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
     options = { id: form_field_id, class: "form-control", data: { "cms-date" => true } }
@@ -13,7 +12,6 @@ class Occams::Content::Tag::Date < Occams::Content::Tag::Datetime
 
     yield input
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -6,7 +6,6 @@
 # `strftime` - Format datetime string during rendering
 #
 class Occams::Content::Tag::Datetime < Occams::Content::Tag::Fragment
-
   attr_reader :strftime
 
   def initialize(context:, params: [], source: nil)
@@ -36,7 +35,6 @@ class Occams::Content::Tag::Datetime < Occams::Content::Tag::Fragment
 
     yield input
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -14,7 +14,6 @@ require_relative "./mixins/file_content"
 # `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
 class Occams::Content::Tag::File < Occams::Content::Tag::Fragment
-
   include Occams::Content::Tag::Mixins::FileContent
 
   # @type ["url", "link", "image"]
@@ -41,11 +40,11 @@ class Occams::Content::Tag::File < Occams::Content::Tag::Fragment
         view.render(
           partial: "occams/admin/cms/fragments/form_fragment_attachments",
           locals: {
-            object_name:  object_name,
-            index:        index,
-            attachments:  fragment.attachments,
-            fragment_id:  identifier,
-            multiple:     false
+            object_name: object_name,
+            index: index,
+            attachments: fragment.attachments,
+            fragment_id: identifier,
+            multiple: false
           }
         )
       end
@@ -64,7 +63,6 @@ protected
   def label
     @label || file&.filename
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -14,7 +14,6 @@ require_relative "./mixins/file_content"
 # `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
 class Occams::Content::Tag::FileLink < Occams::Content::Tag
-
   include Occams::Content::Tag::Mixins::FileContent
 
   # @return [String] A {Occams::Cms::Site#files} ID.
@@ -53,9 +52,9 @@ class Occams::Content::Tag::FileLink < Occams::Content::Tag
   # @return [String]
   def label
     return "" if file_record.nil?
+
     file_record.label.presence || file.filename.to_s
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -6,7 +6,6 @@
 #   {{ cms:files identifier }}
 #
 class Occams::Content::Tag::Files < Occams::Content::Tag::File
-
   def content
     return "" if fragment.attachments.blank?
 
@@ -24,18 +23,17 @@ class Occams::Content::Tag::Files < Occams::Content::Tag::File
         view.render(
           partial: "occams/admin/cms/fragments/form_fragment_attachments",
           locals: {
-            object_name:  object_name,
-            index:        index,
-            attachments:  fragment.attachments,
-            fragment_id:  identifier,
-            multiple:     true
+            object_name: object_name,
+            index: index,
+            attachments: fragment.attachments,
+            fragment_id: identifier,
+            multiple: true
           }
         )
       end
 
     yield view.safe_join([input, attachments_partial], "")
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -9,7 +9,6 @@
 #     Just a string that allows grouping of form elements in the admin area
 #
 class Occams::Content::Tag::Fragment < Occams::Content::Tag
-
   attr_accessor :renderable
   attr_reader :identifier, :namespace
 
@@ -62,5 +61,4 @@ class Occams::Content::Tag::Fragment < Occams::Content::Tag
   def form_field_id
     "fragment-#{@identifier}"
   end
-
 end

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

@@ -8,7 +8,6 @@
 # By default there's a blacklist of methods that should not be called.
 #
 class Occams::Content::Tag::Helper < Occams::Content::Tag
-
   BLACKLIST = %w[eval class_eval instance_eval render].freeze
 
   attr_reader :method_name
@@ -47,7 +46,6 @@ class Occams::Content::Tag::Helper < Occams::Content::Tag
       content unless BLACKLIST.member?(method_name)
     end
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -4,7 +4,6 @@
 #   {{ cms:markdown identifier }}
 #
 class Occams::Content::Tag::Markdown < Occams::Content::Tag::Fragment
-
   def render
     renderable ? Kramdown::Document.new(content.to_s).to_html : ""
   end
@@ -16,7 +15,6 @@ class Occams::Content::Tag::Markdown < Occams::Content::Tag::Fragment
 
     yield input
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -3,7 +3,6 @@
 # A mixin for tags that returns the file as their content.
 module Occams::Content::Tag::Mixins
   module FileContent
-
     # @param [ActiveStorage::Blob] file
     # @param ["link", "image", "url"] as
     # @param [{String => String}] variant_attrs ImageMagick variant attributes
@@ -36,8 +35,8 @@ module Occams::Content::Tag::Mixins
 
     def html_class_attribute
       return if @class.blank?
+
       " class='#{@class}'"
     end
-
   end
 end

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

@@ -4,7 +4,6 @@
 #   {{ cms:number identifier }}
 #
 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" }
@@ -12,7 +11,6 @@ class Occams::Content::Tag::Number < Occams::Content::Tag::Fragment
 
     yield input
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -23,7 +23,6 @@ require_relative "./mixins/file_content"
 # `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
 class Occams::Content::Tag::PageFileLink < Occams::Content::Tag
-
   include Occams::Content::Tag::Mixins::FileContent
 
   # @return [String] A `cms:file(s)` identifier.
@@ -74,9 +73,9 @@ class Occams::Content::Tag::PageFileLink < Occams::Content::Tag
   # @return [String]
   def label
     return if file.nil?
+
     file.filename.to_s
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -7,7 +7,6 @@
 # Whitelist is can be used to control what partials are renderable.
 #
 class Occams::Content::Tag::Partial < Occams::Content::Tag
-
   attr_reader :path, :locals
 
   def initialize(context:, params: [], source: nil)
@@ -41,7 +40,6 @@ class Occams::Content::Tag::Partial < Occams::Content::Tag
       content
     end
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -5,7 +5,6 @@
 # Snippets may have more tags in them like fragments, so they may be expanded too.
 #
 class Occams::Content::Tag::Snippet < Occams::Content::Tag
-
   attr_reader :identifier
 
   def initialize(context:, params: [], source: nil)
@@ -30,7 +29,6 @@ class Occams::Content::Tag::Snippet < Occams::Content::Tag
     context.site.snippets.detect { |s| s.identifier == identifier } ||
       context.site.snippets.build(identifier: identifier)
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -7,7 +7,6 @@
 # Whitelist is can be used to control what templates are available.
 #
 class Occams::Content::Tag::Template < Occams::Content::Tag
-
   attr_reader :path
 
   def initialize(context:, params: [], source: nil)
@@ -36,7 +35,6 @@ class Occams::Content::Tag::Template < Occams::Content::Tag
       content
     end
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -4,7 +4,6 @@
 #   {{ cms:text identifier }}
 #
 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" }
@@ -12,7 +11,6 @@ class Occams::Content::Tag::Text < Occams::Content::Tag::Fragment
 
     yield input
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -4,7 +4,6 @@
 #   {{ cms:textarea identifier }}
 #
 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" } }
@@ -12,7 +11,6 @@ class Occams::Content::Tag::TextArea < Occams::Content::Tag::Fragment
 
     yield input
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

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

@@ -6,14 +6,12 @@
 #
 #
 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 } }
     input   = view.send(:text_area_tag, name, content, options)
     yield input
   end
-
 end
 
 Occams::Content::Renderer.register_tag(

data/lib/occams/engine.rb

@@ -12,7 +12,6 @@ require "sassc-rails"
 
 module Occams
   class Engine < ::Rails::Engine
-
     initializer "occams.setup_assets" do
       ::Occams::Engine.config.assets.precompile += %w[
         occams/admin/cms/application.js
@@ -22,10 +21,9 @@ module Occams
     end
 
     config.to_prepare do
-      Dir.glob(Rails.root + "app/decorators/occams/*_decorator*.rb").each do |c|
+      Dir.glob("#{Rails.root}app/decorators/occams/*_decorator*.rb").each do |c|
         require_dependency(c)
       end
     end
-
   end
 end

data/lib/occams/error.rb

@@ -1,32 +1,24 @@
 # frozen_string_literal: true
 
 module Occams
-
   class Error < StandardError
   end
 
   class MissingSite < Occams::Error
-
     def initialize(identifier)
       super "Cannot find CMS Site with identifier: #{identifier}"
     end
-
   end
 
   class MissingLayout < Occams::Error
-
     def initialize(identifier)
       super "Cannot find CMS Layout with identifier: #{identifier}"
     end
-
   end
 
   class MissingPage < Occams::Error
-
     def initialize(path)
       super "Cannot find CMS Page at #{path}"
     end
-
   end
-
 end

data/lib/occams/extensions/acts_as_tree.rb

@@ -1,35 +1,33 @@
 # frozen_string_literal: true
 
 module Occams::ActsAsTree
-
   def self.included(base)
     base.extend(ClassMethods)
   end
 
   module ClassMethods
-
     def cms_acts_as_tree(options = {})
       configuration = {
-        foreign_key:    "parent_id",
-        order:          nil,
-        counter_cache:  nil,
-        dependent:      :destroy,
-        touch:          false
+        foreign_key: "parent_id",
+        order: nil,
+        counter_cache: nil,
+        dependent: :destroy,
+        touch: false
       }
       configuration.update(options) if options.is_a?(Hash)
 
       belongs_to :parent,
-        optional:       true,
-        class_name:     name,
-        foreign_key:    configuration[:foreign_key],
-        counter_cache:  configuration[:counter_cache],
-        touch:          configuration[:touch]
+                 optional: true,
+                 class_name: name,
+                 foreign_key: configuration[:foreign_key],
+                 counter_cache: configuration[:counter_cache],
+                 touch: configuration[:touch]
 
       has_many :children,
-        -> { order(configuration[:order]) },
-        class_name:   name,
-        foreign_key:  configuration[:foreign_key],
-        dependent:    configuration[:dependent]
+               -> { order(configuration[:order]) },
+               class_name: name,
+               foreign_key: configuration[:foreign_key],
+               dependent: configuration[:dependent]
 
       class_eval <<-RUBY, __FILE__, __LINE__ + 1
         include Occams::ActsAsTree::InstanceMethods
@@ -54,11 +52,9 @@ module Occams::ActsAsTree
         end
       RUBY
     end
-
   end
 
   module InstanceMethods
-
     # Returns list of ancestors, starting from parent until root.
     #
     #   subchild1.ancestors # => [child1, root]
@@ -110,9 +106,7 @@ module Occams::ActsAsTree
     def parent_id=(id)
       self.parent = self.class.find_by(id: id)
     end
-
   end
-
 end
 
 ActiveSupport.on_load :active_record do

data/lib/occams/extensions/has_revisions.rb

@@ -1,22 +1,20 @@
 # frozen_string_literal: true
 
 module Occams::HasRevisions
-
   def self.included(base)
     base.send :extend, ClassMethods
   end
 
   module ClassMethods
-
     def cms_has_revisions_for(*fields)
       include Occams::HasRevisions::InstanceMethods
 
       attr_accessor :revision_data
 
       has_many :revisions,
-        as:         :record,
-        dependent:  :destroy,
-        class_name: "Occams::Cms::Revision"
+               as: :record,
+               dependent: :destroy,
+               class_name: "Occams::Cms::Revision"
 
       before_save :prepare_revision
       after_save  :create_revision
@@ -25,14 +23,13 @@ module Occams::HasRevisions
         fields.collect(&:to_s)
       end
     end
-
   end
 
   module InstanceMethods
-
     # Preparing revision data. A bit of a special thing to grab page blocks
     def prepare_revision
       return if new_record?
+
       if (respond_to?(:fragments_attributes_changed) && fragments_attributes_changed) ||
         !(changed & revision_fields).empty?
         self.revision_data = revision_fields.each_with_object({}) do |field, c|
@@ -60,11 +57,10 @@ module Occams::HasRevisions
     # Assigning whatever is found in revision data and attempting to save the object
     def restore_from_revision(revision)
       return unless revision.record == self
+
       update!(revision.data)
     end
-
   end
-
 end
 
 ActiveSupport.on_load :active_record do

data/lib/occams/form_builder.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::FormBuilder < ComfyBootstrapForm::FormBuilder
-
   # Renders form input for a fragment
   #
   # @param [Occams::Cms::Page] record
@@ -32,16 +31,13 @@ class Occams::FormBuilder < ComfyBootstrapForm::FormBuilder
   #   = form.form_actions do
   #     = form.submit
   #
-  def form_actions
+  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") do
-            yield
-          end
+          content_tag(:div, class: "col-sm-10 offset-sm-2", &block)
         end
       end
     end
   end
-
 end