alchemy_cms 5.0.6 → 5.1.0.beta1

data/app/models/alchemy/picture.rb

@@ -30,11 +30,22 @@ module Alchemy
 
     CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
 
+    TRANSFORMATION_OPTIONS = [
+      :crop,
+      :crop_from,
+      :crop_size,
+      :flatten,
+      :format,
+      :quality,
+      :size,
+      :upsample,
+    ]
+
+    include Alchemy::Logger
     include Alchemy::NameConversions
     include Alchemy::Taggable
     include Alchemy::TouchElements
-    include Alchemy::Picture::Transformations
-    include Alchemy::Picture::Url
+    include Calculations
 
     has_many :essence_pictures,
       class_name: "Alchemy::EssencePicture",
@@ -44,6 +55,7 @@ module Alchemy
     has_many :contents, through: :essence_pictures
     has_many :elements, through: :contents
     has_many :pages, through: :elements
+    has_many :thumbs, class_name: "Alchemy::PictureThumb", dependent: :destroy
 
     # Raise error, if picture is in use (aka. assigned to an EssencePicture)
     #
@@ -78,6 +90,9 @@ module Alchemy
       end
     end
 
+    # Create important thumbnails upfront
+    after_create -> { PictureThumb.generate_thumbs!(self) }
+
     # We need to define this method here to have it available in the validations below.
     class << self
       def allowed_filetypes
@@ -103,6 +118,20 @@ module Alchemy
     # Class methods
 
     class << self
+      # The class used to generate URLs for pictures
+      #
+      # @see Alchemy::Picture::Url
+      def url_class
+        @_url_class ||= Alchemy::Picture::Url
+      end
+
+      # Set a different picture url class
+      #
+      # @see Alchemy::Picture::Url
+      def url_class=(klass)
+        @_url_class = klass
+      end
+
       def searchable_alchemy_resource_attributes
         %w(name image_file_name)
       end
@@ -145,6 +174,33 @@ module Alchemy
 
     # Instance methods
 
+    # Returns an url (or relative path) to a processed image for use inside an image_tag helper.
+    #
+    # Any additional options are passed to the url method, so you can add params to your url.
+    #
+    # Example:
+    #
+    #   <%= image_tag picture.url(size: '320x200', format: 'png') %>
+    #
+    # @see Alchemy::PictureVariant#call for transformation options
+    # @see Alchemy::Picture::Url#call for url options
+    # @return [String|Nil]
+    def url(options = {})
+      return unless image_file
+
+      variant = PictureVariant.new(self, options.slice(*TRANSFORMATION_OPTIONS))
+      self.class.url_class.new(variant).call(
+        options.except(*TRANSFORMATION_OPTIONS).merge(
+          basename: name,
+          ext: variant.render_format,
+          name: name,
+        )
+      )
+    rescue ::Dragonfly::Job::Fetch::NotFound => e
+      log_warning(e.message)
+      nil
+    end
+
     def previous(params = {})
       query = Picture.ransack(params[:q])
       Picture.search_by(params, query).where("name < ?", name).last

data/app/models/alchemy/picture_thumb/create.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PictureThumb < BaseRecord
+    # Stores the render result of a Alchemy::PictureVariant
+    # in the configured Dragonfly datastore
+    # (Default: Dragonfly::FileDataStore)
+    #
+    class Create
+      class << self
+        # @param [Alchemy::PictureVariant] variant the to be rendered image
+        # @param [String] signature A unique hashed version of the rendering options
+        # @param [String] uid The Unique Image Identifier the image is stored at
+        #
+        # @return [Alchemy::PictureThumb] The persisted thumbnail record
+        #
+        def call(variant, signature, uid)
+          image = variant.image
+          image.to_file(server_path(uid)).close
+          variant.picture.thumbs.create!(
+            picture: variant.picture,
+            signature: signature,
+            uid: uid,
+          )
+        end
+
+        private
+
+        # Alchemys dragonfly datastore config seperates the storage path from the public server
+        # path for security reasons. The Dragonfly FileDataStorage does not support that,
+        # so we need to build the path on our own.
+        def server_path(uid)
+          dragonfly_app = ::Dragonfly.app(:alchemy_pictures)
+          "#{dragonfly_app.datastore.server_root}/#{uid}"
+        end
+      end
+    end
+  end
+end

data/app/models/alchemy/picture_thumb/signature.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PictureThumb < BaseRecord
+    class Signature
+      # Returns a unique image process signature
+      #
+      # @param [Alchemy::PictureVariant]
+      #
+      # @return [String]
+      def self.call(variant)
+        steps_without_fetch = variant.image.steps.reject do |step|
+          step.is_a?(::Dragonfly::Job::Fetch)
+        end
+
+        steps_with_id = [[variant.picture.id]] + steps_without_fetch
+        job_string = steps_with_id.map(&:to_a).to_dragonfly_unique_s
+
+        Digest::SHA1.hexdigest(job_string)
+      end
+    end
+  end
+end

data/app/models/alchemy/picture_thumb/uid.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PictureThumb < BaseRecord
+    class Uid
+      # Returns a image variant uid for storage
+      #
+      # @param [String]
+      # @param [Alchemy::PictureVariant]
+      #
+      # @return [String]
+      def self.call(signature, variant)
+        picture = variant.picture
+        filename = variant.image_file_name || "image"
+        name = File.basename(filename, ".*").gsub(/[^\w.]+/, "_")
+        ext = variant.render_format
+
+        "pictures/#{picture.id}/#{signature}/#{name}.#{ext}"
+      end
+    end
+  end
+end

data/app/models/alchemy/picture_thumb.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Alchemy
+  # The persisted version of a rendered picture variant
+  #
+  # You can configure the generator class to implement a
+  # different thumbnail store (ie. a remote file storage).
+  #
+  #     config/initializers/alchemy.rb
+  #     Alchemy::PictureThumb.generator_class = My::ThumbnailGenerator
+  #
+  class PictureThumb < BaseRecord
+    belongs_to :picture, class_name: "Alchemy::Picture"
+
+    validates :signature, presence: true
+    validates :uid, presence: true
+
+    class << self
+      # Thumbnail generator class
+      #
+      # @see Alchemy::PictureThumb::Create
+      def generator_class
+        @_generator_class ||= Alchemy::PictureThumb::Create
+      end
+
+      # Set a thumbnail generator class
+      #
+      # @see Alchemy::PictureThumb::Create
+      def generator_class=(klass)
+        @_generator_class = klass
+      end
+
+      # Upfront generation of picture thumbnails
+      #
+      # Called after a Alchemy::Picture has been created (after an image has been uploaded)
+      #
+      # Generates three types of thumbnails that are used by Alchemys picture archive and
+      # persists them in the configures file store (Default Dragonfly::FileDataStore).
+      #
+      # @see Picture::THUMBNAIL_SIZES
+      def generate_thumbs!(picture)
+        Alchemy::Picture::THUMBNAIL_SIZES.values.each do |size|
+          variant = Alchemy::PictureVariant.new(picture, {
+            size: size,
+            flatten: true,
+          })
+          signature = Alchemy::PictureThumb::Signature.call(variant)
+          thumb = find_by(signature: signature)
+          next if thumb
+
+          uid = Alchemy::PictureThumb::Uid.call(signature, variant)
+          generator_class.call(variant, signature, uid)
+        end
+      end
+    end
+  end
+end

data/app/models/alchemy/picture_variant.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require "forwardable"
+
+module Alchemy
+  # Represents a rendered picture
+  #
+  # Resizes, crops and encodes the image with imagemagick
+  #
+  class PictureVariant
+    extend Forwardable
+
+    include Alchemy::Logger
+    include Alchemy::Picture::Transformations
+
+    attr_reader :picture, :render_format
+
+    def_delegators :@picture,
+      :image_file,
+      :image_file_width,
+      :image_file_height,
+      :image_file_name,
+      :image_file_size
+
+    # @param [Alchemy::Picture]
+    #
+    # @param [Hash] options passed to the image processor
+    # @option options [Boolean] :crop Pass true to enable cropping
+    # @option options [String] :crop_from Coordinates to start cropping from
+    # @option options [String] :crop_size Size of the cropping area
+    # @option options [Boolean] :flatten Pass true to flatten GIFs
+    # @option options [String|Symbol] :format Image format to encode the image in
+    # @option options [Integer] :quality JPEG compress quality
+    # @option options [String] :size Size of resulting image in WxH
+    # @option options [Boolean] :upsample Pass true to upsample (grow) an image if the original size is lower than the resulting size
+    #
+    def initialize(picture, options = {})
+      raise ArgumentError, "Picture missing!" if picture.nil?
+
+      @picture = picture
+      @options = options
+      @render_format = options[:format] || picture.default_render_format
+    end
+
+    # Process a variant of picture
+    #
+    # @return [Dragonfly::Attachment|Dragonfly::Job] The processed image variant
+    #
+    def image
+      image = image_file
+
+      raise MissingImageFileError, "Missing image file for #{picture.inspect}" if image.nil?
+
+      image = processed_image(image, @options)
+      image = encoded_image(image, @options)
+      image
+    rescue MissingImageFileError, WrongImageFormatError => e
+      log_warning(e.message)
+      nil
+    end
+
+    private
+
+    # Returns the processed image dependent of size and cropping parameters
+    def processed_image(image, options = {})
+      size = options[:size]
+      upsample = !!options[:upsample]
+
+      return image unless size.present? && picture.has_convertible_format?
+
+      if options[:crop]
+        crop(size, options[:crop_from], options[:crop_size], upsample)
+      else
+        resize(size, upsample)
+      end
+    end
+
+    # Returns the encoded image
+    #
+    # Flatten animated gifs, only if converting to a different format.
+    # Can be overwritten via +options[:flatten]+.
+    #
+    def encoded_image(image, options = {})
+      unless render_format.in?(Alchemy::Picture.allowed_filetypes)
+        raise WrongImageFormatError.new(picture, @render_format)
+      end
+
+      options = {
+        flatten: render_format != "gif" && picture.image_file_format == "gif",
+      }.with_indifferent_access.merge(options)
+
+      encoding_options = []
+
+      convert_format = render_format.sub("jpeg", "jpg") != picture.image_file_format.sub("jpeg", "jpg")
+
+      if render_format =~ /jpe?g/ && convert_format
+        quality = options[:quality] || Config.get(:output_image_jpg_quality)
+        encoding_options << "-quality #{quality}"
+      end
+
+      if options[:flatten]
+        encoding_options << "-flatten"
+      end
+
+      convertion_needed = convert_format || encoding_options.present?
+
+      if picture.has_convertible_format? && convertion_needed
+        image = image.encode(render_format, encoding_options.join(" "))
+      end
+
+      image
+    end
+  end
+end

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, level, folded)
+        path.last[:children] << page_hash(page, has_children, level, folded)
       end
 
       tree
@@ -48,7 +48,7 @@ module Alchemy
 
     protected
 
-    def page_hash(page, level, folded)
+    def page_hash(page, has_children, 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.root?,
-        root_or_leaf: page.root? || page.leaf?,
+        root: page.depth == 1,
+        root_or_leaf: page.depth == 1 || !has_children,
         children: [],
       }
 

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

@@ -7,15 +7,15 @@
   </div>
   <div class="value with-icon">
     <label><%= Alchemy::Attachment.human_attribute_name(:url) %></label>
-    <p><%= alchemy.show_attachment_url(@attachment) %></p>
-    <a data-clipboard-text="<%= alchemy.show_attachment_url(@attachment) %>" class="icon_button--right">
+    <p><%= @attachment.url %></p>
+    <a data-clipboard-text="<%= @attachment.url %>" class="icon_button--right">
       <%= render_icon(:clipboard, style: 'regular') %>
     </a>
   </div>
   <div class="value with-icon">
     <label><%= Alchemy::Attachment.human_attribute_name(:download_url) %></label>
-    <p><%= alchemy.download_attachment_url(@attachment) %></p>
-    <a data-clipboard-text="<%= alchemy.download_attachment_url(@attachment) %>" class="icon_button--right">
+    <p><%= @attachment.url(download: true) %></p>
+    <a data-clipboard-text="<%= @attachment.url(download: true) %>" class="icon_button--right">
       <%= render_icon(:clipboard, style: 'regular') %>
     </a>
   </div>
@@ -24,18 +24,18 @@
 <% case @attachment.icon_css_class %>
 <% when "file-image" %>
 <div class="attachment_preview_container image-preview">
-  <%= image_tag(alchemy.show_attachment_path(@attachment), class: "full_width") %>
+  <%= image_tag(@attachment.url, class: "full_width") %>
 </div>
 <% when "file-audio" %>
 <div class="attachment_preview_container player-preview">
-  <%= audio_tag(alchemy.show_attachment_path(@attachment), preload: "none", controls: true, class: "full_width") %>
+  <%= audio_tag(@attachment.url, preload: "none", controls: true, class: "full_width") %>
 </div>
 <% when "file-video" %>
 <div class="attachment_preview_container player-preview">
-  <%= video_tag(alchemy.show_attachment_path(@attachment), preload: "metadata", controls: true, class: "full_width") %>
+  <%= video_tag(@attachment.url, preload: "metadata", controls: true, class: "full_width") %>
 </div>
 <% when "file-pdf" %>
-<iframe src="<%= alchemy.show_attachment_path(@attachment) %>" frameborder=0 class="full-iframe">
+<iframe src="<%= @attachment.url %>" frameborder=0 class="full-iframe">
   Your browser does not support frames.
 </iframe>
 <% end %>

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

@@ -1,20 +1,17 @@
-<%= toolbar(
-  buttons: [
-    {
-      icon: 'info-circle',
-      label: Alchemy.t(:info),
-      url: alchemy.dashboard_info_path,
+<%= content_for :toolbar do %>
+  <%= toolbar_button(
+    icon: 'info-circle',
+    label: Alchemy.t(:info),
+    url: alchemy.dashboard_info_path,
+    title: Alchemy.t(:info),
+    dialog_options: {
       title: Alchemy.t(:info),
-      dialog_options: {
-        title: Alchemy.t(:info),
-        size: "420x435"
-      },
-      if_permitted_to: [:info, :alchemy_admin_dashboard],
-      hotkey: 'alt+i'
-    }
-  ],
-  search: false
-) %>
+      size: "420x435"
+    },
+    if_permitted_to: [:info, :alchemy_admin_dashboard],
+    hotkey: 'alt+i'
+  ) %>
+<% end %>
 
 <div id="dashboard">
   <h1>

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

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

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -34,7 +34,7 @@
   $('#imageToCrop').load(function() {
     Alchemy.ImageCropper.init(
        <%= @initial_box.values.to_json %>,
-      <% if @essence_picture.can_be_cropped_to("#{@min_size[:width]}x#{@min_size[:height]}") %>
+      <% if @picture.can_be_cropped_to?("#{@min_size[:width]}x#{@min_size[:height]}") %>
         <%= @min_size.values.to_json %>,
       <% else %>
         <%= false %>,

data/app/views/alchemy/admin/essence_pictures/edit.html.erb

@@ -4,10 +4,10 @@
   <%= f.input :caption, as: @content.settings[:caption_as_textarea] ? 'text' : 'string' %>
   <%= f.input :title %>
   <%= f.input :alt_tag %>
-  <%- if @content.settings[:sizes].present? -%>
+  <%- if @content.settings[:sizes].present? && @content.settings[:srcset].blank? -%>
     <%= f.input :render_size,
       collection: [
-        [Alchemy.t('Layout default'), @content.settings[:size]]
+        [Alchemy.t('Layout default'), ""]
       ] + @content.settings[:sizes].to_a,
       include_blank: false,
       input_html: {class: 'alchemy_selectbox'} %>

data/app/views/alchemy/admin/layoutpages/edit.html.erb

@@ -5,11 +5,9 @@
     include_blank: Alchemy.t('Please choose'),
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name, autofocus: true %>
-  <% if @page.taggable? %>
-    <div class="input string">
-      <%= f.label :tag_list %>
-      <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-    </div>
-  <% end %>
+  <div class="input string">
+    <%= f.label :tag_list %>
+    <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+  </div>
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/pages/_form.html.erb

@@ -36,12 +36,10 @@
     as: 'text',
     hint: Alchemy.t('pages.update.comma_seperated') %>
 
-  <% if @page.taggable? %>
-    <div class="input string autocomplete_tag_list">
-      <%= f.label :tag_list %>
-      <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-    </div>
-  <% end %>
+  <div class="input string autocomplete_tag_list">
+    <%= f.label :tag_list %>
+    <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+  </div>
 
   <%= f.submit Alchemy.t(:save) %>
 <% end %>

data/app/views/alchemy/admin/pages/_new_page_form.html.erb

@@ -5,8 +5,9 @@
   <%= f.input :page_layout,
     collection: @page_layouts,
     label: Alchemy.t(:page_type),
-    include_blank: Alchemy.t('Please choose'),
+    include_blank: @page_layouts.length == 1 ? nil : Alchemy.t('Please choose'),
     required: true,
+    selected: @page_layouts.length == 1 ? @page_layouts.first : nil,
     input_html: {class: 'alchemy_selectbox'} %>
   <%= f.input :name %>
   <%= f.submit Alchemy.t(:create) %>

data/app/views/alchemy/admin/partials/_remote_search_form.html.erb

@@ -1,24 +1,25 @@
-<%= search_form_for @query, url: url_for(
-    action: 'index',
-    size: @size
+<%= search_form_for @query, url: url_for({
+      action: 'index',
+      size: @size,
+    }.merge(search_filter_params.except(:q))
   ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
-  <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
-  <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id) %>
+  <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id, id: nil) %>
+  <%= hidden_field_tag("content_id", @content.blank? ? "" : @content.id, id: nil) %>
   <div class="search_field">
-    <label>
+    <button type="submit">
       <%= render_icon('search') %>
-      <%= f.search_field resource_handler.search_field_name,
-        placeholder: Alchemy.t(:search),
-        class: 'search_input_field',
-        id: nil %>
-    </label>
-    <%= link_to render_icon(:times, size: 'xs'), url_for(
+    </button>
+    <%= f.search_field resource_handler.search_field_name,
+      placeholder: Alchemy.t(:search),
+      class: 'search_input_field',
+      id: nil %>
+    <%= link_to render_icon(:times, size: 'xs'), url_for({
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
         content_id: @content.blank? ? '' : @content.id,
         size: @size,
         overlay: true
-      ),
+      }.merge(search_filter_params.except(:q))),
       remote: true,
       class: 'search_field_clear',
       title: Alchemy.t(:click_to_show_all),

data/app/views/alchemy/admin/partials/_search_form.html.erb

@@ -1,15 +1,15 @@
-<%- url ||= resource_url_proxy.url_for(action: 'index') -%>
+<%- url ||= resource_url_proxy.url_for({ action: 'index' }.merge(search_filter_params.except(:q, :page))) -%>
 
 <%= search_form_for @query, url: url, class: 'search_form' do |f| %>
   <div class="search_field">
-    <label>
+    <button type="submit">
       <%= render_icon('search') %>
-      <%= f.search_field resource_handler.search_field_name,
-        class: 'search_input_field',
-        placeholder: Alchemy.t(:search) %>
-    </label>
+    </button>
+    <%= f.search_field resource_handler.search_field_name,
+      class: 'search_input_field',
+      placeholder: Alchemy.t(:search) %>
     <% local_assigns.fetch(:additional_query_fields, []).each do |field| %>
-      <%= f.hidden_field field %>
+      <%= f.hidden_field field, id: nil %>
     <% end %>
     <%= link_to render_icon(:times, size: 'xs'), url,
         class: 'search_field_clear',
@@ -17,7 +17,7 @@
         title: Alchemy.t(:click_to_show_all),
         style: search_filter_params.fetch(:q, {}).fetch(resource_handler.search_field_name, '').present? ? 'display: block' : 'display: none' %>
     <% local_assigns.fetch(:additional_params, []).each do |additional_param| %>
-      <%= hidden_field_tag additional_param, search_filter_params[additional_param] %>
+      <%= hidden_field_tag additional_param, search_filter_params[additional_param], id: nil %>
     <% end %>
   </div>
 <% end %>

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

@@ -31,7 +31,7 @@
       admin_pictures_path(
         q: search_filter_params[:q],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: 'secondary button with_icon',

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

@@ -6,7 +6,7 @@
     <small class="hint"><%= Alchemy.t('Please seperate the tags with commata') %></small>
   </div>
   <%= hidden_field_tag :q, search_filter_params[:q] %>
-  <%= hidden_field_tag :size, params[:size] %>
+  <%= hidden_field_tag :size, @size %>
   <%= hidden_field_tag :tagged_with, search_filter_params[:tagged_with] %>
   <%= hidden_field_tag :filter, search_filter_params[:filter] %>
   <%= f.submit Alchemy.t(:save) %>

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

@@ -12,7 +12,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       {
@@ -22,7 +22,7 @@
   </span>
   <% end %>
   <% image = image_tag(
-    picture.url(size: preview_size(@size), flatten: true),
+    picture.url(size: preview_size(@size), flatten: true) || "alchemy/missing-image.svg",
     alt: picture.name,
     title: Alchemy.t(:zoom_image)
   ) %>
@@ -34,7 +34,7 @@
         q: search_filter_params[:q],
         page: params[:page],
         tagged_with: search_filter_params[:tagged_with],
-        size: params[:size],
+        size: @size,
         filter: search_filter_params[:filter]
       ),
       class: 'thumbnail_background'