alchemy_cms 4.0.0.beta → 4.0.0.rc1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 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.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Picture::Url
     TRANSFORMATION_OPTIONS = [

data/app/models/alchemy/site.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: alchemy_sites
 #
 #  id                       :integer          not null, primary key
-#  host                     :string(255)
-#  name                     :string(255)
+#  host                     :string
+#  name                     :string
 #  created_at               :datetime         not null
 #  updated_at               :datetime         not null
 #  public                   :boolean          default(FALSE)

data/app/models/alchemy/site/layout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Site::Layout
     extend ActiveSupport::Concern

data/app/models/alchemy/tag.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 # == Schema Information
 #
 # Table name: tags
 #
-#  id   :integer          not null, primary key
-#  name :string(255)
+#  id             :integer          not null, primary key
+#  name           :string
+#  taggings_count :integer          default(0)
 #
 
 # Just holds some useful tag methods.

data/app/models/alchemy/tree_node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Represents a node in the admin page tree
 #
 # Used by page reorder

data/app/serializers/alchemy/attachment_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class AttachmentSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/base_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class BaseSerializer
     include ActiveModel::Serializers::JSON

data/app/serializers/alchemy/cell_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class CellSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/content_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class ContentSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/element_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class ElementSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_boolean_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceBooleanSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_date_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceDateSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_file_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceFileSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_html_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceHtmlSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_link_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceLinkSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_picture_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssencePictureSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_richtext_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceRichtextSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_select_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceSelectSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/essence_text_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class EssenceTextSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/legacy_element_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class LegacyElementSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/page_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class PageSerializer < ActiveModel::Serializer
     self.root = false

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class PageTreeSerializer < BaseSerializer
     def attributes

data/app/serializers/alchemy/picture_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   class PictureSerializer < ActiveModel::Serializer
     self.root = false

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

@@ -8,7 +8,7 @@
       redirect_url: admin_attachments_path(
         element_id: @element.try(:id),
         content_id: @content.try(:id),
-        options: @options ? @options.to_json : nil
+        options: options_from_params
       ) %>
   <% end %>
   <%= render 'alchemy/admin/partials/remote_search_form' %>

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

@@ -2,7 +2,7 @@
   <%= link_to alchemy.assign_admin_essence_files_path(
       attachment_id: file_to_assign.id,
       content_id: @content.id,
-      options: @options.to_json
+      options: options_from_params
     ),
     remote: true,
     method: 'put' do %>

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

@@ -1,5 +1,3 @@
-<% params_to_keep = [:tagged_with, :q, :content_id, :options] %>
-
 <div id="filter_bar">
   <h2><%= Alchemy.t('Filter') %></h2>
   <%= select_tag(
@@ -18,7 +16,7 @@
   $(function() {
     $('#file_type_filter').on('change', function(e) {
       var $this = $(this);
-      var url = '<%= alchemy.admin_attachments_path(merge_params_only(params_to_keep)).html_safe %>';
+      var url = '<%= alchemy.admin_attachments_path(search_filter_params.except(:file_type).to_h) %>';
       if ($this.data('remote') === true) {
         $.get(url, {file_type: $this.val()}, null, 'script');
       } else {

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

@@ -7,7 +7,7 @@
   <% if params[:tagged_with].present? %>
     <%= link_to(
       render_icon('delete-small') + Alchemy.t('Remove tag filter'),
-      url_for(tag_list_params.delete_if { |k, v| k == "tagged_with" }.merge(action: 'index')),
+      url_for(search_filter_params.except(:tagged_with)),
       remote: request.xhr?,
       class: 'button small with_icon please_wait'
     ) %>

data/app/views/alchemy/admin/contents/_missing.html.erb

@@ -9,7 +9,7 @@
           name: name
         },
         was_missing: true,
-        options: options.to_json
+        options: options
       ),
       'data-create-missing-content' => true,
       class: 'small button' %>

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

@@ -1,20 +1,16 @@
+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
+}) %>';
+
 <% if params[:was_missing] %>
 
-$("[data-element-<%= @element.id %>-missing-content=\"<%= @content.name %>\"]").replaceWith('<%= j(
-  render(
-    partial: "alchemy/essences/#{@content.essence_partial_name}_editor",
-    locals: @locals
-  )
-) %>');
+$("[data-element-<%= @element.id %>-missing-content=\"<%= @content.name %>\"]").replaceWith(editor_html);
 
 <% else %>
 
-$("<%= @content_dom_id %>").before('<%= j(
-  render(
-    partial: "alchemy/essences/#{@content.essence_partial_name}_editor",
-    locals: @locals
-  )
-) %>');
+$("<%= @content_dom_id %>").before(editor_html);
 Alchemy.Buttons.enable();
 Alchemy.growl('<%= j Alchemy.t("Successfully added content") % {content: @content.name_for_label} %>')
 
@@ -29,7 +25,7 @@ $('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('c
 <% if @gallery_pictures %>
 
 <% if @gallery_pictures.size > 1 %>
-$('#element_<%= @element.id %>_contents .essence_picture_editor').addClass('dragable_picture');
+$('#element_<%= @element.id %>_contents .essence_picture_editor').addClass('draggable_picture');
 <% end %>
 
 <% if !max_image_count.blank? && @gallery_pictures.size >= max_image_count %>

data/app/views/alchemy/admin/contents/new.html.erb

@@ -1,6 +1,6 @@
 <%= alchemy_form_for [:admin, @content] do |f| %>
   <%= f.hidden_field :element_id %>
-  <%= hidden_field_tag('options', @options.to_json) %>
+  <%= hidden_field_tag('options', options_from_params) %>
   <%= f.input :name, collection: @contents.map { |content|
       [
         Alchemy.t(content['name'], scope: 'content_names', default: content['name'].humanize),

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

@@ -1,23 +1,23 @@
+<% sortable = pictures.size > 1 %>
 <%- max_image_count = options[:maximum_amount_of_images] || options[:max_images] -%>
 <div class="content_editor picture_gallery_editor">
   <label><%= Alchemy.t("picture_gallery_editor.#{element.name}", default: Alchemy.t(:picture_gallery_editor)) %></label>
   <div class="picture_gallery_images" id="element_<%= element.id %>_contents">
     <%- pictures.each do |picture| -%>
-      <%= render_essence_editor(picture, {dragable: (pictures.size > 1)}.merge(options)) %>
+      <%= render_essence_editor(picture, {sortable: sortable}.merge(options)) %>
     <%- end -%>
     <%- if max_image_count.blank? || pictures.length < max_image_count.to_i -%>
       <%= render(
         partial: 'alchemy/admin/elements/add_picture',
         locals: {
           element: element,
-          options: options,
-          dragable: (pictures.size > 1)
+          options: options
         }
       ) %>
     <%- end -%>
   </div>
 </div>
-<%- if pictures.size > 1 -%>
+<%- if sortable -%>
 <script type="text/javascript" charset="utf-8">
   Alchemy.SortableContents('#element_<%= element.id %>_contents', '<%= form_authenticity_token %>');
 </script>

data/app/views/alchemy/admin/essence_files/assign.js.erb

@@ -2,7 +2,7 @@ $('#<%= @content.dom_id %>').replaceWith('<%= j(
   render "alchemy/essences/essence_file_editor",
     formats: [:html],
     content: @content,
-    options: @options
+    options: options_from_params
 ) %>');
 Alchemy.closeCurrentDialog();
 Alchemy.setElementDirty($('#element_<%= @content.element.id %>'));

data/app/views/alchemy/admin/essence_pictures/assign.js.erb

@@ -3,7 +3,7 @@ $('#<%= @content.dom_id -%>').replaceWith('<%= j(
   render(
     "alchemy/essences/essence_picture_editor",
     content: @content,
-    options: @options
+    options: options_from_params
   )
 ) %>');
 

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

@@ -12,7 +12,7 @@
   </div>
   <%= form_for(
     @essence_picture,
-    url: alchemy.admin_essence_picture_path(@essence_picture, options: @options.to_json),
+    url: alchemy.admin_essence_picture_path(@essence_picture, options: options_from_params),
     id: 'image_cropper_form',
     remote: true
   ) do |f| %>

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

@@ -1,23 +1,26 @@
 (function() {
-  var $picture_editor;
+  var $picture_editor = $('#element_<%= @element.id %>_contents');
 
   $('#essence_picture_<%= @content_id %>').remove();
 
-  <% if max_image_count.present? && @essence_pictures.count < max_image_count.to_i -%>
-
-    $picture_editor = $('#element_<%= @element.id %>_contents');
+  <% if max_image_count.present? && @essence_pictures.size < max_image_count.to_i -%>
 
     if ($('div.add_picture', $picture_editor).length === 0) {
-      $('#element_<%= @element.id %>_contents').append('<%= j(
+      $picture_editor.append('<%= j(
         render "alchemy/admin/elements/add_picture",
           element: @element,
-          options: @options
+          options: options_from_params
       ) %>');
     }
 
   <% end -%>
 
-  Alchemy.SortableContents('#element_<%= @element.id %>_contents', '<%= form_authenticity_token %>');
+  <% if @essence_pictures.size > 1 %>
+    Alchemy.SortableContents($picture_editor.selector, '<%= form_authenticity_token %>');
+  <% else %>
+    $picture_editor.find('.draggable_picture').removeClass('draggable_picture');
+    $picture_editor.sortable('destroy');
+  <% end %>
   Alchemy.reloadPreview();
   Alchemy.pleaseWaitOverlay(false);
 

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

@@ -1,18 +1,20 @@
 <%= alchemy_form_for @essence_picture,
-    url: alchemy.admin_essence_picture_path(@essence_picture, options: @options.to_json) do |f| %>
+    url: alchemy.admin_essence_picture_path(@essence_picture, options: options_from_params) do |f| %>
   <%= hidden_field_tag 'content_id', @content.id %>
-  <%= f.input :caption, as: @options[:caption_as_textarea] ? 'text' : 'string' %>
+  <%= f.input :caption, as: options_from_params[:caption_as_textarea] ? 'text' : 'string' %>
   <%= f.input :title %>
   <%= f.input :alt_tag %>
-  <%- if @options[:sizes].present? -%>
+  <%- if options_from_params[:sizes].present? -%>
     <%= f.input :render_size,
-      collection: [[Alchemy.t('Layout default'), @options[:size]]] + @options[:sizes].to_a,
+      collection: [
+        [Alchemy.t('Layout default'), options_from_params[:size]]
+      ] + options_from_params[:sizes].to_a,
       include_blank: false,
       input_html: {class: 'alchemy_selectbox'} %>
   <%- end -%>
-  <%- if @options[:css_classes].present? -%>
+  <%- if options_from_params[:css_classes].present? -%>
     <%= f.input :css_class,
-      collection: @options[:css_classes],
+      collection: options_from_params[:css_classes],
       include_blank: Alchemy.t('None'),
       input_html: {class: 'alchemy_selectbox'} %>
   <%- else -%>

data/app/views/alchemy/admin/essence_pictures/update.js.erb

@@ -3,7 +3,7 @@
   Alchemy.closeCurrentDialog();
   Alchemy.setElementDirty('#element_<%= @content.element.id %>');
 <% if @content.ingredient %>
-  $('.thumbnail_background img', '#<%= @content.dom_id %>').replaceWith('<%= essence_picture_thumbnail(@content, @options) %>');
+  $('.thumbnail_background img', '#<%= @content.dom_id %>').replaceWith('<%= essence_picture_thumbnail(@content, options_from_params) %>');
   Alchemy.ImageLoader('#<%= @content.dom_id %> .thumbnail_background');
 <% end %>
 })(jQuery);

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

@@ -1,6 +1,6 @@
 <%= search_form_for @query, url: url_for(
     action: 'index',
-    options: @options.to_json,
+    options: options_from_params,
     size: @size
   ), remote: true, html: {class: 'search_form', id: nil} do |f| %>
   <%= hidden_field_tag("element_id", @element.blank? ? "" : @element.id) %>
@@ -15,7 +15,7 @@
         action: 'index',
         element_id: @element.blank? ? '' : @element.id,
         content_id: @content.blank? ? '' : @content.id,
-        options: @options.to_json,
+        options: options_from_params,
         size: @size,
         overlay: true
       ),

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

@@ -10,7 +10,7 @@
         filter: 'last_upload',
         content_id: @content.try(:id),
         element_id: @element.try(:id),
-        options: @options
+        options: options_from_params
       ) %>
     <div class="toolbar_spacer"></div>
   <% end %>
@@ -23,7 +23,7 @@
           content_id: @content,
           element_id: @element,
           q: params[:q],
-          options: @options.to_json,
+          options: options_from_params,
           filter: params[:filter],
           tagged_with: params[:tagged_with]
         }),
@@ -40,7 +40,7 @@
           content_id: @content,
           element_id: @element,
           q: params[:q],
-          options: @options.to_json,
+          options: options_from_params,
           filter: params[:filter],
           tagged_with: params[:tagged_with]
         }),
@@ -57,7 +57,7 @@
           content_id: @content,
           element_id: @element,
           q: params[:q],
-          options: @options.to_json,
+          options: options_from_params,
           filter: params[:filter],
           tagged_with: params[:tagged_with]
         }),