alchemy_cms 5.0.0.rc2 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb305961a97845dc249d123acf15ed281e69e13a4be8879eedcb5a858723a5fd
-  data.tar.gz: 6b3d61f36b20ccb41fd0d1f21a26bff8a6fe14f6cf18a2661c63b6044fd5ac2c
+  metadata.gz: 16f4ae2bce440faa0777082d737d275f21bc1b5dcd13c52143369a4db9e2b5cf
+  data.tar.gz: 305a0964902cae1ff220c3b20e77c8da0f0ffef33e1022baa1283b97d8a8dc72
 SHA512:
-  metadata.gz: 31c91f9169a7a21982f769fe85ed77d4d6d4609eb6de6b37b6d2006a9aeaa5d63bc775280ca37dbdbf37edff969ea28384cc3c92451c36b932f3bfde0025e665
-  data.tar.gz: bc74c7d3bbefe12c90506e8e874c230001deed4dffc2acd5504e3c304d375ef41b818a85ce645e5c95ff064aae3a042fdd27d2c8f4dd01aadc61f764469118a1
+  metadata.gz: ee11b0843264ecc2feeb7317e2caae8a27d2a2416abbd990b1fef3d8a662ce4781f4b586b68bd920fc25f9c1ac5c09fd2139bf45c4cb29bb2fbcff318e40fac3
+  data.tar.gz: f34a6757641128e2815e2b50baa2a5628020880e2af272ad5f5df01f9b8ec9a4f98d9b8b9e696d845d3c70a27254ba09988066d0892bb0b8c23311ceb7c39069

data/CHANGELOG.md

@@ -1,5 +1,10 @@
-## 5.0.0 (unreleased)
+## 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/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/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/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/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.0.0.rc2"
+  VERSION = "5.0.0"
 
   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.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1263,9 +1263,9 @@ 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