alchemy_cms 5.0.0.rc2 → 5.1.0.rc1

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_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/models/alchemy/site/layout.rb

@@ -25,10 +25,38 @@ module Alchemy
       end
     end
 
-    # Returns site's layout definition
+    # Returns sites layout definition
     #
     def definition
-      self.class.definitions.detect { |l| l["name"] == partial_name }
+      self.class.definitions.detect { |l| l["name"] == partial_name } || {}
+    end
+
+    # Returns sites page layout names
+    #
+    # If no site layout file is defined all page layouts are returned
+    #
+    # @param [Boolean] layoutpages Return layout pages only (default false)
+    #
+    # @return [Array<String>] Array of page layout names
+    #
+    def page_layout_names(layoutpages: false)
+      page_layout_definitions.select do |layout|
+        !!layout["layoutpage"] && layoutpages || !layout["layoutpage"] && !layoutpages
+      end.collect { |layout| layout["name"] }
+    end
+
+    # Returns sites page layout definitions
+    #
+    # If no site layout file is defined all page layouts are returned
+    #
+    def page_layout_definitions
+      if definition["page_layouts"].presence
+        Alchemy::PageLayout.all.select do |layout|
+          layout["name"].in?(definition["page_layouts"])
+        end
+      else
+        Alchemy::PageLayout.all
+      end
     end
 
     # Returns the name for the layout partial

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/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/_create_language_form.html.erb

@@ -1,8 +1,7 @@
 <div class="panel">
   <%= render_message do %>
-    <p><%= Alchemy.t(:language_does_not_exist) %></p>
+    <p><%= Alchemy.t(:homepage_does_not_exist) %></p>
   <% end %>
-<%- if @language -%>
 
   <%- if @languages_with_page_tree.size >= 1 -%>
     <%= form_tag(alchemy.copy_language_tree_admin_pages_path) do %>
@@ -19,32 +18,23 @@
     <% end %>
   <%- end -%>
 
-  <%- if params[:action] == "index" -%>
-    <%= alchemy_form_for([:admin, Alchemy::Page.new], id: 'create_language_tree') do |form| %>
-      <% if @languages_with_page_tree.size >= 1 %>
-        <h3><%= Alchemy.t(:create_language_tree_heading) %></h3>
-        <p><%= Alchemy.t(:want_to_create_new_language) %></p>
-      <% end %>
-      <%= form.input :name, input_html: {value: @language.frontpage_name} %>
-      <%= form.input :page_layout,
-        collection: @page_layouts,
-        selected: @language.page_layout,
-        label: Alchemy.t(:page_type),
-        include_blank: Alchemy.t('Please choose'),
-        required: true,
-        input_html: {class: 'alchemy_selectbox'} %>
-      <%= form.hidden_field :language_id, value: @language.id %>
-      <%= form.hidden_field :language_code, value: @language.code %>
-      <%= form.hidden_field :language_root, value: true %>
-      <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
-      <%= form.submit Alchemy.t("create_tree_as_new_language", language: @language.name), autofocus: true %>
+  <%= alchemy_form_for([:admin, Alchemy::Page.new], id: 'create_language_tree') do |form| %>
+    <% if @languages_with_page_tree.size >= 1 %>
+      <h3><%= Alchemy.t(:create_language_tree_heading) %></h3>
+      <p><%= Alchemy.t(:want_to_create_new_language) %></p>
     <% end %>
-  <%- end -%>
-
-<%- else -%>
-
-  <p><%= Alchemy.t("Actually this language does not exist. Please create this language first.") %></p>
-
-<%- end -%>
-
+    <%= form.input :name, input_html: {value: @language.frontpage_name} %>
+    <%= form.input :page_layout,
+      collection: @page_layouts,
+      selected: @language.page_layout,
+      label: Alchemy.t(:page_type),
+      include_blank: Alchemy.t('Please choose'),
+      required: true,
+      input_html: {class: 'alchemy_selectbox'} %>
+    <%= form.hidden_field :language_id, value: @language.id %>
+    <%= form.hidden_field :language_code, value: @language.code %>
+    <%= form.hidden_field :language_root, value: true %>
+    <%= form.hidden_field :public, value: Alchemy::Language.all.size == 1 %>
+    <%= form.submit Alchemy.t(:create), autofocus: true %>
+  <% end %>
 </div>

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

@@ -1,12 +1,22 @@
 <%= alchemy_form_for([:admin, @page]) do |f| %>
-  <%= f.hidden_field(:parent_id) %>
+  <% if @page.parent_id || @page.layoutpage %>
+    <%= f.hidden_field(:parent_id) %>
+  <% else %>
+    <% @page.parent = @current_language.root_page %>
+    <%= f.input :parent_id,
+      collection: @current_language.pages.contentpages,
+      label_method: :name,
+      value_method: :id,
+      input_html: { class: "alchemy_selectbox" } %>
+  <% end %>
   <%= f.hidden_field(:language_id) %>
   <%= f.hidden_field(:layoutpage) %>
   <%= 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) %>