occams 1.0.1 → 1.0.2

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

@@ -4,7 +4,7 @@ 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/")
+      self.path = ::File.join(Occams.config.seeds_path, to, 'layouts/')
     end
 
     def export!
@@ -14,19 +14,19 @@ module Occams::Seeds::Layout
         layout_path = File.join(path, layout.ancestors.reverse.collect(&:identifier), layout.identifier)
         FileUtils.mkdir_p(layout_path)
 
-        path = ::File.join(layout_path, "content.html")
+        path = ::File.join(layout_path, 'content.html')
         data = []
 
         attrs = {
-          "label" => layout.label,
-          "app_layout" => layout.app_layout,
-          "position" => layout.position
+          'label' => layout.label,
+          'app_layout' => layout.app_layout,
+          'position' => layout.position
         }.to_yaml
 
-        data << { header: "attributes",  content: attrs }
-        data << { header: "content",     content: layout.content }
-        data << { header: "js",          content: layout.js }
-        data << { header: "css",         content: layout.css }
+        data << { header: 'attributes',  content: attrs }
+        data << { header: 'content',     content: layout.content }
+        data << { header: 'js',          content: layout.js }
+        data << { header: 'css',         content: layout.css }
 
         write_file_content(path, data)
 

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

@@ -4,7 +4,7 @@ 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/")
+      self.path = ::File.join(Occams.config.seeds_path, from, 'layouts/')
     end
 
     def import!(path = self.path, parent = nil)
@@ -13,20 +13,20 @@ module Occams::Seeds::Layout
       end
 
       # cleaning up
-      site.layouts.where("id NOT IN (?)", seed_ids).destroy_all
+      site.layouts.where('id NOT IN (?)', seed_ids).destroy_all
     end
 
   private
 
     def import_layout(path, parent)
-      identifier = path.split("/").last
+      identifier = path.split('/').last
 
       # reading file content in, resulting in a hash
-      content_path = File.join(path, "content.html")
+      content_path = File.join(path, 'content.html')
       content_hash = parse_file_content(content_path)
 
       # parsing attributes section
-      attributes_yaml = content_hash.delete("attributes")
+      attributes_yaml = content_hash.delete('attributes')
       attrs           = YAML.safe_load(attributes_yaml)
 
       layout = site.layouts.where(identifier: identifier).first_or_initialize
@@ -34,10 +34,10 @@ 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"]
+          app_layout: attrs['app_layout'] || parent.try(:app_layout),
+          content: content_hash['content'],
+          js: content_hash['js'],
+          css: content_hash['css']
         )
 
         if layout.save

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

@@ -4,30 +4,30 @@ 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/")
+      self.path = ::File.join(Occams.config.seeds_path, to, 'pages/')
     end
 
     def export!
       prepare_folder!(path)
 
       site.pages.each do |page|
-        page.slug = "index" if page.slug.blank?
-        page_path = File.join(path, page.ancestors.reverse.map { |p| p.slug.blank? ? "index" : p.slug }, page.slug)
+        page.slug = 'index' if page.slug.blank?
+        page_path = File.join(path, page.ancestors.reverse.map { |p| p.slug.blank? ? 'index' : p.slug }, page.slug)
         FileUtils.mkdir_p(page_path)
 
-        path = ::File.join(page_path, "content.html")
+        path = ::File.join(page_path, 'content.html')
         data = []
 
         attrs = {
-          "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
+          '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
         }.to_yaml
 
-        data << { header: "attributes", content: attrs }
+        data << { header: 'attributes', content: attrs }
         data += fragments_data(page, page_path)
 
         write_file_content(path, data)
@@ -47,12 +47,12 @@ module Occams::Seeds::Page
         data = []
 
         attrs = {
-          "label" => translation.label,
-          "layout" => translation.layout.try(:identifier),
-          "is_published" => page.is_published
+          'label' => translation.label,
+          'layout' => translation.layout.try(:identifier),
+          'is_published' => page.is_published
         }.to_yaml
 
-        data << { header: "attributes", content: attrs }
+        data << { header: 'attributes', content: attrs }
         data += fragments_data(translation, page_path)
 
         write_file_content(path, data)
@@ -68,15 +68,13 @@ module Occams::Seeds::Page
         header = "#{frag.tag} #{frag.identifier}"
         content =
           case frag.tag
-          when "datetime", "date"
+          when 'datetime', 'date'
             frag.datetime
-          when "checkbox"
+          when 'checkbox'
             frag.boolean
-          when "file", "files"
+          when 'file', 'files'
             frag.attachments.map do |attachment|
-              ::File.open(::File.join(page_path, attachment.filename.to_s), "wb") do |f|
-                f.write(attachment.download)
-              end
+              ::File.binwrite(::File.join(page_path, attachment.filename.to_s), attachment.download)
               attachment.filename
             end.join("\n")
           else

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

@@ -8,23 +8,23 @@ module Occams::Seeds::Page
 
     def initialize(from, to = from)
       super
-      self.path = ::File.join(Occams.config.seeds_path, from, "pages/")
+      self.path = ::File.join(Occams.config.seeds_path, from, 'pages/')
     end
 
     def import!
-      import_page(File.join(path, "index/"), nil)
+      import_page(File.join(path, 'index/'), nil)
 
       link_target_pages
 
       # Remove pages not found in seeds
-      site.pages.where("id NOT IN (?)", seed_ids).destroy_all
+      site.pages.where('id NOT IN (?)', seed_ids).destroy_all
     end
 
   private
 
     # Recursive function that will be called for each child page (subfolder)
     def import_page(path, parent)
-      slug = path.split("/").last
+      slug = path.split('/').last
 
       # setting page record
       page =
@@ -36,7 +36,7 @@ module Occams::Seeds::Page
           site.pages.root || site.pages.new(slug: slug)
         end
 
-      content_path = File.join(path, "content.html")
+      content_path = File.join(path, 'content.html')
 
       # If file is newer than page record we'll process it
       if fresh_seed?(page, content_path)
@@ -45,13 +45,13 @@ module Occams::Seeds::Page
         fragments_hash  = parse_file_content(content_path)
 
         # parsing attributes section
-        attributes_yaml = fragments_hash.delete("attributes")
+        attributes_yaml = fragments_hash.delete('attributes')
         attrs           = YAML.safe_load(attributes_yaml)
 
         # applying attributes
-        layout = site.layouts.find_by(identifier: attrs.delete("layout")) || parent.try(:layout)
-        category_ids    = category_names_to_ids(page, attrs.delete("categories"))
-        target_page     = attrs.delete("target_page")
+        layout = site.layouts.find_by(identifier: attrs.delete('layout')) || parent.try(:layout)
+        category_ids    = category_names_to_ids(page, attrs.delete('categories'))
+        target_page     = attrs.delete('target_page')
 
         page.attributes = attrs.merge(
           layout: layout,
@@ -113,11 +113,11 @@ module Occams::Seeds::Page
         fragments_hash  = parse_file_content(file_path)
 
         # parsing attributes section
-        attributes_yaml = fragments_hash.delete("attributes")
+        attributes_yaml = fragments_hash.delete('attributes')
         attrs           = YAML.safe_load(attributes_yaml)
 
         # applying attributes
-        layout = site.layouts.find_by(identifier: attrs.delete("layout")) || page.try(:layout)
+        layout = site.layouts.find_by(identifier: attrs.delete('layout')) || page.try(:layout)
         translation.attributes = attrs.merge(
           layout: layout
         )
@@ -164,11 +164,11 @@ module Occams::Seeds::Page
 
         # based on tag we need to cram content in proper place and proper format
         case tag
-        when "date", "datetime"
+        when 'date', 'datetime'
           frag_hash[:datetime] = frag_content
-        when "checkbox"
+        when 'checkbox'
           frag_hash[:boolean] = frag_content
-        when "file", "files"
+        when 'file', 'files'
           files, file_ids_destroy = files_content(record, identifier, path, frag_content)
           frag_hash[:files]            = files
           frag_hash[:file_ids_destroy] = file_ids_destroy

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

@@ -4,7 +4,7 @@ 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/")
+      self.path = ::File.join(Occams.config.seeds_path, to, 'snippets/')
     end
 
     def export!
@@ -12,14 +12,14 @@ 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 = []
-        data << { header: "attributes", content: attrs }
-        data << { header: "content", content: snippet.content }
+        data << { header: 'attributes', content: attrs }
+        data << { header: 'content', content: snippet.content }
 
         snippet_path = File.join(path, "#{snippet.identifier}.html")
         write_file_content(snippet_path, data)

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

@@ -4,28 +4,28 @@ 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/")
+      self.path = ::File.join(Occams.config.seeds_path, from, 'snippets/')
     end
 
     def import!
       Dir.glob("#{path}/*.html").each do |path|
-        identifier = File.basename(path, ".html")
+        identifier = File.basename(path, '.html')
 
         # reading file content in, resulting in a hash
         content_hash = parse_file_content(path)
 
         # parsing attributes section
-        attributes_yaml = content_hash.delete("attributes")
+        attributes_yaml = content_hash.delete('attributes')
         attrs           = YAML.safe_load(attributes_yaml)
 
         snippet = site.snippets.where(identifier: identifier).first_or_initialize
 
         if fresh_seed?(snippet, path)
-          category_ids = category_names_to_ids(snippet, attrs.delete("categories"))
+          category_ids = category_names_to_ids(snippet, attrs.delete('categories'))
 
           snippet.attributes = attrs.merge(
             category_ids: category_ids,
-            content: content_hash["content"]
+            content: content_hash['content']
           )
 
           if snippet.save
@@ -43,7 +43,7 @@ module Occams::Seeds::Snippet
       end
 
       # cleaning up
-      site.snippets.where("id NOT IN (?)", seed_ids).destroy_all
+      site.snippets.where('id NOT IN (?)', seed_ids).destroy_all
     end
   end
 end

data/lib/occams/seeds.rb

@@ -5,7 +5,7 @@ module Occams::Seeds
 
   class Error < StandardError; end
 
-  require "mimemagic"
+  require 'mimemagic'
 
   class Importer
     attr_accessor :site,
@@ -21,9 +21,9 @@ module Occams::Seeds
       self.site         = Occams::Cms::Site.where(identifier: to).first!
       self.seed_ids     = []
 
-      unless ::File.exist?(path = ::File.join(Occams.config.seeds_path, from))
-        raise Error, "Folder for import: '#{path}' is not found"
-      end
+      return if ::File.exist?(path = ::File.join(Occams.config.seeds_path, from))
+
+      raise Error, "Folder for import: '#{path}' is not found"
     end
 
     # if passed nil will use default seed classes
@@ -92,7 +92,7 @@ module Occams::Seeds
     # Writing to the seed file. Takes in file handler and array of hashes with
     # `header` and `content` keys
     def write_file_content(path, data)
-      ::File.open(::File.join(path), "wb") do |f|
+      ::File.open(::File.join(path), 'wb') do |f|
         data.each do |item|
           f.write("[#{item[:header]}]\n#{item[:content]}")
           # adds a newline between items if not already there

data/lib/occams/version.rb

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

data/lib/occams/view_hooks.rb

@@ -10,7 +10,7 @@ module Occams::ViewHooks
 
   # Renders hook content
   def self.render(name, template, options = {})
-    out = ""
+    out = ''
     (hooks[name.to_sym] || []).each do |path|
       out += template.render({ partial: path.first }.merge(options))
     end

data/lib/occams.rb

@@ -2,33 +2,33 @@
 
 # Loading engine only if this is not a standalone installation
 unless defined? Occams::Application
-  require_relative "occams/engine"
+  require_relative 'occams/engine'
 end
 
-require_relative "occams/version"
-require_relative "occams/error"
-require_relative "occams/configuration"
-require_relative "occams/routing"
-require_relative "occams/access_control/admin_authentication"
-require_relative "occams/access_control/admin_authorization"
-require_relative "occams/access_control/public_authentication"
-require_relative "occams/access_control/public_authorization"
-require_relative "occams/render_methods"
-require_relative "occams/view_hooks"
-require_relative "occams/form_builder"
-require_relative "occams/seeds"
-require_relative "occams/seeds/layout/importer"
-require_relative "occams/seeds/layout/exporter"
-require_relative "occams/seeds/page/importer"
-require_relative "occams/seeds/page/exporter"
-require_relative "occams/seeds/snippet/importer"
-require_relative "occams/seeds/snippet/exporter"
-require_relative "occams/seeds/file/importer"
-require_relative "occams/seeds/file/exporter"
-require_relative "occams/extensions/acts_as_tree"
-require_relative "occams/extensions/has_revisions"
+require_relative 'occams/version'
+require_relative 'occams/error'
+require_relative 'occams/configuration'
+require_relative 'occams/routing'
+require_relative 'occams/access_control/admin_authentication'
+require_relative 'occams/access_control/admin_authorization'
+require_relative 'occams/access_control/public_authentication'
+require_relative 'occams/access_control/public_authorization'
+require_relative 'occams/render_methods'
+require_relative 'occams/view_hooks'
+require_relative 'occams/form_builder'
+require_relative 'occams/seeds'
+require_relative 'occams/seeds/layout/importer'
+require_relative 'occams/seeds/layout/exporter'
+require_relative 'occams/seeds/page/importer'
+require_relative 'occams/seeds/page/exporter'
+require_relative 'occams/seeds/snippet/importer'
+require_relative 'occams/seeds/snippet/exporter'
+require_relative 'occams/seeds/file/importer'
+require_relative 'occams/seeds/file/exporter'
+require_relative 'occams/extensions/acts_as_tree'
+require_relative 'occams/extensions/has_revisions'
 
-require_relative "occams/content"
+require_relative 'occams/content'
 
 module Occams
   class << self

data/lib/tasks/cms_seeds.rake

@@ -2,7 +2,7 @@
 
 namespace :occams do
   namespace :cms_seeds do
-    desc "Import CMS Seed data into database (from: folder name, to: site identifier, classes: class name[s])"
+    desc 'Import CMS Seed data into database (from: folder name, to: site identifier, classes: class name[s])'
 
     task :import, %i[from to classes] => [:environment] do |_t, args|
       from  = args[:from]
@@ -20,7 +20,7 @@ namespace :occams do
       Occams.logger = logger
     end
 
-    desc "Export database data into CMS Seed files (from: site identifier, to: folder name, classes: class name[s])"
+    desc 'Export database data into CMS Seed files (from: site identifier, to: folder name, classes: class name[s])'
     task :export, %i[from to classes] => [:environment] do |_t, args|
       from  = args[:from]
       to    = args[:to] || from

data/occams.gemspec

@@ -1,33 +1,34 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.expand_path("lib", __dir__)
-require "occams/version"
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
+require 'occams/version'
 
 Gem::Specification.new do |s|
-  s.name          = "occams"
+  s.name          = 'occams'
   s.version       = Occams::VERSION
-  s.authors       = ["Andrew vonderLuft"]
-  s.email         = ["wonder@hey.com"]
-  s.homepage      = "http://github.com/avonderluft/occams"
-  s.summary       = "Rails 6-7+ CMS Engine"
-  s.description   = "Occams is a powerful Rails 6-7+ CMS Engine"
-  s.license       = "MIT"
+  s.authors       = ['Andrew vonderLuft']
+  s.email         = ['wonder@hey.com']
+  s.homepage      = 'http://github.com/avonderluft/occams'
+  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|
     f.match(%r{^(test|doc)/})
   end
 
-  s.required_ruby_version = ">= 2.7.0"
+  s.required_ruby_version = '>= 2.7.0'
+  s.metadata['rubygems_mfa_required'] = 'true'
 
-  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"
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrew vonderLuft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -236,9 +236,9 @@ files:
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
-- LICENSE.comfy
 - README.md
 - Rakefile
+- TODOS.md
 - app/assets/config/manifest.js
 - app/assets/fonts/occams/admin/cms/lib/redactor-font.eot
 - app/assets/javascripts/occams/admin/cms/application.js
@@ -697,7 +697,8 @@ files:
 homepage: http://github.com/avonderluft/occams
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:

data/LICENSE.comfy

@@ -1,20 +0,0 @@
-Copyright (c) 2010-2019 Oleg Khabarov
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.