alchemy_cms 5.3.3 → 6.0.0.b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f18c2fd116b7cecb0091d78a0e3d7bdad8a996e03b04c53e56e04a651a5d47b
-  data.tar.gz: 35f9e7ed5ef6c525348a5d885c50d448376ce03f2ce0955037ed3a05c4733ade
+  metadata.gz: 0f491f19d3f42a56aa03e0a82724e1473413c926f9bb9a823f909726415bb844
+  data.tar.gz: 42c4841d037f5d351305b4e2c97fdc9298a4b886d51b666436c712f1c9c7ce80
 SHA512:
-  metadata.gz: 23b529d54cdc27a766208ee9750e282349b184feec1cc21f398a01caccd970d2dc5a9bdd7f500f52fe165f306bf32052d8d48f2e892b83af92037d65fcec33c9
-  data.tar.gz: f733eee0bb31d47a489657d66c741fb983f1a363e017756f3be0ced53a589e3978e51f5240c8bdd3fa6d405a89bf8c89d6a7ff3b17d6de4631d638f7206dcb90
+  metadata.gz: fbb3af41e4d5a9715507f87d38d87f0dea4ceb9c62750721587ce14a7e7aa32f89b7e044fac5b14ab68781539f80b16297cce668b0bef76eb96b099c157b751c
+  data.tar.gz: fdd0443e75620528d6434eeb13fb675db04f3a91911b92f66122df83c963a737509a99d968ddd48189195340ea00e06310919d3ba201906291088c66ee5ec455

data/.github/workflows/ci.yml

@@ -9,12 +9,11 @@ jobs:
       fail-fast: false
       matrix:
         rails:
-          - '5.2'
           - '6.0'
         ruby:
-          - '2.5.x'
-          - '2.6.x'
-          - '2.7.x'
+          - '2.6.6'
+          - '2.7.2'
+          - '3.0.0'
         database:
           - mysql
           - postgresql
@@ -46,9 +45,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2.3.4
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1.1.2
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Restore apt cache
         id: apt-cache
         uses: actions/cache@v2.1.3
@@ -74,18 +74,10 @@ jobs:
       - name: Install bundler
         run: |
           gem install bundler
-      - name: Restore Ruby Gems cache
-        id: cache
-        uses: actions/cache@v2.1.3
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-bundle-${{ matrix.ruby }}-${{ matrix.rails }}-${{ matrix.database }}-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-bundle-
       - name: Install bundle
         timeout-minutes: 10
         run: |
-          bundle install --jobs 4 --retry 3 --path vendor/bundle
+          bundle install --jobs 4 --retry 3
       - name: Restore node modules cache
         id: yarn-cache
         uses: actions/cache@v2.1.3

data/.gitignore

@@ -10,7 +10,6 @@ tmp
 log
 .sass-cache
 spec/dummy/.browserslistrc
-spec/dummy/app/assets/stylesheets/alchemy/
 spec/dummy/app/javascript/
 spec/dummy/babel.config.js
 spec/dummy/bin/webpack
@@ -34,6 +33,7 @@ spec/dummy/uploads/
 .ruby-gemset
 .ruby-version
 .env
+.rspec
 node_modules
 yarn-error.log
 yarn-debug.log*

data/.hound.yml

@@ -1,6 +1,6 @@
 rubocop:
   config_file: .rubocop.yml
-  version: 0.80.0
+  version: 1.5.2
 scss:
   enabled: false
 coffeescript:

data/.rubocop.yml

@@ -1,7 +1,7 @@
 # Relaxed.Ruby.Style
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   Exclude:
     - 'bin/rspec'
     - 'vendor/**/*'
@@ -100,9 +100,6 @@ Layout/MultilineMethodCallBraceLayout:
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
-Layout/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
 Layout/SpaceBeforeBlockBraces:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
@@ -309,3 +306,48 @@ Naming/PredicateName:
 
 Naming/VariableNumber:
   Enabled: false
+
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: false
+
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: false
+
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: false
+
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: false
+
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: false
+
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: false
+
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: false
+
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: false
+
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: false
+
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: false
+
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: false
+
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: false
+
+Style/NilLambda: # (new in 1.3)
+  Enabled: false
+
+Style/RedundantArgument: # (new in 1.4)
+  Enabled: false
+
+Style/SwapValues: # (new in 1.1)
+  Enabled: false

data/CHANGELOG.md

@@ -1,74 +1,90 @@
-## 5.3.3 (2022-03-24)
+## 6.0.0.b1 (2021-07-05)
 
-- fix admin sitemap feature specs ([tvdeyen](https://github.com/tvdeyen))
-- fix: Add support for ajax.get query params ([tvdeyen](https://github.com/tvdeyen))
-- fix(Sitemap): Use response data ([tvdeyen](https://github.com/tvdeyen))
-- Revert "Ajax: Send method override" ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.3.2 (2022-03-24)
-
-- ImageLoader: Add error handling ([tvdeyen](https://github.com/tvdeyen))
-- Fix new Sitemap ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.3.1 (2022-03-11)
-
-- Allow all pages in API again ([tvdeyen](https://github.com/tvdeyen))
-- New sortable page tree ([tvdeyen](https://github.com/tvdeyen))
-- Send language_id to Api::PagesController#index so Pages can be restricted to the language of the page. ([dbwinger](https://github.com/dbwinger))
-- Eager load in PageTree serializer ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.3.0 (2022-03-09)
-
-- Allow parent page change ([tvdeyen](https://github.com/tvdeyen))
-- Precompile packs during test setup ([tvdeyen](https://github.com/tvdeyen))
-- Rework Sitemap JS ([tvdeyen](https://github.com/tvdeyen))
-- Fix rendering errors in page configure overlay ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.2.7 (2022-03-01)
-
-- Fix copying page with descendants to a different language ([dbwinger](https://github.com/dbwinger))
-- Handle copying/pasting global pages ([dbwinger](https://github.com/dbwinger))
-
-## 5.2.6 (2022-02-28)
-
-- Add crop_resize Dragonfly processor ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.2.5 (2021-11-24)
-
-- Adjust tinymce skin assets urls again ([tvdeyen](https://github.com/tvdeyen))
-
-## 5.2.4 (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))
-
-## 5.2.3 (2021-10-26)
+### Features
 
-- Make sure to install correct npm package ([tvdeyen](https://github.com/tvdeyen))
+- Import essence video and audio from extension [#2089](https://github.com/AlchemyCMS/alchemy_cms/pull/2089) ([tvdeyen](https://github.com/tvdeyen))
+- Introduce ingredients as new content structure [#2061](https://github.com/AlchemyCMS/alchemy_cms/pull/2061) ([tvdeyen](https://github.com/tvdeyen))
+- Alchemy essence headline [#2060](https://github.com/AlchemyCMS/alchemy_cms/pull/2060) ([mamhoff](https://github.com/mamhoff))
+- Add Page Versions [#2022](https://github.com/AlchemyCMS/alchemy_cms/pull/2022) ([tvdeyen](https://github.com/tvdeyen))
 
-## 5.2.2 (2021-09-15)
+### Changes
 
-- Return only pages from current site in api [#2169](https://github.com/AlchemyCMS/alchemy_cms/pull/2169) ([afdev82](https://github.com/afdev82))
-- Improve cache key defaults for menus #2138 [#2160](https://github.com/AlchemyCMS/alchemy_cms/pull/2160) ([oneiros](https://github.com/oneiros))
-- generate picture thumbnails only for pictures with convertible format [#2130](https://github.com/AlchemyCMS/alchemy_cms/pull/2130) ([afdev82](https://github.com/afdev82))
-- Backport #2114 to v5.2 [#2116](https://github.com/AlchemyCMS/alchemy_cms/pull/2116) ([afdev82](https://github.com/afdev82))
-- Add webpacker tasks to Alchemy upgrader [#2115](https://github.com/AlchemyCMS/alchemy_cms/pull/2115) ([dbwinger](https://github.com/dbwinger))
+- Link dialog changes can be submitted by enter [#2144](https://github.com/AlchemyCMS/alchemy_cms/pull/2144) ([tvdeyen](https://github.com/tvdeyen))
+- Extract Thumbnails and CropAction concerns [#2141](https://github.com/AlchemyCMS/alchemy_cms/pull/2141) ([tvdeyen](https://github.com/tvdeyen))
+- generate picture thumbnails only for pictures with convertible format [#2129](https://github.com/AlchemyCMS/alchemy_cms/pull/2129) ([afdev82](https://github.com/afdev82))
+- Only crop image if cropping is enabled [#2143](https://github.com/AlchemyCMS/alchemy_cms/pull/2143) ([tvdeyen](https://github.com/tvdeyen))
+- expose translations in global Alchemy js object, #2113 [#2114](https://github.com/AlchemyCMS/alchemy_cms/pull/2114) ([afdev82](https://github.com/afdev82))
+- Only return pages for current site in API [#2111](https://github.com/AlchemyCMS/alchemy_cms/pull/2111) ([tvdeyen](https://github.com/tvdeyen))
+- Add crop_resize Dragonfly processor [#2109](https://github.com/AlchemyCMS/alchemy_cms/pull/2109) ([tvdeyen](https://github.com/tvdeyen))
+- Auto-orient images based on their EXIF data [#2107](https://github.com/AlchemyCMS/alchemy_cms/pull/2107) ([tvdeyen](https://github.com/tvdeyen))
+- Allow flatten as argument for Dragonfly encode [#2106](https://github.com/AlchemyCMS/alchemy_cms/pull/2106) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate image format methods [#2103](https://github.com/AlchemyCMS/alchemy_cms/pull/2103) ([tvdeyen](https://github.com/tvdeyen))
+- Do not attempt to generate thumbs for svg files (fixes upload of svg files) [#2090](https://github.com/AlchemyCMS/alchemy_cms/pull/2090) ([oneiros](https://github.com/oneiros))
+- Trigger publish targets after page published [#2088](https://github.com/AlchemyCMS/alchemy_cms/pull/2088) ([tvdeyen](https://github.com/tvdeyen))
+- Add collection option for resource relations [#2084](https://github.com/AlchemyCMS/alchemy_cms/pull/2084) ([robinboening](https://github.com/robinboening))
+- Remove deprecated helper method page_active? [#2074](https://github.com/AlchemyCMS/alchemy_cms/pull/2074) ([robinboening](https://github.com/robinboening))
+- Handle json requests in error handler [#2071](https://github.com/AlchemyCMS/alchemy_cms/pull/2071) ([tvdeyen](https://github.com/tvdeyen))
+- Background page publishing [#2067](https://github.com/AlchemyCMS/alchemy_cms/pull/2067) ([tvdeyen](https://github.com/tvdeyen))
+- Faster element duplication [#2066](https://github.com/AlchemyCMS/alchemy_cms/pull/2066) ([mamhoff](https://github.com/mamhoff))
+- Parse params in ajax.get as query string [#2070](https://github.com/AlchemyCMS/alchemy_cms/pull/2070) ([tvdeyen](https://github.com/tvdeyen))
+- Assign, crop and remove files and pictures client side [#2069](https://github.com/AlchemyCMS/alchemy_cms/pull/2069) ([tvdeyen](https://github.com/tvdeyen))
+- Allow copying contents when they're not in the elements.yml [#2068](https://github.com/AlchemyCMS/alchemy_cms/pull/2068) ([mamhoff](https://github.com/mamhoff))
+- Delete nested elements quickly [#2065](https://github.com/AlchemyCMS/alchemy_cms/pull/2065) ([mamhoff](https://github.com/mamhoff))
+- Quickly delete elements when deleting a page version [#2064](https://github.com/AlchemyCMS/alchemy_cms/pull/2064) ([mamhoff](https://github.com/mamhoff))
+- Fast element deletion [#2063](https://github.com/AlchemyCMS/alchemy_cms/pull/2063) ([mamhoff](https://github.com/mamhoff))
+- Touch Elements only after update [#2062](https://github.com/AlchemyCMS/alchemy_cms/pull/2062) ([mamhoff](https://github.com/mamhoff))
+- Convert "Visit page" button to "Link to new tab" [#2058](https://github.com/AlchemyCMS/alchemy_cms/pull/2058) ([mamhoff](https://github.com/mamhoff))
+- Allow creating an EssenceRichtext without a content [#2057](https://github.com/AlchemyCMS/alchemy_cms/pull/2057) ([mamhoff](https://github.com/mamhoff))
+- Allow instantiating a content on an unpersisted valid element [#2056](https://github.com/AlchemyCMS/alchemy_cms/pull/2056) ([mamhoff](https://github.com/mamhoff))
+- Sanitized richtext body [#2055](https://github.com/AlchemyCMS/alchemy_cms/pull/2055) ([mamhoff](https://github.com/mamhoff))
+- Only require the Rails gems we actually need [#2054](https://github.com/AlchemyCMS/alchemy_cms/pull/2054) ([tvdeyen](https://github.com/tvdeyen))
+- Create new contents on demand [#2049](https://github.com/AlchemyCMS/alchemy_cms/pull/2049) ([tvdeyen](https://github.com/tvdeyen))
+- Add Elements repository [#2039](https://github.com/AlchemyCMS/alchemy_cms/pull/2039) ([tvdeyen](https://github.com/tvdeyen))
+- Render site layout with block [#2038](https://github.com/AlchemyCMS/alchemy_cms/pull/2038) ([henvo](https://github.com/henvo))
+- Add namespace for Tree related routes [#2037](https://github.com/AlchemyCMS/alchemy_cms/pull/2037) ([dhiraj14](https://github.com/dhiraj14))
+- Tidy Rake task to remove duplicate legacy URLs [#2036](https://github.com/AlchemyCMS/alchemy_cms/pull/2036) ([pelargir](https://github.com/pelargir))
+- Change Factory loading mechanism to FactoryBots supported mechanism [#2029](https://github.com/AlchemyCMS/alchemy_cms/pull/2029) ([mamhoff](https://github.com/mamhoff))
+- Add rake task to remove trashed elements [#2025](https://github.com/AlchemyCMS/alchemy_cms/pull/2025) ([tvdeyen](https://github.com/tvdeyen))
+- Do not include unpublished pages in breadcrumb [#2020](https://github.com/AlchemyCMS/alchemy_cms/pull/2020) ([tvdeyen](https://github.com/tvdeyen))
+- Respect Language public status for page public status [#2017](https://github.com/AlchemyCMS/alchemy_cms/pull/2017) ([tvdeyen](https://github.com/tvdeyen))
+- Use at least Ruby 2.5 [#2014](https://github.com/AlchemyCMS/alchemy_cms/pull/2014) ([tvdeyen](https://github.com/tvdeyen))
+- Drop Rails 5.2 support [#2013](https://github.com/AlchemyCMS/alchemy_cms/pull/2013) ([tvdeyen](https://github.com/tvdeyen))
+- Remove page layout change of persisted pages [#1991](https://github.com/AlchemyCMS/alchemy_cms/pull/1991) ([tvdeyen](https://github.com/tvdeyen))
+- Remove element trash [#1987](https://github.com/AlchemyCMS/alchemy_cms/pull/1987) ([tvdeyen](https://github.com/tvdeyen))
+- Remove elements fallbacks [#1983](https://github.com/AlchemyCMS/alchemy_cms/pull/1983) ([tvdeyen](https://github.com/tvdeyen))
 
-## 5.2.1 (2021-05-13)
+### Misc
 
+- Fixes i18n Jest specs [#2120](https://github.com/AlchemyCMS/alchemy_cms/pull/2120) ([tvdeyen](https://github.com/tvdeyen))
+- Allow to update element without tags [#2150](https://github.com/AlchemyCMS/alchemy_cms/pull/2150) ([tvdeyen](https://github.com/tvdeyen))
+- fix: call paging on jquery tabs only after initializing them [#2146](https://github.com/AlchemyCMS/alchemy_cms/pull/2146) ([robinboening](https://github.com/robinboening))
+- Image cropper destroy [#2139](https://github.com/AlchemyCMS/alchemy_cms/pull/2139) ([tvdeyen](https://github.com/tvdeyen))
+- Fix URL for dragonfly configuration reference [#2128](https://github.com/AlchemyCMS/alchemy_cms/pull/2128) ([afdev82](https://github.com/afdev82))
+- Link dialog UI fixes [#2112](https://github.com/AlchemyCMS/alchemy_cms/pull/2112) ([tvdeyen](https://github.com/tvdeyen))
+- [js] Upgrade babel-jest to version 27.0.1 [#2110](https://github.com/AlchemyCMS/alchemy_cms/pull/2110) ([depfu](https://github.com/apps/depfu))
+- Fix node select height [#2102](https://github.com/AlchemyCMS/alchemy_cms/pull/2102) ([tvdeyen](https://github.com/tvdeyen))
+- [ruby - main] Upgrade execjs to version 2.8.1 [#2100](https://github.com/AlchemyCMS/alchemy_cms/pull/2100) ([depfu](https://github.com/apps/depfu))
+- Fix Essence Picture View (#2083) [#2099](https://github.com/AlchemyCMS/alchemy_cms/pull/2099) ([afdev82](https://github.com/afdev82))
+- Pass crop parameter in default EssencePicture#picture_url_options [#2098](https://github.com/AlchemyCMS/alchemy_cms/pull/2098) ([mamhoff](https://github.com/mamhoff))
+- [main] Fix execjs to 2.7.0 for developers and CI [#2095](https://github.com/AlchemyCMS/alchemy_cms/pull/2095) ([mamhoff](https://github.com/mamhoff))
 - Fix alchemy:generate:thumbnails task [#2092](https://github.com/AlchemyCMS/alchemy_cms/pull/2092) ([afdev82](https://github.com/afdev82))
-- Do not attempt to generate thumbs for svg files. [#2090](https://github.com/AlchemyCMS/alchemy_cms/pull/2090) ([oneiros](https://github.com/oneiros))
-
-## 5.2.0 (2021-05-06)
-
-- Backport #2049 to 5.2 [#2086](https://github.com/AlchemyCMS/alchemy_cms/pull/2086) ([rickythefox](https://github.com/rickythefox))
-- hotfix and deprecate page_active? helper [#2073](https://github.com/AlchemyCMS/alchemy_cms/pull/2073) ([robinboening](https://github.com/robinboening))
-
-## 5.2.0.rc1 (2021-02-17)
-
-### Changes
-
-- Change Factory loading mechanism to FactoryBots supported mechanism [#2030](https://github.com/AlchemyCMS/alchemy_cms/pull/2030) ([mamhoff](https://github.com/mamhoff))
+- Use symbols in polymorphic routes for resources [#2087](https://github.com/AlchemyCMS/alchemy_cms/pull/2087) ([tvdeyen](https://github.com/tvdeyen))
+- Fix the height of node select [#2081](https://github.com/AlchemyCMS/alchemy_cms/pull/2081) ([tvdeyen](https://github.com/tvdeyen))
+- Preview url fixes [#2079](https://github.com/AlchemyCMS/alchemy_cms/pull/2079) ([tvdeyen](https://github.com/tvdeyen))
+- Use count over select.count in UrlPath class [#2078](https://github.com/AlchemyCMS/alchemy_cms/pull/2078) ([tvdeyen](https://github.com/tvdeyen))
+- Use the fast DuplicateElement service in Page.copy [#2077](https://github.com/AlchemyCMS/alchemy_cms/pull/2077) ([tvdeyen](https://github.com/tvdeyen))
+- Fix page versioning issues [#2076](https://github.com/AlchemyCMS/alchemy_cms/pull/2076) ([tvdeyen](https://github.com/tvdeyen))
+- Fix add nested element with multiple nestable elements [#2052](https://github.com/AlchemyCMS/alchemy_cms/pull/2052) ([tvdeyen](https://github.com/tvdeyen))
+- Destroy public version if public checkbox is unset [#2050](https://github.com/AlchemyCMS/alchemy_cms/pull/2050) ([tvdeyen](https://github.com/tvdeyen))
+- Fixes paste element and create element with autogenerated nested elements [#2046](https://github.com/AlchemyCMS/alchemy_cms/pull/2046) ([tvdeyen](https://github.com/tvdeyen))
+- Fix page re-publishing for page with nested elements [#2043](https://github.com/AlchemyCMS/alchemy_cms/pull/2043) ([tvdeyen](https://github.com/tvdeyen))
+- Update rubocop config and stick version [#2042](https://github.com/AlchemyCMS/alchemy_cms/pull/2042) ([tvdeyen](https://github.com/tvdeyen))
+- Fix factory loading [#2041](https://github.com/AlchemyCMS/alchemy_cms/pull/2041) ([tvdeyen](https://github.com/tvdeyen))
+- Fix element re-ordering [#2028](https://github.com/AlchemyCMS/alchemy_cms/pull/2028) ([tvdeyen](https://github.com/tvdeyen))
+- Fix typo in element destroy confirm notice [#2026](https://github.com/AlchemyCMS/alchemy_cms/pull/2026) ([tvdeyen](https://github.com/tvdeyen))
+- Fix constants reloading in page and element concerns [#2024](https://github.com/AlchemyCMS/alchemy_cms/pull/2024) ([tvdeyen](https://github.com/tvdeyen))
+- Fix delete element confirm dialog [#2023](https://github.com/AlchemyCMS/alchemy_cms/pull/2023) ([tvdeyen](https://github.com/tvdeyen))
+- Build for Ruby 3 [#1990](https://github.com/AlchemyCMS/alchemy_cms/pull/1990) ([tvdeyen](https://github.com/tvdeyen))
 
 ## 5.2.0.b1 (2021-02-11)
 

data/Gemfile

@@ -16,9 +16,11 @@ group :development, :test do
   # execjs 2.8 removes deprecation warnings but also breaks a number of dependent projects.
   # in our case the culprit is `handlebars-assets`. The changes between 2.7.0 and 2.8.0 are
   # minimal, but breaking.
-  gem "execjs", "= 2.7.0"
+  gem "execjs", "= 2.8.1"
 
   if ENV["GITHUB_ACTIONS"]
+    # Necessary because GH Actions gem cache does not have this "Bundled with Ruby" gem installed
+    gem "rexml", "~> 3.2.4"
     gem "sassc", "~> 2.4.0" # https://github.com/sass/sassc-ruby/issues/146
   else
     gem "launchy"
@@ -27,7 +29,7 @@ group :development, :test do
     gem "yard"
     gem "redcarpet"
     gem "pry-byebug"
-    gem "rubocop", "~> 1.9.0", require: false
+    gem "rubocop", "1.5.2", require: false
     gem "listen"
     gem "localeapp", "~> 3.0", require: false
     gem "dotenv", "~> 2.2"

data/README.md

@@ -51,8 +51,9 @@ or visit the existing demo at https://alchemy-demo.herokuapp.com
 
 ## 🚂 Rails Version
 
-**This version of AlchemyCMS runs with Rails 5.2 and Rails 6.0**
+**This version of AlchemyCMS runs with Rails 6.0**
 
+* For a Rails 5.2 compatible version use the [`5.2-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/5.2-stable).
 * For a Rails 5.0 or 5.1 compatible version use the [`4.5-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/4.5-stable).
 * For a Rails 4.2 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).
 * For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).
@@ -64,7 +65,9 @@ or visit the existing demo at https://alchemy-demo.herokuapp.com
 
 ## 💎 Ruby Version
 
-Alchemy runs with Ruby >= 2.3.0.
+Alchemy runs with Ruby >= 2.5.0.
+
+For a Ruby 2.4 compatible version use the [`5.2-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/5.2-stable).
 
 For a Ruby 2.2 compatible version use the [`4.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/4.1-stable).
 

data/Rakefile

@@ -41,16 +41,12 @@ namespace :alchemy do
     task :prepare do
       system(
         <<~BASH
-          yarn install && \
-          yarn link && \
           cd spec/dummy && \
           export RAILS_ENV=test && \
           bin/rake db:create && \
           bin/rake db:environment:set && \
           bin/rake db:migrate:reset && \
           bin/rails g alchemy:install --skip --skip-demo-files --auto-accept && \
-          yarn link @alchemy_cms/admin && \
-          RAILS_ENV=test bin/webpack && \
           cd -
         BASH
       ) || fail
@@ -76,18 +72,4 @@ 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

@@ -1,80 +1,93 @@
-# coding: utf-8
-lib = File.expand_path('lib', __dir__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'alchemy/version'
+require "alchemy/version"
 
 Gem::Specification.new do |gem|
-  gem.name                  = 'alchemy_cms'
-  gem.version               = Alchemy::VERSION
-  gem.platform              = Gem::Platform::RUBY
-  gem.authors               = ['Thomas von Deyen', 'Robin Boening', 'Marc Schettke', 'Hendrik Mans', 'Carsten Fregin', 'Martin Meyerhoff']
-  gem.email                 = ['hello@alchemy-cms.com']
-  gem.homepage              = 'https://alchemy-cms.com'
-  gem.summary               = 'A powerful, userfriendly and flexible CMS for Rails'
-  gem.description           = 'Alchemy is a powerful, userfriendly and flexible Rails CMS.'
-  gem.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
-  gem.required_ruby_version = '>= 2.3.0'
-  gem.license               = 'BSD New'
-  gem.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
-  gem.require_paths         = ['lib']
+  gem.name = "alchemy_cms"
+  gem.version = Alchemy::VERSION
+  gem.platform = Gem::Platform::RUBY
+  gem.authors = ["Thomas von Deyen", "Robin Boening", "Marc Schettke", "Hendrik Mans", "Carsten Fregin", "Martin Meyerhoff"]
+  gem.email = ["hello@alchemy-cms.com"]
+  gem.homepage = "https://alchemy-cms.com"
+  gem.summary = "A powerful, userfriendly and flexible CMS for Rails"
+  gem.description = "Alchemy is a powerful, userfriendly and flexible Rails CMS."
+  gem.requirements << "ImageMagick (libmagick), v6.6 or greater."
+  gem.required_ruby_version = ">= 2.5.0"
+  gem.license = "BSD New"
+  gem.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
+  gem.require_paths = ["lib"]
+
+  %w[
+    actionmailer
+    actionpack
+    actionview
+    activejob
+    activemodel
+    activerecord
+    activesupport
+    railties
+  ].each do |rails_gem|
+    gem.add_runtime_dependency rails_gem, [">= 6.0", "< 6.1"]
+  end
 
-  gem.add_runtime_dependency 'active_model_serializers',         ['~> 0.10.0']
-  gem.add_runtime_dependency 'acts_as_list',                     ['>= 0.3', '< 2']
-  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', '< 6.0']
-  gem.add_runtime_dependency 'dragonfly',                        ['~> 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']
-  gem.add_runtime_dependency 'jquery-rails',                     ['~> 4.0', '>= 4.0.4']
-  gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 6.0']
-  gem.add_runtime_dependency 'kaminari',                         ['~> 1.1']
-  gem.add_runtime_dependency 'originator',                       ['~> 3.1']
-  gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.8']
-  gem.add_runtime_dependency 'rails',                            ['>= 5.2.0', '< 6.1']
-  gem.add_runtime_dependency 'ransack',                          ['>= 1.8', '< 3.0']
-  gem.add_runtime_dependency 'request_store',                    ['~> 1.2']
-  gem.add_runtime_dependency 'responders',                       ['>= 2.0', '< 4.0']
-  gem.add_runtime_dependency 'sassc-rails',                      ['~> 2.1']
-  gem.add_runtime_dependency 'simple_form',                      ['>= 4.0', '< 6']
-  gem.add_runtime_dependency 'sprockets',                        ['>= 3.0', '< 5']
-  gem.add_runtime_dependency 'turbolinks',                       ['>= 2.5']
-  gem.add_runtime_dependency 'webpacker',                        ['>= 4.0', '< 6']
+  gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"]
+  gem.add_runtime_dependency "acts_as_list", [">= 0.3", "< 2"]
+  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", "< 6.0"]
+  gem.add_runtime_dependency "dragonfly", ["~> 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"]
+  gem.add_runtime_dependency "jquery-rails", ["~> 4.0", ">= 4.0.4"]
+  gem.add_runtime_dependency "jquery-ui-rails", ["~> 6.0"]
+  gem.add_runtime_dependency "kaminari", ["~> 1.1"]
+  gem.add_runtime_dependency "originator", ["~> 3.1"]
+  gem.add_runtime_dependency "non-stupid-digest-assets", ["~> 1.0.8"]
+  gem.add_runtime_dependency "ransack", [">= 1.8", "< 2.4.2"] # 2.4.2 dropped Ruby 2.5 support in a patch level release
+  gem.add_runtime_dependency "request_store", ["~> 1.2"]
+  gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]
+  gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]
+  gem.add_runtime_dependency "simple_form", [">= 4.0", "< 6"]
+  gem.add_runtime_dependency "sprockets", [">= 3.0", "< 5"]
+  gem.add_runtime_dependency "turbolinks", [">= 2.5"]
+  gem.add_runtime_dependency "webpacker", [">= 4.0", "< 6"]
 
-  gem.add_development_dependency 'capybara',                     ['~> 3.0']
-  gem.add_development_dependency 'capybara-screenshot',          ['~> 1.0']
-  gem.add_development_dependency 'factory_bot_rails',            ['~> 6.0']
-  gem.add_development_dependency 'puma',                         ['~> 5.0']
-  gem.add_development_dependency 'rails-controller-testing',     ['~> 1.0']
-  gem.add_development_dependency 'rspec-activemodel-mocks',      ['~> 1.0']
-  gem.add_development_dependency 'rspec-rails',                  ['>= 4.0.0.beta2']
-  gem.add_development_dependency 'simplecov',                    ['~> 0.20']
-  gem.add_development_dependency 'webdrivers',                   ['~> 4.0']
-  gem.add_development_dependency 'webmock',                      ['~> 3.3']
-  gem.add_development_dependency 'shoulda-matchers',             ['~> 4.0']
-  gem.add_development_dependency 'timecop',                      ['~> 0.9']
+  gem.add_development_dependency "capybara", ["~> 3.0"]
+  gem.add_development_dependency "capybara-screenshot", ["~> 1.0"]
+  gem.add_development_dependency "factory_bot_rails", ["~> 6.0"]
+  gem.add_development_dependency "puma", ["~> 5.0"]
+  gem.add_development_dependency "rails-controller-testing", ["~> 1.0"]
+  gem.add_development_dependency "rspec-activemodel-mocks", ["~> 1.0"]
+  gem.add_development_dependency "rspec-rails", [">= 4.0.0.beta2"]
+  gem.add_development_dependency "simplecov", ["~> 0.20"]
+  gem.add_development_dependency "webdrivers", ["~> 4.0"]
+  gem.add_development_dependency "webmock", ["~> 3.3"]
+  gem.add_development_dependency "shoulda-matchers", ["~> 4.0"]
+  gem.add_development_dependency "timecop", ["~> 0.9"]
 
-  gem.post_install_message = <<-MSG
--------------------------------------------------------------
-            Thank you for installing Alchemy CMS
--------------------------------------------------------------
+  gem.post_install_message = <<~MSG
+    -------------------------------------------------------------
+                Thank you for installing Alchemy CMS
+    -------------------------------------------------------------
 
-- Complete the installation in an existing Rails application:
+    - Complete the installation in an existing Rails application:
 
-  $ bin/rake alchemy:install
+      $ bin/rake alchemy:install
 
-- Complete the upgrade of an existing Alchemy installation:
+    - Complete the upgrade of an existing Alchemy installation:
 
-  $ bin/rake alchemy:upgrade
+      $ bin/rake alchemy:upgrade
 
-and follow the onscreen instructions.
+    and follow the onscreen instructions.
 
-Need help? Try:
+    Need help? Try:
 
-* https://stackoverflow.com/questions/tagged/alchemy-cms
-* https://slackin.alchemy-cms.com
--------------------------------------------------------------
+    * https://stackoverflow.com/questions/tagged/alchemy-cms
+    * https://slackin.alchemy-cms.com
+    -------------------------------------------------------------
 
-MSG
+  MSG
 end

data/app/assets/javascripts/alchemy/admin.js

@@ -31,17 +31,17 @@
 //= require alchemy/alchemy.growler
 //= require alchemy/alchemy.gui
 //= require alchemy/alchemy.hotkeys
-//= require alchemy/alchemy.image_cropper
 //= require alchemy/alchemy.image_overlay
 //= require alchemy/alchemy.string_extension
 //= require alchemy/alchemy.link_dialog
 //= require alchemy/alchemy.list_filter
 //= require alchemy/alchemy.initializer
+//= require alchemy/alchemy.page_sorter
 //= require alchemy/alchemy.uploader
 //= require alchemy/alchemy.preview_window
+//= require alchemy/alchemy.sitemap
 //= require alchemy/alchemy.spinner
 //= require alchemy/alchemy.tinymce
 //= require alchemy/alchemy.tooltips
-//= require alchemy/alchemy.trash_window
 //= require alchemy/page_select
 //= require alchemy/node_select

data/app/assets/javascripts/alchemy/alchemy.base.js.coffee

@@ -42,36 +42,6 @@ $.extend Alchemy,
       $overlay.hide()
     return
 
-  # Shows spinner while loading images and
-  # fades the image after its been loaded
-  ImageLoader: (scope = document, options = {fill: '#fff'}) ->
-    $('img', scope).each ->
-      if !this.complete
-        image = $(this).hide()
-        $parent = image.parent()
-        spinner = new Alchemy.Spinner('small', options)
-        spinner.spin $parent[0]
-        image.on 'load', ->
-          spinner.stop()
-          image.fadeIn 400
-        image.on 'error', (evt) ->
-          message = "Could not load #{this.src}"
-          spinner.stop()
-          console.error(message, evt)
-          $parent.html('<span class="icon fas fa-exclamation-triangle" title="' + message + '" />')
-          return
-
-  # Removes the picture from essence picture thumbnail
-  removePicture: (selector) ->
-    $form_field = $(selector)
-    $element = $form_field.closest(".element-editor")
-    $content = $form_field.closest(".content_editor")
-    if $form_field[0]
-      $form_field.val ""
-      $content.find(".thumbnail_background").html('<i class="icon far fa-image fa-fw"/>')
-      Alchemy.setElementDirty $element
-    false
-
   # Initializes all select tag with .alchemy_selectbox class as select2 instance
   # Pass a jQuery scope to only init a subset of selectboxes.
   SelectBox: (scope) ->