alchemy_cms 4.6.3 → 4.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35defab4a613fba87ec24e3ba3e9b6f6a9a079282703618c670f0ef3398caf38
-  data.tar.gz: 7e4b5c160ecfac06634f9720e4927d70e0517c9b2affa23efd14167c975b8433
+  metadata.gz: ca89899748d18f70ee78b29698acf1bf9a768a938ef9bc6b95183eda42fb0e7b
+  data.tar.gz: e8fcc703a6dce815bea12d6af8f9e0307fcf38589a41fb12b96fe223ce09c793
 SHA512:
-  metadata.gz: 1c111055665890647aa60caa158644c1405ba53343f2cc6188b6184746d15353a49124fe49a6d493cfcddce43ab2fe2c433bdfd77b6dbe7fdede4191e96d661f
-  data.tar.gz: 490f3afb8151c0e2e76cc62cc9e7e5bc3c8051b92515ee9c19ed8e757bba235e8b9d675d83c11e1331b3445c61568525a6c1b66e21a8702d8061f41e845db7b4
+  metadata.gz: 6f653e26248ed2a01b92fcc6b7ded6b4eac3e057b25ad84830a6ba2ca3fa3df8c1d1af722c281bcb89ab273f4a07f5556822e0e27b40ca89d2057a4a9337e174
+  data.tar.gz: 96404109c54eb6c3c12e46bcc925725ccd352041437f895359f8b11e4b10abe93abd039e040868b0bbf5a5716865bcbbcc0662c3e20fd4d5ce636e8a0c5aa465

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 4.6.7 (2022-01-23)
+
+- fix(CellsMigration): Do not autogenerate nested elements
+- make the admin error tracker customizable
+
+## 4.6.6 (2021-11-24)
+
+- Give overlay picture spec more time to load images
+- Stay below dragonfly 1.4
+- Adjust tinymce skin assets urls again
+- Fix userstamp spec
+
+## 4.6.5 (2021-11-17)
+
+- Set stampable user_class_name without root identifier ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.6.4 (2021-11-15)
+
+- Use relative path for tinymce font-face ([tvdeyen](https://github.com/tvdeyen))
+- make the fixed element upgrader more robust ([darkswoop](https://github.com/darkswoop))
+- don't use existing element names when migrating from cells ([darkswoop](https://github.com/darkswoop))
+- enhance regexp in partial name upgrader ([darkswoop](https://github.com/darkswoop))
+
 ## 4.6.3 (2020-05-06)
 
 - Use symbols in polymorphic routes for resources [#2087](https://github.com/AlchemyCMS/alchemy_cms/pull/2087) ([tvdeyen](https://github.com/tvdeyen))

data/alchemy_cms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.1']
   gem.add_runtime_dependency 'cancancan',                        ['>= 2.1', '< 4.0']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0', '< 5.0']
-  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7']
+  gem.add_runtime_dependency 'dragonfly',                        ['>= 1.0.7', '< 1.4']
   gem.add_runtime_dependency 'dragonfly_svg',                    ['~> 0.0.4']
   gem.add_runtime_dependency 'gutentag',                         ['~> 2.2', '>= 2.2.1']
   gem.add_runtime_dependency 'handlebars_assets',                ['~> 0.23']

data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss

@@ -30,7 +30,7 @@ td,th {
 
 .mce-object {
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url(img/object.gif) no-repeat center;
+  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/object.gif') no-repeat center;
 }
 
 .mce-pagebreak {
@@ -55,7 +55,7 @@ td,th {
   width: 9px!important;
   height: 9px!important;
   border: 1px dotted #3a3a3a;
-  background: #d5d5d5 url(img/anchor.gif) no-repeat center;
+  background: #d5d5d5 url('tinymce/skins/alchemy/fonts/img/anchor.gif') no-repeat center;
 }
 
 .mce-nbsp {
@@ -77,7 +77,7 @@ hr {
 }
 
 .mce-spellchecker-word {
-  background: url(img/wline.gif) repeat-x bottom left;
+  background: url('tinymce/skins/alchemy/fonts/img/wline.gif') repeat-x bottom left;
   cursor: default;
 }
 

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -1561,23 +1561,23 @@ i.mce-i-resize {
   opacity: 0.6;
   filter: alpha(opacity=60);
   zoom: 1;
-  background: #fff url('img/loader.gif') no-repeat center center;
+  background: #fff url('tinymce/skins/alchemy/fonts/img/loader.gif') no-repeat center center;
 }
 
 @font-face {
   font-family: 'tinymce';
-  src: url('fonts/tinymce.woff') format('woff'),
-       url('fonts/tinymce.ttf') format('truetype'),
-       url('fonts/tinymce.svg#tinymce') format('svg');
+  src: url('tinymce/skins/alchemy/fonts/tinymce.woff') format('woff'),
+       url('tinymce/skins/alchemy/fonts/tinymce.ttf') format('truetype'),
+       url('tinymce/skins/alchemy/fonts/tinymce.svg#tinymce') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'tinymce-small';
-  src: url('fonts/tinymce-small.woff') format('woff'),
-       url('fonts/tinymce-small.ttf') format('truetype'),
-       url('fonts/tinymce-small.svg#tinymce') format('svg');
+  src: url('tinymce/skins/alchemy/fonts/tinymce-small.woff') format('woff'),
+       url('tinymce/skins/alchemy/fonts/tinymce-small.ttf') format('truetype'),
+       url('tinymce/skins/alchemy/fonts/tinymce-small.svg#tinymce') format('svg');
   font-weight: normal;
   font-style: normal;
 }

data/app/controllers/alchemy/admin/base_controller.rb

@@ -42,9 +42,7 @@ module Alchemy
       def exception_handler(error)
         exception_logger(error)
         show_error_notice(error)
-        if defined?(Airbrake)
-          notify_airbrake(error) unless Rails.env.development? || Rails.env.test?
-        end
+        notify_error_tracker(error)
       end
 
       # Displays an error notice in the Alchemy backend.
@@ -167,6 +165,14 @@ module Alchemy
           site
         end
       end
+
+      def notify_error_tracker(exception)
+        if ::Alchemy::ErrorTracking.notification_handler.respond_to?(:call)
+          ::Alchemy::ErrorTracking.notification_handler.call(exception)
+        else
+          Rails.logger.warn("To use the Alchemy::ErrorTracking.notification_handler, it must respond to #call.")
+        end
+      end
     end
   end
 end

data/app/models/alchemy/attachment.rb

@@ -28,7 +28,7 @@ module Alchemy
       after_assign { |f| write_attribute(:file_mime_type, f.mime_type) }
     end
 
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.user_class.name
 
     has_many :essence_files, class_name: 'Alchemy::EssenceFile', foreign_key: 'attachment_id'
     has_many :contents, through: :essence_files

data/app/models/alchemy/content.rb

@@ -28,7 +28,7 @@ module Alchemy
     belongs_to :element, touch: true, inverse_of: :contents
     has_one :page, through: :element
 
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.user_class.name
 
     acts_as_list scope: [:element_id]
 

data/app/models/alchemy/element.rb

@@ -58,7 +58,7 @@ module Alchemy
     #
     acts_as_list scope: [:page_id, :fixed, :parent_element_id]
 
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.user_class.name
 
     has_many :contents, -> { order(:position) }, dependent: :destroy, inverse_of: :element
 

data/app/models/alchemy/node.rb

@@ -5,7 +5,7 @@ module Alchemy
     VALID_URL_REGEX = /\A(\/|\D[a-z\+\d\.\-]+:)/
 
     acts_as_nested_set scope: "language_id", touch: true
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.user_class.name
 
     belongs_to :site, class_name: "Alchemy::Site"
     belongs_to :language, class_name: "Alchemy::Language"

data/app/models/alchemy/page.rb

@@ -85,7 +85,7 @@ module Alchemy
 
     acts_as_nested_set(dependent: :destroy)
 
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.user_class.name
 
     belongs_to :language, optional: true
 

data/app/models/alchemy/picture.rb

@@ -74,7 +74,7 @@ module Alchemy
       case_sensitive: false,
       message: Alchemy.t("not a valid image")
 
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.user_class.name
 
     scope :named, ->(name) {
       where("#{table_name}.name LIKE ?", "%#{name}%")

data/lib/alchemy/engine.rb

@@ -28,5 +28,12 @@ module Alchemy
     config.after_initialize do
       require_relative './userstamp'
     end
+
+    initializer "alchemy.error_tracking" do
+      if defined?(Airbrake)
+        require_relative "error_tracking/airbrake_handler"
+        Alchemy::ErrorTracking.notification_handler = Alchemy::ErrorTracking::AirbrakeHandler
+      end
+    end
   end
 end

data/lib/alchemy/error_tracking/airbrake_handler.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ErrorTracking
+    class AirbrakeHandler < BaseHandler
+      def self.call(exception)
+        return if ["development", "test"].include?(Rails.env)
+
+        notify_airbrake(exception)
+      end
+    end
+  end
+end

data/lib/alchemy/error_tracking.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ErrorTracking
+    class BaseHandler
+      def self.call(exception)
+        # implement your own notification method
+      end
+    end
+
+    mattr_accessor :notification_handler
+    @@notification_handler = BaseHandler
+  end
+end

data/lib/alchemy/essence.rb

@@ -48,7 +48,7 @@ module Alchemy #:nodoc:
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           attr_writer :validation_errors
           include Alchemy::Essence::InstanceMethods
-          stampable stamper_class_name: Alchemy.user_class_name
+          stampable stamper_class_name: Alchemy.user_class.name
           validate :validate_ingredient, on: :update, if: -> { validations.any? }
 
           has_one :content, as: :essence, class_name: "Alchemy::Content", inverse_of: :essence

data/lib/alchemy/upgrader/four_point_two.rb

@@ -1,5 +1,6 @@
 require_relative 'tasks/picture_gallery_upgrader'
 require_relative 'tasks/picture_gallery_migration'
+require_relative 'tasks/fixed_element_name_finder'
 require_relative 'tasks/cells_upgrader'
 require_relative 'tasks/cells_migration'
 require_relative 'tasks/element_partial_name_variable_updater'

data/lib/alchemy/upgrader/tasks/cells_migration.rb

@@ -8,6 +8,7 @@ module Alchemy::Upgrader::Tasks
     def migrate_cells
       if ActiveRecord::Base.connection.data_source_exists?('alchemy_cells')
         cells = Cell.all
+        @fixed_element_name_finder = FixedElementNameFinder.new
 
         if cells.any?
           cells.each do |cell|
@@ -26,10 +27,11 @@ module Alchemy::Upgrader::Tasks
     def migrate_cell!(cell)
       # bust element definitions insta cache
       Alchemy::Element.instance_variable_set('@definitions', nil)
-      fixed_element = Alchemy::Element.find_or_initialize_by(fixed: true, name: cell.name, page: cell.page)
+      fixed_element = Alchemy::Element.find_or_initialize_by(fixed: true, name: @fixed_element_name_finder.call(cell.name), page: cell.page)
       elements = Alchemy::Element.where(cell_id: cell.id).order(position: :asc)
 
       if fixed_element.new_record?
+        fixed_element.autogenerate_nested_elements = false
         fixed_element.save!
         Alchemy::Element.acts_as_list_no_update do
           elements.update_all(parent_element_id: fixed_element.id)

data/lib/alchemy/upgrader/tasks/cells_upgrader.rb

@@ -72,12 +72,13 @@ module Alchemy::Upgrader::Tasks
 
     def convert_cell_config
       puts '-- Converting cells into unique fixed nestable elements.'
+      fixed_element_name_finder = FixedElementNameFinder.new
 
       YAML.load_file(cells_config_file).each do |cell|
         append_to_file Rails.root.join('config', 'alchemy', 'elements.yml') do
           <<-CELL.strip_heredoc
 
-            - name: #{cell['name']}
+            - name: #{fixed_element_name_finder.call(cell['name'])}
               fixed: true
               unique: true
               nestable_elements: [#{cell['elements'].join(', ')}]
@@ -128,8 +129,25 @@ module Alchemy::Upgrader::Tasks
       puts "-- Update render_cell calls"
       Dir.glob("#{alchemy_views_folder}/**/*").each do |view|
         next if File.directory?(view)
-        gsub_file(view, /render_cell[\(\s]?([:'"]?[a-z_]+['"]?)\)?/, 'render_elements(only: \1, fixed: true)')
-        gsub_file(view, /render_elements[\(\s](.*):?from_cell:?\s?(=>)?\s?(['"][a-z_]+['"])\)?/, 'render_elements(\1only: \3, fixed: true)')
+        # <%= render_cell 'test' %>
+        # <%= render_cell('test') %>
+        # <%= render_cell("test", options: true) %>
+        content = File.binread(view)
+        content.gsub!(/render_cell([\s(]+)(['":])(\w+)([^\w])(.*?)/) do
+          element_name = CellNameMigrator.call($3)
+          "render_elements#{$1}only: #{$2}#{element_name}#{$4}, fixed: true#{$5}"
+        end
+        
+        # <%= render_elements from_cell: 'page_intro' %>
+        # <%= render_elements testing: 'blubb',     from_cell: :page_intro %>
+        # <%= render_elements from_cell: "page_intro", testing: 'blubb' %>
+        # <%= render_elements(from_cell: "page_intro", testing: 'blubb') %>
+        # <%= render_elements(testing: 'blubb', from_cell: "page_intro") %>
+        content.gsub!(/render_elements(.*?)from_cell[:\s=>]+([:'"])(\w+)(['"]?)(.*)/) do
+          element_name = CellNameMigrator.call($3)
+          "render_elements#{$1}only: #{$2}#{element_name}#{$4}, fixed: true#{$5}"
+        end
+        File.open(view, "wb") { |file| file.write(content) }
       end
     end
 

data/lib/alchemy/upgrader/tasks/element_partial_name_variable_updater.rb

@@ -11,10 +11,14 @@ module Alchemy::Upgrader::Tasks
         puts "-- Update element views local variable to partial name"
         Dir.glob("#{elements_view_folder}/*_view.*").each do |view|
           variable_name = File.basename(view).gsub(/^_([\w-]*)\..*$/, '\1')
-          gsub_file(view, /cache\(?element([,\s\w:\-,=>'"\?\/]*)\)?/, "cache(#{variable_name}\\1)")
-          gsub_file(view, /render_essence_view_by_name\(?element([,\s\w:\-,=>'"\?\/]*)\)?/, "render_essence_view_by_name(#{variable_name}\\1)")
-          gsub_file(view, /element_view_for\(?element([,\s\w:\-,=>'"\?\/]*)\)?/, "element_view_for(#{variable_name}\\1)")
-          gsub_file(view, /element\.([\w\?]+)/, "#{variable_name}.\\1")
+          %w[
+            cache
+            render_essence_view_by_name
+            element_view_for
+          ].each do |method_name|
+            gsub_file(view, /#{method_name}([\s(]+)element([^\w])/, "#{method_name}\\1#{variable_name}\\2")
+          end
+          gsub_file(view, /([\s(%={]+)element([^\w:"'])/, "\\1#{variable_name}\\2")
         end
       end
     end

data/lib/alchemy/upgrader/tasks/fixed_element_name_finder.rb

@@ -0,0 +1,31 @@
+module Alchemy::Upgrader::Tasks
+  class FixedElementNameFinder
+
+    def call(cell_name)
+      return cell_name if fixed_elements.include?(cell_name)
+      return "#{cell_name}_elements" if unfixed_elements.include?(cell_name)
+      cell_name
+    end
+
+    private
+
+    def fixed_elements
+      @_fixed_element_names ||= begin
+        definitions.select { |element| element['fixed'] }.map { |element| element['name'] }
+      end
+    end
+
+    def unfixed_elements
+      @_unfixed_elements ||= begin
+        definitions.reject { |element| element['fixed'] }.map { |element| element['name'] }
+      end
+    end
+
+    def definitions
+      @_definitions ||= begin
+        elements_file_path = Rails.root.join('config', 'alchemy', 'elements.yml')
+        YAML.load_file(elements_file_path)
+      end
+    end
+  end
+end

data/lib/alchemy/userstamp.rb

@@ -7,6 +7,6 @@
 if Alchemy.user_class < ActiveRecord::Base
   Alchemy.user_class.class_eval do
     model_stamper
-    stampable stamper_class_name: Alchemy.user_class_name
+    stampable stamper_class_name: Alchemy.user_class.name
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.6.3"
+  VERSION = "4.6.7"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -35,6 +35,7 @@ require_relative 'alchemy/configuration_methods'
 require_relative 'alchemy/controller_actions'
 require_relative 'alchemy/deprecation'
 require_relative 'alchemy/elements_finder'
+require_relative 'alchemy/error_tracking'
 require_relative 'alchemy/errors'
 require_relative 'alchemy/essence'
 require_relative 'alchemy/filetypes'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.6.7
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -107,22 +107,22 @@ dependencies:
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: dragonfly_svg
   requirement: !ruby/object:Gem::Requirement
@@ -1056,6 +1056,8 @@ files:
 - lib/alchemy/deprecation.rb
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb
+- lib/alchemy/error_tracking.rb
+- lib/alchemy/error_tracking/airbrake_handler.rb
 - lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
 - lib/alchemy/filetypes.rb
@@ -1110,6 +1112,7 @@ files:
 - lib/alchemy/upgrader/tasks/cells_upgrader.rb
 - lib/alchemy/upgrader/tasks/element_partial_name_variable_updater.rb
 - lib/alchemy/upgrader/tasks/element_views_updater.rb
+- lib/alchemy/upgrader/tasks/fixed_element_name_finder.rb
 - lib/alchemy/upgrader/tasks/harden_acts_as_taggable_on_migrations.rb
 - lib/alchemy/upgrader/tasks/picture_gallery_migration.rb
 - lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb
@@ -1244,8 +1247,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 5
 test_files: []
+...