alchemy_cms 3.2.1 → 3.3.0.rc1

data/spec/controllers/{pictures_controller_spec.rb → alchemy/pictures_controller_spec.rb}

@@ -7,16 +7,15 @@ end
 
 module Alchemy
   describe PicturesController do
-
-    let(:public_page)        { create(:public_page, restricted: false) }
-    let(:restricted_page)    { create(:public_page, restricted: true) }
-    let(:element)            { create(:element, page: public_page, name: 'bild', create_contents_after_create: true) }
-    let(:restricted_element) { create(:element, page: restricted_page, name: 'bild', create_contents_after_create: true) }
-    let(:picture)            { create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/image.png', __FILE__), 'image/png')) }
+    let(:public_page)        { create(:alchemy_page, :public, restricted: false) }
+    let(:restricted_page)    { create(:alchemy_page, :public, restricted: true) }
+    let(:element)            { create(:alchemy_element, page: public_page, name: 'bild', create_contents_after_create: true) }
+    let(:restricted_element) { create(:alchemy_element, page: restricted_page, name: 'bild', create_contents_after_create: true) }
+    let(:picture)            { create(:alchemy_picture, image_file: fixture_file_upload(File.expand_path('../../../fixtures/image.png', __FILE__), 'image/png')) }
 
     describe '#zoom' do
       let(:picture) do
-        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/80x60.png', __FILE__), 'image/png'))
+        create(:alchemy_picture, image_file: fixture_file_upload(File.expand_path('../../../fixtures/80x60.png', __FILE__), 'image/png'))
       end
 
       it "renders the original image without any resizing" do
@@ -98,7 +97,7 @@ module Alchemy
 
       context "Requesting a picture with crop_from and crop_size parameters" do
         let(:picture) do
-          create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+          create(:alchemy_picture, image_file: fixture_file_upload(File.expand_path('../../../fixtures/500x500.png', __FILE__), 'image/png'))
         end
 
         it "renders the cropped picture" do
@@ -111,7 +110,7 @@ module Alchemy
 
       context "Requesting a picture with crop_from and crop_size parameters with different size param" do
         let(:picture) do
-          create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+          create(:alchemy_picture, image_file: fixture_file_upload(File.expand_path('../../../fixtures/500x500.png', __FILE__), 'image/png'))
         end
 
         it "renders the cropped picture" do
@@ -129,13 +128,13 @@ module Alchemy
               crop: true,
               size: '100x100'
             )
-         expect(response.body[0x10..0x18].unpack('NN')).to eq [100, 100]
+          expect(response.body[0x10..0x18].unpack('NN')).to eq [100, 100]
         end
       end
 
       context "Requesting a picture with crop_from and crop_size parameters with larger size param" do
         let(:picture) do
-          create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+          create(:alchemy_picture, image_file: fixture_file_upload(File.expand_path('../../../fixtures/500x500.png', __FILE__), 'image/png'))
         end
 
         it "renders the cropped picture without upsampling" do
@@ -159,7 +158,7 @@ module Alchemy
 
       context "Requesting a picture with crop_from and crop_size parameters with larger size param and upsample set" do
         let(:picture) do
-          create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+          create(:alchemy_picture, image_file: fixture_file_upload(File.expand_path('../../../fixtures/500x500.png', __FILE__), 'image/png'))
         end
 
         it "renders the cropped picture with upsampling" do
@@ -235,11 +234,34 @@ module Alchemy
           end
         end
       end
+
+      context 'requesting an animated gif with different format' do
+        let(:image) do
+          fixture_file_upload(
+            File.expand_path('../../../fixtures/animated.gif', __FILE__),
+            'image/gif'
+          )
+        end
+
+        let(:picture) { build_stubbed(:alchemy_picture, image_file: image) }
+
+        before do
+          expect(image).to receive(:ext) { 'gif' }
+          expect(picture).to receive(:image_file) { image }
+          expect(Alchemy::Picture).to receive(:find) { picture }
+        end
+
+        it 'flattens the gif before converting the format.' do
+          expect(image).to receive(:encode).with('png', '-flatten') { double(data: '') }
+          alchemy_get :show, id: picture.id, name: picture.urlname,
+            format: 'png', sh: picture.security_token
+        end
+      end
     end
 
     describe '#thumbnail' do
       let(:picture) do
-        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/500x500.png', __FILE__), 'image/png'))
+        create(:alchemy_picture, image_file: fixture_file_upload(File.expand_path('../../../fixtures/500x500.png', __FILE__), 'image/png'))
       end
 
       context 'with size param set to small' do
@@ -307,7 +329,7 @@ module Alchemy
 
     describe 'Picture processing' do
       let(:big_picture) do
-        create(:picture, image_file: fixture_file_upload(File.expand_path('../../fixtures/80x60.png', __FILE__), 'image/png'))
+        create(:alchemy_picture, image_file: fixture_file_upload(File.expand_path('../../../fixtures/80x60.png', __FILE__), 'image/png'))
       end
 
       context "with crop and size parameters" do
@@ -318,7 +340,7 @@ module Alchemy
             format: 'png'
           }
           alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
-          expect(response.body[0x10..0x18].unpack('NN')).to eq([10,10])
+          expect(response.body[0x10..0x18].unpack('NN')).to eq([10, 10])
         end
 
         context "without a full size specification" do
@@ -342,7 +364,7 @@ module Alchemy
               format: 'png'
             }
             alchemy_get :show, options.merge(id: picture.id, name: big_picture.urlname, sh: picture.security_token(options))
-            expect(response.body[0x10..0x18].unpack('NN')).to eq([1,1])
+            expect(response.body[0x10..0x18].unpack('NN')).to eq([1, 1])
           end
         end
 
@@ -355,7 +377,7 @@ module Alchemy
               format: 'png'
             }
             alchemy_get :show, options.merge(id: picture.id, name: big_picture.urlname, sh: picture.security_token(options))
-            expect(response.body[0x10..0x18].unpack('NN')).to eq([10,10])
+            expect(response.body[0x10..0x18].unpack('NN')).to eq([10, 10])
           end
         end
       end
@@ -367,7 +389,7 @@ module Alchemy
             format: 'png'
           }
           alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
-          expect(response.body[0x10..0x18].unpack('NN')).to eq([40,30])
+          expect(response.body[0x10..0x18].unpack('NN')).to eq([40, 30])
         end
 
         it "should resize the image inferring the height if not given" do
@@ -376,7 +398,7 @@ module Alchemy
             format: 'png'
           }
           alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
-          expect(response.body[0x10..0x18].unpack('NN')).to eq([40,30])
+          expect(response.body[0x10..0x18].unpack('NN')).to eq([40, 30])
         end
 
         it "should resize the image inferring the width if not given" do
@@ -385,7 +407,7 @@ module Alchemy
             format: 'png'
           }
           alchemy_get :show, options.merge(id: big_picture.id, name: big_picture.urlname, sh: big_picture.security_token(options))
-          expect(response.body[0x10..0x18].unpack('NN')).to eq([40,30])
+          expect(response.body[0x10..0x18].unpack('NN')).to eq([40, 30])
         end
       end
     end

data/spec/dummy/app/models/dummy_user.rb

@@ -5,6 +5,10 @@ class DummyUser < ActiveRecord::Base
     []
   end
 
+  def self.admins
+    [first].compact
+  end
+
   def alchemy_roles
     @alchemy_roles || %w(admin)
   end

data/spec/dummy/app/views/alchemy/elements/_all_you_can_eat_view.html.erb

@@ -0,0 +1,31 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <div class="essence_boolean">
+      <%= el.render :essence_boolean %>
+    </div>
+    <div class="essence_date">
+      <%= el.render :essence_date %>
+    </div>
+    <div class="essence_file">
+      <%= el.render :essence_file %>
+    </div>
+    <div class="essence_html">
+      <%= el.render :essence_html %>
+    </div>
+    <div class="essence_link">
+      <%= el.render :essence_link %>
+    </div>
+    <div class="essence_picture">
+      <%= el.render :essence_picture %>
+    </div>
+    <div class="essence_richtext">
+      <%= el.render :essence_richtext %>
+    </div>
+    <div class="essence_select">
+      <%= el.render :essence_select %>
+    </div>
+    <div class="essence_text">
+      <%= el.render :essence_text %>
+    </div>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_article_editor.html.erb

@@ -1,10 +1,6 @@
-<%= render_essence_editor_by_name(element, 'intro') %>
-<%= render_essence_editor_by_name(element, 'image', {
-  :image_size => "450x300",
-  :crop => true,
-  :fixed_ratio => false
-}) %>
-<% element.contents.where(:name => ['headline', 'text']).each do |content| %>
-  <%= render_essence_editor content %>
-<% end %>
-<%= render_new_content_link(element) %>
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :intro %>
+  <%= el.edit :headline %>
+  <%= el.edit :image, image_size: "450x300", crop: true, fixed_ratio: false %>
+  <%= el.edit :text %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_article_view.html.erb

@@ -1,25 +1,10 @@
-<div class="article" id="<%= element_dom_id(element) %>"<%= element_preview_code(element) -%><%= element_tags(element) %>>
-  <%- intro = render_essence_view_by_name(element, 'intro') -%>
-  <%- if !intro.blank? -%>
-  <div class="intro">
-    <%= intro %>
-  </div>
-  <%- end -%>
-  <% element.contents.where(:name => 'headline').each do |content| %>
-  <% next if content.ingredient.blank? %>
-  <h1 class="headline"><%= render_essence content %></h1>
-  <% end %>
-  <div class="text_bild_container">
-    <%- content = element.contents.find_by_essence_type("Alchemy::EssencePicture") -%>
-    <%- if content -%>
-    <div class="image <%= content.essence.css_class %>">
-      <%= render_essence_view(content, :image_size => "450x1000", :crop => true) %>
-    </div>
-    <%- end -%>
-    <% element.contents.where(:name => 'text').each do |content| %>
-    <div class="text">
-      <%= render_essence content %>
-    </div>
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <% if element.has_ingredient?(:intro) %>
+      <div class="intro"><%= el.render :intro %></div>
     <% end %>
-  </div>
-</div>
+    <h1 class="headline"><%= el.render :headline %></h1>
+    <%= el.render :image, image_size: "450x1000", crop: true %>
+    <%= el.render :text %>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_bild_editor.html.erb

@@ -0,0 +1,3 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :image %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_bild_view.html.erb

@@ -0,0 +1,5 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <%= el.render :image %>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_contactform_editor.html.erb

@@ -0,0 +1,6 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :mail_from %>
+  <%= el.edit :mail_to %>
+  <%= el.edit :subject %>
+  <%= el.edit :success_page %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_contactform_view.html.erb

@@ -0,0 +1,16 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <div class="mail_from">
+      <%= el.render :mail_from %>
+    </div>
+    <div class="mail_to">
+      <%= el.render :mail_to %>
+    </div>
+    <div class="subject">
+      <%= el.render :subject %>
+    </div>
+    <div class="success_page">
+      <%= el.render :success_page %>
+    </div>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_download_editor.html.erb

@@ -0,0 +1,3 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :file %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_download_view.html.erb

@@ -0,0 +1,5 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <%= el.render :file %>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_erb_element_editor.html.erb

@@ -0,0 +1,3 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :text %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_erb_element_view.html.erb

@@ -0,0 +1,5 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <%= el.render :text %>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_header_editor.html.erb

@@ -0,0 +1,3 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :image %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_header_view.html.erb

@@ -0,0 +1,5 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <%= el.render :image %>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_news_editor.html.erb

@@ -0,0 +1,5 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :date %>
+  <%= el.edit :news_headline %>
+  <%= el.edit :body %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_search_editor.html.erb

@@ -0,0 +1 @@
+<%= element_editor_for(element) -%>

data/spec/dummy/app/views/alchemy/elements/_search_view.html.erb

@@ -0,0 +1,4 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_slide_editor.html.erb

@@ -0,0 +1,3 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :picture %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_slide_view.html.erb

@@ -0,0 +1,5 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <%= el.render :picture %>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_slider_editor.html.erb

@@ -0,0 +1,2 @@
+<%= element_editor_for(element) do |el| -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_slider_view.html.erb

@@ -0,0 +1,4 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_text_editor.html.erb

@@ -0,0 +1,3 @@
+<%= element_editor_for(element) do |el| -%>
+  <%= el.edit :text %>
+<%- end -%>

data/spec/dummy/app/views/alchemy/elements/_text_view.html.erb

@@ -0,0 +1,5 @@
+<%- cache(element) do -%>
+  <%= element_view_for(element) do |el| -%>
+    <%= el.render :text %>
+  <%- end -%>
+<%- end -%>

data/spec/dummy/app/views/alchemy/page_layouts/_standard.html.erb

@@ -10,5 +10,6 @@
   <%- end -%>
 </div>
 <div id="content">
+  <h1><%= t(:hello) %></h1>
   <%= render_elements :except => ["claim", "header"] %>
 </div>

data/spec/dummy/config/alchemy/elements.yml

@@ -17,18 +17,11 @@
   - name: headline
     type: EssenceText
     settings:
-      deletable: true
+      linkable: true
   - name: image
     type: EssencePicture
   - name: text
     type: EssenceRichtext
-    settings:
-      deletable: true
-  available_contents:
-  - name: text
-    type: EssenceRichtext
-  - name: headline
-    type: EssenceText
 
 - name: text
   contents:
@@ -53,11 +46,6 @@
   contents:
   - name: file
     type: EssenceFile
-    settings:
-      deletable: true
-  available_contents:
-  - name: file
-    type: EssenceFile
 
 - name: bild
   contents:
@@ -110,3 +98,12 @@
   contents:
   - name: text
     type: EssenceRichtext
+
+- name: slide
+  contents:
+    - name: picture
+      type: EssencePicture
+
+- name: slider
+  nestable_elements:
+    - slide

data/spec/dummy/config/alchemy/page_layouts.yml

@@ -2,7 +2,7 @@
   unique: true
 
 - name: standard
-  elements: [article, header]
+  elements: [article, header, slider]
   autogenerate: [header, article]
 
 - name: everything

data/spec/dummy/config/initializers/alchemy.rb

@@ -1,2 +1,3 @@
 Alchemy.register_ability Ability
 Alchemy.user_class_name = 'DummyUser'
+Alchemy.signup_path = '/admin/pages' unless Rails.env.test?

data/spec/dummy/config/locales/kl.yml

@@ -0,0 +1,2 @@
+kl:
+  hello_world: qo' vIvan