occams 1.0.0 → 1.0.1

data/lib/occams/render_methods.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
 module Occams::RenderMethods
-
   def self.included(base)
     # 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|
-      begin
-        render cms_page: request.path
-      rescue Occams::MissingPage, Occams::MissingSite
-        raise e
-      end
+      render cms_page: request.path
+    rescue Occams::MissingPage, Occams::MissingSite
+      raise e
     end
   end
 
@@ -39,16 +36,14 @@ module Occams::RenderMethods
   def render(options = {}, locals = {}, &block)
     return super unless options.is_a?(Hash)
 
-    if (site_identifier = options.delete(:cms_site))
-      unless (@cms_site = Occams::Cms::Site.find_by_identifier(site_identifier))
-        raise Occams::MissingSite, site_identifier
-      end
+    if (site_identifier = options.delete(:cms_site)) && !(@cms_site = Occams::Cms::Site.find_by_identifier(site_identifier))
+      raise Occams::MissingSite, site_identifier
     end
 
-    if (page_path = options.delete(:cms_page)) || (layout_identifier = options.delete(:cms_layout))
-      unless @cms_site ||= Occams::Cms::Site.find_site(request.host_with_port.downcase, request.fullpath)
-        raise Occams::MissingSite, "#{request.host.downcase}/#{request.fullpath}"
-      end
+    if ((page_path = options.delete(:cms_page)) || (layout_identifier = options.delete(:cms_layout))) && !@cms_site ||= Occams::Cms::Site.find_site(
+      request.host_with_port.downcase, request.fullpath
+    )
+      raise Occams::MissingSite, "#{request.host.downcase}/#{request.fullpath}"
     end
 
     if page_path
@@ -104,7 +99,6 @@ module Occams::RenderMethods
 
     render(options, locals, &block)
   end
-
 end
 
 ActiveSupport.on_load :action_controller_base do

data/lib/occams/routes/cms.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class ActionDispatch::Routing::Mapper
-
   def occams_route_cms(options = {})
     Occams.configuration.public_cms_path = options[:path]
 
@@ -14,5 +13,4 @@ class ActionDispatch::Routing::Mapper
       end
     end
   end
-
 end

data/lib/occams/routes/cms_admin.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class ActionDispatch::Routing::Mapper
-
   def occams_route_cms_admin(path: "admin")
     scope module: :occams, as: :occams do
       scope module: :admin do
@@ -28,7 +27,7 @@ class ActionDispatch::Routing::Mapper
               concerns :with_form_fragments
               concerns :with_revisions, controller: "revisions/page"
 
-              get :toggle_branch,  on: :member
+              get :toggle_branch, on: :member
 
               resources :translations, except: [:index] do
                 concerns :with_form_fragments
@@ -54,5 +53,4 @@ class ActionDispatch::Routing::Mapper
       end
     end
   end
-
 end

data/lib/occams/routing.rb

@@ -4,9 +4,7 @@ require_relative "routes/cms_admin"
 require_relative "routes/cms"
 
 class ActionDispatch::Routing::Mapper
-
   def occams_route(identifier, options = {})
     send("occams_route_#{identifier}", **options)
   end
-
 end

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

@@ -2,7 +2,6 @@
 
 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/")
@@ -17,9 +16,9 @@ module Occams::Seeds::File
         # writing attributes
         ::File.open(::File.join(path, "_#{file.attachment.filename}.yml"), "w") do |f|
           f.write({
-            "label"       => file.label,
+            "label" => file.label,
             "description" => file.description,
-            "categories"  => file.categories.map(&:label)
+            "categories" => file.categories.map(&:label)
           }.to_yaml)
         end
 
@@ -38,6 +37,5 @@ module Occams::Seeds::File
         Occams.logger.info(message)
       end
     end
-
   end
 end

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

@@ -2,7 +2,6 @@
 
 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/")
@@ -19,16 +18,14 @@ module Occams::Seeds::File
         # We need to track actual file and its attributes
         fresh_file = false
 
-        if File.exist?(attrs_path = File.join(path, "_#{filename}.yml"))
-          if fresh_seed?(file, attrs_path)
-            fresh_file = true
+        if File.exist?(attrs_path = File.join(path, "_#{filename}.yml")) && fresh_seed?(file, attrs_path)
+          fresh_file = true
 
-            attrs = YAML.safe_load(File.read(attrs_path))
-            category_ids = category_names_to_ids(file, attrs.delete("categories"))
-            file.attributes = attrs.merge(
-              category_ids: category_ids
-            )
-          end
+          attrs = YAML.safe_load(File.read(attrs_path))
+          category_ids = category_names_to_ids(file, attrs.delete("categories"))
+          file.attributes = attrs.merge(
+            category_ids: category_ids
+          )
         end
 
         if fresh_seed?(file, file_path)
@@ -36,8 +33,8 @@ module Occams::Seeds::File
 
           file_handler = File.open(file_path)
           file.file = {
-            io:           file_handler,
-            filename:     filename,
+            io: file_handler,
+            filename: filename,
             content_type: MimeMagic.by_magic(file_handler)
           }
         end
@@ -58,6 +55,5 @@ module Occams::Seeds::File
       # cleaning up
       site.files.where("id NOT IN (?)", seed_ids).destroy_all
     end
-
   end
 end

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

@@ -2,7 +2,6 @@
 
 module Occams::Seeds::Layout
   class Exporter < Occams::Seeds::Exporter
-
     def initialize(from, to = from)
       super
       self.path = ::File.join(Occams.config.seeds_path, to, "layouts/")
@@ -19,9 +18,9 @@ module Occams::Seeds::Layout
         data = []
 
         attrs = {
-          "label"      => layout.label,
+          "label" => layout.label,
           "app_layout" => layout.app_layout,
-          "position"   => layout.position
+          "position" => layout.position
         }.to_yaml
 
         data << { header: "attributes",  content: attrs }
@@ -35,6 +34,5 @@ module Occams::Seeds::Layout
         Occams.logger.info(message)
       end
     end
-
   end
 end

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

@@ -2,7 +2,6 @@
 
 module Occams::Seeds::Layout
   class Importer < Occams::Seeds::Importer
-
     def initialize(from, to = from)
       super
       self.path = ::File.join(Occams.config.seeds_path, from, "layouts/")
@@ -36,9 +35,9 @@ module Occams::Seeds::Layout
       if fresh_seed?(layout, content_path)
         layout.attributes = attrs.merge(
           app_layout: attrs["app_layout"] || parent.try(:app_layout),
-          content:    content_hash["content"],
-          js:         content_hash["js"],
-          css:        content_hash["css"]
+          content: content_hash["content"],
+          js: content_hash["js"],
+          css: content_hash["css"]
         )
 
         if layout.save
@@ -57,6 +56,5 @@ module Occams::Seeds::Layout
         import_layout(layout_path, layout)
       end
     end
-
   end
 end

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

@@ -2,7 +2,6 @@
 
 module Occams::Seeds::Page
   class Exporter < Occams::Seeds::Exporter
-
     def initialize(from, to = from)
       super
       self.path = ::File.join(Occams.config.seeds_path, to, "pages/")
@@ -20,12 +19,12 @@ module Occams::Seeds::Page
         data = []
 
         attrs = {
-          "label"        => page.label,
-          "layout"       => page.layout.try(:identifier),
-          "target_page"  => page.target_page.try(:full_path),
-          "categories"   => page.categories.map(&:label),
+          "label" => page.label,
+          "layout" => page.layout.try(:identifier),
+          "target_page" => page.target_page.try(:full_path),
+          "categories" => page.categories.map(&:label),
           "is_published" => page.is_published,
-          "position"     => page.position
+          "position" => page.position
         }.to_yaml
 
         data << { header: "attributes", content: attrs }
@@ -48,8 +47,8 @@ module Occams::Seeds::Page
         data = []
 
         attrs = {
-          "label"        => translation.label,
-          "layout"       => translation.layout.try(:identifier),
+          "label" => translation.label,
+          "layout" => translation.layout.try(:identifier),
           "is_published" => page.is_published
         }.to_yaml
 
@@ -87,6 +86,5 @@ module Occams::Seeds::Page
         { header: header, content: content }
       end
     end
-
   end
 end

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

@@ -2,7 +2,6 @@
 
 module Occams::Seeds::Page
   class Importer < Occams::Seeds::Importer
-
     # tracking target page linking. Since we might be linking to something that
     # doesn't exist yet, we'll defer linking to the end of import
     attr_accessor :target_pages
@@ -157,7 +156,7 @@ module Occams::Seeds::Page
         tag, identifier = frag_header.split
         frag_hash = {
           identifier: identifier,
-          tag:        tag
+          tag: tag
         }
 
         # tracking fragments that need removing later
@@ -190,8 +189,8 @@ module Occams::Seeds::Page
       files = frag_content.split("\n").collect do |filename|
         file_handler = File.open(File.join(path, filename))
         {
-          io:           file_handler,
-          filename:     filename,
+          io: file_handler,
+          filename: filename,
           content_type: MimeMagic.by_magic(file_handler)
         }
       end
@@ -214,6 +213,5 @@ module Occams::Seeds::Page
         end
       end
     end
-
   end
 end

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

@@ -2,7 +2,6 @@
 
 module Occams::Seeds::Snippet
   class Exporter < Occams::Seeds::Exporter
-
     def initialize(from, to = from)
       super
       self.path = ::File.join(Occams.config.seeds_path, to, "snippets/")
@@ -13,9 +12,9 @@ module Occams::Seeds::Snippet
 
       site.snippets.each do |snippet|
         attrs = {
-          "label"       => snippet.label,
-          "categories"  => snippet.categories.map(&:label),
-          "position"    => snippet.position
+          "label" => snippet.label,
+          "categories" => snippet.categories.map(&:label),
+          "position" => snippet.position
         }.to_yaml
 
         data = []
@@ -29,6 +28,5 @@ module Occams::Seeds::Snippet
         Occams.logger.info(message)
       end
     end
-
   end
 end

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

@@ -2,7 +2,6 @@
 
 module Occams::Seeds::Snippet
   class Importer < Occams::Seeds::Importer
-
     def initialize(from, to = from)
       super
       self.path = ::File.join(Occams.config.seeds_path, from, "snippets/")
@@ -26,7 +25,7 @@ module Occams::Seeds::Snippet
 
           snippet.attributes = attrs.merge(
             category_ids: category_ids,
-            content:      content_hash["content"]
+            content: content_hash["content"]
           )
 
           if snippet.save
@@ -46,6 +45,5 @@ module Occams::Seeds::Snippet
       # cleaning up
       site.snippets.where("id NOT IN (?)", seed_ids).destroy_all
     end
-
   end
 end

data/lib/occams/seeds.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Occams::Seeds
-
   SEED_CLASSES = %w[Layout Page Snippet File].freeze
 
   class Error < StandardError; end
@@ -9,7 +8,6 @@ module Occams::Seeds
   require "mimemagic"
 
   class Importer
-
     attr_accessor :site,
                   :path,
                   :from,
@@ -60,17 +58,15 @@ module Occams::Seeds
     def category_names_to_ids(record, names)
       [names].flatten.map do |name|
         category = site.categories.find_or_create_by(
-          label:            name,
+          label: name,
           categorized_type: record.class.to_s
         )
         category.id
       end
     end
-
   end
 
   class Exporter
-
     attr_accessor :site,
                   :path,
                   :from,
@@ -112,7 +108,5 @@ module Occams::Seeds
       FileUtils.rm_rf(path)
       FileUtils.mkdir_p(path)
     end
-
   end
-
 end

data/lib/occams/version.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
 module Occams
-
-  VERSION = "1.0.0"
-
+  VERSION = "1.0.1"
 end

data/lib/occams/view_hooks.rb

@@ -3,7 +3,6 @@
 # This mechanism is used by 3rd party plugins.
 # Normally you'd use partials from your own app
 module Occams::ViewHooks
-
   # Array of declared hooks
   def self.hooks
     @hooks ||= {}
@@ -31,5 +30,4 @@ module Occams::ViewHooks
   def self.remove(name)
     hooks.delete(name)
   end
-
 end

data/lib/occams.rb

@@ -31,9 +31,7 @@ require_relative "occams/extensions/has_revisions"
 require_relative "occams/content"
 
 module Occams
-
   class << self
-
     attr_writer :logger
 
     # Modify CMS configuration
@@ -54,7 +52,5 @@ module Occams
     def logger
       @logger ||= Rails.logger
     end
-
   end
-
 end

data/lib/tasks/cms_seeds.rake

@@ -13,7 +13,7 @@ namespace :occams do
 
       # changing so that logger is going straight to screen
       logger = Occams.logger
-      Occams.logger = Logger.new(STDOUT)
+      Occams.logger = Logger.new($stdout)
 
       Occams::Seeds::Importer.new(from, to).import!(classes)
 
@@ -30,7 +30,7 @@ namespace :occams do
 
       # changing so that logger is going straight to screen
       logger = Occams.logger
-      Occams.logger = Logger.new(STDOUT)
+      Occams.logger = Logger.new($stdout)
 
       Occams::Seeds::Exporter.new(from, to).export!(classes)
 

data/occams.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors       = ["Andrew vonderLuft"]
   s.email         = ["wonder@hey.com"]
   s.homepage      = "http://github.com/avonderluft/occams"
-  s.summary       = "Rails 6.0+ CMS Engine"
-  s.description   = "Occams is a powerful Rails 6.0+ CMS Engine"
+  s.summary       = "Rails 6-7+ CMS Engine"
+  s.description   = "Occams is a powerful Rails 6-7+ CMS Engine"
   s.license       = "MIT"
 
   s.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -19,15 +19,15 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.7.0"
 
-  s.add_dependency "active_link_to",        ">= 1.0.5"
-  s.add_dependency "comfy_bootstrap_form",  ">= 4.0.0"
-  s.add_dependency "haml-rails",            ">= 2.1.0"
-  s.add_dependency "image_processing",      ">= 1.12.2"
-  s.add_dependency "jquery-rails",          ">= 4.6.0"
-  s.add_dependency "kramdown",              ">= 2.4.0"
-  s.add_dependency "mimemagic",             ">= 0.4.3"
-  s.add_dependency "mini_magick",           ">= 4.12.0"
-  s.add_dependency "rails",                 ">= 6.1.7"
-  s.add_dependency "rails-i18n",            ">= 6.0.0"
-  s.add_dependency "sassc-rails",           ">= 2.0.0"
+  s.add_runtime_dependency "active_link_to",       "~> 1.0", ">= 1.0.5"
+  s.add_runtime_dependency "comfy_bootstrap_form", "~> 4.0", ">= 4.0.0"
+  s.add_runtime_dependency "haml-rails",           "~> 2.1", ">= 2.1.0"
+  s.add_runtime_dependency "image_processing",     "~> 1.12", ">= 1.12.2"
+  s.add_runtime_dependency "jquery-rails",         "~> 4.6", ">= 4.6.0"
+  s.add_runtime_dependency "kramdown",             "~> 2.4", ">= 2.4.0"
+  s.add_runtime_dependency "mimemagic",            "~> 0.4", ">= 0.4.3"
+  s.add_runtime_dependency "mini_magick",          "~> 4.12", ">= 4.12.0"
+  s.add_dependency "rails",                        ">= 6.1.7.4"
+  s.add_runtime_dependency "rails-i18n",           ">= 6.0.0"
+  s.add_runtime_dependency "sassc-rails",          "~> 2.1", ">= 2.1.2"
 end