alchemy_cms 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e25191bd90849e3276a03f409875bcd05a49ce5
-  data.tar.gz: ce85ab765e70be9351d4d6c69a7a5aaf84b174bd
+  metadata.gz: ecc49224edb076e4d074a37cd7c8b0d5c28980e5
+  data.tar.gz: a5f478f502e5385c1dde9763e448386cba0d41f0
 SHA512:
-  metadata.gz: 4d0b6f298b7b9ccb71f4a539a329dc5b3e485f3c02a029ea248214b694634112b19712270009d5fe0f2f3e367972a10876d88be2e9508b72a116528d35e664cb
-  data.tar.gz: 45bed619a0e65bb9427fe91c76ee8077c261c7c969ac3d07e455e9cdc50e02393ad40e07952c7f54bdfbb8a3360652621e703bcc7cd37f270ecb46c64c6a884f
+  metadata.gz: f5ca9eda67f8cda86864329b0b0f113d8d29da3aeb2db1f46a677ab6b4ef3da38ffe4d6b26b851824cc767bceb94751729e20876a8d7af6d4e0b8b430438bc0c
+  data.tar.gz: 87baad981ff2942c54e8a497738213fc529c94f0e997515c20081e99f3bc08d3b11bcb3865477880e87b363ee14566b2430c88c2c561865d67cebd77aef94bbd

data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee

@@ -28,11 +28,10 @@ $.extend Alchemy,
         params_string = ""
         cell_id = $(this).attr("data-cell-id")
         # Is the trash window open?
-        if $("#alchemyTrashWindow").length > 0
-          # updating the trash icon
+        if Alchemy.TrashWindow.current
+          # update the trash icon
           if $("#trash_items div.element_editor").not(".dragged").length is 0
             $("#element_trash_button .icon").removeClass "full"
-            $("#trash_empty_notice").show()
         $(event.target).css "cursor", "progress"
         params_string = "page_id=" + page_id + "&authenticity_token=" + encodeURIComponent(form_token) + "&" + $.param(element_ids: ids)
         params_string += "&cell_id=" + cell_id  if cell_id

data/app/assets/stylesheets/alchemy/elements.scss

@@ -29,7 +29,7 @@ div#element_area {
 
   .sortable_cell {
     min-height: 100px;
-    padding: 8px 8px 2px;
+    padding: 8px 4px 2px;
   }
 
   textarea {
@@ -539,9 +539,10 @@ div.file_icon {
 }
 
 a.new_content_link {
-  float: none;
-  margin-bottom: 12px !important;
-  margin-top: 4px !important;
+  display: block;
+  text-align: center;
+  margin-bottom: 12px;
+  margin-top: 4px;
 }
 
 div.tinymce_container {

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

@@ -16,21 +16,14 @@ module Alchemy
         @content = Content.create_from_scratch(@element, params[:content])
         @options = options_from_params
         @html_options = params[:html_options] || {}
-        if @content.essence_type == "Alchemy::EssencePicture"
+        if picture_gallery_editor?
+          @content.update_essence(picture_id: params[:picture_id])
+          @options = options_for_picture_gallery
           @content_dom_id = "#add_picture_#{@element.id}"
-          @content.essence.picture_id = params[:picture_id]
-          @content.essence.save
-          @contents_of_this_type = @element.contents.gallery_pictures
-          @dragable = @contents_of_this_type.length > 1
-          @options = @options.merge(:dragable => @dragable)
         else
           @content_dom_id = "#add_content_for_element_#{@element.id}"
         end
-        @locals = {
-          :content => @content,
-          :options => @options.symbolize_keys,
-          :html_options => @html_options.symbolize_keys
-        }
+        @locals = essence_editor_locals
       end
 
       def update
@@ -53,6 +46,26 @@ module Alchemy
         @content.destroy
       end
 
+      private
+
+      def picture_gallery_editor?
+        params[:content][:essence_type] == 'Alchemy::EssencePicture' && @options[:grouped] == 'true'
+      end
+
+      def options_for_picture_gallery
+        @gallery_pictures = @element.contents.gallery_pictures
+        @dragable = @gallery_pictures.size > 1
+        @options.merge(dragable: @dragable)
+      end
+
+      def essence_editor_locals
+        {
+          content: @content,
+          options: @options.symbolize_keys,
+          html_options: @html_options.symbolize_keys
+        }
+      end
+
     end
   end
 end

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

@@ -83,12 +83,14 @@ module Alchemy
       end
 
       def order
+        @trashed_elements = []
         params[:element_ids].each do |element_id|
           element = Element.find(element_id)
           if element.trashed?
             element.page_id = params[:page_id]
             element.cell_id = params[:cell_id]
             element.insert_at
+            @trashed_elements << element
           end
           element.move_to_bottom
         end
@@ -101,7 +103,7 @@ module Alchemy
         @element.save
       end
 
-    private
+      private
 
       # Returns the cell for element name in params.
       # Creates the cell if necessary.

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

@@ -4,8 +4,8 @@
 
   $("#element_<%= @element.id %>_content_missing").replaceWith('<%= escape_javascript(
     render(
-      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
-      :locals => @locals
+      partial: "alchemy/essences/#{@content.essence_partial_name}_editor",
+      locals: @locals
     )
   ) %>');
 
@@ -13,12 +13,12 @@
 
   $("<%= @content_dom_id %>").before('<%= escape_javascript(
     render(
-      :partial => "alchemy/essences/#{@content.essence_partial_name}_editor",
-      :locals => @locals
+      partial: "alchemy/essences/#{@content.essence_partial_name}_editor",
+      locals: @locals
     )
   ) %>');
   Alchemy.Buttons.enable();
-  Alchemy.growl('<%= _t("Successfully added content") % {:content => @content.name_for_label} %>')
+  Alchemy.growl('<%= _t("Successfully added content") % {content: @content.name_for_label} %>')
 
 <% end %>
 
@@ -28,16 +28,20 @@
   $('#picture_to_assign_<%= @content.ingredient.id %> a').attr('href', '#').off('click');
   <% end %>
 
-  <% if @contents_of_this_type.length > 1 %>
+  <% if @gallery_pictures %>
+
+  <% if @gallery_pictures.size > 1 %>
   $('#element_<%= @element.id %>_contents .essence_picture_editor').addClass('dragable_picture');
   <% end %>
 
-  <% if !max_image_count.blank? && @contents_of_this_type.length >= max_image_count %>
+  <% if !max_image_count.blank? && @gallery_pictures.size >= max_image_count %>
   $("#add_picture_<%= @element.id %>").remove();
   <% end %>
 
   Alchemy.SortableContents('#element_<%= @element.id %>_contents', '<%= form_authenticity_token %>');
 
+  <% end %>
+
 <% elsif @content.essence_type == "Alchemy::EssenceDate" %>
 
   Alchemy.Datepicker('#element_<%= @element.id %>');

data/app/views/alchemy/admin/elements/order.js.erb

@@ -1,7 +1,12 @@
-(function($) {
-
-  Alchemy.growl('<%= _t(:successfully_saved_element_position) -%>');
-  $('#element_area .ajax_folder').show();
-  Alchemy.PreviewWindow.refresh();
-
-})(jQuery);
+$('#element_area .ajax_folder').show();
+Alchemy.PreviewWindow.refresh();
+<% if @trashed_elements.any? %>
+Alchemy.growl('<%= _t(:successfully_restored_element) -%>');
+<% element_ids = @trashed_elements.collect { |e| ".dragged[data-element-id=\"#{e.id}\"]" }.join(", ").html_safe %>
+<% @trashed_elements.each do |element| %>
+$('<%= element_ids %>').each(function() { this.id = 'element_' + <%= element.id %> });
+<% end %>
+Alchemy.ElementEditors.reinit('<%= element_ids %>');
+<% else %>
+Alchemy.growl('<%= _t(:successfully_saved_element_position) -%>');
+<% end %>

data/config/locales/alchemy.de.yml

@@ -563,6 +563,7 @@ de:
     subject: "Betreff"
     successfully_added_element: "Element wurde hinzugefügt."
     successfully_deleted_tag: "Das Tag wurde gelöscht"
+    successfully_restored_element: "Das Element wurde wieder hergestellt."
     successfully_saved_element_position: "Die Elementposition wurde gespeichert."
     successfully_updated_tag: "Das Tag wurde gespeichert"
     swap_image: "Bild tauschen"

data/config/locales/alchemy.en.yml

@@ -382,6 +382,7 @@ en:
     searchresults_editor_info: "This element displays the search and the searchresults."
     small_thumbnails: "Small thumbnails"
     successfully_added_element: "Succesfully added new element."
+    successfully_restored_element: "Element restored succesfully."
     successfully_saved_element_position: "Element position updated succesfully."
     swap_image: "Change image"
     "These pictures could not be deleted, because they were in use": "These pictures could not be deleted, because they were in use: %{names}"

data/lib/alchemy/essence.rb

@@ -150,7 +150,7 @@ module Alchemy #:nodoc:
       # Essence description from config/elements.yml
       def description
         return {} if element.nil? or element.content_descriptions.nil?
-        element.content_descriptions.detect { |c| c['name'] == self.content.name }
+        element.content_descriptions.detect { |c| c['name'] == self.content.name } || {}
       end
 
       # Returns the Content Essence is in

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.7.1"
+  VERSION = "2.7.2"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/elements/templates/editor.html.erb

@@ -1,16 +1,16 @@
-<%- if @element['contents'].present? -%>
+<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 <%%= element_editor_for(element) do |el| -%>
 <%- if @element['picture_gallery'] -%>
-  <%%= render_picture_gallery_editor(element, :max_images => nil, :crop => true) %>
+  <%%= render_picture_gallery_editor(element, max_images: nil, crop: true) %>
 <%- end -%>
 <% @contents.each do |content| -%>
   <%%= el.edit :<%= content["name"] %> %>
 <% end -%>
 <%- if @element['available_contents'] -%>
-  <%% element.contents.where(:name => ['<%= @available_contents_names.join("', '") %>']).each do |content| %>
+  <%% element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content| %>
     <%%= render_essence_editor content %>
   <%% end %>
   <p><%%= render_new_content_link(element) %></p>
 <%- end -%>
 <%%- end -%>
-<%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.haml

@@ -1,15 +1,14 @@
-<%- if @element['contents'].present? -%>
+<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 = element_editor_for(element) do |el|
 <%- if @element['picture_gallery'] -%>
-  = render_picture_gallery_editor(element, :max_images => nil, :crop => true)
+  = render_picture_gallery_editor(element, max_images: nil, crop: true)
 <%- end -%>
 <% @contents.each do |content| -%>
   = el.edit :<%= content["name"] %>
 <% end -%>
 <%- if @element['available_contents'] -%>
-  - element.contents.where(:name => ['<%= @available_contents_names.join("', '") %>']).each do |content|
+  - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
     = render_essence_editor content
-
-  %p= render_new_content_link(element)
+  %p = render_new_content_link(element)
+<% end -%>
 <% end -%>
-<% end -%>

data/lib/rails/generators/alchemy/elements/templates/editor.html.slim

@@ -1,15 +1,14 @@
-<%- if @element['contents'].present? -%>
+<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 = element_editor_for(element) do |el|
 <%- if @element['picture_gallery'] -%>
-  = render_picture_gallery_editor(element, :max_images => nil, :crop => true)
+  = render_picture_gallery_editor(element, max_images: nil, crop: true)
 <%- end -%>
 <% @contents.each do |content| -%>
   = el.edit :<%= content["name"] %>
 <% end -%>
 <%- if @element['available_contents'] -%>
-  - element.contents.where(:name => ['<%= @available_contents_names.join("', '") %>']).each do |content|
+  - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
     = render_essence_editor content
-
-  p= render_new_content_link(element)
+  p = render_new_content_link(element)
 <% end -%>
-<%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.erb

@@ -1,10 +1,10 @@
-<%- if @element['contents'].present? -%>
+<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 <%%= element_view_for(element) do |el| -%>
 <%- if @element["picture_gallery"] -%>
   <div class="<%= @element_name %>_images">
     <%%- element.contents.gallery_pictures.each do |image| -%>
     <div class="<%= @element_name %>_image <%%= image.essence.css_class %>">
-      <%%= render_essence_view(image, :image_size => "160x120") %>
+      <%%= render_essence_view(image, image_size: '160x120') %>
     </div>
     <%%- end -%>
   </div>
@@ -18,5 +18,10 @@
   <%%= el.render :<%= content["name"] %> %>
   <%- end -%>
 <%- end -%>
+<%- if @element['available_contents'] -%>
+  <%% element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content| %>
+    <%%= render_essence_view content %>
+  <%% end %>
+<%- end -%>
 <%%- end -%>
-<%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.haml

@@ -1,11 +1,11 @@
-<%- if @element['contents'].present? -%>
+<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 = element_view_for(element) do |el|
-<%- if @element["picture_gallery"] -%>
+  <%- if @element["picture_gallery"] -%>
   .<%= @element_name %>_images
     - element.contents.gallery_pictures.each do |image|
       .<%= @element_name %>_image{class: image.essence.css_class}
         = render_essence_view(image, :image_size => "160x120")
-<%- end -%>
+  <%- end -%>
 <%- @contents.each do |content| -%>
   <%- if @contents.length > 1 -%>
   .<%= content["name"] %>
@@ -14,4 +14,8 @@
   = el.render :<%= content["name"] %>
   <%- end -%>
 <%- end -%>
-<%- end -%>
+<%- if @element['available_contents'] -%>
+  - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
+    = render_essence_view content
+<%- end -%>
+<%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.slim

@@ -1,11 +1,11 @@
-<%- if @element['contents'].present? -%>
+<%- if @element['contents'].present? || @element['available_contents'].present? -%>
 = element_view_for(element) do |el|
-<%- if @element["picture_gallery"] -%>
+  <%- if @element["picture_gallery"] -%>
   .<%= @element_name %>_images
     - element.contents.gallery_pictures.each do |image|
       .<%= @element_name %>_image class=image.essence.css_class
         = render_essence_view(image, :image_size => "160x120")
-<%- end -%>
+  <%- end -%>
 <%- @contents.each do |content| -%>
   <%- if @contents.length > 1 -%>
   .<%= content["name"] %>
@@ -14,4 +14,8 @@
   = el.render :<%= content["name"] %>
   <%- end -%>
 <%- end -%>
-<%- end -%>
+<%- if @element['available_contents'] -%>
+  - element.contents.where(name: ['<%= @available_contents_names.join("', '") %>']).each do |content|
+    = render_essence_view content
+<%- end -%>
+<%- end -%>

data/spec/controllers/admin/contents_controller_spec.rb

@@ -19,6 +19,24 @@ describe Alchemy::Admin::ContentsController do
         xhr :post, :create, {content: {element_id: element.id, essence_type: 'EssencePicture'}}
       }.to change{element.contents.count}.by(1)
     end
+
+    context 'inside a picture gallery' do
+      let(:attributes) do
+        {content: {element_id: element.id, essence_type: 'Alchemy::EssencePicture'}, options: {grouped: 'true'}}
+      end
+
+      it "adds it into the gallery editor" do
+        xhr :post, :create, attributes
+        assigns(:content_dom_id).should eq("#add_picture_#{element.id}")
+      end
+
+      context 'with picture_id given' do
+        it "assigns the picture" do
+          Alchemy::Content.any_instance.should_receive(:update_essence).with(picture_id: '1')
+          xhr :post, :create, attributes.merge(picture_id: '1')
+        end
+      end
+    end
   end
 
   describe '#update' do

data/spec/libraries/essence_spec.rb

@@ -2,8 +2,46 @@ require 'spec_helper'
 
 module Alchemy
   describe "ActsAsEssence" do
-    #let(:element) { FactoryGirl.create(:element, :name => 'headline', :create_contents_after_create => true) }
-    let(:essence) { Alchemy::EssenceText.new }
+    let(:element) { Element.new }
+    let(:content) { Content.new(name: 'foo') }
+    let(:essence) { EssenceText.new }
+    let(:content_description) { {'name' => 'foo'} }
+
+    describe '#description' do
+      subject { essence.description }
+
+      context 'without element' do
+        it { should eq({}) }
+      end
+
+      context 'with element' do
+        before { essence.stub(element: element) }
+
+        context 'but without content descriptions' do
+          it { should eq({}) }
+        end
+
+        context 'and content descriptions' do
+          before do
+            essence.stub(content: content)
+          end
+
+          context 'containing the content name' do
+            before { element.stub(content_descriptions: [content_description]) }
+
+            it "returns the content description" do
+              should eq(content_description)
+            end
+          end
+
+          context 'not containing the content name' do
+            before { element.stub(content_descriptions: []) }
+
+            it { should eq({}) }
+          end
+        end
+      end
+    end
 
     describe '#ingredient=' do
       it 'should set the value to ingredient column' do

data/spec/libraries/resource_spec.rb

@@ -1,6 +1,4 @@
-require 'rspec'
-require File.dirname(__FILE__) + '/../../lib/alchemy/resource'
-require File.dirname(__FILE__) + '/../../lib/alchemy/errors'
+require 'spec_helper'
 
 class Event
 end

data/spec/libraries/resources_helper_spec.rb

@@ -1,7 +1,4 @@
-require 'rspec'
-require 'ostruct'
-require File.dirname(__FILE__) + "/../../lib/alchemy/resource"
-require File.dirname(__FILE__) + "/../../lib/alchemy/resources_helper"
+require 'spec_helper'
 
 module Namespace
   class MyResource

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1146,7 +1146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 3