alchemy_cms 5.0.0.rc2 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb305961a97845dc249d123acf15ed281e69e13a4be8879eedcb5a858723a5fd
-  data.tar.gz: 6b3d61f36b20ccb41fd0d1f21a26bff8a6fe14f6cf18a2661c63b6044fd5ac2c
+  metadata.gz: f72f743e334595c49a1bfd3c2faf2a7751106cbbf7db00e26df9ea6f676e0d9c
+  data.tar.gz: f370970c8934b50efc3c63b16cd7aaa8e6314334cbf7b71a76794567b69011ff
 SHA512:
-  metadata.gz: 31c91f9169a7a21982f769fe85ed77d4d6d4609eb6de6b37b6d2006a9aeaa5d63bc775280ca37dbdbf37edff969ea28384cc3c92451c36b932f3bfde0025e665
-  data.tar.gz: bc74c7d3bbefe12c90506e8e874c230001deed4dffc2acd5504e3c304d375ef41b818a85ce645e5c95ff064aae3a042fdd27d2c8f4dd01aadc61f764469118a1
+  metadata.gz: effc1689a9c747ab521c3d2af854e645c69050846cecef186788c908772f321fd679d0dc2372355651162b2a9837fa91d480121af3d0e4d45cf7505434626373
+  data.tar.gz: '00192ed6cc59f60a1aecb130d2302a5fe074ece729c154167d1b7d3c094c10039032c1382662b819ea72264c2a5c9a3f77ddaf92d784e60297c56360d590f11e'

data/.github/workflows/ci.yml

@@ -43,14 +43,14 @@ jobs:
           MYSQL_ROOT_PASSWORD: password
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.3.4
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: actions/setup-ruby@v1.1.2
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: Restore apt cache
         id: apt-cache
-        uses: actions/cache@preview
+        uses: actions/cache@v2.1.3
         with:
           path: /home/runner/apt/cache
           key: ${{ runner.os }}-apt-${{ matrix.database }}
@@ -75,7 +75,7 @@ jobs:
           gem install bundler
       - name: Restore Ruby Gems cache
         id: cache
-        uses: actions/cache@preview
+        uses: actions/cache@v2.1.3
         with:
           path: vendor/bundle
           key: ${{ runner.os }}-bundle-${{ matrix.ruby }}-${{ matrix.rails }}-${{ matrix.database }}-${{ hashFiles('**/Gemfile') }}
@@ -87,7 +87,7 @@ jobs:
           bundle install --jobs 4 --retry 3 --path vendor/bundle
       - name: Restore node modules cache
         id: yarn-cache
-        uses: actions/cache@preview
+        uses: actions/cache@v2.1.3
         with:
           path: spec/dummy/node_modules
           key: ${{ runner.os }}-yarn-dummy-${{ hashFiles('./package.json') }}
@@ -97,12 +97,12 @@ jobs:
         run: |
           bundle exec rake alchemy:spec:prepare
       - name: Run tests & publish code coverage
-        uses: paambaati/codeclimate-action@v2.5.7
+        uses: paambaati/codeclimate-action@v2.7.5
         env:
           CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
         with:
           coverageCommand: bundle exec rspec
-      - uses: actions/upload-artifact@master
+      - uses: actions/upload-artifact@main
         if: failure()
         with:
           name: Screenshots
@@ -112,9 +112,9 @@ jobs:
     env:
       NODE_ENV: test
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2.3.4
       - name: Restore node modules cache
-        uses: actions/cache@preview
+        uses: actions/cache@v2.1.3
         with:
           path: node_modules
           key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }}
@@ -124,11 +124,3 @@ jobs:
         run: yarn install
       - name: Run jest
         run: yarn jest
-      - name: Run jest & publish code coverage
-        uses: paambaati/codeclimate-action@v2.5.7
-        env:
-          CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
-        with:
-          coverageLocations:
-            ./coverage/lcov.info:lcov
-          coverageCommand: yarn jest --collectCoverage --coverageDirectory=coverage

data/CHANGELOG.md

@@ -1,5 +1,26 @@
-## 5.0.0 (unreleased)
+## 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))
+
+## 5.0.2 (2020-12-18)
+
+- Fix page sorting [#1984](https://github.com/AlchemyCMS/alchemy_cms/pull/1984) ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.0.1 (2020-09-29)
+
+- Better image alt text support [#1940](https://github.com/AlchemyCMS/alchemy_cms/pull/1940) ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.0.0 (2020-07-17)
+
+- Do not convert JPEG images into JPG [#1904](https://github.com/AlchemyCMS/alchemy_cms/pull/1904) ([tvdeyen](https://github.com/tvdeyen))
+- Do not enable image cropper if file is missing [#1903](https://github.com/AlchemyCMS/alchemy_cms/pull/1903) ([tvdeyen](https://github.com/tvdeyen))
+- Always show original image as zoomed image [#1902](https://github.com/AlchemyCMS/alchemy_cms/pull/1902) ([tvdeyen](https://github.com/tvdeyen))
+- Rename Attachment#urlname into slug [#1848](https://github.com/AlchemyCMS/alchemy_cms/pull/1848) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate toolbar helper ([tvdeyen](https://github.com/tvdeyen))
 - Deprecate redirect_to_public_child ([tvdeyen](https://github.com/tvdeyen))
 - Add --auto-accept option to installer ([tvdeyen](https://github.com/tvdeyen))
 - Move all installer code into install generator ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -10,7 +10,7 @@ if ENV["DB"].nil? || ENV["DB"] == "sqlite"
   gem "sqlite3", "~> 1.4.1"
 end
 gem "mysql2", "~> 0.5.1" if ENV["DB"] == "mysql"
-gem "pg",     "~> 1.0"   if ENV["DB"] == "postgresql"
+gem "pg", "~> 1.0" if ENV["DB"] == "postgresql"
 
 group :development, :test do
   if ENV["GITHUB_ACTIONS"]

data/README.md

@@ -1,7 +1,7 @@
 # AlchemyCMS
 
 [![Gem Version](https://badge.fury.io/rb/alchemy_cms.svg)](http://badge.fury.io/rb/alchemy_cms)
-[![Build Status](https://github.com/AlchemyCMS/alchemy_cms/workflows/CI/badge.svg?branch=master)](https://github.com/AlchemyCMS/alchemy_cms/actions)
+[![Build Status](https://github.com/AlchemyCMS/alchemy_cms/workflows/CI/badge.svg?branch=main)](https://github.com/AlchemyCMS/alchemy_cms/actions)
 [![Maintainability](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/maintainability)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/196c56c56568ed24a697/test_coverage)](https://codeclimate.com/github/AlchemyCMS/alchemy_cms/test_coverage)
 [![Depfu](https://badges.depfu.com/badges/ebe56d2dd7b7044a8ae700cc81212a8e/overview.svg)](https://depfu.com/github/AlchemyCMS/alchemy_cms?project_id=4600)

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

@@ -138,7 +138,7 @@ module Alchemy
 
       def link
         @attachments = Attachment.all.collect { |f|
-          [f.name, download_attachment_path(id: f.id, name: f.urlname)]
+          [f.name, download_attachment_path(id: f.id, name: f.slug)]
         }
       end
 

data/app/helpers/alchemy/admin/base_helper.rb

@@ -314,6 +314,8 @@ module Alchemy
         end
       end
 
+      deprecate toolbar: "Please use `content_for(:toolbar)` instead", deprecator: Alchemy::Deprecation
+
       # (internal) Used by upload form
       def new_asset_path_with_session_information(asset_type)
         session_key = Rails.application.config.session_options[:key]

data/app/helpers/alchemy/url_helper.rb

@@ -26,12 +26,12 @@ module Alchemy
 
     # Returns the path for downloading an alchemy attachment
     def download_alchemy_attachment_path(attachment)
-      alchemy.download_attachment_path(attachment, attachment.urlname)
+      alchemy.download_attachment_path(attachment, attachment.slug)
     end
 
     # Returns the url for downloading an alchemy attachment
     def download_alchemy_attachment_url(attachment)
-      alchemy.download_attachment_url(attachment, attachment.urlname)
+      alchemy.download_attachment_url(attachment, attachment.slug)
     end
 
     # Returns the full url containing host, page and anchor for the given element

data/app/models/alchemy/attachment.rb

@@ -77,10 +77,13 @@ module Alchemy
     end
 
     # An url save filename without format suffix
-    def urlname
+    def slug
       CGI.escape(file_name.gsub(/\.#{extension}$/, "").tr(".", " "))
     end
 
+    alias_method :urlname, :slug
+    deprecate urlname: :slug, deprecator: Alchemy::Deprecation
+
     # Checks if the attachment is restricted, because it is attached on restricted pages only
     def restricted?
       pages.any? && pages.not_restricted.blank?

data/app/models/alchemy/essence_file.rb

@@ -23,7 +23,7 @@ module Alchemy
 
       routes.download_attachment_path(
         id: attachment.id,
-        name: attachment.urlname,
+        name: attachment.slug,
         format: attachment.suffix,
       )
     end

data/app/models/alchemy/essence_picture.rb

@@ -143,7 +143,7 @@ module Alchemy
         picture.can_be_cropped_to(
           content.settings[:size],
           content.settings[:upsample],
-        )
+        ) && !!picture.image_file
     end
 
     def crop_values_present?

data/app/models/alchemy/essence_picture_view.rb

@@ -55,7 +55,7 @@ module Alchemy
     def img_tag
       @_img_tag ||= image_tag(
         essence.picture_url(options.except(*DEFAULT_OPTIONS.keys)), {
-          alt: essence.alt_tag.presence,
+          alt: alt_text,
           title: essence.title.presence,
           class: caption ? nil : essence.css_class.presence,
           srcset: srcset.join(", ").presence,
@@ -79,5 +79,9 @@ module Alchemy
         width.present? ? "#{url} #{width}w" : "#{url} #{height}h"
       end
     end
+
+    def alt_text
+      essence.alt_tag.presence || html_options.delete(:alt) || essence.picture.name&.humanize
+    end
   end
 end

data/app/models/alchemy/picture/url.rb

@@ -71,7 +71,9 @@ module Alchemy
 
       encoding_options = []
 
-      if target_format =~ /jpe?g/
+      convert_format = target_format != image_file_format.sub("jpeg", "jpg")
+
+      if target_format =~ /jpe?g/ && convert_format
         quality = options[:quality] || Config.get(:output_image_jpg_quality)
         encoding_options << "-quality #{quality}"
       end
@@ -80,7 +82,7 @@ module Alchemy
         encoding_options << "-flatten"
       end
 
-      convertion_needed = target_format != image_file_format || encoding_options.present?
+      convertion_needed = convert_format || encoding_options.present?
 
       if has_convertible_format? && convertion_needed
         image = image.encode(target_format, encoding_options.join(" "))

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -40,7 +40,7 @@ module Alchemy
 
         level = path.count + base_level
 
-        path.last[:children] << page_hash(page, has_children, level, folded)
+        path.last[:children] << page_hash(page, level, folded)
       end
 
       tree
@@ -48,7 +48,7 @@ module Alchemy
 
     protected
 
-    def page_hash(page, has_children, level, folded)
+    def page_hash(page, level, folded)
       p_hash = {
         id: page.id,
         name: page.name,
@@ -59,8 +59,8 @@ module Alchemy
         urlname: page.urlname,
         url_path: page.url_path,
         level: level,
-        root: page.depth == 1,
-        root_or_leaf: page.depth == 1 || !has_children,
+        root: page.root?,
+        root_or_leaf: page.root? || page.leaf?,
         children: [],
       }
 

data/app/views/alchemy/admin/elements/_element_toolbar.html.erb

@@ -1,4 +1,4 @@
-<% remarkable_type = element.class.name.demodulize.underscore.pluralize %>
+<% remarkable_type = "elements" %>
 <div class="element-toolbar">
   <span class="element_tools">
     <div class="button_with_label">

data/app/views/alchemy/admin/pictures/show.html.erb

@@ -1,5 +1,5 @@
 <div class="zoomed-picture-background">
-  <%= image_tag @picture.url(format: @picture.image_file_format) %>
+  <%= image_tag @picture.url %>
 </div>
 
 <div class="picture-overlay-navigation">

data/app/views/alchemy/admin/resources/index.html.erb

@@ -1,29 +1,28 @@
 <% label_title = Alchemy.t("Create #{resource_name}", default: Alchemy.t('Create')) %>
 
-<% toolbar(
-  buttons: [
-    {
-      icon: :plus,
-      label: label_title,
-      url: new_resource_path,
+<% content_for(:toolbar) do %>
+  <%= toolbar_button(
+    icon: :plus,
+    label: label_title,
+    url: new_resource_path,
+    title: label_title,
+    hotkey: 'alt+n',
+    dialog_options: {
       title: label_title,
-      hotkey: 'alt+n',
-      dialog_options: {
-        title: label_title,
-        size: resource_window_size
-      },
-      if_permitted_to: [:create, resource_model]
+      size: resource_window_size
     },
-    {
-      icon: 'download',
-      url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: search_filter_params[:q], sort: params[:sort]),
-      label: Alchemy.t(:download_csv),
-      title: Alchemy.t(:download_csv),
-      dialog: false,
-      if_permitted_to: [:index, resource_model]
-    }
-  ]
-) %>
+    if_permitted_to: [:create, resource_model]
+  ) %>
+  <%= toolbar_button(
+    icon: :download,
+    url: resource_url_proxy.url_for(action: 'index', format: 'csv', q: search_filter_params[:q], sort: params[:sort]),
+    label: Alchemy.t(:download_csv),
+    title: Alchemy.t(:download_csv),
+    dialog: false,
+    if_permitted_to: [:index, resource_model]
+  ) %>
+  <%= render 'alchemy/admin/partials/search_form' %>
+<% end %>
 
 <div id="archive_all" class="resources-table-wrapper<%= ' with_tag_filter' if resource_has_tags || resource_has_filters %>">
   <%= render 'alchemy/admin/resources/table_header' %>

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

@@ -7,7 +7,7 @@
     attachment.name,
   alchemy.download_attachment_path(
     attachment,
-    name: attachment.urlname,
+    name: attachment.slug,
     format: attachment.suffix
   ),
   {

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/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.0.0.rc2"
+  VERSION = "5.0.4"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc2
+  version: 5.0.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1263,14 +1263,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails
 test_files: []
-...