alchemy_cms 4.6.2 → 4.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d09503d403038880c93066f8ff4606496ab8023f406c2fdb7fd36dd62749b3d4
-  data.tar.gz: 97518f445dadcb7fe00626ba6cd5aa78c9e04ef596abdf7229828ebf6dd9644b
+  metadata.gz: cba5724f523be0da026405c616379badba8f6bc12dd5cd3b3ed8ce380031a580
+  data.tar.gz: 06ceccfb73194bb322fe13a09284d890602e03ce7702e170efcde7075cb3babf
 SHA512:
-  metadata.gz: 8030842fd29540fa6a7e20e5ad4b5866cb5b8d214911e11a8370c37ae71542c81f65173addcde23ffd3e7c7c01c8f77c15f3934c555c49f03d5b37da7384fd46
-  data.tar.gz: 200eb39b0a8b6517896e0b799053a1e1d179dab67933b991ac3508370e7e664c7b0eba8bcfc6dbabdaaab4301ba3f6b6e28d84aa34dcdefbf3e9e2513fe8c32b
+  metadata.gz: 1743906a75c14ad90b5dc3ae38c9ab58fbbaf7a58b482c7a97a56b991f7f4df31af25dbef02df6ca72d2e8fdacc9f8743ecfc0b92dbdedfb15c41e1054dd6590
+  data.tar.gz: 3e1106629ffc7dc3c41f3e186a21546a9cc3b1fd7d8fb8f5a2a4590f64498e347bb9caf176f695f98c76a9cdd32bc9d2118c43d8843ffcf0465ce846a25e8e87

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 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))
+- Fix convert:page_trees:to_menus task [#2033](https://github.com/AlchemyCMS/alchemy_cms/pull/2033) ([afdev82](https://github.com/afdev82))
+- fix 4.6 upgrader tasks [#1995](https://github.com/AlchemyCMS/alchemy_cms/pull/1995) ([afdev82](https://github.com/afdev82))
+
 ## 4.6.2 (2020-09-07)
 
 - Fix tri-Boolean check in PageNaming Module [#1931](https://github.com/AlchemyCMS/alchemy_cms/pull/1931) ([mamhoff](https://github.com/mamhoff))

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/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/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/resource.rb

@@ -131,21 +131,23 @@ module Alchemy
     end
 
     def namespaced_resource_name
-      @_namespaced_resource_name ||= namespaced_resources_name.singularize
+      @_namespaced_resource_name ||= begin
+        namespaced_resources_name.to_s.singularize
+      end.to_sym # Rails >= 6.0.3.7 needs symbols in polymorphic routes
     end
 
     def namespaced_resources_name
       @_namespaced_resources_name ||= begin
         resource_name_array = resource_array.dup
         resource_name_array.delete(engine_name) if in_engine?
-        resource_name_array.join('_')
-      end
+        resource_name_array.join("_")
+      end.to_sym # Rails >= 6.0.3.7 needs symbols in polymorphic routes
     end
 
     def namespace_for_scope
       namespace_array = namespace_diff
       namespace_array.delete(engine_name) if in_engine?
-      namespace_array
+      namespace_array.map(&:to_sym) # Rails >= 6.0.3.7 needs symbols in polymorphic routes
     end
 
     # Returns an array of underscored association names

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,7 +27,7 @@ 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?

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.2"
+  VERSION = "4.6.6"
 
   def self.version
     VERSION

data/lib/tasks/alchemy/convert.rake

@@ -60,15 +60,17 @@ namespace :alchemy do
         def convert_to_nodes(children, node:)
           children.each do |page|
             has_children = page.children.any?
-            next unless page.visible || has_children
 
             Alchemy::Deprecation.silence do
+              next unless page.visible || has_children
+
               new_node = node.children.create!(
                 name: name_for_node(page),
                 page: page_for_node(page),
-                url: page.definition['redirects_to_external'] ? page.urlname : nil,
-                external: page.definition['redirects_to_external'] && Alchemy::Config.get(:open_external_links_in_new_tab),
-                language_id: page.language_id
+                url: !!page.definition['redirects_to_external'] ? page.urlname : nil,
+                external: !!page.definition['redirects_to_external'] && Alchemy::Config.get(:open_external_links_in_new_tab),
+                language_id: page.language_id,
+                site_id: page.language.site_id
               )
               print "."
               if has_children
@@ -82,9 +84,8 @@ namespace :alchemy do
         puts "\n- Converting #{menu_count} page #{'tree'.pluralize(menu_count)} into #{'menu'.pluralize(menu_count)}."
         Alchemy::BaseRecord.transaction do
           Alchemy::Language.all.each do |language|
-            locale = language.locale.presence || I18n.default_locale
-            menu_name = I18n.t('Main Navigation', scope: 'alchemy.menu_names', default: 'Main Navigation', locale: locale)
-            root_node = Alchemy::Node.create(language: language, name: menu_name)
+            menu_name = 'main_menu'
+            root_node = Alchemy::Node.create(language: language, name: menu_name, site: language.site, external: false)
             language.pages.language_roots.each do |root_page|
               convert_to_nodes(root_page.children, node: root_node)
             end

data/lib/tasks/alchemy/upgrade.rake

@@ -143,7 +143,11 @@ namespace :alchemy do
     desc "Upgrade Alchemy to v4.6"
     task "4.6" => [
       "alchemy:upgrade:prepare",
-    ]
+      "alchemy:upgrade:4.6:run",
+      "alchemy:upgrade:4.6:todo",
+    ] do
+      Alchemy::Upgrader.display_todos
+    end
 
     namespace "4.6" do
       task run: []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-11-24 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
@@ -1110,6 +1110,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,7 +1245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 5