alchemy_cms 2.2.4 → 2.3.rc5

data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb

@@ -4,17 +4,21 @@ module Alchemy
   module Generators
     class DeployScriptGenerator < ::Rails::Generators::Base
 
-      desc "This generator generates a Capistrano deploy script."
-      class_option :scm, :type => :string, :desc => "Set the type of scm you use for deployment.", :default => 'svn'
+      desc "This generator generates a Capistrano receipt for deploying Alchemy CMS."
+      class_option :scm, :type => :string, :desc => "Set the type of scm you use for deployment.", :default => 'git'
       class_option :db, :type => :string, :desc => "Set the type of database you use on your server.", :default => 'mysql'
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
       def copy_script
-        @ssh_user = ask('Please enter SSH username:')
-        @ssh_password = ask('Please enter SSH password:')
-        port = ask('Please enter SSH port (22):')
-        @ssh_port = port.blank? ? 22 : port
         @server = ask('Please enter server ip or domain:')
+        if !yes?('Do you use ssh public keys to connect to your server? (y/N)')
+          if @store_credentials = yes?('Do want to store the ssh credentials? (PLEASE DO NOT STORE THEM IF THE REPOSITORY IS PUBLIC) (y/N)')
+            @ssh_user = ask('Please enter ssh username:')
+            @ssh_password = ask('Please enter ssh password:')
+            port = ask('Please enter ssh port (22):')
+            @ssh_port = port.blank? ? "22" : port
+          end
+        end
         @deploy_path = ask('Please enter the path to the public html folder:')
         @scm = options[:scm]
         @repository_url = ask('Please enter the URL to your projects repository:')
@@ -24,6 +28,12 @@ module Alchemy
         end
         @database_type = options[:db]
         template "deploy.rb.tt", Rails.root.join('config', 'deploy.rb')
+        puts "\nSetting up Capistrano"
+        `capify .`
+        puts "\nWe are done!\n"
+        puts "\nPlease run 'cap deploy:setup'\n to setup the server for deployment."
+        puts "\nIf you want to deploy Alchemy the first time type:\ncap deploy:cold"
+        puts "\nAfter the first deploy you just need to type:\ncap deploy"
       end
 
     end

data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt

@@ -3,9 +3,21 @@ require 'alchemy/capistrano'
 load 'deploy/assets'
 
 # ssh settings
+<%- if @ssh_user.blank? -%>
+set(:user)                      { Capistrano::CLI.ui.ask('Enter your ssh username: ') }
+<%- else -%>
 set :user,                      "<%= @ssh_user %>"
+<%- end -%>
+<%- if @ssh_password.blank? -%>
+set(:password)                  { Capistrano::CLI.password_prompt("Enter the password for #{user}: ") }
+<%- else -%>
 set :password,                  "<%= @ssh_password %>"
-set :port,                      <%= @ssh_port || 22 %>
+<%- end -%>
+<%- if @ssh_port != "22" && !@store_credentials -%>
+set(:port)                      { Capistrano::CLI.ui.ask('Enter the ssh port: ') }
+<%- elsif @ssh_port != "22" && @store_credentials -%>
+set :port,                      <%= @ssh_port %>
+<%- end -%>
 
 # domain names
 role :app,                      "<%= @server %>"
@@ -45,9 +57,10 @@ after "deploy",                 "deploy:cleanup"
 
 # special tasks
 
-namespace :logs do
+namespace :log do
+
   desc "show last 100 lines of log"
-  task :tail do
+  task :show do
     run "tail -n100 #{shared_path}/log/#{rails_env}.log"
   end
 
@@ -55,6 +68,7 @@ namespace :logs do
   task :watch do
     stream("tail -f #{shared_path}/log/#{rails_env}.log")
   end
+
 end
 
 namespace :deploy do

data/lib/rails/generators/alchemy/elements/elements_generator.rb

@@ -15,7 +15,12 @@ module Alchemy
         @elements = get_elements_from_yaml
         @elements.each do |element|
           @element = element
-          @contents = (element["contents"] or [])
+          if @element['available_contents']
+            @available_contents_names = @element['available_contents'].collect { |c| c['name'] }
+            @contents = (element["contents"].delete_if { |c| @available_contents_names.include?(c['name']) } or [])
+          else
+            @contents = (element["contents"] or [])
+          end
           @element_name = element["name"].underscore
           template "editor.html.erb", "#{@elements_dir}/_#{@element_name}_editor.html.erb"
           template "view.html.erb", "#{@elements_dir}/_#{@element_name}_view.html.erb"

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

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

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

@@ -1,21 +1,20 @@
-<div class="<%= @element_name %>" id="<%%= element_dom_id(element) %>"<%%= element_preview_code(element) -%>>
-<%- unless @contents.blank? -%>
-  <%- @contents.each do |content| -%>
-    <%- if content["type"] == "Alchemy::EssencePicture" -%>
-      <div class="<%= @element_name %>_images">
-        <%%- element.all_contents_by_type("Alchemy::EssencePicture").each do |content| -%>
-        <div class="<%= @element_name %>_image <%%= content.essence.css_class %>">
-          <%%= render_essence_view(content, :image_size => "160x120") %>
-        </div>
-        <%%- end -%>
-      </div>
-    <%- elsif @contents.size > 1 -%>
-      <div class="<%= content["name"] %>">
-        <%%= render_essence_view_by_name(element, '<%= content["name"] %>') %>
-      </div>
-    <%- else -%>
-      <%%= render_essence_view_by_name(element, '<%= content["name"] %>') %>
-    <%- end -%>
+<div class="<%= @element_name %>" id="<%%= element_dom_id(element) %>"<%%= element_preview_code(element) %>>
+<%- 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") %>
+    </div>
+    <%%- end -%>
+  </div>
+<%- end -%>
+<%- @contents.each do |content| -%>
+  <%- if @contents.length > 1 -%>
+  <div class="<%= content["name"] %>">
+    <%%= render_essence_view_by_name(element, '<%= content["name"] %>') %>
+  </div>
+  <%- else -%>
+  <%%= render_essence_view_by_name(element, '<%= content["name"] %>') %>
   <%- end -%>
 <%- end -%>
 </div>

data/lib/rails/generators/alchemy/scaffold/files/pages.html.erb

@@ -2,9 +2,11 @@
 <html>
 <head>
   <%= render_meta_data %>
+  <%= stylesheet_link_tag 'application' %>
 </head>
 <body>
-<%= yield %>
-<%= alchemy_preview_mode_code %>
+  <%= yield %>
+  <%= alchemy_preview_mode_code %>
+  <%= alchemy_menu_bar %>
 </body>
 </html>

data/lib/tasks/fleximage.rake

@@ -11,8 +11,8 @@ namespace :fleximage do
     model_class.find(:all).each do |obj|
       if obj.has_image?
         img = obj.load_image
-        obj.update_attribute :image_width, img.columns if obj.respond_to?(:image_width=)
-        obj.update_attribute :image_height, img.rows if obj.respond_to?(:image_height=)
+        obj.update_column :image_width, img.columns if obj.respond_to?(:image_width=)
+        obj.update_column :image_height, img.rows if obj.respond_to?(:image_height=)
       end
     end
   end

data/spec/controllers/admin/contents_controller_spec.rb

@@ -23,7 +23,7 @@ describe Alchemy::Admin::ContentsController do
   describe '#update' do
 
     it "should update a content via ajax" do
-      @element = FactoryGirl.create(:element)
+      @element = FactoryGirl.create(:element, :create_contents_after_create => true)
       post :update, {:id => @element.contents.find_by_name('intro').id, :content => {:body => 'Peters Petshop'}, :format => :js}
       @element.ingredient('intro').should == "Peters Petshop"
     end
@@ -35,7 +35,7 @@ describe Alchemy::Admin::ContentsController do
     context "with content_ids in params" do
 
       before(:each) do
-        @element = FactoryGirl.create(:element)
+        @element = FactoryGirl.create(:element, :create_contents_after_create => true)
       end
 
       it "should reorder the contents" do

data/spec/controllers/admin/elements_controller_spec.rb

@@ -73,10 +73,39 @@ module Alchemy
 
     describe '#create' do
 
-      render_views
+      context "with cells" do
+
+        before do
+          @page = FactoryGirl.create(:public_page, :do_not_autogenerate => false)
+          @cell = FactoryGirl.create(:cell, :name => 'header', :page => @page)
+          Page.any_instance.stub(:can_have_cells?).and_return(true)
+          Cell.stub!(:definition_for).and_return({'name' => 'header', 'elements' => ['article']})
+        end
+
+        context "and cell name in element name" do
+
+          it "should put the element in the correct cell" do
+            post :create, {:element => {:name => "article#header", :page_id => @page.id}}
+            @cell.elements.first.should be_an_instance_of(Element)
+          end
+
+        end
+
+        context "and no cell name in element name" do
+
+          it "should put the element in the main cell" do
+            post :create, {:element => {:name => "article", :page_id => @page.id}}
+            @page.elements.not_in_cell.first.should be_an_instance_of(Element)
+          end
+
+        end
+
+      end
 
       context "with paste_from_clipboard in parameters" do
 
+        render_views
+
         let(:clipboard) { session[:clipboard] = Clipboard.new }
         let(:element_in_clipboard) { @element ||= FactoryGirl.create(:element, :page_id => page.id) }
 

data/spec/controllers/admin/pages_controller_spec.rb

@@ -44,8 +44,8 @@ module Alchemy
       context "with paste_from_clipboard in parameters" do
 
         let(:clipboard) { session[:clipboard] = Clipboard.new }
-        let(:page_in_clipboard) { @page ||= FactoryGirl.create(:public_page) }
-        let(:parent) { @page ||= FactoryGirl.create(:public_page) }
+        let(:page_in_clipboard) { FactoryGirl.create(:public_page) }
+        let(:parent) { FactoryGirl.create(:public_page) }
 
         before(:each) do
           clipboard[:pages] = [{:id => page_in_clipboard.id, :action => 'cut'}]
@@ -63,32 +63,49 @@ module Alchemy
 
     describe '#copy_language_tree' do
 
+      let(:language) { Language.get_default }
+      let(:new_language) { FactoryGirl.create(:klingonian) }
+      let(:language_root) { FactoryGirl.create(:language_root_page, :language => language) }
+      let(:new_lang_root) { Page.language_root_for(new_language.id) }
+
       before(:each) do
-        @language = Language.get_default
-        @language_root = FactoryGirl.create(:language_root_page, :language => @language, :name => 'Intro')
-        @level_1 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @language_root.id, :visible => true, :name => 'Level 1')
-        @level_2 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_1.id, :visible => true, :name => 'Level 2')
-        @level_3 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_2.id, :visible => true, :name => 'Level 3')
-        @level_4 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_3.id, :visible => true, :name => 'Level 4')
-        @new_language = FactoryGirl.create(:language)
-        session[:language_code] = @new_language.code
-        session[:language_id] = @new_language.id
-        post :copy_language_tree, {:languages => {:new_lang_id => @new_language.id, :old_lang_id => @language.id}}
-        @new_lang_root = Page.language_root_for(@new_language.id)
+        level_1 = FactoryGirl.create(:public_page, :parent_id => language_root.id, :visible => true, :name => 'Level 1')
+        level_2 = FactoryGirl.create(:public_page, :parent_id => level_1.id, :visible => true, :name => 'Level 2')
+        level_3 = FactoryGirl.create(:public_page, :parent_id => level_2.id, :visible => true, :name => 'Level 3')
+        level_4 = FactoryGirl.create(:public_page, :parent_id => level_3.id, :visible => true, :name => 'Level 4')
+        session[:language_code] = new_language.code
+        session[:language_id] = new_language.id
+        post :copy_language_tree, {:languages => {:new_lang_id => new_language.id, :old_lang_id => language.id}}
       end
 
       it "should copy all pages" do
-        @new_lang_root.should_not be_nil
-        @new_lang_root.descendants.count.should == 4
-        @new_lang_root.descendants.collect(&:name).should == ["Level 1 (Copy)", "Level 2 (Copy)", "Level 3 (Copy)", "Level 4 (Copy)"]
+        new_lang_root.should_not be_nil
+        new_lang_root.descendants.count.should == 4
+        new_lang_root.descendants.collect(&:name).should == ["Level 1 (Copy)", "Level 2 (Copy)", "Level 3 (Copy)", "Level 4 (Copy)"]
       end
 
       it "should not set layoutpage attribute to nil" do
-        @new_lang_root.layoutpage.should_not be_nil
+        new_lang_root.layoutpage.should_not be_nil
       end
 
       it "should not set layoutpage attribute to true" do
-        @new_lang_root.layoutpage.should_not be_true
+        new_lang_root.layoutpage.should_not be_true
+      end
+
+    end
+
+    describe '#destroy' do
+
+      let(:clipboard) { session[:clipboard] = Clipboard.new }
+      let(:page) { FactoryGirl.create(:public_page) }
+
+      before do
+        clipboard[:pages] = [{:id => page.id}]
+      end
+
+      it "should also remove the page from clipboard" do
+        post :destroy, {:id => page.id, :_method => :delete}
+        clipboard[:pages].should be_empty
       end
 
     end

data/spec/controllers/admin/trash_controller_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-
-
 module Alchemy
   module Admin
 
@@ -9,38 +7,64 @@ module Alchemy
 
       render_views
 
-      before(:each) do
-        activate_authlogic
-        UserSession.create FactoryGirl.create(:admin_user)
-      end
-
       let(:page) do
         FactoryGirl.create(:page, :parent_id => Page.rootpage.id)
       end
 
       let(:element) do
-        FactoryGirl.create(:element, :public => false)
+        FactoryGirl.create(:element, :public => false, :page => page)
       end
 
-      it "should hold trashed elements" do
-        # Because of a before_create filter it can not be created with a nil position and needs to be trashed here
+      before do
+        activate_authlogic
+        UserSession.create FactoryGirl.create(:admin_user)
         element.trash
+      end
+
+      it "should hold trashed elements" do
         get :index, :page_id => page.id
-        response.body.should have_selector("#trash_items #element_#{element.id}.element_editor")
+        response.body.should have_selector("#element_#{element.id}.element_editor")
       end
 
       it "should not hold elements that are not trashed" do
-        element = FactoryGirl.create(:element, :page_id => 5, :public => false)
+        element = FactoryGirl.create(:element, :page => page, :public => false)
         get :index, :page_id => page.id
-        response.body.should_not have_selector("#trash_items #element_#{element.id}.element_editor")
+        response.body.should_not have_selector("#element_#{element.id}.element_editor")
+      end
+
+      context "with unique elements inside the trash" do
+
+        before do
+          Element.stub!(:all_definitions_for).and_return([
+            {'name' => element.name, 'unique' => true}
+          ])
+        end
+
+        context "and no unique elements on the page" do
+
+          it "unique elements should be draggable" do
+            get :index, :page_id => page.id
+            response.body.should have_selector("#element_#{element.id}.element_editor.draggable")
+          end
+
+        end
+
+        context "and with an unique element on the page" do
+
+          it "unique elements should not be draggable" do
+            FactoryGirl.create(:element, :page => page, :public => false)
+            get :index, :page_id => page.id
+            response.body.should have_selector("#element_#{element.id}.element_editor.not-draggable")
+          end
+
+        end
+
       end
 
       context "#clear" do
 
         it "should destroy all containing elements" do
-          # Because of a before_create filter it can not be created with a nil position and needs to be trashed here
-          element.trash
-          post :clear, {:page_id => 1}
+          post :clear, {:page_id => page.id}
           Element.trashed.should be_empty
         end
 

data/spec/controllers/attachments_controller_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+# Fixes missing method tempfile error
+class Rack::Test::UploadedFile
+  attr_reader :tempfile
+end
+
+module Alchemy
+  describe AttachmentsController do
+
+    let(:page)       { FactoryGirl.create(:public_page, :restricted => true) }
+    let(:element)    { FactoryGirl.create(:element, :page => page, :name => 'download', :create_contents_after_create => true) }
+    let(:attachment) { Attachment.create(:uploaded_data => fixture_file_upload(File.expand_path('../../support/image.png', __FILE__), 'image/png')) }
+
+    before do
+      essence = element.contents.where(:name => 'file').first.essence
+      essence.attachment_id = attachment.id
+      essence.save
+    end
+
+    it "should not be possible to download attachments from restricted pages" do
+      get :download, :id => attachment.id
+      response.status.should == 302
+      response.should redirect_to(login_path)
+    end
+
+    context "as registered user" do
+
+      before do
+        activate_authlogic
+        UserSession.create(FactoryGirl.create(:registered_user))
+      end
+
+      it "should be possible to download attachments from restricted pages" do
+        get :download, :id => attachment.id
+        response.status.should == 200
+      end
+
+    end
+
+    it "should not be possible to see attachments from restricted pages" do
+      get :show, :id => attachment.id
+      response.status.should == 302
+      response.should redirect_to(login_path)
+    end
+
+    context "as registered user" do
+
+      before do
+        activate_authlogic
+        UserSession.create(FactoryGirl.create(:registered_user))
+      end
+
+      it "should be possible to see attachments from restricted pages" do
+        get :show, :id => attachment.id
+        response.status.should == 200
+      end
+
+    end
+
+  end
+end