alchemy_cms 5.0.0.beta1 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a47529eb07ef956c81fe417efd5570b37a0d56e689ee3079c9bc623b91b8bc28
-  data.tar.gz: 9bb8aa6ca4eab610212690d3630c223269d3d6cb28224e33a9a4838fb4869c81
+  metadata.gz: 6917c640c04335035e6dc96c947904226222acd26dec111b81da71496b40505e
+  data.tar.gz: d5e33e37d5d5cbacbbb6c3729468548155add079b131524880bdd9c8ff8fd35f
 SHA512:
-  metadata.gz: df610fff48f0e7a30c0f348b20c452a8ade6226a9ce6457b497d76e3cdc7269d43cfe24da082687773de1c9a692df0116475b87469e9538899bc142e7d49397e
-  data.tar.gz: 89281dc3a6bccd9d537adc2662143e61f023f38205a3474a1d4f6a63b40dea7374df95f7f40614aee771f14de7bec44f92afb68dfcffafb1df1028f416bb0c79
+  metadata.gz: e73a121ef1c1eee8c0dc065a585509cc55f3eeb457e89f4356ab112a6c8347e1209bb6b37f7f865a1f3589f3f4aae07158a8e842874e735e46ebbb1566a689c7
+  data.tar.gz: d82eb3375db6a20ac410051da9e476b50193b1a72337660a87bc8931d56b674369bb4f1bc9909511b85183f16949a854cdbed6301884db8c59c1016a8b6fa53d

data/.rubocop.yml

@@ -227,7 +227,7 @@ Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
 
 Style/TrailingCommaInArguments:
-  EnforcedStyleForMultiline: comma
+  Enabled: false
 
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -0,0 +1,48 @@
+language: ruby
+os: linux
+dist: bionic
+services:
+  - mysql
+addons:
+  postgresql: "10"
+cache:
+  bundler: true
+  yarn: true
+  directories:
+    - /home/travis/.webdrivers/
+rvm:
+  - 2.6.6
+  - 2.7.1
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+  - nvm use 12
+
+script: bundle exec rake
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+
+jobs:
+  include:
+    - language: node_js
+      node_js: 12
+      install: yarn install
+      script: yarn jest --coverage
+      env: NODE_ENV=test
+      before_script: skip
+      after_script: skip
+
+env:
+  global:
+    CC_TEST_REPORTER_ID=bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
+  jobs:
+    - DB=mysql RAILS_VERSION=5.2
+    - DB=mysql RAILS_VERSION=6.0
+    - DB=postgresql RAILS_VERSION=5.2
+    - DB=postgresql RAILS_VERSION=6.0
+notifications:
+  slack:
+    secure: QzOFw1Ph69pzwWBFgtIVkOnjbcRxB9HPRQ+RYjK+2tg+fsbiTJ+wYgHcZL49tPYcLAls4kymkFWzWBF3PCAXJMfKgUCqXzdQ2FuJC/JoVRTLll4wDnZFPG33jsm5tVznmycZ3ma4+ZWfJQ+C+elEBOba6v1kG9eGIy6sH2cvXfE=

data/CHANGELOG.md

@@ -1,5 +1,22 @@
-## 5.0.0 (unreleased)
-
+## 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))
+- Language Factory: Create default language in host app's locale [#1884](https://github.com/AlchemyCMS/alchemy_cms/pull/1884) ([mamhoff](https://github.com/mamhoff))
+- Respect filter and tagging params in picture archive size buttons [#1880](https://github.com/AlchemyCMS/alchemy_cms/pull/1880) ([tvdeyen](https://github.com/tvdeyen))
+- Extract picture thumbnail sizes in a constant [#1879](https://github.com/AlchemyCMS/alchemy_cms/pull/1879) ([tvdeyen](https://github.com/tvdeyen))
+- Configurable Image Preprocessor [#1878](https://github.com/AlchemyCMS/alchemy_cms/pull/1878) ([tvdeyen](https://github.com/tvdeyen))
+- Configure edit page preview per site [#1877](https://github.com/AlchemyCMS/alchemy_cms/pull/1877) ([tvdeyen](https://github.com/tvdeyen))
 - Fix Page tree sorting after root page removal [#1876](https://github.com/AlchemyCMS/alchemy_cms/pull/1876) ([tvdeyen](https://github.com/tvdeyen))
 - 5.0 Upgrader fixes [#1874](https://github.com/AlchemyCMS/alchemy_cms/pull/1874) ([tvdeyen](https://github.com/tvdeyen))
 - Remove url_nesting config [#1872](https://github.com/AlchemyCMS/alchemy_cms/pull/1872) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -10,10 +10,10 @@ 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"]
+  if ENV["TRAVIS"]
     gem "sassc", "~> 2.4.0" # https://github.com/sass/sassc-ruby/issues/146
   else
     gem "launchy"

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://travis-ci.com/AlchemyCMS/alchemy_cms.svg?branch=master)](https://travis-ci.com/AlchemyCMS/alchemy_cms)
 [![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)
@@ -125,7 +125,7 @@ $ bundle add alchemy-devise
 Then run the `alchemy-devise` installer:
 
 ```bash
-$ bin/rails g alchemy_devise:install
+$ bin/rails g alchemy:devise:install
 ```
 
 ##### Use your User model
@@ -167,7 +167,7 @@ Please follow [this guide](http://guides.alchemy-cms.com/stable/custom_authentic
 **After** you set the user model you need to run the Alchemy install task:
 
 ```bash
-$ bin/rake alchemy:install
+$ bin/rails alchemy:install
 ```
 
 Now everything should be set up and you should be able to visit the Alchemy Dashboard at:

data/Rakefile

@@ -39,16 +39,17 @@ namespace :alchemy do
   namespace :spec do
     desc "Prepares database for testing Alchemy"
     task :prepare do
-      result = system <<~BASH
-        cd spec/dummy && \
-        export RAILS_ENV=test && \
-        bin/rake db:create && \
-        bin/rake db:environment:set && \
-        bin/rake db:migrate:reset && \
-        bin/rails g alchemy:install --skip --skip-demo-files && \
-        cd -
-      BASH
-      result || fail
+      system(
+        <<~BASH
+          cd spec/dummy && \
+          export RAILS_ENV=test && \
+          bin/rake db:create && \
+          bin/rake db:environment:set && \
+          bin/rake db:migrate:reset && \
+          bin/rails g alchemy:install --skip --skip-demo-files --auto-accept && \
+          cd -
+        BASH
+      ) || fail
     end
   end
 

data/alchemy_cms.gemspec

@@ -45,7 +45,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'capybara',                     ['~> 3.0']
   gem.add_development_dependency 'capybara-screenshot',          ['~> 1.0']
-  gem.add_development_dependency 'factory_bot_rails',            ['~> 5.0']
+  gem.add_development_dependency 'factory_bot_rails',            ['~> 6.0']
   gem.add_development_dependency 'puma',                         ['~> 4.0']
   gem.add_development_dependency 'rails-controller-testing',     ['~> 1.0']
   gem.add_development_dependency 'rspec-activemodel-mocks',      ['~> 1.0']

data/app/assets/stylesheets/alchemy/navigation.scss

@@ -286,5 +286,6 @@
     color: $muted-text-color;
     margin-right: $default-margin;
     font-size: $small-font-size;
+    line-height: 31px;
   }
 }

data/app/assets/stylesheets/alchemy/tags.scss

@@ -3,14 +3,14 @@
   padding-bottom: 138px;
 
   &.filtered {
-    padding-bottom: 164px;
+    padding-bottom: 178px;
   }
 
   &.with_filter_bar {
     padding-bottom: 218px;
 
     &.filtered {
-      padding-bottom: 244px;
+      padding-bottom: 256px;
     }
   }
 

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/admin/pictures_helper.rb

@@ -4,12 +4,10 @@ module Alchemy
   module Admin
     module PicturesHelper
       def preview_size(size)
-        case size
-        when "small" then "80x60"
-        when "large" then "240x180"
-        else
-          "160x120"
-        end
+        Alchemy::Picture::THUMBNAIL_SIZES.fetch(
+          size,
+          Alchemy::Picture::THUMBNAIL_SIZES[:medium]
+        )
       end
     end
   end

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

@@ -22,6 +22,12 @@
 
 module Alchemy
   class Picture < BaseRecord
+    THUMBNAIL_SIZES = {
+      small: "80x60",
+      medium: "160x120",
+      large: "240x180",
+    }.with_indifferent_access.freeze
+
     CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
 
     include Alchemy::NameConversions
@@ -50,12 +56,25 @@ module Alchemy
       raise PictureInUseError, Alchemy.t(:cannot_delete_picture_notice) % { name: name }
     end
 
+    # Image preprocessing class
+    def self.preprocessor_class
+      @_preprocessor_class ||= Preprocessor
+    end
+
+    # Set a image preprocessing class
+    #
+    #     # config/initializers/alchemy.rb
+    #     Alchemy::Picture.preprocessor_class = My::ImagePreprocessor
+    #
+    def self.preprocessor_class=(klass)
+      @_preprocessor_class = klass
+    end
+
     # Enables Dragonfly image processing
     dragonfly_accessor :image_file, app: :alchemy_pictures do
       # Preprocess after uploading the picture
-      after_assign do |p|
-        resize = Config.get(:preprocess_image_resize)
-        p.thumb!(resize) if resize.present?
+      after_assign do |image|
+        self.class.preprocessor_class.new(image).call
       end
     end
 

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Picture < BaseRecord
+    class Preprocessor
+      def initialize(image_file)
+        @image_file = image_file
+      end
+
+      # Preprocess images after upload
+      #
+      # Define preprocessing options in the Alchemy::Config
+      #
+      #   preprocess_image_resize [String] - Downsizing example: '1000x1000>'
+      #
+      def call
+        max_image_size = Alchemy::Config.get(:preprocess_image_resize)
+        image_file.thumb!(max_image_size) if max_image_size.present?
+      end
+
+      private
+
+      attr_reader :image_file
+    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/views/alchemy/admin/pictures/index.html.erb

@@ -14,7 +14,12 @@
       <div class="button_with_label">
         <%= link_to(
           render_icon('search-minus'),
-          alchemy.admin_pictures_path(size: "small", q: search_filter_params[:q]),
+          alchemy.admin_pictures_path(
+            size: "small",
+            q: search_filter_params[:q],
+            filter: search_filter_params[:filter],
+            tagged_with: search_filter_params[:tagged_with]
+          ),
           title: Alchemy.t(:small_thumbnails),
           class: "icon_button"
         ) %>
@@ -22,7 +27,12 @@
       <div class="button_with_label">
         <%= link_to(
           render_icon('search'),
-          alchemy.admin_pictures_path(size: "medium", q: search_filter_params[:q]),
+          alchemy.admin_pictures_path(
+            size: "medium",
+            q: search_filter_params[:q],
+            filter: search_filter_params[:filter],
+            tagged_with: search_filter_params[:tagged_with]
+          ),
           title: Alchemy.t(:medium_thumbnails),
           class: "icon_button"
         ) %>
@@ -30,7 +40,12 @@
       <div class="button_with_label">
         <%= link_to(
           render_icon('search-plus'),
-          alchemy.admin_pictures_path(size: "large", q: search_filter_params[:q]),
+          alchemy.admin_pictures_path(
+            size: "large",
+            q: search_filter_params[:q],
+            filter: search_filter_params[:filter],
+            tagged_with: search_filter_params[:tagged_with]
+          ),
           title: Alchemy.t(:big_thumbnails),
           class: "icon_button"
         ) %>

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/admin/sites/_form.html.erb

@@ -1,5 +1,5 @@
-<%= alchemy_form_for site, url: alchemy.admin_sites_path(site, search_filter_params) do |f| %>
-  <%= f.input :host, hint: resource_handler.help_text_for(name: :host).html_safe %>
+<%= alchemy_form_for site, url: resource_path(site, search_filter_params) do |f| %>
+  <%= f.input :host, hint: resource_handler.help_text_for(name: :host)&.html_safe %>
   <%= f.input :name %>
   <%= f.input :public %>
   <%= f.input :aliases, hint: resource_handler.help_text_for(name: :aliases), input_html: {rows: 4} %>

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/config/alchemy/config.yml

@@ -55,6 +55,16 @@ items_per_page: 15
 #   auth:
 #     username: <%= ENV["BASIC_AUTH_USERNAME"] %>
 #     password: <%= ENV["BASIC_AUTH_PASSWORD"] %>
+#
+# Preview config per site is supported as well.
+#
+# preview:
+#   My site name:
+#     host: https://www.my-static-site.com
+#     auth:
+#       username: <%= ENV["BASIC_AUTH_USERNAME"] %>
+#       password: <%= ENV["BASIC_AUTH_PASSWORD"] %>
+#
 
 # === Picture rendering settings
 #

data/lib/alchemy/admin/preview_url.rb

@@ -19,19 +19,31 @@ module Alchemy
     #         username: <%= ENV["BASIC_AUTH_USERNAME"] %>
     #         password: <%= ENV["BASIC_AUTH_PASSWORD"] %>
     #
+    # Preview config per site is supported as well.
+    #
+    # == Example config/alchemy/config.yml
+    #
+    #     preview:
+    #       My site name:
+    #         host: https://www.my-static-site.com
+    #         auth:
+    #           username: <%= ENV["BASIC_AUTH_USERNAME"] %>
+    #           password: <%= ENV["BASIC_AUTH_PASSWORD"] %>
+    #
     class PreviewUrl
       class MissingProtocolError < StandardError; end
 
       def initialize(routes:)
         @routes = routes.url_helpers
-        @preview_config = Alchemy::Config.get(:preview)
       end
 
       def url_for(page)
-        if preview_config
+        @preview_config = preview_config_for(page)
+
+        if @preview_config && uri
           uri_class.build(
             host: uri.host,
-            path: "/#{page.urlname}",
+            path: page.url_path,
             userinfo: userinfo,
           ).to_s
         else
@@ -41,10 +53,19 @@ module Alchemy
 
       private
 
-      attr_reader :preview_config, :routes
+      attr_reader :routes
+
+      def preview_config_for(page)
+        preview_config = Alchemy::Config.get(:preview)
+        return unless preview_config
+
+        preview_config[page.site.name] || preview_config
+      end
 
       def uri
-        URI(preview_config["host"])
+        return unless @preview_config["host"]
+
+        URI(@preview_config["host"])
       end
 
       def uri_class
@@ -56,7 +77,7 @@ module Alchemy
       end
 
       def userinfo
-        auth = preview_config["auth"]
+        auth = @preview_config["auth"]
         auth ? "#{auth["username"]}:#{auth["password"]}" : nil
       end
     end

data/lib/alchemy/config.rb

@@ -31,7 +31,9 @@ module Alchemy
       # a value of nil means there is no new default
       # any not nil value is the new default
       def deprecated_configs
-        {}
+        {
+          redirect_to_public_child: nil,
+        }
       end
 
       private
@@ -74,11 +76,11 @@ module Alchemy
         if deprecated_configs.key?(name.to_sym)
           config = deprecated_configs[name.to_sym]
           if config.nil?
-            Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy 5.0")
+            Alchemy::Deprecation.warn("#{name} configuration is deprecated and will be removed from Alchemy 5.1")
           else
             value = show[name.to_s]
             if value != config
-              Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy 5.0")
+              Alchemy::Deprecation.warn("Setting #{name} configuration to #{value} is deprecated and will be always #{config} in Alchemy 5.1")
             end
           end
         end

data/lib/alchemy/deprecation.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Alchemy
-  Deprecation = ActiveSupport::Deprecation.new("5.0", "Alchemy")
+  Deprecation = ActiveSupport::Deprecation.new("5.1", "Alchemy")
 end

data/lib/alchemy/install/tasks.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require "thor"
+
+module Alchemy
+  module Install
+    class Tasks < Thor
+      include Thor::Actions
+
+      no_tasks do
+        def inject_routes(auto_accept = false)
+          return if File.read("./config/routes.rb").match?("mount Alchemy::Engine")
+
+          mountpoint = "/"
+          unless auto_accept
+            mountpoint = ask("- At which path do you want to mount Alchemy CMS at?", default: mountpoint)
+          end
+          sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
+          inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
+        end
+
+        def set_primary_language(auto_accept = false)
+          code = "en"
+          unless auto_accept
+            code = ask("- What is the language code of your site's primary language?", default: code)
+          end
+          name = "English"
+          unless auto_accept
+            name = ask("- What is the name of your site's primary language?", default: name)
+          end
+          gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do
+            "default_language:\n  code: #{code}\n  name: #{name}"
+          end
+        end
+
+        def inject_seeder
+          append_file "./db/seeds.rb", "Alchemy::Seeder.seed!\n"
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/resource.rb

@@ -210,7 +210,7 @@ module Alchemy
       @module_definition && @module_definition["engine_name"]
     end
 
-    # Returns a help text for resource's form
+    # Returns a help text for resource's form or nil if no help text is available
     #
     # === Example:
     #
@@ -223,7 +223,7 @@ module Alchemy
     def help_text_for(attribute)
       ::I18n.translate!(attribute[:name], scope: [:alchemy, :resource_help_texts, resource_name])
     rescue ::I18n::MissingTranslationData
-      false
+      nil
     end
 
     # Return attributes that should be viewable but not editable.

data/lib/alchemy/test_support/factories/language_factory.rb

@@ -5,8 +5,8 @@ require "alchemy/test_support/factories/site_factory"
 
 FactoryBot.define do
   factory :alchemy_language, class: "Alchemy::Language" do
-    name { "Deutsch" }
-    code { "de" }
+    name { "Your Language" }
+    code { ::I18n.available_locales.first.to_s }
     default { true }
     frontpage_name { "Intro" }
     page_layout { Alchemy::Config.get(:default_language)["page_layout"] }
@@ -25,7 +25,12 @@ FactoryBot.define do
     trait :english do
       name { "English" }
       code { "en" }
-      frontpage_name { "Intro" }
+      default { false }
+    end
+
+    trait :german do
+      name { "Deutsch" }
+      code { "de" }
       default { false }
     end
   end

data/lib/alchemy/version.rb

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

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

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 require "rails/generators"
+require "alchemy/install/tasks"
 
 module Alchemy
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       desc "Installs Alchemy into your App."
 
+      class_option :auto_accept,
+        type: :boolean,
+        default: false,
+        desc: "Automatically accept defaults."
+
       class_option :skip_demo_files,
         type: :boolean,
         default: false,
@@ -18,6 +24,13 @@ module Alchemy
 
       source_root File.expand_path("files", __dir__)
 
+      def setup
+        header
+        say "Welcome to AlchemyCMS!"
+        say "Let's begin with some questions.\n\n"
+        install_tasks.inject_routes(options[:auto_accept])
+      end
+
       def copy_config
         copy_file "#{gem_config_path}/config.yml", app_config_path.join("alchemy", "config.yml")
       end
@@ -53,7 +66,11 @@ module Alchemy
       end
 
       def copy_dragonfly_config
-        template "#{__dir__}/templates/dragonfly.rb.tt", app_config_path.join("initializers", "dragonfly.rb")
+        template(
+          "#{__dir__}/templates/dragonfly.rb.tt",
+          app_config_path.join("initializers", "dragonfly.rb"),
+          skip: options[:auto_accept]
+        )
       end
 
       def install_gutentag_migrations
@@ -80,8 +97,46 @@ module Alchemy
           app_root.join(webpack_config["source_path"], webpack_config["source_entry_path"], "alchemy/admin.js")
       end
 
+      def set_primary_language
+        header
+        install_tasks.set_primary_language(options[:auto_accept])
+      end
+
+      def setup_database
+        rake("db:create", abort_on_failure: true)
+        # We can't invoke this rake task, because Rails will use wrong engine names otherwise
+        rake("railties:install:migrations", abort_on_failure: true)
+        rake("db:migrate", abort_on_failure: true)
+        install_tasks.inject_seeder
+        rake("db:seed", abort_on_failure: true)
+      end
+
+      def finalize
+        header
+        say "Alchemy successfully installed!"
+        say "Now start the server with:\n\n"
+        say "  bin/rails server\n\n"
+        say "and point your browser to\n\n"
+        say "  http://localhost:3000/admin\n\n"
+        say "and follow the onscreen instructions to finalize the installation.\n\n"
+      end
+
       private
 
+      def header
+        return if options[:auto_accept]
+
+        puts "─────────────────────"
+        puts "* Alchemy Installer *"
+        puts "─────────────────────"
+      end
+
+      def say(something)
+        return if options[:auto_accept]
+
+        puts "  #{something}"
+      end
+
       def gem_config_path
         @_config_path ||= File.expand_path("../../../../config/alchemy", __dir__)
       end
@@ -105,6 +160,10 @@ module Alchemy
       def app_root
         @_app_root ||= Rails.root
       end
+
+      def install_tasks
+        @_install_tasks ||= Alchemy::Install::Tasks.new
+      end
     end
   end
 end

data/lib/tasks/alchemy/install.rake

@@ -1,59 +1,15 @@
 # frozen_string_literal: true
-require "thor"
-
-class Alchemy::InstallTask < Thor
-  include Thor::Actions
-
-  no_tasks do
-    def inject_routes
-      mountpoint = ask "\nAt which path do you want to mount Alchemy CMS at? (DEFAULT: At root path '/')"
-      mountpoint = "/" if mountpoint.empty?
-      sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
-      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
-    end
-
-    def set_primary_language
-      code = ask "\nWhat's the language code of your site's primary language? (DEFAULT: en)"
-      code = "en" if code.empty?
-      name = ask "What's the name of your site's primary language? (DEFAULT: English)"
-      name = "English" if name.empty?
-      gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do
-        "default_language:\n  code: #{code}\n  name: #{name}"
-      end
-    end
-
-    def inject_seeder
-      append_file "./db/seeds.rb", "Alchemy::Seeder.seed!\n"
-    end
-  end
-end
 
 namespace :alchemy do
   desc "Installs Alchemy CMS into your app."
-  task install: "alchemy:yarn:install" do
-    install_helper = Alchemy::InstallTask.new
-
-    puts "\nAlchemy Installer"
-    puts "-----------------"
-
-    Rake::Task["alchemy:mount"].invoke
-    system("rails g alchemy:install") || exit!(1)
-    install_helper.set_primary_language
-    Rake::Task["db:create"].invoke
-    # We can't invoke this rake task, because Rails will use wrong engine names otherwise
-    `bundle exec rake railties:install:migrations`
-    Rake::Task["db:migrate"].invoke
-    install_helper.inject_seeder
-    Rake::Task["db:seed"].invoke
-
-    puts "\nAlchemy successfully installed."
-    puts "\nNow start the server with:"
-    puts "\n$ bin/rails server"
-    puts "\nand point your browser to http://localhost:3000/admin and follow the onscreen instructions to finalize the installation."
+  task :install do
+    require "generators/alchemy/install/install_generator"
+    Alchemy::Generators::InstallGenerator.start
   end
 
   desc "Mounts Alchemy into your routes."
   task :mount do
-    Alchemy::InstallTask.new.inject_routes
+    require "alchemy/install/tasks"
+    Alchemy::InstallTasks.new.inject_routes
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1
+  version: 5.0.1
 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-06-11 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -463,14 +463,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -596,7 +596,6 @@ files:
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
-- ".github/workflows/ci.yml"
 - ".github/workflows/greetings.yml"
 - ".github/workflows/stale.yml"
 - ".gitignore"
@@ -604,6 +603,7 @@ files:
 - ".localeapp/config.rb"
 - ".prettierrc"
 - ".rubocop.yml"
+- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -815,6 +815,7 @@ files:
 - app/models/alchemy/page/page_scopes.rb
 - app/models/alchemy/page/url_path.rb
 - app/models/alchemy/picture.rb
+- app/models/alchemy/picture/preprocessor.rb
 - app/models/alchemy/picture/transformations.rb
 - app/models/alchemy/picture/url.rb
 - app/models/alchemy/site.rb
@@ -1086,6 +1087,7 @@ files:
 - lib/alchemy/forms/builder.rb
 - lib/alchemy/hints.rb
 - lib/alchemy/i18n.rb
+- lib/alchemy/install/tasks.rb
 - lib/alchemy/logger.rb
 - lib/alchemy/modules.rb
 - lib/alchemy/name_conversions.rb
@@ -1261,13 +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: 
+signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails
 test_files: []

data/.github/workflows/ci.yml

@@ -1,134 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  RSpec:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        rails:
-          - '5.2'
-          - '6.0'
-        ruby:
-          - '2.5.x'
-          - '2.6.x'
-        database:
-          - mysql
-          - postgresql
-    env:
-      DB: ${{ matrix.database }}
-      DB_USER: alchemy_user
-      DB_PASSWORD: password
-      DB_HOST: '127.0.0.1'
-      RAILS_ENV: test
-      RAILS_VERSION: ${{ matrix.rails }}
-    services:
-      postgres:
-        image: postgres:11
-        env:
-          POSTGRES_USER: alchemy_user
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: alchemy_cms_dummy_test
-        ports: ['5432:5432']
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-      mysql:
-        image: mysql:latest
-        ports: ['3306:3306']
-        env:
-          MYSQL_USER: alchemy_user
-          MYSQL_PASSWORD: password
-          MYSQL_DATABASE: alchemy_cms_dummy_test
-          MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=5
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Restore apt cache
-        id: apt-cache
-        uses: actions/cache@preview
-        with:
-          path: /home/runner/apt/cache
-          key: ${{ runner.os }}-apt-${{ matrix.database }}
-          restore-keys: |
-            ${{ runner.os }}-apt-
-      - name: Install Postgres headers
-        if: matrix.database == 'postgresql'
-        run: |
-          mkdir -p /home/runner/apt/cache
-          sudo apt update -qq
-          sudo apt install -qq --fix-missing libpq-dev -o dir::cache::archives="/home/runner/apt/cache"
-          sudo chown -R runner /home/runner/apt/cache
-      - name: Install MySQL headers
-        if: matrix.database == 'mysql'
-        run: |
-          mkdir -p /home/runner/apt/cache
-          sudo apt update -qq
-          sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
-          sudo chown -R runner /home/runner/apt/cache
-      - name: Install bundler
-        run: |
-          gem install bundler
-      - name: Restore Ruby Gems cache
-        id: cache
-        uses: actions/cache@preview
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-bundle-${{ matrix.ruby }}-${{ matrix.rails }}-${{ matrix.database }}-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-bundle-
-      - name: Install bundle
-        timeout-minutes: 10
-        run: |
-          bundle install --jobs 4 --retry 3 --path vendor/bundle
-      - name: Restore node modules cache
-        id: yarn-cache
-        uses: actions/cache@preview
-        with:
-          path: spec/dummy/node_modules
-          key: ${{ runner.os }}-yarn-dummy-${{ hashFiles('./package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-dummy-
-      - name: Prepare database
-        run: |
-          bundle exec rake alchemy:spec:prepare
-      - name: Run tests & publish code coverage
-        uses: paambaati/codeclimate-action@v2.5.7
-        env:
-          CC_TEST_REPORTER_ID: bca4349e32f97919210ac8a450b04904b90683fcdd57d65a22c0f5065482bc22
-        with:
-          coverageCommand: bundle exec rspec
-      - uses: actions/upload-artifact@master
-        if: failure()
-        with:
-          name: Screenshots
-          path: spec/dummy/tmp/screenshots
-  Jest:
-    runs-on: ubuntu-latest
-    env:
-      NODE_ENV: test
-    steps:
-      - uses: actions/checkout@v1
-      - name: Restore node modules cache
-        uses: actions/cache@preview
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('./package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install yarn
-        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