alchemy_cms 4.0.0.rc2 → 4.0.0

data/app/models/alchemy/essence_picture.rb

@@ -56,23 +56,35 @@ module Alchemy
     # @option options crop [Boolean]
     #   If set to true the picture will be cropped to fit the size value.
     #
+    # @return [String]
     def picture_url(options = {})
       return if picture.nil?
 
-      options = {
-        format: picture.default_render_format,
-        crop_from: crop_from,
-        crop_size: crop_size
-      }.merge(options)
+      picture.url picture_url_options.merge(options)
+    end
 
-      picture.url(options)
+    # Picture rendering options
+    #
+    # Returns the +default_render_format+ of the associated +Alchemy::Picture+
+    # together with the +crop_from+ and +crop_size+ values
+    #
+    # @return [HashWithIndifferentAccess]
+    def picture_url_options
+      return {} if picture.nil?
+
+      {
+        format: picture.default_render_format,
+        crop_from: crop_from.presence,
+        crop_size: crop_size.presence
+      }.with_indifferent_access
     end
 
-    # Renders a thumbnail representation of the assigned image
+    # Returns an url for the thumbnail representation of the assigned picture
     #
     # It takes cropping values into account, so it always represents the current
     # image displayed in the frontend.
     #
+    # @return [String]
     def thumbnail_url(options = {})
       return if picture.nil?
 
@@ -96,6 +108,7 @@ module Alchemy
     # @param max [Integer]
     #   The maximum length of the text returned.
     #
+    # @return [String]
     def preview_text(max = 30)
       return "" if picture.nil?
       picture.name.to_s[0..max - 1]
@@ -103,6 +116,7 @@ module Alchemy
 
     # A Hash of coordinates suitable for the graphical image cropper.
     #
+    # @return [Hash]
     def cropping_mask
       return if crop_from.blank? || crop_size.blank?
       crop_from = point_from_string(read_attribute(:crop_from))
@@ -112,6 +126,8 @@ module Alchemy
     end
 
     # Returns a serialized ingredient value for json api
+    #
+    # @return [String]
     def serialized_ingredient
       picture_url(content.settings)
     end
@@ -132,13 +148,15 @@ module Alchemy
     private
 
     def fix_crop_values
-      %w(crop_from crop_size).each do |crop_value|
-        write_attribute crop_value, normalize_crop_value(crop_value)
+      %i(crop_from crop_size).each do |crop_value|
+        if self[crop_value].is_a?(String)
+          write_attribute crop_value, normalize_crop_value(crop_value)
+        end
       end
     end
 
     def normalize_crop_value(crop_value)
-      send(crop_value).to_s.split('x').map { |n| normalize_number(n) }.join('x')
+      self[crop_value].split('x').map { |n| normalize_number(n) }.join('x')
     end
 
     def normalize_number(number)

data/app/models/alchemy/essence_picture_view.rb

@@ -14,7 +14,7 @@ module Alchemy
       disable_link: false,
       srcset: [],
       sizes: []
-    }
+    }.with_indifferent_access
 
     def initialize(content, options = {}, html_options = {})
       @content = content

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

@@ -111,12 +111,11 @@ module Alchemy
     end
 
     # An Image smaller than dimensions
-    # can not be cropped to string - unless upsample is true.
+    # can not be cropped to given size - unless upsample is true.
     #
     def can_be_cropped_to(string, upsample = false)
-      dimensions = sizes_from_string(string)
       return true if upsample
-      is_bigger_than(dimensions)
+      is_bigger_than sizes_from_string(string)
     end
 
     # Returns true if the class we're included in has a meaningful render_size attribute

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

@@ -2,6 +2,8 @@
 
 module Alchemy
   module Picture::Url
+    include Alchemy::Logger
+
     TRANSFORMATION_OPTIONS = [
       :crop,
       :crop_from,
@@ -30,6 +32,9 @@ module Alchemy
       image = encoded_image(image, options)
 
       image.url(options.except(*TRANSFORMATION_OPTIONS).merge(name: name))
+    rescue MissingImageFileError, WrongImageFormatError => e
+      log_warning e.message
+      nil
     end
 
     private
@@ -41,7 +46,7 @@ module Alchemy
 
       return image unless size.present? && has_convertible_format?
 
-      if options[:crop_size].present? && options[:crop_from].present? || options[:crop].present?
+      if options[:crop]
         crop(size, options[:crop_from], options[:crop_size], upsample)
       else
         resize(size, upsample)
@@ -55,7 +60,10 @@ module Alchemy
     #
     def encoded_image(image, options = {})
       target_format = options[:format] || default_render_format
-      raise WrongImageFormatError if !target_format.in?(Alchemy::Picture.allowed_filetypes)
+
+      unless target_format.in?(Alchemy::Picture.allowed_filetypes)
+        raise WrongImageFormatError.new(self, target_format)
+      end
 
       options = {
         flatten: target_format != 'gif' && image_file_format == 'gif'

data/app/views/alchemy/admin/contents/create.js.erb

@@ -1,7 +1,5 @@
 var editor_html = '<%= j(render "alchemy/essences/#{@content.essence_partial_name}_editor", {
-  content: @content,
-  options: options_from_params.symbolize_keys,
-  html_options: @html_options.symbolize_keys
+  content: @content, options: options_from_params, html_options: @html_options
 }) %>';
 
 <% if params[:was_missing] %>

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

@@ -19,11 +19,12 @@
     <%= f.hidden_field :crop_from %>
     <%= f.hidden_field :crop_size %>
     <%= hidden_field_tag :content_id, @content.id %>
-    <%= f.button "#{render_icon(:true)} #{Alchemy.t(:apply)}".html_safe, class: 'with_icon' %>
-    <%= link_to Alchemy.t('Reset Imagemask'), '#', {
+    <%= button_tag Alchemy.t('Reset Imagemask'), {
       onclick: 'Alchemy.ImageCropper.reset(); return false',
-      class: 'reset_mask'
+      class: 'reset_mask',
+      type: 'reset'
     } %>
+    <%= f.button Alchemy.t(:apply) %>
   <% end %>
 </div>
 <% end %>

data/app/views/alchemy/essences/_essence_file_editor.html.erb

@@ -11,7 +11,7 @@
     padding: false
   },
   {
-    class: 'assign_file',
+    class: 'icon assign_file',
     title: Alchemy.t(:assign_file)
   }
 ) %>

data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb

@@ -6,7 +6,7 @@
       content.essence,
       options: content.settings.update(options)
     ), {
-      size: "1000x615",
+      size: "1080x615",
       title: Alchemy.t('Edit Picturemask'),
       image_loader: false,
       padding: false

data/config/brakeman.ignore

@@ -7,7 +7,7 @@
       "check_name": "MassAssignment",
       "message": "Parameters should be whitelisted for mass assignment",
       "file": "app/controllers/alchemy/admin/resources_controller.rb",
-      "line": 128,
+      "line": 130,
       "link": "http://brakemanscanner.org/docs/warning_types/mass_assignment/",
       "code": "params.require(resource_handler.namespaced_resource_name).permit!",
       "render_path": null,
@@ -23,13 +23,13 @@
     {
       "warning_type": "Dynamic Render Path",
       "warning_code": 15,
-      "fingerprint": "26461414e9f6be7b68dd8c7dda1c69b09c92a8e9997c0ac204e1756cae7f3d68",
+      "fingerprint": "79e194e21561d40888d86ebc7fd2ab474fdb0ce32d605dbe9ac6e8984ecc5e92",
       "check_name": "Render",
       "message": "Render path contains parameter value",
       "file": "app/views/alchemy/admin/contents/create.js.erb",
       "line": 1,
       "link": "http://brakemanscanner.org/docs/warning_types/dynamic_render_path/",
-      "code": "render(action => \"alchemy/essences/#{Content.create_from_scratch(Element.find(params[:content][:element_id]), content_params).essence_partial_name}_editor\", { :content => Content.create_from_scratch(Element.find(params[:content][:element_id]), content_params), :options => options_from_params.symbolize_keys, :html_options => (params[:html_options] or {}).symbolize_keys })",
+      "code": "render(action => \"alchemy/essences/#{Content.create_from_scratch(Element.find(params[:content][:element_id]), content_params).essence_partial_name}_editor\", { :content => Content.create_from_scratch(Element.find(params[:content][:element_id]), content_params), :options => options_from_params, :html_options => ((params[:html_options] or {})) })",
       "render_path": [{"type":"controller","class":"Alchemy::Admin::ContentsController","method":"create","line":21,"file":"app/controllers/alchemy/admin/contents_controller.rb"}],
       "location": {
         "type": "template",
@@ -60,6 +60,6 @@
       "note": "`Alchemy::Content` is a polymorphic association of any kind of model extending `Alchemy::Essence`. Since we can't know the attributes of all potential essences we need to permit all attributes. As this all happens inside the password protected /admin namespace this can be considered a false positive."
     }
   ],
-  "updated": "2017-08-16 15:07:26 +0200",
-  "brakeman_version": "3.7.0"
+  "updated": "2017-10-23 11:49:41 +0200",
+  "brakeman_version": "4.0.1"
 }

data/config/locales/alchemy.de.yml

@@ -252,7 +252,7 @@ de:
     "Remove item from clipboard": "Inhalt aus der Zwischenablage entfernen"
     "Remove tag filter": "Filter entfernen"
     "Remove this content": "Diesen Inhalt entfernen"
-    "Reset Imagemask": "Bildmaske zurücksetzen"
+    "Reset Imagemask": "zurücksetzen"
     "Reset password instructions": "Anweisungen um Ihr Passwort zurückzusetzen"
     "Select all": "Alle auswählen"
     "Select an content": "Wählen Sie einen Inhalt aus"
@@ -365,7 +365,7 @@ de:
     element_of_type: "Element"
     element_saved: "Element wurde gespeichert."
     enter_external_link: "Geben Sie hier die Adresse der Seite ein zu der Sie einen Link setzen wollen."
-    explain_cropping: "<p>Sie können den Rahmen verschieben und in der Größe verändern um den Bildausschnitt festzulegen.</p><p>Wenn Sie zufrieden sind, dann klicken Sie bitte auf speichern.</p>"
+    explain_cropping: "<p>Sie können den Rahmen mit der Maus und den Pfeiltasten verschieben und in der Größe verändern, um einen eigenen Bildausschnitt festzulegen. Wenn Sie zufrieden sind, dann klicken Sie bitte auf \"übernehmen\".</p><p>Um zu dem zentrierten Bildausschnitt zurückzukehren, wie er im Layout vorgesehen wurde, klicken Sie bitte auf \"zurücksezen\" und \"übernehmen\" anschließend die Änderungen.</p>"
     explain_publishing: "Die gecachte Version vom Server löschen und die aktuellen Änderungen veröffentlichen"
     explain_sitemap_dragndrop_sorting: "Tip: Halten Sie zum Sortieren der Seiten das Seitensymbol mit der Maus fest und bewegen Sie sie an ihre neue Position."
     explain_unlocking: "Die Seite verlassen und für andere Benutzer zum Bearbeiten freigeben."

data/config/locales/alchemy.en.yml

@@ -251,7 +251,7 @@ en:
     "Remove item from clipboard": "Remove item from clipboard"
     "Remove tag filter": "Remove tag filter"
     "Remove this content": "Remove this content"
-    "Reset Imagemask": "Reset Imagemask"
+    "Reset Imagemask": "Reset mask"
     "Reset password instructions": "Reset password instructions"
     "Select all": "Select all"
     "Select an content": "Select a content"
@@ -363,7 +363,7 @@ en:
     element_of_type: "Element"
     element_saved: "Saved element."
     enter_external_link: "Please enter the URL you want to link with"
-    explain_cropping: "<p>Move the frame and change its size to adjust the image section.</p><p>Click on apply when you are satisfied.</p>"
+    explain_cropping: "<p>Move the frame and change its size with the mouse or arrow keys to adjust the image mask. Click on \"apply\" when you are satisfied with your selection.</p><p>If you want to return to the original centered image mask like it was defined in the layout, click \"reset\" and \"apply\" afterwards.</p>"
     explain_publishing: "Publish the page and remove the cached version from the server."
     explain_sitemap_dragndrop_sorting: "Tip: Drag the pages at the icon in order to sort them."
     explain_unlocking: "Leave page and unlock it for other users."

data/config/locales/alchemy.es.yml

@@ -252,7 +252,7 @@ es:
     "Remove item from clipboard": "Quitar elemento del portapapeles"
     "Remove tag filter": "Quitar filtro de etiquetas"
     "Remove this content": "Quitar este contenido"
-    "Reset Imagemask": "Reiniciar máscara de imagen"
+    "Reset Imagemask": "Reiniciar"
     "Reset password instructions": "Instrucciones para restablecer la contraseña"
     "Select all": "Seleccionar todo"
     "Select an content": "Seleccionar contenido"

data/config/locales/alchemy.fr.yml

@@ -271,7 +271,7 @@ fr:
     "Remove item from clipboard": "Supprimer le contenu du presse-papiers"
     "Remove tag filter": "Enlever filtre"
     "Remove this content": "Retirer ce contenu"
-    "Reset Imagemask": "Enlever le masque d'image"
+    "Reset Imagemask": "Enlever"
     "Reset password instructions": "Instructions pour réinitialiser votre mot de passe"
     "Select all": "Sélectionner tous"
     "Select an content": "Sélectionnez un contenu de"

data/config/locales/alchemy.it.yml

@@ -252,7 +252,7 @@ it:
     "Remove item from clipboard": "Rimuovi elemento dagli appunti"
     "Remove tag filter": "Rimuovi filtro tag"
     "Remove this content": "Rimuovi questo contenuto"
-    "Reset Imagemask": "Ripristina la maschera delle immagini"
+    "Reset Imagemask": "Ripristina"
     "Reset password instructions": "Ripristina le istruzioni per la password"
     "Select all": "Seleziona tutto"
     "Select an content": "Seleziona un contenuto"

data/config/locales/alchemy.nl.yml

@@ -250,7 +250,7 @@ nl:
     "Remove item from clipboard": "Item van klembord verwijderen"
     "Remove tag filter": "Filter verwijderen"
     "Remove this content": "Inhoud verwijderen"
-    "Reset Imagemask": "Afbeeldingsmasker resetten"
+    "Reset Imagemask": "resetten"
     "Reset password instructions": "Instructies om het wachtwoord te resetten."
     "Select all": "Alles selecteren"
     "Select an content": "Selecteer de inhoud"

data/config/locales/alchemy.ru.yml

@@ -251,7 +251,7 @@ ru:
     "Remove item from clipboard": "Удалить элемент из буфера обмена"
     "Remove tag filter": "Удалить фильтр меток"
     "Remove this content": "Удалить этот контент"
-    "Reset Imagemask": "Сбросить маску изображений"
+    "Reset Imagemask": "Сбросить"
     "Reset password instructions": "Инструкция по сбросу пароля"
     "Select all": "Выбрать все"
     "Select an content": "Выбрать контент"

data/db/migrate/20160422195310_add_image_file_format_to_alchemy_pictures.rb

@@ -1,18 +1,6 @@
 class AddImageFileFormatToAlchemyPictures < ActiveRecord::Migration[4.2]
   def up
     add_column :alchemy_pictures, :image_file_format, :string
-
-    say_with_time "Storing file format of existing pictures" do
-      Alchemy::Picture.all.each do |pic|
-        begin
-          format = pic.image_file.identify('-ping -format "%m"')
-          pic.update_column('image_file_format', format.to_s.chomp.downcase)
-        rescue Dragonfly::Job::Fetch::NotFound => e
-          say(e.message, true)
-        end
-      end
-      Alchemy::Picture.count
-    end
   end
 
   def down

data/lib/alchemy/errors.rb

@@ -57,9 +57,14 @@ module Alchemy
 
   # Raised if calling +image_file+ on a Picture object returns nil.
   class WrongImageFormatError < StandardError
+    def initialize(image, requested_format)
+      @image = image
+      @requested_format = requested_format
+    end
+
     def message
       allowed_filetypes = Alchemy::Picture.allowed_filetypes.map(&:upcase).to_sentence
-      "Requested image format is not one of allowed filetypes (#{allowed_filetypes})."
+      "Requested image format (#{@requested_format.inspect}) for #{@image.inspect} is not one of allowed filetypes (#{allowed_filetypes})."
     end
   end
 

data/lib/alchemy/logger.rb

@@ -9,7 +9,7 @@ module Alchemy
     end
 
     def log_warning(message)
-      Alchemy::Logger.warn(message, caller(0..0))
+      Alchemy::Logger.warn(message, caller(1..1))
     end
   end
 end

data/lib/alchemy/permissions.rb

@@ -37,7 +37,6 @@ module Alchemy
       def alchemy_guest_user_rules
         can([:show, :download], Alchemy::Attachment) { |a| !a.restricted? }
         can :see,               Alchemy::Page,       restricted: false, visible: true
-        can(:display,           Alchemy::Picture)    { |p| !p.restricted? }
 
         can :read, Alchemy::Content, Alchemy::Content.available.not_restricted do |c|
           c.public? && !c.restricted? && !c.trashed?
@@ -67,7 +66,6 @@ module Alchemy
         can [:show, :download], Alchemy::Attachment
         can :read,              Alchemy::Page,      Alchemy::Page.published, &:public?
         can :see,               Alchemy::Page,      restricted: true, visible: true
-        can :display,           Alchemy::Picture
 
         can :read, Alchemy::Content, Alchemy::Content.available do |c|
           c.public? && !c.trashed?
@@ -217,11 +215,6 @@ module Alchemy
         :unlock,
         :visit,
         to: :edit_content
-
-      alias_action :show,
-        :thumbnail,
-        :zoom,
-        to: :display
     end
 
     # Include the role specific permissions.

data/lib/alchemy/tasks/tidy.rb

@@ -0,0 +1,130 @@
+require 'alchemy/shell'
+
+module Alchemy
+  class Tidy
+    extend Shell
+
+    class << self
+      def create_missing_cells(page_layouts, cells)
+        page_layouts.each do |layout|
+          next if layout['cells'].blank?
+          cells_for_layout = cells.select { |cell| layout['cells'].include? cell['name'] }
+          Alchemy::Page.where(page_layout: layout['name']).each do |page|
+            cells_for_layout.each do |cell_for_layout|
+              cell = Alchemy::Cell.find_or_initialize_by(name: cell_for_layout['name'], page_id: page.id)
+              if cell.new_record?
+                log "Creating cell #{cell.name} for page #{page.name}"
+              else
+                log "Cell #{cell.name} for page #{page.name} already present", :skip
+              end
+            end
+          end
+        end
+      end
+
+      def update_element_positions
+        Alchemy::Page.all.each do |page|
+          if page.elements.any?
+            puts "\n## Updating element positions of page `#{page.name}`"
+          end
+          page.elements.group_by(&:cell_id).each do |_cell_id, elements|
+            elements.each_with_index do |element, idx|
+              position = idx + 1
+              if element.position != position
+                log "Updating position for element ##{element.id} to #{position}"
+                element.update_column(:position, position)
+              else
+                log "Position for element ##{element.id} is already correct (#{position})", :skip
+              end
+            end
+          end
+        end
+      end
+
+      def update_content_positions
+        Alchemy::Element.all.each do |element|
+          if element.contents.any?
+            puts "\n## Updating content positions of element `#{element.name}`"
+          end
+          element.contents.group_by(&:essence_type).each do |essence_type, contents|
+            puts "-> Contents of type `#{essence_type}`"
+            contents.each_with_index do |content, idx|
+              position = idx + 1
+              if content.position != position
+                log "Updating position for content ##{content.id} to #{position}"
+                content.update_column(:position, position)
+              else
+                log "Position for content ##{content.id} is already correct (#{position})", :skip
+              end
+            end
+          end
+        end
+      end
+
+      def remove_orphaned_cells
+        puts "\n## Removing orphaned cells"
+        cells = Alchemy::Cell.unscoped.all
+        if cells.any?
+          orphaned_cells = cells.select do |cell|
+            cell.page.nil? && cell.page_id.present?
+          end
+          if orphaned_cells.any?
+            log "Found #{orphaned_cells.size} orphaned cells"
+            destroy_orphaned_records(orphaned_cells, 'cell')
+          else
+            log "No orphaned cells found", :skip
+          end
+        else
+          log "No cells found", :skip
+        end
+      end
+
+      def remove_orphaned_elements
+        puts "\n## Removing orphaned elements"
+        elements = Alchemy::Element.unscoped.all
+        if elements.any?
+          orphaned_elements = elements.select do |element|
+            element.page.nil? && element.page_id.present? ||
+              element.cell.nil? && element.cell_id.present?
+          end
+          if orphaned_elements.any?
+            log "Found #{orphaned_elements.size} orphaned elements"
+            destroy_orphaned_records(orphaned_elements, 'element')
+          else
+            log "No orphaned elements found", :skip
+          end
+        else
+          log "No elements found", :skip
+        end
+      end
+
+      def remove_orphaned_contents
+        puts "\n## Removing orphaned contents"
+        contents = Alchemy::Content.unscoped.all
+        if contents.any?
+          orphaned_contents = contents.select do |content|
+            content.essence.nil? && content.essence_id.present? ||
+              content.element.nil? && content.element_id.present?
+          end
+          if orphaned_contents.any?
+            log "Found #{orphaned_contents.size} orphaned contents"
+            destroy_orphaned_records(orphaned_contents, 'content')
+          else
+            log "No orphaned contents found", :skip
+          end
+        else
+          log "No contents found", :skip
+        end
+      end
+
+      private
+
+      def destroy_orphaned_records(records, class_name)
+        records.each do |record|
+          log "Destroy orphaned #{class_name}: #{record.inspect}"
+          record.destroy
+        end
+      end
+    end
+  end
+end