alchemy_cms 5.0.0.beta1 → 5.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a47529eb07ef956c81fe417efd5570b37a0d56e689ee3079c9bc623b91b8bc28
-  data.tar.gz: 9bb8aa6ca4eab610212690d3630c223269d3d6cb28224e33a9a4838fb4869c81
+  metadata.gz: 89a4ae7079c8ca7f64ae3b28d1acf1b648090d98fc4b9beff5061f81c73e1044
+  data.tar.gz: bb1169db4e23c9621745888be3963319b3746e156028d711a22870a4f51330e4
 SHA512:
-  metadata.gz: df610fff48f0e7a30c0f348b20c452a8ade6226a9ce6457b497d76e3cdc7269d43cfe24da082687773de1c9a692df0116475b87469e9538899bc142e7d49397e
-  data.tar.gz: 89281dc3a6bccd9d537adc2662143e61f023f38205a3474a1d4f6a63b40dea7374df95f7f40614aee771f14de7bec44f92afb68dfcffafb1df1028f416bb0c79
+  metadata.gz: c60d6b0ddcbe43763ff32fcad72144f572f6f8c91bbd1ac9bd0edbd41fd88723a29ef299f5ae51f5edd366e9f8ad7de5054a19768cfe92f27bb61f36d5c04bc2
+  data.tar.gz: f2f612afa9ae01c12d56b61c674ff311f89951acbeb0d327e3b15465761380a5344c65160dd121a6b88b6ab2ca6841d26a7eb75b92cfea65cba9bfb956fd81a1

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## 5.0.0 (unreleased)
 
+- 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/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/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/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/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/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/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.0.beta2"
 
   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.beta1
+  version: 5.0.0.beta2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-25 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
@@ -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