alchemy_cms 5.0.3 → 5.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54cfa6b7582851195ca4efa3cba8f84bbb4f1d4f064df0e0ed7827d2878c9642
-  data.tar.gz: 2d8c9abc0af15288204c2c8fd190d36717ff2c5d6fd2b9d1cef4d1dff0d0ab66
+  metadata.gz: 8314deb3da46220c3ae380d6cfbcf4bf9c5ae71c89f57070c80854c852902fa0
+  data.tar.gz: c6f0b239474a7f9117b7178880efddcfd2072aa7b625ea023ca461e286041721
 SHA512:
-  metadata.gz: 10d8633d5579d29799a981f465fefd14341e8165c124c008f75e1598b8e7001bccb7960fb3a79fcda915587296ff8aec627446ff733059cda3e548ab2480ab30
-  data.tar.gz: 3f9af3b0200fa6a4d58ce70c955a95e40296a9332f58f8773d31987911b9254fc83e6b7bddabdb0a8380ba2e7768a37abb7620287848d1f8150fd2c6657d1802
+  metadata.gz: 1feceb8caa6386c912ce7eee42dc23f3cc7defc7c2be23a9b7760f8677e838691ca13ea5dfad1ae68a92c15c88493d20a3b54847b66886b2c7cc298e37f24ca5
+  data.tar.gz: b63b5df5f228e82f125273fbb29dfca421b57c06d9bdb111031f04e81942e6aacf7b3c6f593cfed0b7a7969f89175d221ed352bbe296062fb80ddf6647340eee

data/.github/workflows/ci.yml

@@ -12,8 +12,8 @@ jobs:
           - '5.2'
           - '6.0'
         ruby:
-          - '2.5.x'
           - '2.6.x'
+          - '2.7.x'
         database:
           - mysql
           - postgresql

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 5.0.7 (2021-10-26)
+
+- Make sure to install correct npm package ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.0.6 (2021-09-17)
+
+- Use self_and_ancestors in page_active? helper [#2193](https://github.com/AlchemyCMS/alchemy_cms/pull/2193) ([mamhoff](https://github.com/mamhoff))
+
+## 5.0.5 (2021-09-15)
+
+- Backport #2115 to v5.0 [#2126](https://github.com/AlchemyCMS/alchemy_cms/pull/2126) ([dbwinger](https://github.com/dbwinger))
+- Fixate Dragonfly to < 1.4 [#2122](https://github.com/AlchemyCMS/alchemy_cms/pull/2122) ([tvdeyen](https://github.com/tvdeyen))
+- Backport #2114 to v5.0 [#2118](https://github.com/AlchemyCMS/alchemy_cms/pull/2118) ([afdev82](https://github.com/afdev82))
+
+## 5.0.4 (2021-05-06)
+
+- Use symbols in polymorphic routes for resources [#2087](https://github.com/AlchemyCMS/alchemy_cms/pull/2087) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 5.0.3 (2021-01-12)
 
 - Fix copy element feature [#1996](https://github.com/AlchemyCMS/alchemy_cms/pull/1996) ([tvdeyen](https://github.com/tvdeyen))

data/alchemy_cms.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   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.required_ruby_version = '~> 2.3'
   gem.license               = 'BSD New'
   gem.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   gem.require_paths         = ['lib']
@@ -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', '>= 1.0.7', '< 1.4.0']
   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/helpers/alchemy/pages_helper.rb

@@ -100,7 +100,7 @@ module Alchemy
 
     # Returns true if page is in the active branch
     def page_active?(page)
-      @_page_ancestors ||= Page.ancestors_for(@page)
+      @_page_ancestors ||= @page.self_and_ancestors.contentpages
       @_page_ancestors.include?(page)
     end
 

data/app/views/alchemy/essences/_essence_picture_view.html.erb

@@ -1,6 +1,6 @@
 <% content = local_assigns[:content] || local_assigns[:essence_picture_view] %>
 <%= Alchemy::EssencePictureView.new(
   content,
-  local_assigns[:options],
-  local_assigns[:html_options]
-).render %>
+  local_assigns[:options] || {},
+  local_assigns[:html_options] || {}
+).render %>

data/lib/alchemy/resource.rb

@@ -132,7 +132,9 @@ 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
@@ -140,13 +142,13 @@ module Alchemy
         resource_name_array = resource_array.dup
         resource_name_array.delete(engine_name) if in_engine?
         resource_name_array.join("_")
-      end
+      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/five_point_zero.rb

@@ -1,9 +1,19 @@
 # frozen_string_literal: true
 
 require_relative "tasks/harden_gutentag_migrations"
+require "rails/generators"
+require "thor"
+require "alchemy/install/tasks"
+require "alchemy/version"
 
 module Alchemy
   class Upgrader::FivePointZero < Upgrader
+    include Rails::Generators::Actions
+    include Thor::Base
+    include Thor::Actions
+
+    source_root File.expand_path("../../generators/alchemy/install/files", __dir__)
+
     class << self
       def install_gutentag_migrations
         desc "Install Gutentag migrations"
@@ -36,6 +46,28 @@ module Alchemy
           log "Root page not found.", :skip
         end
       end
+
+      def run_webpacker_installer
+        # Webpacker does not create a package.json, but we need one
+        unless File.exist? app_root.join("package.json")
+          in_root { run "echo '{}' > package.json" }
+        end
+        new.rake("webpacker:install", abort_on_failure: true)
+      end
+
+      def add_npm_package
+        new.run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
+      end
+
+      def copy_alchemy_entry_point
+        webpack_config = YAML.load_file(app_root.join("config", "webpacker.yml"))[Rails.env]
+        new.copy_file "alchemy_admin.js",
+          app_root.join(webpack_config["source_path"], webpack_config["source_entry_path"], "alchemy/admin.js")
+      end
+
+      def app_root
+        @_app_root ||= Rails.root
+      end
     end
   end
 end

data/lib/alchemy/version.rb

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

data/lib/generators/alchemy/install/install_generator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "rails/generators"
 require "alchemy/install/tasks"
+require "alchemy/version"
 
 module Alchemy
   module Generators
@@ -88,7 +89,7 @@ module Alchemy
       end
 
       def add_npm_package
-        run "yarn add @alchemy_cms/admin"
+        run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
       end
 
       def copy_alchemy_entry_point

data/lib/tasks/alchemy/upgrade.rake

@@ -42,6 +42,9 @@ namespace :alchemy do
         "alchemy:upgrade:5.0:install_gutentag_migrations",
         "alchemy:upgrade:5.0:remove_layout_roots",
         "alchemy:upgrade:5.0:remove_root_page",
+        "alchemy:upgrade:5.0:run_webpacker_installer",
+        "alchemy:upgrade:5.0:add_npm_package",
+        "alchemy:upgrade:5.0:copy_alchemy_entry_point",
       ]
 
       desc "Install Gutentag migrations"
@@ -58,6 +61,23 @@ namespace :alchemy do
       task remove_root_page: [:environment] do
         Alchemy::Upgrader::FivePointZero.remove_root_page
       end
+
+      desc "Run webpacker installer"
+      task run_webpacker_installer: [:environment] do
+        Alchemy::Upgrader::FivePointZero.run_webpacker_installer
+      end
+
+      desc "Add NPM package"
+      task add_npm_package: [:environment] do
+        puts "adding npm_package..."
+        Alchemy::Upgrader::FivePointZero.add_npm_package
+      end
+
+      desc "Copy alchemy entry point"
+      task copy_alchemy_entry_point: [:environment] do
+        puts "copying alchemy entry point"
+        Alchemy::Upgrader::FivePointZero.copy_alchemy_entry_point
+      end
     end
   end
 end

data/package/admin.js

@@ -1,4 +1,5 @@
 import translate from "./src/i18n"
+import translationData from "./src/translations"
 import NodeTree from "./src/node_tree"
 
 // Global Alchemy object
@@ -10,5 +11,6 @@ if (typeof window.Alchemy === "undefined") {
 Object.assign(Alchemy, {
   // Global utility method for translating a given string
   t: translate,
+  translations: Object.assign(Alchemy.translations || {}, translationData),
   NodeTree
 })

data/package/src/__tests__/i18n.spec.js

@@ -15,12 +15,20 @@ describe("translate", () => {
     })
 
     describe("if translation is present", () => {
+      beforeEach(() => {
+        Alchemy.translations = { en: { help: "Help" } }
+      })
+
       it("Returns translated string", () => {
         expect(translate("help")).toEqual("Help")
       })
 
       describe("if key includes a period", () => {
         describe("that is translated", () => {
+          beforeEach(() => {
+            Alchemy.translations = { en: { formats: { date: "Y-m-d" } } }
+          })
+
           it("splits into group", () => {
             expect(translate("formats.date")).toEqual("Y-m-d")
           })
@@ -40,6 +48,10 @@ describe("translate", () => {
       })
 
       describe("if replacement is given", () => {
+        beforeEach(() => {
+          Alchemy.translations = { en: { allowed_chars: "of %{number} chars" } }
+        })
+
         it("replaces it", () => {
           expect(translate("allowed_chars", 5)).toEqual("of 5 chars")
         })
@@ -67,4 +79,15 @@ describe("translate", () => {
       spy.mockRestore()
     })
   })
+
+  describe("if Alchemy.translations is not set", () => {
+    it("Returns passed string and logs a warning", () => {
+      const spy = jest.spyOn(console, "warn").mockImplementation(() => {})
+      expect(translate("help")).toEqual("help")
+      expect(spy.mock.calls).toEqual([
+        ["Translations for locale kl not found!"]
+      ])
+      spy.mockRestore()
+    })
+  })
 })

data/package/src/i18n.js

@@ -1,5 +1,3 @@
-import translationData from "./translations"
-
 const KEY_SEPARATOR = /\./
 
 function currentLocale() {
@@ -11,7 +9,7 @@ function currentLocale() {
 
 function getTranslations() {
   const locale = currentLocale()
-  const translations = translationData[locale]
+  const translations = Alchemy.translations && Alchemy.translations[locale]
 
   if (translations) {
     return translations

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "0.2.0",
+  "version": "5.0.7",
   "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: 5.0.3
+  version: 5.0.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-01-12 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -113,6 +113,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,6 +126,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: dragonfly_svg
   requirement: !ruby/object:Gem::Requirement
@@ -1258,9 +1264,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1268,8 +1274,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.2.28
+signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails
 test_files: []
+...