occams 1.0.0 → 1.0.1

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

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 class Occams::Cms::File < ActiveRecord::Base
-
   self.table_name = "occams_cms_files"
 
   include Occams::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
@@ -30,7 +29,7 @@ class Occams::Cms::File < ActiveRecord::Base
     after_save :process_attachment
   end
 
-  after_save    :clear_page_content_cache
+  after_save :clear_page_content_cache
 
   # -- Validations -------------------------------------------------------------
   validates :label, presence: true
@@ -45,9 +44,9 @@ class Occams::Cms::File < ActiveRecord::Base
 
 private
 
-def clear_page_content_cache
-  Occams::Cms::Page.where(id: site.pages.pluck(:id)).update_all(content_cache: nil)
-end
+  def clear_page_content_cache
+    Occams::Cms::Page.where(id: site.pages.pluck(:id)).update_all(content_cache: nil)
+  end
 
 protected
 
@@ -59,12 +58,13 @@ protected
   # TODO: Change db schema not to set blank string
   def assign_label
     return if label.present?
+
     self.label = file&.original_filename
   end
 
   def process_attachment
     return if @file.blank?
+
     self.attachment = @file
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Fragment < ActiveRecord::Base
-
   self.table_name = "occams_cms_fragments"
 
   has_many_attached :attachments
@@ -23,8 +22,8 @@ class Occams::Cms::Fragment < ActiveRecord::Base
 
   # -- Validations -------------------------------------------------------------
   validates :identifier,
-    presence:   true,
-    uniqueness: { scope: :record }
+            presence: true,
+            uniqueness: { scope: :record }
 
   # -- Instance Methods --------------------------------------------------------
 
@@ -45,6 +44,7 @@ protected
 
   def remove_attachments
     return unless @file_ids_destroy.present?
+
     attachments.where(id: @file_ids_destroy).destroy_all
   end
 
@@ -59,5 +59,4 @@ protected
 
     attachments.attach(@files)
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Layout < ActiveRecord::Base
-
   self.table_name = "occams_cms_layouts"
 
   cms_acts_as_tree
@@ -19,13 +18,13 @@ class Occams::Cms::Layout < ActiveRecord::Base
 
   # -- Validations -------------------------------------------------------------
   validates :site_id,
-    presence:   true
+            presence:   true
   validates :label,
-    presence:   true
+            presence:   true
   validates :identifier,
-    presence:   true,
-    uniqueness: { scope: :site_id },
-    format:     { with: %r{\A\w[a-z0-9_-]*\z}i }
+            presence: true,
+            uniqueness: { scope: :site_id },
+            format: { with: %r{\A\w[a-z0-9_-]*\z}i }
 
   # -- Class Methods -----------------------------------------------------------
   # Tree-like structure for layouts
@@ -106,8 +105,8 @@ protected
 
   def assign_position
     return if position.to_i.positive?
+
     max = site.layouts.where(parent_id: parent_id).maximum(:position)
     self.position = max ? max + 1 : 0
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Page < ActiveRecord::Base
-
   self.table_name = "occams_cms_pages"
 
   include Occams::Cms::WithFragments
@@ -15,11 +14,11 @@ class Occams::Cms::Page < ActiveRecord::Base
   # -- Relationships -----------------------------------------------------------
   belongs_to :site
   belongs_to :target_page,
-    class_name: "Occams::Cms::Page",
-    optional:   true
+             class_name: "Occams::Cms::Page",
+             optional: true
 
   has_many :translations,
-    dependent: :destroy
+           dependent: :destroy
 
   # -- Callbacks ---------------------------------------------------------------
   before_validation :assigns_label,
@@ -32,13 +31,13 @@ class Occams::Cms::Page < ActiveRecord::Base
 
   # -- Validations -------------------------------------------------------------
   validates :label,
-    presence:   true
+            presence: true
   validates :slug,
-    presence:   true,
-    uniqueness: { scope: :parent_id },
-    unless:     ->(p) {
-      p.site && (p.site.pages.count.zero? || p.site.pages.root == self)
-    }
+            presence: true,
+            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
 
@@ -75,7 +74,7 @@ class Occams::Cms::Page < ActiveRecord::Base
 
   # Somewhat unique method of identifying a page that is not a full_path
   def identifier
-    parent_id.blank? ? "index" : full_path[1..-1].parameterize
+    parent_id.blank? ? "index" : full_path[1..].parameterize
   end
 
   # Full url for a page
@@ -113,6 +112,7 @@ protected
 
   def assign_parent
     return unless site
+
     self.parent ||= site.pages.root unless self == site.pages.root || site.pages.count.zero?
   end
 
@@ -128,12 +128,14 @@ protected
   def assign_position
     return unless self.parent
     return if position.to_i.positive?
+
     max = self.parent.children.maximum(:position)
     self.position = max ? max + 1 : 0
   end
 
   def validate_target_page
     return unless target_page
+
     p = self
     while p.target_page
       if (p = p.target_page) == self
@@ -144,13 +146,15 @@ protected
 
   def validate_format_of_unescaped_slug
     return unless slug.present?
+
     unescaped_slug = CGI.unescape(slug)
-    errors.add(:slug, :invalid) unless unescaped_slug =~ %r{^\p{Alnum}[\.\p{Alnum}\p{Mark}_-]*$}i
+    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 full_path_previously_changed?
+
     children.each do |p|
       p.update_attribute(:full_path, p.send(:assign_full_path))
     end
@@ -166,5 +170,4 @@ protected
     self.slug       = CGI.unescape(slug)      unless slug.nil?
     self.full_path  = CGI.unescape(full_path) unless full_path.nil?
   end
-
 end

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

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Revision < ActiveRecord::Base
-
   self.table_name = "occams_cms_revisions"
 
   serialize :data
 
   # -- Relationships --------------------------------------------------------
   belongs_to :record, polymorphic: true
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Site < ActiveRecord::Base
-
   self.table_name = "occams_cms_sites"
 
   # -- Relationships -----------------------------------------------------------
@@ -21,20 +20,21 @@ class Occams::Cms::Site < ActiveRecord::Base
 
   # -- Validations -------------------------------------------------------------
   validates :identifier,
-    presence:   true,
-    uniqueness: true,
-    format:     { with: %r{\A\w[a-z0-9_-]*\z}i }
+            presence: true,
+            uniqueness: true,
+            format: { with: %r{\A\w[a-z0-9_-]*\z}i }
   validates :label,
-    presence:   true
+            presence: true
   validates :hostname,
-    presence:   true,
-    uniqueness: { scope: :path },
-    format:     { with: %r{\A[\w.-]+(?:\:\d+)?\z} }
+            presence: true,
+            uniqueness: { scope: :path },
+            format: { with: %r{\A[\w.-]+(?::\d+)?\z} }
 
   # -- Class Methods -----------------------------------------------------------
   # returning the Occams::Cms::Site instance based on host and path
   def self.find_site(host, path = nil)
     return Occams::Cms::Site.first if Occams::Cms::Site.count == 1
+
     cms_site = nil
 
     public_cms_path = Occams.configuration.public_cms_path
@@ -90,5 +90,4 @@ protected
     self.path.gsub!(%r{/$}, "")
     self.path = nil if self.path.blank?
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Snippet < ActiveRecord::Base
-
   self.table_name = "occams_cms_snippets"
 
   include Occams::Cms::WithCategories
@@ -19,11 +18,11 @@ class Occams::Cms::Snippet < ActiveRecord::Base
 
   # -- Validations -------------------------------------------------------------
   validates :label,
-    presence:   true
+            presence: true
   validates :identifier,
-    presence:   true,
-    uniqueness: { scope: :site_id },
-    format:     { with: %r{\A\w[a-z0-9_-]*\z}i }
+            presence: true,
+            uniqueness: { scope: :site_id },
+            format: { with: %r{\A\w[a-z0-9_-]*\z}i }
 
 protected
 
@@ -41,5 +40,4 @@ protected
     max = site.snippets.maximum(:position)
     self.position = max ? max + 1 : 0
   end
-
 end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Cms::Translation < ActiveRecord::Base
-
   self.table_name = "occams_cms_translations"
 
   include Occams::Cms::WithFragments
@@ -21,11 +20,11 @@ class Occams::Cms::Translation < ActiveRecord::Base
 
   # -- Validations -------------------------------------------------------------
   validates :label,
-    presence:   true
+            presence: true
 
   validates :locale,
-    presence:   true,
-    uniqueness: { scope: :page_id }
+            presence: true,
+            uniqueness: { scope: :page_id }
 
   validate :validate_locale
 
@@ -33,11 +32,11 @@ private
 
   def validate_locale
     return unless page
+
     errors.add(:locale) if locale == page.site.locale
   end
 
   def assign_layout
     self.layout ||= page.layout if page.present?
   end
-
 end

data/app/views/layouts/occams/admin/cms/_left.html.haml

@@ -37,3 +37,7 @@
 .left-footer
   = link_to 'Occams', 'https://github.com/avonderluft/occams', target: '_blank'
   %span.version= Occams::VERSION
+  = link_to 'Rails', 'https://rubyonrails.org', target: '_blank'
+  %span.version= Rails::version
+  = link_to 'Ruby', 'https://www.ruby-lang.org', target: '_blank'
+  %span.version= RUBY_VERSION

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

@@ -1,7 +1,7 @@
 %li{data: {id: file.id}}
   :ruby
     file_tag  = cms_file_link_tag(file)
-    thumb_url = url_for(file.attachment.variant(Occams::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.variable?
+    thumb_url = url_for(file.attachment.representation(resize_to_limit: [200, nil])) if file.attachment.variable?
   .row
     .col-md-5.item
       .item-controls.d-none.d-lg-block

data/config/application.rb

@@ -10,7 +10,6 @@ Bundler.require(*Rails.groups)
 
 module Occams
   class Application < Rails::Application
-
     require_relative "../lib/occams"
 
     config.load_defaults 5.2
@@ -34,6 +33,5 @@ module Occams
     config.paths["config/routes.rb"] << "config/cms_routes.rb"
 
     config.i18n.enforce_available_locales = true
-
   end
 end

data/config.ru

@@ -2,5 +2,5 @@
 
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path("../config/environment", __FILE__)
+require ::File.expand_path("config/environment", __dir__)
 run Occams::Application

data/lib/generators/occams/cms/assets_generator.rb

@@ -4,14 +4,12 @@ module Occams
   module Generators
     module Cms
       class AssetsGenerator < Rails::Generators::Base
-
         source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/assets"))
 
         def generate_assets
           directory "javascripts/occams/admin/cms", "app/assets/javascripts/occams/admin/cms"
           directory "stylesheets/occams/admin/cms", "app/assets/stylesheets/occams/admin/cms"
         end
-
       end
     end
   end

data/lib/generators/occams/cms/cms_generator.rb

@@ -5,7 +5,6 @@ require "rails/generators/active_record"
 module Occams
   module Generators
     class CmsGenerator < Rails::Generators::Base
-
       include Rails::Generators::Migration
       include Thor::Actions
 
@@ -25,7 +24,7 @@ module Occams
 
       def generate_initializer
         copy_file "config/initializers/occams.rb",
-          "config/initializers/occams.rb"
+                  "config/initializers/occams.rb"
       end
 
       def generate_railties_order
@@ -51,9 +50,9 @@ module Occams
 
       def generate_assets
         copy_file "app/assets/javascripts/occams/admin/cms/custom.js",
-          "app/assets/javascripts/occams/admin/cms/custom.js"
+                  "app/assets/javascripts/occams/admin/cms/custom.js"
         copy_file "app/assets/stylesheets/occams/admin/cms/custom.sass",
-          "app/assets/stylesheets/occams/admin/cms/custom.sass"
+                  "app/assets/stylesheets/occams/admin/cms/custom.sass"
       end
 
       def show_readme
@@ -63,7 +62,6 @@ module Occams
       def self.next_migration_number(dirname)
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
-
     end
   end
 end

data/lib/generators/occams/cms/controllers_generator.rb

@@ -4,13 +4,11 @@ module Occams
   module Generators
     module Cms
       class ControllersGenerator < Rails::Generators::Base
-
         source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/controllers"))
 
         def generate_controllers
           directory "occams", "app/controllers/occams"
         end
-
       end
     end
   end

data/lib/generators/occams/cms/models_generator.rb

@@ -4,13 +4,11 @@ module Occams
   module Generators
     module Cms
       class ModelsGenerator < Rails::Generators::Base
-
         source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/models"))
 
         def generate_models
           directory "occams", "app/models/occams"
         end
-
       end
     end
   end

data/lib/generators/occams/cms/views_generator.rb

@@ -4,13 +4,11 @@ module Occams
   module Generators
     module Cms
       class ViewsGenerator < Rails::Generators::Base
-
         source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/views"))
 
         def generate_views
           directory "occams", "app/views/occams"
         end
-
       end
     end
   end

data/lib/generators/occams/scaffold/scaffold_generator.rb

@@ -6,7 +6,6 @@ require "rails/generators/active_record"
 module Occams
   module Generators
     class ScaffoldGenerator < Rails::Generators::NamedBase
-
       include Rails::Generators::Migration
 
       no_tasks do
@@ -22,6 +21,7 @@ module Occams
         @model_attrs = []
         model_args.each do |arg|
           next unless arg.include?(":")
+
           @model_attrs << Rails::Generators::GeneratedAttribute.new(*arg.split(":"))
         end
       end
@@ -74,7 +74,6 @@ module Occams
           HAML
         end
       end
-
     end
   end
 end

data/lib/occams/access_control/admin_authentication.rb

@@ -2,7 +2,6 @@
 
 module Occams::AccessControl
   module AdminAuthentication
-
     # Set username and password in config/initializers/occams.rb
     # Like this:
     #   Occams::AccessControl::AdminAuthentication.username = 'myname'
@@ -19,6 +18,5 @@ module Occams::AccessControl
         self.username == username && self.password == password
       end
     end
-
   end
 end

data/lib/occams/access_control/admin_authorization.rb

@@ -2,11 +2,9 @@
 
 module Occams::AccessControl
   module AdminAuthorization
-
     # By default there's no authorization of any kind
     def authorize
       true
     end
-
   end
 end

data/lib/occams/access_control/public_authentication.rb

@@ -2,11 +2,9 @@
 
 module Occams::AccessControl
   module PublicAuthentication
-
     # By defaut all published pages are accessible
     def authenticate
       true
     end
-
   end
 end

data/lib/occams/access_control/public_authorization.rb

@@ -2,11 +2,9 @@
 
 module Occams::AccessControl
   module PublicAuthorization
-
     # By default there's no authorization of any kind
     def authorize
       true
     end
-
   end
 end

data/lib/occams/configuration.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Configuration
-
   # Don't like Occams? Set it to whatever you like. :(
   attr_accessor :cms_title
 
@@ -101,28 +100,28 @@ class Occams::Configuration
     @seeds_path             = File.expand_path("db/cms_seeds", Rails.root)
     @revisions_limit        = 25
     @locales                = {
-      "ar"    => "عربي",
-      "ca"    => "Català",
-      "cs"    => "Česky",
-      "da"    => "Dansk",
-      "de"    => "Deutsch",
-      "en"    => "English",
-      "es"    => "Español",
-      "fi"    => "Suomi",
-      "fr"    => "Français",
-      "gr"    => "Ελληνικά",
-      "hr"    => "Hrvatski",
-      "it"    => "Italiano",
-      "ja"    => "日本語",
-      "nb"    => "Norsk",
-      "nl"    => "Nederlands",
-      "pl"    => "Polski",
+      "ar" => "عربي",
+      "ca" => "Català",
+      "cs" => "Česky",
+      "da" => "Dansk",
+      "de" => "Deutsch",
+      "en" => "English",
+      "es" => "Español",
+      "fi" => "Suomi",
+      "fr" => "Français",
+      "gr" => "Ελληνικά",
+      "hr" => "Hrvatski",
+      "it" => "Italiano",
+      "ja" => "日本語",
+      "nb" => "Norsk",
+      "nl" => "Nederlands",
+      "pl" => "Polski",
       "pt-BR" => "Português Brasileiro",
-      "ru"    => "Русский",
-      "sk"    => "Slovensky",
-      "sv"    => "Svenska",
-      "tr"    => "Türkçe",
-      "uk"    => "Українська",
+      "ru" => "Русский",
+      "sk" => "Slovensky",
+      "sv" => "Svenska",
+      "tr" => "Türkçe",
+      "uk" => "Українська",
       "zh-CN" => "简体中文",
       "zh-TW" => "正體中文"
     }
@@ -136,5 +135,4 @@ class Occams::Configuration
     @public_cms_path      = nil
     @page_to_json_options = { methods: [:content], except: [:content_cache] }
   end
-
 end

data/lib/occams/content/block.rb

@@ -4,11 +4,9 @@
 # it means that all nodes between this must be moved into here
 # {{cms:block}} some content {{cms:end_block}}
 class Occams::Content::Block < Occams::Content::Tag
-
   attr_writer :nodes
 
   def nodes
     @nodes ||= []
   end
-
 end

data/lib/occams/content/params_parser.rb

@@ -3,18 +3,17 @@
 require "strscan"
 
 class Occams::Content::ParamsParser
-
   class Error < StandardError; end
 
-  STRING_LITERAL  = %r{'[^']*'|"[^"]*"}
-  IDENTIFIER      = %r{[a-z0-9][\w\-/.]*}i
-  HASH_KEY        = %r{#{IDENTIFIER}:}
-  COMMA           = %r{,}
-  HASH_OPEN       = %r{\{}
-  HASH_CLOSE      = %r{\}}
-  ARRAY_OPEN      = %r{\[}
-  ARRAY_CLOSE     = %r{\]}
-  INTEGER         = %r{\b[0-9]+\b}i
+  STRING_LITERAL  = %r{'[^']*'|"[^"]*"}.freeze
+  IDENTIFIER      = %r{[a-z0-9][\w\-/.]*}i.freeze
+  HASH_KEY        = %r{#{IDENTIFIER}:}.freeze
+  COMMA           = %r{,}.freeze
+  HASH_OPEN       = %r{\{}.freeze
+  HASH_CLOSE      = %r{\}}.freeze
+  ARRAY_OPEN      = %r{\[}.freeze
+  ARRAY_CLOSE     = %r{\]}.freeze
+  INTEGER         = %r{\b[0-9]+\b}i.freeze
 
   # @param <String> string
   def initialize(string = "")
@@ -147,5 +146,4 @@ private
 
     tokens
   end
-
 end