alchemy_cms 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87323b91f4cbf7c67ce585467f021dc5c9be44424bb92ce34538876a671b9a0e
-  data.tar.gz: e7a6c2c6bd5a547bce29dc67956975a8d6e2010418234d138c3c15aaa3aebe5b
+  metadata.gz: e8b665afca9f931729de47f8dde2132fbc3c9709498c9709e1c67644a9ff0d00
+  data.tar.gz: 85726253e3274efe019bfaad154d99a396f2fe1fe0e0cd6c9e6cfedc62c869e2
 SHA512:
-  metadata.gz: f55c35c77239b02a72cae0168afa70b1a27d550edaac33d30c7f584e956547ae7019ee31f36cb750b9c8e2110e3e54b8be49173b44c63028fbb984b22f3bdeea
-  data.tar.gz: '0998634c50a87e6137b9caa7d0a0bee5a4fd1bf249f9708ed5e1e5cc2531dbbffcd8b1f1cf165197afb078a3029efaa66b1495f257c2f0977fef561bf97da426'
+  metadata.gz: f9fbd42d74150d10372a99418f5215fc76b1d1974141f6141f97de5a73e3e7efd46671188140b415bf9268bdf7c9e0d2a4dce72130ebfff1c4a8e68d234d94e6
+  data.tar.gz: 496d9611ef5ea7c944c6bae6b28b4aa6ec688a5a029e7336d99b0b9571c4a518d3d319df939eee5006d73a68a1e43f1f4c2e4122be48d02f5fb9ad87104f2d46

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 5.2.2 (2021-09-15)
+
+- 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))
+
 ## 5.2.1 (2021-05-13)
 
 - Fix alchemy:generate:thumbnails task [#2092](https://github.com/AlchemyCMS/alchemy_cms/pull/2092) ([afdev82](https://github.com/afdev82))

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', '< 6.0']
-  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 1.0.7']
+  gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0', '>= 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/controllers/alchemy/api/pages_controller.rb

@@ -8,10 +8,11 @@ module Alchemy
     #
     def index
       # Fix for cancancan not able to merge multiple AR scopes for logged in users
-      if can? :edit_content, Alchemy::Page
-        @pages = Page.all
+      if cannot? :edit_content, Alchemy::Page
+        @pages = Alchemy::Page.accessible_by(current_ability, :index)
+        @pages = @pages.where(language: Language.current)
       else
-        @pages = Page.accessible_by(current_ability, :index)
+        @pages = Language.current&.pages.presence || Alchemy::Page.none
       end
       @pages = @pages.includes(*page_includes)
       @pages = @pages.ransack(params[:q]).result

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/upgrader/five_point_zero.rb

@@ -1,9 +1,18 @@
 # frozen_string_literal: true
 
 require_relative "tasks/harden_gutentag_migrations"
+require "rails/generators"
+require "thor"
+require "alchemy/install/tasks"
 
 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 +45,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"
+      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.2.1"
+  VERSION = "5.2.2"
 
   def self.version
     VERSION

data/lib/generators/alchemy/menus/templates/node.html.erb

@@ -1,4 +1,4 @@
-<%% cache node do %>
+<%% cache [node, @page, @preview_mode] do %>
   <%%= content_tag :li, class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do %>
     <%%= link_to_if node.url,
       node.name,

data/lib/generators/alchemy/menus/templates/node.html.haml

@@ -1,4 +1,4 @@
-- cache node do
+- cache [node, @page, @preview_mode] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,

data/lib/generators/alchemy/menus/templates/node.html.slim

@@ -1,4 +1,4 @@
-- cache node do
+- cache [node, @page, @preview_mode] do
   = content_tag :li,
     class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
     = link_to_if node.url,

data/lib/generators/alchemy/menus/templates/wrapper.html.erb

@@ -1,4 +1,4 @@
-<%% cache menu do %>
+<%% cache [menu, @page, @preview_mode] do %>
   <ul class="nav">
     <%%= render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/lib/generators/alchemy/menus/templates/wrapper.html.haml

@@ -1,4 +1,4 @@
-- cache menu do
+- cache [menu, @page, @preview_mode] do
   %ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/lib/generators/alchemy/menus/templates/wrapper.html.slim

@@ -1,4 +1,4 @@
-- cache menu do
+- cache [menu, @page, @preview_mode] do
   ul.nav
     = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),

data/lib/tasks/alchemy/thumbnails.rake

@@ -14,6 +14,8 @@ namespace :alchemy do
       puts "Please wait..."
 
       Alchemy::Picture.find_each do |picture|
+        next unless picture.has_convertible_format?
+
         puts Alchemy::PictureThumb.generate_thumbs!(picture)
       end
 

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.2.2",
   "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.2.1
+  version: 5.2.2
 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-05-13 00:00:00.000000000 Z
+date: 2021-09-15 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'
   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'
 - !ruby/object:Gem::Dependency
   name: dragonfly_svg
   requirement: !ruby/object:Gem::Requirement
@@ -1280,8 +1286,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.26
+signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails
 test_files: []
+...