alchemy_cms 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fd79c1d49d2d3ee4bb6f47b7ec4a9ec294bc890f9a217ee30cdac569eef0780
-  data.tar.gz: baec6c36ea7c500185bade60f79fda54f3464055903375de4b43bc3a11c2457a
+  metadata.gz: 4f640cf9df17528d45476a6edb303f9d4d3fadc0e78f6bb8bbbe0a0b79f57059
+  data.tar.gz: '09d6e935c44b7fede23439298f68ee9055118bd6b0a645a2294ad05161271a8e'
 SHA512:
-  metadata.gz: 705b4473ea1d26a3c168b9a7e3592d9b14ad77b1e1802d227127f4a26ee6e4665a26ae6bc7357ffe0681d5f79ea5b1ebee75289db63e252fce61170be6325678
-  data.tar.gz: ef27de44013eeb6f04f98ba2af578b07912f8386d8c1240300561e9bbdc803be69ff0f57c2ca12a5090cf380f461834570be23cddcb11361c54984dd451ad76f
+  metadata.gz: 9975ccf31bd9e74791149c2426e6dbf350d6cb4df000018bcba509f9bed88c23808e8fc0a2f690bfcb791c550384fd3d18c9f1f73b3a08115b5251efae2a3559
+  data.tar.gz: a315453502650bbddf31e4c60cf1ff1abf7797b2ed9a8d12a502cfc02e91bb2fde457ede616769a06ce9f2cc805a6ad5bc252bc90003a5894daa1a9c0d95f252

data/.github/workflows/ci.yml

@@ -19,9 +19,9 @@ jobs:
           - postgresql
     env:
       DB: ${{ matrix.database }}
-      MYSQL_PASSWORD: root
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: password
+      DB_USER: alchemy_user
+      DB_PASSWORD: password
+      DB_HOST: '127.0.0.1'
       RAILS_ENV: test
       RAILS_VERSION: ${{ matrix.rails }}
       CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
@@ -29,11 +29,20 @@ jobs:
       postgres:
         image: postgres:11
         env:
-          POSTGRES_USER: postgres
+          POSTGRES_USER: alchemy_user
           POSTGRES_PASSWORD: password
           POSTGRES_DB: alchemy_cms_dummy_test
         ports: ['5432:5432']
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      mysql:
+        image: mysql:latest
+        ports: ['3306:3306']
+        env:
+          MYSQL_USER: alchemy_user
+          MYSQL_PASSWORD: password
+          MYSQL_DATABASE: alchemy_cms_dummy_test
+          MYSQL_ROOT_PASSWORD: password
+        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
     steps:
       - uses: actions/checkout@v1
       - name: Set up Ruby

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## 5.0.0 (unreleased)
+## 4.5.1 (2021-11-17)
+
+- Set stampable user_class_name without root identifier ([tvdeyen](https://github.com/tvdeyen))
+- Use relative path for tinymce font-face ([tvdeyen](https://github.com/tvdeyen))
+- Use symbols in polymorphic routes for resources ([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.5.0 (2020-03-30)
 

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

@@ -1566,18 +1566,18 @@ i.mce-i-resize {
 
 @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('./fonts/tinymce.woff') format('woff'),
+       url('./fonts/tinymce.ttf') format('truetype'),
+       url('./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('./fonts/tinymce-small.woff') format('woff'),
+       url('./fonts/tinymce-small.ttf') format('truetype'),
+       url('./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.5.0"
+  VERSION = "4.5.1"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1107,6 +1107,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
@@ -1241,8 +1242,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 5
 test_files: []
+...