alchemy_cms 6.0.0.b3 → 6.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8fcd022eba5fdba4ce96cfe4971344ced0191b6d12d9cbd7bad923b07b7359a
-  data.tar.gz: 9dfbf5f590c6c2e8d562bf81daeb8faf3a1358f5f46aeb8857adef4d48fd6181
+  metadata.gz: 8c2e459c0097bf27f22b10ef62a2daf9b6b00c9d27a5a7062a580a0ce40fd288
+  data.tar.gz: 79dcef9fe37b902dcbdaba9eafacca27e772660b297953a0f3cfefc076fc4719
 SHA512:
-  metadata.gz: 82cc3e7f0c3b0e8fb8a4d2219d8237d66db02275b878951be1fcc0d12f9a7fdd750415ad45b5af03a05e6abce298c718551541dc80774c689b395d758d39d942
-  data.tar.gz: 665d8a15204e872ab41867e1466c4611fec7c46f83d862669c89d3e5c3038f30fa1dfb45fb56d227a71b92c945a9c45de9a5d887bbb726af9d49b5c87121d2c9
+  metadata.gz: ae3cca3894448880c1c86a63585b104a04fdeba14be7e9160451bc91a64993f2ff50080d87be5b2be487734fa4267358d0ce263da352a6005f1d8264919670bf
+  data.tar.gz: 74e9ad0b8e7242349d3be0b0e1abe54a4fbd73a7fbb17beac177faa332df98d25f0d0302868c5771b3d04a7f2da81257a7639e04739d7ef462f9d04c86ca449f

data/.github/workflows/ci.yml

@@ -10,10 +10,11 @@ jobs:
       matrix:
         rails:
           - '6.0'
+          - '6.1'
         ruby:
-          - '2.6.6'
-          - '2.7.2'
-          - '3.0.0'
+          - '2.6.8'
+          - '2.7.4'
+          - '3.0.2'
         database:
           - mysql
           - postgresql

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 6.0.0-rc1 (2021-09-12)
+
+- Allow Rails 6.1 [#2047](https://github.com/AlchemyCMS/alchemy_cms/pull/2047) ([robinboening](https://github.com/robinboening))
+
+## 6.0.0-b6 (2021-09-02)
+
+- Fix element with ingredients preview text [#2187](https://github.com/AlchemyCMS/alchemy_cms/pull/2187) ([tvdeyen](https://github.com/tvdeyen))
+- Do not validate element during toggle fold and create [#2186](https://github.com/AlchemyCMS/alchemy_cms/pull/2186) ([tvdeyen](https://github.com/tvdeyen))
+## 6.0.0-b5 (2021-08-27)
+
+- Remove spec that tests default data store value [#2184](https://github.com/AlchemyCMS/alchemy_cms/pull/2184) ([tvdeyen](https://github.com/tvdeyen))
+- Remove data store accessor from ingredient base class [#2183](https://github.com/AlchemyCMS/alchemy_cms/pull/2183) ([tvdeyen](https://github.com/tvdeyen))
+
+## 6.0.0-b4 (2021-08-27)
+
+- Load custom Tinymce config for ingredients [#2182](https://github.com/AlchemyCMS/alchemy_cms/pull/2182) ([tvdeyen](https://github.com/tvdeyen))
+- Fix ingredient editor selector in element update callback [#2181](https://github.com/AlchemyCMS/alchemy_cms/pull/2181) ([tvdeyen](https://github.com/tvdeyen))
+- Ingredient by role block level helper [#2180](https://github.com/AlchemyCMS/alchemy_cms/pull/2180) ([tvdeyen](https://github.com/tvdeyen))
+- Fixes caching [#2179](https://github.com/AlchemyCMS/alchemy_cms/pull/2179) ([tvdeyen](https://github.com/tvdeyen))
+- make images non-executable [#2176](https://github.com/AlchemyCMS/alchemy_cms/pull/2176) ([mensfeld](https://github.com/mensfeld))
+- Release task [#2173](https://github.com/AlchemyCMS/alchemy_cms/pull/2173) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.0.0.b3 (2021-08-12)
 
 ### Fixes

data/Gemfile

@@ -3,7 +3,7 @@ source "https://rubygems.org"
 
 gemspec
 
-rails_version = ENV.fetch("RAILS_VERSION", 6.0).to_f
+rails_version = ENV.fetch("RAILS_VERSION", 6.1).to_f
 gem "rails", "~> #{rails_version}.0"
 
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"

data/README.md

@@ -18,7 +18,7 @@ Alchemy is an open source CMS engine written in Ruby on Rails.
 
 Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [guidelines](https://guides.alchemy-cms.com).
 
-**CAUTION: This main branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (5.0-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/5.0-stable).**
+**CAUTION: This main branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (5.2-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/5.2-stable).**
 
 
 ## ✅ Features
@@ -339,6 +339,10 @@ $ bin/rails s
 
 ## 📦 Releasing
 
+### Bump version
+
+Bump the version number in both `lib/alchemy/version.rb` and `./package.json`. Make sure both are exactly the same and follow [SemVer format](https://semver.org/#semantic-versioning-specification-semver).
+
 ### Update the changelog
 
 ```bash
@@ -346,12 +350,20 @@ $ export GITHUB_ACCESS_TOKEN=...
 $ PREVIOUS_VERSION=4.1.0 bundle exec rake alchemy:changelog:update
 ```
 
-### Release a new version
+### Commit version bump
 
 ```bash
-$ bundle exec rake release
+$ git commit -am "Bump version to vX.Y.Z"
 ```
 
+### Release a new version
+
+This task will publish both the ruby gem and the npm package.
+It also tags the latest commit.
+
+```bash
+$ bundle exec rake alchemy:release
+```
 
 ## ❓Getting Help
 

data/Rakefile

@@ -1,37 +1,37 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
 begin
-  require 'rdoc/task'
+  require "rdoc/task"
 rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
+  require "rdoc/rdoc"
+  require "rake/rdoctask"
   RDoc::Task = Rake::RDocTask
 end
 
-desc 'Generate documentation for Alchemy CMS.'
+desc "Generate documentation for Alchemy CMS."
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Alchemy CMS'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('config/alchemy/*.yml')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include('app/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "Alchemy CMS"
+  rdoc.options << "--line-numbers" << "--inline-source"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("config/alchemy/*.yml")
+  rdoc.rdoc_files.include("lib/**/*.rb")
+  rdoc.rdoc_files.include("app/**/*.rb")
 end
 
-APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
-load 'rails/tasks/engine.rake'
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require "rspec/core"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: ['alchemy:spec:prepare', :spec]
+task default: ["alchemy:spec:prepare", :spec]
 
 Bundler::GemHelper.install_tasks
 
@@ -56,11 +56,11 @@ namespace :alchemy do
   namespace :changelog do
     desc "Update CHANGELOG from GitHub (Set GITHUB_ACCESS_TOKEN and PREVIOUS_VERSION to a version you want to write changelog changes for)"
     task :update do
-      original_file = './CHANGELOG.md'
-      new_file = original_file + '.new'
-      backup = original_file + '.old'
-      changes = `git rev-list v#{ENV['PREVIOUS_VERSION']}..HEAD | bundle exec github_fast_changelog AlchemyCMS/alchemy_cms`
-      File.open(new_file, 'w') do |fo|
+      original_file = "./CHANGELOG.md"
+      new_file = original_file + ".new"
+      backup = original_file + ".old"
+      changes = `git rev-list v#{ENV["PREVIOUS_VERSION"]}..HEAD | bundle exec github_fast_changelog AlchemyCMS/alchemy_cms`
+      File.open(new_file, "w") do |fo|
         fo.puts changes
         File.foreach(original_file) do |li|
           fo.puts li
@@ -72,4 +72,18 @@ namespace :alchemy do
       File.delete(backup)
     end
   end
+
+  desc "Release a new Ruby gem and npm package in one command"
+  task :release do
+    require "json"
+    require_relative "lib/alchemy/version"
+    package = File.read("package.json")
+    unless JSON.parse(package)["version"] == Alchemy.version
+      abort "Ruby gem and npm package versions are out of sync! Please fix."
+    end
+    # Release the Ruby gem with bundler
+    Rake::Task["release"].invoke
+    # Publish npm package via CLI
+    system "npm publish"
+  end
 end

data/alchemy_cms.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
     activesupport
     railties
   ].each do |rails_gem|
-    gem.add_runtime_dependency rails_gem, [">= 6.0", "< 6.1"]
+    gem.add_runtime_dependency rails_gem, [">= 6.0", "< 6.2"]
   end
 
   gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"]

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

@@ -32,14 +32,14 @@ module Alchemy
           if @paste_from_clipboard = params[:paste_from_clipboard].present?
             @element = paste_element_from_clipboard
           else
-            @element = Element.create(create_element_params)
+            @element = Element.new(create_element_params)
           end
           if @page.definition["insert_elements_at"] == "top"
             @insert_at_top = true
-            @element.move_to_top
+            @element.position = 1
           end
         end
-        if @element.valid?
+        if @element.save
           render :create
         else
           @element.page_version = @page_version
@@ -91,10 +91,14 @@ module Alchemy
         end
       end
 
+      # Toggle fodls the element and persists the state in the db
+      #
+      # Ingredient validations might make the element invalid.
+      # In this case we are just toggling a UI state and do not care about the validations.
       def fold
         @page = @element.page
         @element.folded = !@element.folded
-        @element.save
+        @element.save(validate: false)
       end
 
       private

data/app/helpers/alchemy/elements_block_helper.rb

@@ -77,6 +77,12 @@ module Alchemy
       end
 
       deprecate essence: "Use `ingredient_by_role` instead", deprecator: Alchemy::Deprecation
+
+      # Return's the ingredient record by given role.
+      #
+      def ingredient_by_role(role)
+        element.ingredient_by_role(role)
+      end
     end
 
     # Block-level helper for element views. Constructs a DOM element wrapping

data/app/models/alchemy/element/presenters.rb

@@ -99,12 +99,12 @@ module Alchemy
       # The ingredient that's used for element's preview text.
       #
       # It tries to find one of element's ingredients that is defined +as_element_title+.
-      # Takes element's first ingredient if no ingredient is defined +as_element_title+.
+      # Takes element's first defined ingredient if no ingredient is defined +as_element_title+.
       #
       # @return (Alchemy::Ingredient)
       #
       def preview_ingredient
-        @_preview_ingredient ||= ingredients.detect(&:preview_ingredient?) || ingredients.first
+        @_preview_ingredient ||= ingredients.detect(&:preview_ingredient?) || first_ingredient_by_definition
       end
 
       private
@@ -122,6 +122,13 @@ module Alchemy
       def preview_text_from_preview_ingredient(maxlength)
         preview_ingredient&.preview_text(maxlength)
       end
+
+      def first_ingredient_by_definition
+        return if ingredient_definitions.empty?
+
+        role = ingredient_definitions.first["role"]
+        ingredients.detect { |ingredient| ingredient.role == role }
+      end
     end
   end
 end

data/app/models/alchemy/element.rb

@@ -267,20 +267,6 @@ module Alchemy
       "alchemy/elements/#{name}"
     end
 
-    # Returns the key that's taken for cache path.
-    #
-    # Uses the page's +published_at+ value that's updated when the user publishes the page.
-    #
-    # If the page is the current preview it uses the element's updated_at value as cache key.
-    #
-    def cache_key
-      if Page.current_preview == page
-        "alchemy/elements/#{id}-#{updated_at}"
-      else
-        "alchemy/elements/#{id}-#{page.published_at}"
-      end
-    end
-
     # A collection of element names that can be nested inside this element.
     def nestable_elements
       definition.fetch("nestable_elements", [])

data/app/models/alchemy/ingredient.rb

@@ -118,11 +118,6 @@ module Alchemy
       value.to_s[0..maxlength - 1]
     end
 
-    # Cross DB adapter data accessor that works
-    def data
-      @_data ||= (self[:data] || {}).with_indifferent_access
-    end
-
     # The path to the view partial of the ingredient
     # @return [String]
     def to_partial_path

data/app/models/alchemy/page/page_natures.rb

@@ -110,22 +110,13 @@ module Alchemy
       # If the page is the current preview it uses the updated_at value as cache key.
       #
       def cache_key
-        if Page.current_preview == self
+        if Page.current_preview == id
           "alchemy/pages/#{id}-#{updated_at}"
         else
           "alchemy/pages/#{id}-#{published_at}"
         end
       end
 
-      # We use the published_at value for the cache_key.
-      #
-      # If no published_at value is set yet, i.e. because it was never published,
-      # we return the updated_at value.
-      #
-      def published_at
-        read_attribute(:published_at) || updated_at
-      end
-
       # Returns true if the page cache control headers should be set.
       #
       # == Disable Alchemy's page caching globally

data/app/models/alchemy/page.rb

@@ -198,13 +198,13 @@ module Alchemy
         %w[name urlname title]
       end
 
-      # Used to store the current page previewed in the edit page template.
+      # Used to store the current page id previewed in the edit page template.
       #
       def current_preview=(page)
-        RequestStore.store[:alchemy_current_preview] = page
+        RequestStore.store[:alchemy_current_preview] = page&.id
       end
 
-      # Returns the current page previewed in the edit page template.
+      # Returns the current page id previewed in the edit page template.
       #
       def current_preview
         RequestStore.store[:alchemy_current_preview]

data/app/models/alchemy/page_version.rb

@@ -2,7 +2,7 @@
 
 module Alchemy
   class PageVersion < BaseRecord
-    belongs_to :page, class_name: "Alchemy::Page", inverse_of: :versions
+    belongs_to :page, class_name: "Alchemy::Page", inverse_of: :versions, touch: true
 
     has_many :elements, -> { order(:position) },
       class_name: "Alchemy::Element",

data/app/views/alchemy/admin/elements/update.js.erb

@@ -1,7 +1,7 @@
 (function() {
   var $el = $('#element_<%= @element.id %>');
   var $errors = $('#element_<%= @element.id %>_errors');
-  $('> .element-content .content_editor, > .element-content .ingredient_editor', $el).removeClass('validation_failed');
+  $('> .element-content .content_editor, > .element-content .ingredient-editor', $el).removeClass('validation_failed');
 
 <%- if @element_validated -%>
 

data/app/views/alchemy/admin/pages/edit.html.erb

@@ -138,7 +138,7 @@
 <% end %>
 
 <% content_for :javascripts do %>
-<% if Alchemy::Tinymce.custom_config_contents(@page).present? %>
+<% if Alchemy::Tinymce.custom_configs_present?(@page) %>
   <%= render 'tinymce_custom_config' %>
 <% end %>
 

data/lib/alchemy/test_support/shared_ingredient_examples.rb

@@ -16,7 +16,6 @@ RSpec.shared_examples_for "an alchemy ingredient" do
   it { is_expected.to belong_to(:related_object).optional }
   it { is_expected.to validate_presence_of(:role) }
   it { is_expected.to validate_presence_of(:type) }
-  it { expect(subject.data).to eq({}) }
 
   describe "#settings" do
     subject { ingredient.settings }

data/lib/alchemy/tinymce.rb

@@ -34,6 +34,10 @@ module Alchemy
         @@init
       end
 
+      def custom_configs_present?(page)
+        custom_config_contents(page).any? || custom_config_ingredients(page).any?
+      end
+
       def custom_config_contents(page)
         content_definitions_from_elements(page.descendent_element_definitions)
       end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.0.b3"
+  VERSION = "6.0.0-rc1"
 
   def self.version
     VERSION

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.0-b2",
+  "version": "6.0.0-rc1",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.0.b3
+  version: 6.0.0.pre.rc1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -24,7 +24,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -1516,7 +1516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.1.6
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails