alchemy_cms 3.0.0.rc7 → 3.0.0.rc8

data/app/controllers/alchemy/admin/essence_pictures_controller.rb

@@ -75,7 +75,14 @@ module Alchemy
 
       def sizes_from_essence
         return if @essence_picture.render_size.blank?
-        @essence_picture.render_size.split('x')
+        size_x, size_y = @essence_picture.render_size.split('x').map(&:to_i)
+        if size_x.zero? || size_y.nil? || size_y.zero?
+          size_x_of_original = @essence_picture.picture.image_file_width 
+          size_y_of_original = @essence_picture.picture.image_file_height
+          size_x = size_x_of_original * size_y / size_y_of_original if size_x.zero?
+          size_y = size_y_of_original * size_x / size_x_of_original if size_y.nil? || size_y.zero?
+        end
+        [size_x, size_y]
       end
 
       def sizes_string

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -40,7 +40,8 @@ module Alchemy
       def new
         @page = Page.new(layoutpage: params[:layoutpage] == 'true', parent_id: params[:parent_id])
         @page_layouts = PageLayout.layouts_for_select(Language.current.id, @page.layoutpage?)
-        @clipboard_items = Page.all_from_clipboard_for_select(get_clipboard[:pages], Language.current.id, @page.layoutpage?)
+        @clipboard = get_clipboard('pages')
+        @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, Language.current.id, @page.layoutpage?)
       end
 
       def create
@@ -50,7 +51,8 @@ module Alchemy
           do_redirect_to(redirect_path_after_create_page)
         else
           @page_layouts = PageLayout.layouts_for_select(Language.current.id, @page.layoutpage?)
-          @clipboard_items = Page.all_from_clipboard_for_select(get_clipboard[:pages], Language.current.id, @page.layoutpage?)
+          @clipboard = get_clipboard('pages')
+          @clipboard_items = Page.all_from_clipboard_for_select(@clipboard, Language.current.id, @page.layoutpage?)
           render :new
         end
       end
@@ -59,7 +61,7 @@ module Alchemy
       def edit
         # fetching page via before filter
         if page_is_locked?
-          flash[:notice] = _t("This page is locked by %{name}", name: @page.locker_name)
+          flash[:notice] = _t('This page is locked', name: @page.locker_name)
           redirect_to admin_pages_path
         else
           @page.lock_to!(current_alchemy_user)
@@ -102,7 +104,8 @@ module Alchemy
             format.js
           end
           # remove from clipboard
-          get_clipboard.remove(:pages, @page_id)
+          @clipboard = get_clipboard('pages')
+          @clipboard.delete_if { |item| item['id'] == @page_id.to_s }
         end
       end
 
@@ -170,15 +173,17 @@ module Alchemy
         @sorting = true
       end
 
+      # Receives a JSON object representing a language tree to be ordered
+      # and updates all pages in that language structure to their correct indexes
       def order
-        # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
         neworder = JSON.parse(params[:set])
-        prev_item = nil
-        neworder.each do |item|
-          dbitem = Page.find(item['id'])
-          prev_item.nil? ? dbitem.move_to_child_of(@page_root) : dbitem.move_to_right_of(prev_item)
-          sort_children(item, dbitem) unless item['children'].nil?
-          prev_item = dbitem.reload
+        tree = create_tree(neworder, @page_root)
+
+        Alchemy::Page.transaction do
+          tree.each do |key, node|
+            dbitem = Page.find(key)
+            dbitem.update_node!(node)
+          end
         end
 
         flash[:notice] = _t("Pages order saved")
@@ -215,6 +220,85 @@ module Alchemy
         Page.language_root_for(params[:languages][:old_lang_id])
       end
 
+      # Returns the current left index and the aggregated hash of tree nodes indexed by page id visited so far
+      #
+      # Visits a batch of children nodes, assigns them the correct ordering indexes and spuns recursively the same
+      # procedure on their children, if any
+      #
+      # @param [Array]
+      #   An array of children nodes to be visited
+      # @param [Integer]
+      #   The lft attribute that should be given to the first node in the array
+      # @param [Integer]
+      #   The page id of the parent of this batch of children nodes
+      # @param [Integer]
+      #   The depth at which these children reside
+      # @param [Hash]
+      #   A Hash of TreeNode's indexed by their page ids
+      # @param [String]
+      #   The url for the parent node of these children
+      # @param [Boolean]
+      #   Whether these children reside in a restricted branch according to their ancestors
+      #
+      def visit_nodes(nodes, my_left, parent, depth, tree, url, restricted)
+        nodes.each do |item|
+          my_right = my_left + 1
+          my_restricted = item['restricted'] || restricted
+          urls = process_url(url, item)
+
+          if item['children']
+            my_right, tree = visit_nodes(item['children'], my_left + 1, item['id'], depth + 1, tree, urls[:children_path], my_restricted)
+          end
+
+          tree[item['id']] = TreeNode.new(my_left, my_right, parent, depth, urls[:my_urlname], my_restricted)
+          my_left = my_right + 1
+        end
+
+        [my_left, tree]
+      end
+
+      # Returns a Hash of TreeNode's indexed by their page ids
+      #
+      # Grabs the array representing a tree structure of pages passed as a parameter,
+      # visits it and creates a map of TreeNodes indexed by page id featuring Nested Set
+      # ordering information consisting of the left, right, depth and parent_id indexes as
+      # well as a node's url and restricted status
+      #
+      # @param [Array]
+      #   An Array representing a tree of Alchemy::Page's
+      # @param [Alchemy::Page]
+      #   The root page for the language being ordered
+      #
+      def create_tree(items, rootpage)
+        _, tree = visit_nodes(items, rootpage.lft + 1, rootpage.id, rootpage.depth + 1, {}, "", rootpage.restricted)
+        tree
+      end
+
+      # Returns a pair, the path that a given tree node should take, and the path its children should take
+      #
+      # This function will add a node's own slug into their ancestor's path
+      # in order to create the full URL of a node
+      #
+      # NOTE: external and invisible pages are not part of the full path of their children
+      #
+      # @param [String]
+      #   The node's ancestors path
+      # @param [Hash]
+      #   A children node
+      #
+      def process_url(ancestors_path, item)
+        default_urlname = (ancestors_path.blank? ? "" : "#{ancestors_path}/") + item['slug']
+
+        pair = {my_urlname: default_urlname, children_path: default_urlname}
+
+        if item['external'] == true || item['visible'] == false
+          # children ignore an ancestor in their path if external or invisible
+          pair[:children_path] = ancestors_path
+        end
+
+        pair
+      end
+
       def load_page
         @page = Page.find(params[:id])
       end
@@ -223,17 +307,6 @@ module Alchemy
         request.raw_post.split('&').map { |i| i = {i.split('=')[0].gsub(/[^0-9]/, '') => i.split('=')[1]} }
       end
 
-      # Taken from https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
-      def sort_children(element, dbitem)
-        prevchild = nil
-        element['children'].each do |child|
-          childitem = Page.find(child['id'])
-          prevchild.nil? ? childitem.move_to_child_of(dbitem) : childitem.move_to_right_of(prevchild)
-          sort_children(child, childitem) unless child['children'].nil?
-          prevchild = childitem
-        end
-      end
-
       def redirect_path_for_switch_language
         if request.referer && request.referer.include?('admin/layoutpages')
           admin_layoutpages_path

data/app/controllers/alchemy/admin/tags_controller.rb

@@ -26,7 +26,7 @@ module Alchemy
         if tag_params[:merge_to]
           @new_tag = ActsAsTaggableOn::Tag.find(tag_params[:merge_to])
           Tag.replace(@tag, @new_tag)
-          operation_text = _t('Replaced Tag %{old_tag} with %{new_tag}') % {:old_tag => @tag.name, :new_tag => @new_tag.name}
+          operation_text = _t('Replaced Tag') % {old_tag: @tag.name, new_tag: @new_tag.name}
           @tag.destroy
         else
           @tag.update_attributes(tag_params)

data/app/controllers/alchemy/pictures_controller.rb

@@ -45,68 +45,69 @@ module Alchemy
       return false
     end
 
-    def send_image(image_file, format)
+    def send_image(image, format)
       ALLOWED_IMAGE_TYPES.each do |type|
         format.send(type) do
           if type == 'jpeg'
             quality = params[:quality] || Config.get(:output_image_jpg_quality)
-            image_file = image_file.encode(type, "-quality #{quality}")
+            image = image.encode(type, "-quality #{quality}")
           else
-            image_file = image_file.encode(type)
+            image = image.encode(type)
           end
-          render text: image_file.data
+          render text: image.data
         end
       end
     end
 
     # Return the processed image dependent of size and cropping parameters
     def processed_image
-      image_file = @picture.image_file
-      if image_file.nil?
+      @image = @picture.image_file
+      if @image.nil?
         raise MissingImageFileError, "Missing image file for #{@picture.inspect}"
       end
-      if params[:crop_size].present? && params[:crop_from].present?
-        image_file = image_file.thumb crop_geometry_string(params)
-        image_file.thumb(resize_geometry_string)
-      elsif params[:crop] == 'crop' && @size.present?
-        width, height = normalize_sizes(image_file)
-        image_file.thumb("#{width}x#{height}#")
-      elsif @size.present?
-        image_file.thumb(resize_geometry_string)
+      if @size.present?
+        if params[:crop_size].present? && params[:crop_from].present?
+          @image = @image.thumb xy_crop_geometry_string(params)
+          @image.thumb(resize_geometry_string)
+        elsif params[:crop]
+          @image.thumb(center_crop_geometry_string)
+        else
+          @image.thumb(resize_geometry_string)
+        end
       else
-        image_file
+        @image
       end
     end
 
     # Returns the Imagemagick geometry string for cropping the image.
-    def crop_geometry_string(params)
+    def xy_crop_geometry_string(params)
       crop_from_x, crop_from_y = params[:crop_from].split('x')
       "#{params[:crop_size]}+#{crop_from_x}+#{crop_from_y}"
     end
 
     # Returns the Imagemagick geometry string used to resize the image.
+    #
+    # Prevents upscaling unless :upsample param is true.
     def resize_geometry_string
-      @resize_geometry_string ||= begin
-        params[:upsample] == 'true' ? @size.to_s : "#{@size}>"
-      end
+      params[:upsample] == 'true' ? @size : "#{@size}>"
     end
 
-    # Returns normalized width and height values
+    # Returns the Imagemagick geometry string used to crop the image.
     #
-    # Prevents upscaling unless :upsample param is true,
-    # because unfurtunally Dragonfly does not handle this correctly while cropping
-    #
-    def normalize_sizes(image_file)
-      width, height = @size.split('x').collect(&:to_i)
-      return width, height if params[:upsample] == 'true'
-      if width > image_file.width
-        width = image_file.width
+    # Prevents upscaling unless :upsample param is true
+    def center_crop_geometry_string
+      params[:upsample] == 'true' ? "#{@size}#" : "#{normalized_sizes(*@size.split('x'))}#"
+    end
+
+    # Ensure we're not trying to scale the image up. Used only for cropping.
+    def normalized_sizes(width, height)
+      if width.to_i > @image.width
+        width = @image.width
       end
-      if height > image_file.height
-        height = image_file.height
+      if height.to_i > @image.height
+        height = @image.height
       end
-      return width, height
+      "#{width}x#{height}"
     end
-
   end
 end

data/app/helpers/alchemy/admin/base_helper.rb

@@ -34,12 +34,6 @@ module Alchemy
       #
       #   <%= link_to_dialog('Edit', edit_product_path, {size: '200x300'}, {class: 'icon_button'}) %>
       #
-      # Or you call it with a block
-      #
-      #   <%= link_to_dialog edit_product_path, {size: 200x300} do %>
-      #     <%= render_icon(:edit) %>
-      #   <% end %>
-      #
       # @param [String] content
       #   The string inside the link tag
       # @param [String or Hash] url
@@ -56,18 +50,11 @@ module Alchemy
       # @option options [Boolean] :modal (true)
       #    Show as modal window.
       #
-      def link_to_dialog(content = nil, url = nil, options = {}, html_options = {}, &block)
-        html_options, options, url, content = options, url, content, block if block_given?
+      def link_to_dialog(content, url, options={}, html_options={})
         default_options = {modal: true}
         options = default_options.merge(options)
-        if block_given?
-          link_to url,
-            html_options.merge('data-alchemy-dialog' => options.to_json),
-            &block
-        else
-          link_to content, url,
-            html_options.merge('data-alchemy-dialog' => options.to_json)
-        end
+        link_to content, url,
+          html_options.merge('data-alchemy-dialog' => options.to_json)
       end
 
       # Used for translations selector in Alchemy cockpit user settings.

data/app/models/alchemy/element.rb

@@ -115,7 +115,7 @@ module Alchemy
 
       def all_from_clipboard(clipboard)
         return [] if clipboard.nil?
-        where(id: clipboard.collect { |e| e[:id] })
+        where(id: clipboard.collect { |e| e['id'] })
       end
 
       # All elements in clipboard that could be placed on page

data/app/models/alchemy/page/page_naming.rb

@@ -16,8 +16,10 @@ module Alchemy
         uniqueness: {scope: [:language_id, :layoutpage], if: 'urlname.present?'},
         exclusion:  {in: RESERVED_URLNAMES},
         length:     {minimum: 3, if: 'urlname.present?'},
-        format:     {with: /\A[:\.\w\-+_\/\?&%;=]*\z/, if: :redirects_to_external?},
-        presence:   {if: :redirects_to_external?}
+        format:     {with: /\A[:\.\w\-+_\/\?&%;=]*\z/, if: :redirects_to_external?}
+      validates :urlname,
+        on: :update,
+        presence: {if: :redirects_to_external?}
 
       before_save :set_title, :if => 'title.blank?', :unless => proc { systempage? || redirects_to_external? }
       after_update :update_descendants_urlnames,

data/app/models/alchemy/page/page_natures.rb

@@ -27,7 +27,7 @@ module Alchemy
 
     # Returns true or false if the pages layout_description for config/alchemy/page_layouts.yml contains redirects_to_external: true
     def redirects_to_external?
-      definition["redirects_to_external"]
+      !!definition["redirects_to_external"]
     end
 
     def has_controller?

data/app/models/alchemy/page.rb

@@ -177,7 +177,7 @@ module Alchemy
 
       def all_from_clipboard(clipboard)
         return [] if clipboard.blank?
-        where(id: clipboard.collect { |p| p[:id] })
+        where(id: clipboard.collect { |p| p['id'] })
       end
 
       def all_from_clipboard_for_select(clipboard, language_id, layoutpage = false)
@@ -333,6 +333,25 @@ module Alchemy
       update_columns(published_at: Time.now, public: true)
     end
 
+    # Updates an Alchemy::Page based on a new ordering to be applied to it
+    #
+    # Note: Page's urls should not be updated (and a legacy URL created) if nesting is OFF
+    # or if a page is external or if the URL is the same
+    #
+    # @param [TreeNode]
+    #   A tree node with new lft, rgt, depth, url, parent_id and restricted indexes to be updated
+    #
+    def update_node!(node)
+      hash = {lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted}
+
+      if Config.get(:url_nesting) && !self.redirects_to_external? && self.urlname != node.url
+        LegacyPageUrl.create(page_id: self.id, urlname: self.urlname)
+        hash.merge!(urlname: node.url)
+      end
+
+      update_columns(hash)
+    end
+
     private
 
     # Returns the next or previous page on the same level or nil.

data/app/models/alchemy/picture.rb

@@ -200,6 +200,7 @@ module Alchemy
       return "111x93" if size == "111x93" || size.blank?
       x = size.split('x')[0].to_i
       y = size.split('x')[1].to_i
+      return "111x93" if x.zero? || y.zero?
       if (x > y)
         zoom_factor = 111.0 / x
         new_x = 111

data/app/models/alchemy/tree_node.rb

@@ -0,0 +1,4 @@
+module Alchemy
+  class TreeNode < Struct.new(:left, :right, :parent, :depth, :url, :restricted)
+  end
+end

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

@@ -0,0 +1,4 @@
+$('#<%= @content_dom_id %>').remove();
+Alchemy.growl('<%= j @notice %>');
+Alchemy.reloadPreview();
+Alchemy.pleaseWaitOverlay(false);

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

@@ -26,7 +26,7 @@
   </h1>
   <% if @last_sign_at %>
   <p>
-    <small><%= _t('Your last login was on %{time}', time: l(@last_sign_at)) %></small>
+    <small><%= _t('Your last login was on', time: l(@last_sign_at)) %></small>
   </p>
   <% end %>
   <div class="column left">

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

@@ -1,24 +1,23 @@
 <div class="element_editor<%= element.folded ? ' folded' : '' %> <%= defined?(draggable) && !draggable ? 'not-draggable' : 'draggable'  %>" id="element_<%= element.id %>" data-element-id="<%= element.id %>">
-  <%= form_for [:admin, element], remote: true, html: {id: "element_#{element.id}_form"} do |f| %>
-    <%= render 'alchemy/admin/elements/element_head', element: element %>
-    <% unless element.folded? %>
+  <%= render :partial => "alchemy/admin/elements/element_head", :locals => {:element => element} %>
+  <% if !element.folded? %>
+    <%= form_for [:admin, element], :remote => true, :html => {:id => "element_#{element.id}_form"} do |f| %>
       <div id="element_<%= element.id %>_errors" class="element_errors" style="display: none"></div>
       <div id="element_<%= element.id %>_content" class="element_content">
         <%= render_editor(element) %>
       </div>
       <% if element.has_validations? %>
-        <p class="validation_notice">
-          <span class="validation_indicator">*</span> <%= _t('Mandatory') %>
-        </p>
+      <p class="validation_notice">
+        <span class="validation_indicator">*</span> <%= _t('Mandatory') %>
+      </p>
       <% end %>
       <% if element.taggable? %>
-        <div class="autocomplete_tag_list">
-          <%= f.label :tag_list %>
-          <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
-        </div>
+      <div class="autocomplete_tag_list">
+        <%= f.label :tag_list %>
+        <%= render 'alchemy/admin/partials/autocomplete_tag_list', f: f %>
+      </div>
       <% end %>
-      <%= render 'alchemy/admin/elements/element_foot', element: element, f: f %>
+      <%= render :partial => 'alchemy/admin/elements/element_foot', :locals => {:element => element, :f => f} %>
     <% end %>
   <% end %>
-  <%= render 'alchemy/admin/elements/add_element_button', element_before: element %>
 </div>