alchemy_cms 5.1.4 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb5c73e167cb3cf25c39472962cd945f71853738fee4405daab67521650fff31
-  data.tar.gz: 8da805b0e45430f0db4842a73fa18bf2e3e805bb158a21eff1f9d2fc538638cd
+  metadata.gz: e22cad36f7f22bd3c584b8ec7449098db4664356f44f3dc502ec03b40f6fb37e
+  data.tar.gz: e762d80d1be086a4da0063956187caea7824bf67c556ecb11856af3a33c18988
 SHA512:
-  metadata.gz: 026cf4b8054b3da3c9cc4db868e415a6b988176c13a0c9653dd898b204c048d5e66058039782ada758748cb1e2171a7bf68dd09fde837467b746bdaf446d8e6c
-  data.tar.gz: fec06dbd8ee35382c1b6a8c4c78ad0aa0888f5cfe64a8e90ba6c8f0e5d738e5a41c77c40b929a54593379094c637ac5ddb74e71f3ed8d63d7519d54b2d5c3cb8
+  metadata.gz: b1e60d6b1edbc55f0419a168296067ac0de8860825288e07c9aa063fc80fde587c8cf18c59d2809a500a13588dfdabdeab038fa0bb83a7811c56d77827005467
+  data.tar.gz: 7f6be2a004959880f66a56007c9648c50ad5ce7f3355e40acc5a487fcdacc82c866fcb291c186b84134903de7019aadbf929e6cc96655e6c61e6d6a64a7be8e6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.1.5 (2021-09-15)
+
+- generate picture thumbnails only for pictures with convertible format [#2131](https://github.com/AlchemyCMS/alchemy_cms/pull/2131) ([afdev82](https://github.com/afdev82))
+- Backport #2115 to v5.1 [#2125](https://github.com/AlchemyCMS/alchemy_cms/pull/2125) ([dbwinger](https://github.com/dbwinger))
+- Backport #2114 to v5.1 [#2117](https://github.com/AlchemyCMS/alchemy_cms/pull/2117) ([afdev82](https://github.com/afdev82))
+
 ## 5.1.4 (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.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/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.1.4"
+  VERSION = "5.1.5"
 
   def self.version
     VERSION

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.1.5",
   "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.1.4
+  version: 5.1.5
 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.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
@@ -1278,8 +1284,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: []
+...