alchemy_cms 3.0.4 → 3.1.0.beta1

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

@@ -0,0 +1,249 @@
+module Alchemy
+
+  # This concern can extend classes that expose image_file, image_file_width and image_file_height.
+  # It provides methods for cropping and resizing.
+  #
+  module Picture::Transformations
+    extend ActiveSupport::Concern
+
+    # Returns the default centered image mask for a given size.
+    # If the mask is bigger than the image, the mask is scaled down
+    # so the largest possible part of the image is visible.
+    #
+    def default_mask(mask_arg)
+      mask = mask_arg.dup
+      mask[:width] = image_file_width if mask[:width].zero?
+      mask[:height] = image_file_height if mask[:height].zero?
+
+      crop_size = size_when_fitting({width: image_file_width, height: image_file_height}, mask)
+      top_left = get_top_left_crop_corner(crop_size)
+
+      point_and_mask_to_points(top_left, crop_size)
+    end
+
+    # Returns a size value String for the thumbnail used in essence picture editors.
+    #
+    def thumbnail_size(size_string = "0x0", crop = false)
+      size = sizes_from_string(size_string)
+
+      # only if crop is set do we need to actually parse the size string, otherwise
+      # we take the base image size.
+      if crop
+        size[:width] = get_base_dimensions[:width] if size[:width].zero?
+        size[:height] = get_base_dimensions[:height] if size[:height].zero?
+        size = reduce_to_image(size)
+      else
+        size = get_base_dimensions
+      end
+
+      size = size_when_fitting({width: 111, height: 93}, size)
+      "#{size[:width]}x#{size[:height]}"
+    end
+
+    # Returns the rendered cropped image. Tries to use the crop_from and crop_size
+    # parameters. When they can't be parsed, it just crops from the center.
+    #
+    def crop(size, crop_from = nil, crop_size = nil, upsample = false)
+      raise "No size given!" if size.empty?
+      render_to = sizes_from_string(size)
+      if crop_from && crop_size
+        top_left = point_from_string(crop_from)
+        crop_dimensions = sizes_from_string(crop_size)
+        xy_crop_resize(render_to, top_left, crop_dimensions, upsample)
+      else
+        center_crop(render_to, upsample)
+      end
+    end
+
+    # Returns the rendered resized image using imagemagick directly.
+    #
+    def resize(size, upsample = false)
+      self.image_file.thumb(upsample ? size : "#{size}>")
+    end
+
+    # Given a string with an x, this function returns a Hash with point
+    # :width and :height.
+    #
+    def sizes_from_string(string = "0x0")
+      string = "0x0" if string.nil? || string.empty?
+
+      raise ArgumentError unless string.match(/(\d*x\d*)/)
+
+      width, height = string.scan(/(\d*)x(\d*)/)[0].map(&:to_i)
+
+      width = 0 if width.nil?
+      height = 0 if height.nil?
+      {
+        width: width,
+        height: height
+      }
+    end
+
+    # Returns true if picture's width is greater than it's height
+    #
+    def landscape_format?
+      image_file.landscape?
+    end
+    alias_method :landscape?, :landscape_format?
+
+    # Returns true if picture's width is smaller than it's height
+    #
+    def portrait_format?
+      image_file.portrait?
+    end
+    alias_method :portrait?, :portrait_format?
+
+    # Returns true if picture's width and height is equal
+    #
+    def square_format?
+      image_file.aspect_ratio == 1.0
+    end
+    alias_method :square?, :square_format?
+
+    # This function returns the :width and :height of the image file
+    # as a Hash
+    def image_size
+      {
+        width: image_file_width,
+        height: image_file_height
+      }
+    end
+
+    # An Image smaller than dimensions
+    # can not be cropped to string - 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)
+    end
+
+    # Returns true if the class we're included in has a meaningful render_size attribute
+    #
+    def render_size?
+      self.respond_to?(:render_size) && !self.render_size.nil? && !self.render_size.empty?
+    end
+
+    # Returns true if the class we're included in has a meaningful crop_size attribute
+    #
+     def crop_size?
+      self.respond_to?(:crop_size) && !self.crop_size.nil? && !self.crop_size.empty?
+    end
+
+    private
+
+    # Given a string with an x, this function return a Hash with key :x and :y
+    #
+    def point_from_string(string = "0x0")
+      string = "0x0" if string.empty?
+      raise ArgumentError if !string.match(/(\d*x)|(x\d*)/)
+
+      x, y = string.scan(/(\d*)x(\d*)/)[0].map(&:to_i)
+
+      x = 0 if x.nil?
+      y = 0 if y.nil?
+      {
+        x: x,
+        y: y
+      }
+    end
+
+    # Given dimensions for a possibly destructive crop operation,
+    # this function returns the top left corner as a Hash
+    # with keys :x, :y
+    #
+    def get_top_left_crop_corner(dimensions)
+      {
+        x: (image_file_width - dimensions[:width]) / 2,
+        y: (image_file_height - dimensions[:height]) / 2
+      }
+    end
+
+    # Gets the base dimensions (the dimensions of the Picture before scaling).
+    # If anything is missing, it gets padded with zero (Integer 0).
+    # This is the order of precedence: crop_size > image_size
+    def get_base_dimensions
+      if crop_size?
+        sizes_from_string(crop_size)
+      else
+        image_size
+      end
+    end
+
+    # This function takes a target and a base dimensions hash and returns
+    # the dimensions of the image when the base dimensions hash fills
+    # the target.
+    # Aspect ratio will be preserved.
+    #
+    def size_when_fitting(target, dimensions = get_base_dimensions)
+      zoom_x = dimensions[:width].to_f / target[:width]
+      zoom_y = dimensions[:height].to_f / target[:height]
+
+      zoom = [zoom_x, zoom_y].max
+      {
+        width: (dimensions[:width] / zoom).round.to_i,
+        height: (dimensions[:height] / zoom).round.to_i
+      }
+    end
+
+    # Given a point as a Hash with :x and :y, and a mask with
+    # :width and :height, this function returns the area on the
+    # underlying canvas as a Hash of two points
+    #
+    def point_and_mask_to_points(point, mask)
+      {
+        x1: point[:x],
+        y1: point[:y],
+        x2: point[:x] + mask[:width],
+        y2: point[:y] + mask[:height],
+      }
+    end
+
+    # Converts a dimensions hash to a string of from "20x20"
+    #
+    def dimensions_to_string(dimensions)
+      "#{dimensions[:width]}x#{dimensions[:height]}"
+    end
+
+    # Returns true if both dimensions of the base image are bigger than the dimensions hash.
+    #
+    def is_bigger_than(dimensions)
+      image_file_width > dimensions[:width] && image_file_height > dimensions[:height]
+    end
+
+    # Returns true is one dimension of the base image is smaller than the dimensions hash.
+    #
+    def is_smaller_than(dimensions)
+      !is_bigger_than(dimensions)
+    end
+
+    # Uses imagemagick to make a centercropped thumbnail. Does not scale the image up.
+    #
+    def center_crop(dimensions, upsample)
+      if is_smaller_than(dimensions) && upsample == false
+        dimensions = reduce_to_image(dimensions)
+      end
+      self.image_file.thumb("#{dimensions_to_string(dimensions)}#")
+    end
+
+    # Use imagemagick to custom crop an image. Uses -thumbnail for better performance when resizing.
+    #
+    def xy_crop_resize(dimensions, top_left, crop_dimensions, upsample)
+      crop_argument = "-crop #{dimensions_to_string(crop_dimensions)}"
+      crop_argument += "+#{top_left[:x]}+#{top_left[:y]}"
+
+      resize_argument = "-resize #{dimensions_to_string(dimensions)}"
+      resize_argument += ">" unless upsample
+      self.image_file.convert "#{crop_argument} #{resize_argument}"
+    end
+
+    # Used when centercropping.
+    #
+    def reduce_to_image(dimensions)
+      {
+        width: [dimensions[:width], image_file_width].min,
+        height: [dimensions[:height], image_file_height].min
+      }
+    end
+  end
+end

data/app/serializers/alchemy/content_serializer.rb

@@ -8,20 +8,13 @@ module Alchemy
       :element_id,
       :position,
       :created_at,
-      :updated_at
+      :updated_at,
+      :settings
 
     has_one :essence, polymorphic: true
 
     def ingredient
-      case object.essence_type
-      when 'Alchemy::EssencePicture'
-        object.essence.picture_url
-      when 'Alchemy::EssenceFile'
-        object.essence.attachment_url
-      else
-        object.ingredient
-      end
+      object.serialized_ingredient
     end
-
   end
 end

data/app/serializers/alchemy/element_serializer.rb

@@ -9,9 +9,12 @@ module Alchemy
       :cell_id,
       :tag_list,
       :created_at,
-      :updated_at
-
-    has_many :contents
+      :updated_at,
+      :ingredients,
+      :content_ids
 
+    def ingredients
+      object.contents.collect(&:serialize)
+    end
   end
 end

data/app/serializers/alchemy/legacy_element_serializer.rb

@@ -0,0 +1,17 @@
+module Alchemy
+  class LegacyElementSerializer < ActiveModel::Serializer
+    self.root = false
+
+    attributes :id,
+      :name,
+      :position,
+      :page_id,
+      :cell_id,
+      :tag_list,
+      :created_at,
+      :updated_at
+
+    has_many :contents
+
+  end
+end

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

@@ -1,10 +1,20 @@
-<div class="widget">
-  <h2><%= Alchemy::Site.model_name.human(:count => 2) %>:</h2>
+<div class="widget sites">
+  <h2><%= Alchemy::Site.model_name.human(count: 2) %>:</h2>
   <table>
     <% @sites.each do |site| %>
-    <tr class="<%= cycle('even', 'odd', :name => 'sites') %>">
+    <tr class="<%= cycle('even', 'odd', name: 'sites') %>">
       <td>
-        <%= link_to_unless(site == Alchemy::Site.current, site.name, login_url(:protocol => 'http://', :host => site.host, :user => {:login => current_alchemy_user.login}), :target => '_blank') %>
+        <% if alchemy.respond_to?(:login_url) %>
+          <%= link_to_unless site == Alchemy::Site.current,
+            site.name,
+            alchemy.login_url(
+              protocol: 'http://',
+              host: site.host,
+              user: {login: current_alchemy_user.try(:login)}
+            ), target: '_blank' %>
+        <% else %>
+          <%= site.name %>
+        <% end %>
       </td>
       <td><small><%= site.host %></small></td>
     </tr>

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

@@ -35,12 +35,15 @@
   Alchemy.ImageLoader('#jscropper .thumbnail_background');
   $('#imageToCrop').load(function() {
     Alchemy.ImageCropper.init(
-      [<%= @initial_box[:x1] %>, <%= @initial_box[:y1] %>, <%= @initial_box[:x2] %>, <%= @initial_box[:y2] %>],
-      <%= @size_x %>,
-      <%= @size_y %>,
-      [<%= @default_box[:x1] %>, <%= @default_box[:y1] %>, <%= @default_box[:x2] %>, <%= @default_box[:y2] %>],
+       <%= @initial_box.values.to_json %>,
+      <% if @essence_picture.can_be_cropped_to("#{@min_size[:width]}x#{@min_size[:height]}") %>
+        <%= @min_size.values.to_json %>,
+      <% else %>
+        <%= false %>,
+      <% end %>
+      <%= @default_box.values.to_json %>,
       <%= @ratio %>,
-      [<%= @picture.image_file_width %>, <%= @picture.image_file_height %>]
+      <%= @picture.image_size.values.to_json %>
     );
   });
 </script>

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

@@ -70,15 +70,15 @@
     <% end %>
     <label><%= _t(:page_properties) %></label>
   </div>
-  <% if can?(:publish, @page) && !@page.layoutpage? %>
-    <div class="button_with_label">
-      <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
-        <%= button_tag class: 'icon_button', title: _t(:explain_publishing) do %>
-          <%= render_icon('publish') %>
-        <% end %>
-        <label><%= _t("Publish page") %></label>
-      <% end %>
-    </div>
+  <% if configuration(:cache_pages) && !@page.layoutpage? %>
+  <div class="button_with_label">
+    <%= form_tag alchemy.publish_admin_page_path(@page), id: 'publish_page_form' do %>
+      <button class="icon_button" title="<%= _t(:explain_publishing) %>">
+        <%= render_icon('publish') %>
+      </button>
+      <label><%= _t("Publish page") %></label>
+    <% end %>
+  </div>
   <% end %>
   <div class="toolbar_spacer"></div>
   <div class="select_with_label">

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

@@ -25,9 +25,8 @@
         <ul>
           <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
           <li class="<%= cycle('even', 'odd') %>">
-            <% page_link = link_to element.display_name_with_preview_text, edit_admin_page_path(page, :anchor => "element_#{element.id}") %>
-            <% pictures = essence_pictures.collect { |e| e.content.name_for_label }.to_sentence %>
-            <%= _t(:pictures_in_page, :page => page_link, :pictures => pictures) %>
+            <%= link_to element.display_name_with_preview_text, edit_admin_page_path(page, :anchor => "element_#{element.id}") %> in
+            <%= essence_pictures.collect { |e| e.content.name_for_label }.to_sentence %>
           </li>
           <% end %>
         </ul>

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

@@ -11,7 +11,7 @@
       <%= _t(:or_replace_it_with_an_existing_tag) %>
     <% end %>
     <div class="input tags">
-      <label class="control-label"><%= _t('Tags') %></label>
+      <label class="control-label">Tags</label>
       <div class="control_group" id="tags_tag_list">
         <%= js_filter_field '#tag_list li' %>
         <ul id="tag_list" class="tags">

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

@@ -1,11 +1,12 @@
 <% cache(content) do %>
-  <div class="content_editor essence_boolean" id="<%= content.dom_id %>">
-    <input type="hidden" value="0" name="<%= content.form_field_name %>" />
-    <%= check_box_tag(content.form_field_name, 1,
-      !content.ingredient.nil? ? content.ingredient : options[:default_value],
-      :class => html_options[:class],
-      :style => html_options[:style]
-    ) %>
+  <div class="content_editor essence_boolean" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
+    <input type="hidden" value="0" name="<%= content.form_field_name %>">
+    <%= check_box_tag content.form_field_name, 1,
+      content.ingredient.presence || content_settings_value(
+        content, :default_value,
+        local_assigns.fetch(:options, {})),
+      class: local_assigns.fetch(:html_options, {})[:class],
+      style: local_assigns.fetch(:html_options, {})[:style] %>
     <label for="<%= content.form_field_id %>" style="display: inline">
       <%= render_content_name(content) %>
       <%= delete_content_link(content) %>

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

@@ -1,3 +1,3 @@
-<% cache(content) do %>
-<%= _t(content.ingredient) %>
-<% end %>
+<%- cache(content) do -%>
+<%= _t(content.ingredient) -%>
+<%- end -%>

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

@@ -1,13 +1,19 @@
-<div class="content_editor essence_date" id="<%= content.dom_id %>">
+<% cache(content) do %>
+<div class="content_editor essence_date" id="<%= content.dom_id %>" data-content-id="<%= content.id %>">
   <%= label_and_remove_link(content) %>
   <%= alchemy_datepicker(
     content.essence, :date, {
       name: content.form_field_name,
       id: content.form_field_id,
-      value: options[:default_value]
+      value: content_settings_value(
+        content,
+        :default_value,
+        local_assigns.fetch(:options, {})
+      )
     }
   ) %>
   <label for="<%= content.form_field_id %>" style="cursor: pointer; display: inline; display: inline-block; position: relative; top: 3px; margin: 0;">
     <span class="ui-icon ui-icon-calendar"></span>
   </label>
 </div>
+<% end %>