RubyGems - alchemy_cms - Versions diffs - 2.1.beta1 → 2.1.beta5 - Mend

alchemy_cms 2.1.beta1 → 2.1.beta5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (555) hide show

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

@@ -7,7 +7,7 @@ module Alchemy
       source_root File.expand_path('templates', File.dirname(__FILE__))
       def create_directory
-        @elements_dir = "#{Rails.root}/app/views/elements"
+        @elements_dir = "#{Rails.root}/app/views/alchemy/elements"
         empty_directory @elements_dir
       end

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

@@ -1,6 +1,6 @@
 <%- unless @contents.blank? -%>
 	<%- @contents.each do |content| -%>
-		<%- unless content["type"] == "EssencePicture" -%>
+		<%- unless content["type"] == "Alchemy::EssencePicture" -%>
 <%%= render_essence_editor_by_name(element, '<%= content["name"] %>') %>
 		<%- else -%>
 <%%= render_picture_editor(element) %>

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

@@ -1,9 +1,9 @@
 <div class="<%= @element_name %>" id="<%%= element_dom_id(element) %>"<%%= element_preview_code(element) -%>>
 <%- unless @contents.blank? -%>
 <%- @contents.each do |content| -%>
-	<%- if content["type"] == "EssencePicture" -%>
+	<%- if content["type"] == "Alchemy::EssencePicture" -%>
 	<div class="<%= @element_name %>_images">
-		<%%- element.all_contents_by_type("EssencePicture").each do |content| -%>
+		<%%- 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>

data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb CHANGED Viewed

@@ -7,7 +7,7 @@ module Alchemy
       source_root File.expand_path('templates', File.dirname(__FILE__))
       def create_directory
-        @page_layouts_dir = "#{Rails.root}/app/views/page_layouts"
+        @page_layouts_dir = "#{Rails.root}/app/views/alchemy/page_layouts"
         empty_directory @page_layouts_dir
       end

data/lib/rails/generators/alchemy/plugin/plugin_generator.rb CHANGED Viewed

@@ -25,7 +25,6 @@ module Alchemy
         copy_file("#{File.dirname(__FILE__)}/files/translation.pot", "#{@plugin_path}/locale/#{@plugin_name}.pot")
         copy_file("#{File.dirname(__FILE__)}/files/translation_de.po", "#{@plugin_path}/locale/de/#{@plugin_name}.po")
         copy_file("#{File.dirname(__FILE__)}/files/translation_en.po", "#{@plugin_path}/locale/en/#{@plugin_name}.po")
-        template("gettext.rb", "#{@plugin_path}/config/initializers/gettext.rb")
         template("config.yml", "#{@plugin_path}/config/alchemy/config.yml")
         template("authorization_rules.rb", "#{@plugin_path}/config/authorization_rules.rb")
         template("routes.rb", "#{@plugin_path}/config/routes.rb")

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

@@ -1,4 +1,4 @@
-<!DOCTYPE>
+<!DOCTYPE html>
 <html>
 	<head>
 		<%= render_meta_data %>

data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb CHANGED Viewed

@@ -1,41 +1,41 @@
 require 'rails'
 module Alchemy
-  module Generators
-    class ScaffoldGenerator < ::Rails::Generators::Base
-      desc "This generator generates the Alchemy scaffold. Pass --with-standard-set to copy Alchemys Standardset files into your app."
-      class_option 'with-standard-set', :type => :boolean, :desc => "Copy standard set files."
-      source_root File.expand_path('templates', File.dirname(__FILE__))
-      def create_config_dir
-        empty_directory "#{Rails.root}/config/alchemy"
-      end
+	module Generators
+		class ScaffoldGenerator < ::Rails::Generators::Base
+			desc "This generator generates the Alchemy scaffold. Pass --with-standard-set to copy Alchemys Standardset files into your app."
+			class_option 'with-standard-set', :type => :boolean, :desc => "Copy standard set files."
+			source_root File.expand_path('templates', File.dirname(__FILE__))
+			def create_config_dir
+				empty_directory "#{Rails.root}/config/alchemy"
+			end
 			def create_view_dirs
-				empty_directory Rails.root.join("app/views/elements")
-				empty_directory Rails.root.join("app/views/page_layouts")
+				empty_directory Rails.root.join("app/views/alchemy/elements")
+				empty_directory Rails.root.join("app/views/alchemy/page_layouts")
+			end
+			def copy_config
+				@config_path = File.expand_path('../../../../../config/alchemy', File.dirname(__FILE__))
+				copy_file "#{@config_path}/config.yml", "#{Rails.root}/config/alchemy/config.yml"
 			end
-      def copy_config
-        @config_path = File.expand_path('../../../../../config/alchemy', File.dirname(__FILE__))
-        copy_file "#{@config_path}/config.yml", "#{Rails.root}/config/alchemy/config.yml"
-      end
-      def copy_files
-        if options['with-standard-set']
-          layouts_path = File.expand_path('../../../../../app/views/layouts', File.dirname(__FILE__))
-          copy_file "#{@config_path}/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
-          copy_file "#{@config_path}/page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"
-          copy_file "#{layouts_path}/pages.html.erb", "#{Rails.root}/app/views/layouts/pages.html.erb"
-          Rails::Generators.invoke("alchemy:elements")
-          Rails::Generators.invoke("alchemy:page_layouts")
-        else
-          copy_file "#{File.dirname(__FILE__)}/files/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
-          copy_file "#{File.dirname(__FILE__)}/files/page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"
-					copy_file "#{File.dirname(__FILE__)}/files/pages.html.erb", "#{Rails.root}/app/views/layouts/pages.html.erb"
-        end
-      end
-    end
-  end
+			def copy_files
+				if options['with-standard-set']
+					layouts_path = File.expand_path('../../../../../app/views/layouts/alchemy', File.dirname(__FILE__))
+					copy_file "#{@config_path}/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
+					copy_file "#{@config_path}/page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"
+					copy_file "#{layouts_path}/pages.html.erb", "#{Rails.root}/app/views/layouts/alchemy/pages.html.erb"
+					Rails::Generators.invoke("alchemy:elements")
+					Rails::Generators.invoke("alchemy:page_layouts")
+				else
+					copy_file "#{File.dirname(__FILE__)}/files/elements.yml", "#{Rails.root}/config/alchemy/elements.yml"
+					copy_file "#{File.dirname(__FILE__)}/files/page_layouts.yml", "#{Rails.root}/config/alchemy/page_layouts.yml"
+					copy_file "#{File.dirname(__FILE__)}/files/pages.html.erb", "#{Rails.root}/app/views/layouts/alchemy/pages.html.erb"
+				end
+			end
+		end
+	end
 end

data/lib/tasks/install.rake CHANGED Viewed

@@ -5,7 +5,7 @@ namespace :alchemy do
   desc "Migrates the database, inserts essential data into the database and copies all assets."
   task :prepare do
-    Rake::Task['alchemy:migrations:sync'].invoke
+    Rake::Task['alchemy:install:migrations'].invoke
     Rake::Task['alchemy:seeder:copy'].invoke
     Rake::Task['alchemy:assets:copy:all'].invoke
   end
@@ -19,13 +19,6 @@ namespace :alchemy do
       end
     end
   end
-  namespace 'migrations' do
-    desc "Syncs Alchemy migrations into db/migrate"
-    task 'sync' do
-			system "rsync -ruv #{File.join(File.dirname(__FILE__), '..', '..', 'db', 'migrate')} #{Rails.root}/db"
-    end
-  end
   namespace 'assets' do
     namespace 'copy' do
@@ -82,7 +75,7 @@ namespace :alchemy do
         page_layouts.each do |layout|
           unless layout['cells'].blank?
             cells_for_layout = cells.select { |cell| layout['cells'].include? cell['name'] }
-            Page.find_all_by_page_layout(layout['name']).each do |page|
+            Alchemy::Page.find_all_by_page_layout(layout['name']).each do |page|
               cells_for_layout.each do |cell_for_layout|
                 cell = Cell.find_or_initialize_by_name_and_page_id({:name => cell_for_layout['name'], :page_id => page.id})
                 cell.elements << page.elements.select { |element| cell_for_layout['elements'].include?(element.name) }

data/lib/tasks/upgrade.rake CHANGED Viewed

@@ -1,211 +1,72 @@
-# TODO: Refactor for Rails 3
 namespace :alchemy do
-  namespace :upgrade do
-    desc "Removing unused files and directories"
-    task "cleanup" do
-      system('rm -rf vendor/plugins/webmate')
-      system('rm -rf public/plugin_assets/webmate')
-      system('rm config/initializers/fast_gettext.rb config/initializers/cache_storage.rb config/initializers/session_store.rb')
-    end
-    desc 'Writes a rake file into lib/tasks to make all the Alchemy plugins tasks available'
-    task 'write_rake_task' do
-      s = <<EOF
-# Make all the Alchemy plugins tasks available
-Dir.glob(File.dirname(__FILE__) + "/../../vendor/plugins/alchemy/plugins/**/tasks/*.rake").each do |rake_file|
-  import rake_file
-end
-EOF
-      File.open('lib/tasks/alchemy_plugins_tasks.rake', 'w') { |f| f.write(s)}
-    end
-    desc "Generates migration for upgrading the database."
-    task "generate_migration" do
-      system('script/generate migration upgrade_db_for_alchemy')
-      migration_file = Dir.glob("db/migrate/*_upgrade_db_for_alchemy.rb").first
-      s = <<EOF
-class UpgradeDbForAlchemy < ActiveRecord::Migration
-  def self.up
-    # Removing unused tables
-    drop_table :wa_atom_checkboxes
-    drop_table :wa_atom_formtags
-    drop_table :wa_atom_galleries
-    drop_table :wa_atom_gallery_pictures
-    drop_table :wa_atom_molecule_selectors
-    drop_table :wa_atom_resetbuttons
-    drop_table :wa_atom_selectboxes
-    drop_table :wa_atom_submitbuttons
-    drop_table :wa_atom_text_bigs
-    drop_table :wa_atom_textareas
-    drop_table :wa_atom_textfields
-    drop_table :wa_gallery_images
-    drop_table :wa_atom_sitemaps
-    # renaming tables
-    rename_table :wa_pages, :pages
-    rename_table :wa_molecules, :elements
-    rename_table :wa_atoms, :contents
-    rename_table :wa_users, :users
-    rename_table :wa_images, :pictures
-    rename_table :wa_files, :attachments
-    rename_table :wa_foldeds, :folded_pages
-    rename_table :wa_molecules_wa_pages, :elements_pages
-    rename_table :wa_atom_texts, :essence_texts
-    rename_table :wa_atom_rtfs, :essence_richtexts
-    rename_table :wa_atom_pictures, :essence_pictures
-    rename_table :wa_atom_files, :essence_files
-    rename_table :wa_atom_htmls, :essence_htmls
-    rename_table :wa_atom_flashvideos, :essence_videos
-    rename_table :wa_atom_flashes, :essence_flashes
-    rename_table :wa_atom_dates, :essence_dates
-    rename_table :wa_atom_audios, :essence_audios
-    # renaming tables rows
-    rename_column :elements, :wa_page_id, :page_id
-    rename_column :elements_pages, :wa_molecule_id, :element_id
-    rename_column :elements_pages, :wa_page_id, :page_id
-    rename_column :folded_pages, :wa_user_id, :user_id
-    rename_column :folded_pages, :wa_page_id, :page_id
-    rename_column :contents, :wa_molecule_id, :element_id
-    rename_column :contents, :atom_id, :essence_id
-    rename_column :contents, :atom_type, :essence_type
-    rename_column :essence_pictures, :wa_image_id, :picture_id
-    rename_column :essence_files, :wa_file_id, :attachment_id
-    rename_column :essence_videos, :wa_file_id, :attachment_id
-    rename_column :essence_audios, :wa_file_id, :attachment_id
-    rename_column :essence_flashes, :wa_file_id, :attachment_id
-    rename_column :essence_texts, :content, :body
-    rename_column :essence_richtexts, :content, :body
-    rename_column :essence_richtexts, :stripped_content, :stripped_body
-    rename_column :pages, :systempage, :layoutpage
-    # Changing WaAtoms to Essences
-    execute("UPDATE contents SET essence_type = REPLACE(essence_type, 'WaAtom', 'Essence')")
-    execute("UPDATE contents SET essence_type = REPLACE(essence_type, 'EssenceRtf', 'EssenceRichtext')")
-    execute("UPDATE contents SET essence_type = REPLACE(essence_type, 'EssenceFlashvideo', 'EssenceVideo')")
-    # Renaming old userstamp columns to new userstamp columns
-    rename_column :essence_htmls, :content, :source
-    rename_column :pages, :created_by, :creator_id
-    rename_column :pages, :updated_by, :updater_id
-    # Adding userstamps to tables
-    add_column :essence_audios, :creator_id, :integer
-    add_column :essence_audios, :updater_id, :integer
-    add_column :attachments, :creator_id, :integer
-    add_column :attachments, :updater_id, :integer
-    add_column :contents, :creator_id, :integer
-    add_column :contents, :updater_id, :integer
-    add_column :essence_dates, :creator_id, :integer
-    add_column :essence_dates, :updater_id, :integer
-    add_column :essence_files, :creator_id, :integer
-    add_column :essence_files, :updater_id, :integer
-    add_column :essence_flashes, :creator_id, :integer
-    add_column :essence_flashes, :updater_id, :integer
-    add_column :essence_htmls, :creator_id, :integer
-    add_column :essence_htmls, :updater_id, :integer
-    add_column :essence_pictures, :creator_id, :integer
-    add_column :essence_pictures, :updater_id, :integer
-    add_column :essence_richtexts, :creator_id, :integer
-    add_column :essence_richtexts, :updater_id, :integer
-    add_column :essence_texts, :creator_id, :integer
-    add_column :essence_texts, :updater_id, :integer
-    add_column :essence_videos, :creator_id, :integer
-    add_column :essence_videos, :updater_id, :integer
-    add_column :pictures, :creator_id, :integer
-    add_column :pictures, :updater_id, :integer
-    add_column :elements, :creator_id, :integer
-    add_column :elements, :updater_id, :integer
-    add_column :users, :creator_id, :integer
-    add_column :users, :updater_id, :integer
-    # Adding columns
-    add_column :users, :gender, :string
-    execute("INSERT INTO schema_migrations SET version = '20100607143125-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607144254-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607145256-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607145719-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607150611-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607150812-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607153647-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607161345-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607162339-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607193638-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607193646-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100607193653-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100609111653-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100609111809-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100609111821-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100609111837-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100616150753-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100709163925-alchemy'")
-    execute("INSERT INTO schema_migrations SET version = '20100812085225-alchemy'")
-  end
-  def self.down
-    raise IrreversibleMigration
-  end
-end
-EOF
-      File.open(migration_file, 'w') { |f| f.write(s)}
-    end
-    desc "Updates the config/environment.rb file"
-    task "environment_file" do
-      s = <<EOF
-RAILS_GEM_VERSION = '2.3.10' unless defined? RAILS_GEM_VERSION
-require File.join(File.dirname(__FILE__), 'boot')
-Rails::Initializer.run do |config|
-  config.gem 'acts_as_ferret', :version => '0.4.8.2'
-  config.gem 'authlogic', :version => '>=2.1.2'
-  config.gem 'awesome_nested_set', :version => '>=1.4.3'
-  config.gem 'declarative_authorization', :version => '>=0.4.1'
-  config.gem "fleximage", :version => ">=1.0.4"
-  config.gem 'fast_gettext', :version => '>=0.4.8'
-  config.gem 'gettext_i18n_rails', :version => '0.2.3'
-  config.gem 'gettext', :lib => false, :version => '>=1.9.3'
-  config.gem 'rmagick', :lib => "RMagick2", :version => '>=2.13.1'
-  config.gem 'jk-ferret', :version => '>=0.11.8.2', :lib => 'ferret'
-  config.gem 'will_paginate', :version => '2.3.15'
-  config.gem 'mimetype-fu', :version => '>=0.1.2', :lib => 'mimetype_fu'
-  config.autoload_paths += %W( vendor/plugins/alchemy/app/sweepers )
-  config.autoload_paths += %W( vendor/plugins/alchemy/app/middleware )
-  config.i18n.load_path += Dir[Rails.root.join('vendor/plugins/alchemy/config', 'locales', '*.{rb,yml}')]
-  config.time_zone = 'Berlin'
-  config.i18n.default_locale = :de
-end
-EOF
-      File.open('config/environment.rb', 'w') { |f| f.write(s)}
-    end
-    namespace :svn do
-      desc "Renaming files and folders for svn repository"
-      task "rename" do
-        system('svn rename config/webmate config/alchemy')
-        system('svn rename config/alchemy/molecules.yml config/alchemy/elements.yml')
-        system('svn rename app/views/wa_molecules app/views/elements')
-        system('svn rename app/views/layouts/wa_pages.html.erb app/views/layouts/pages.html.erb')
-        system('svn remove config/initializers/fast_gettext.rb config/initializers/cache_storage.rb')
-      end
-      desc "Commits everything into you svn repository"
-      task "commit" do
-        system("svn mkdir uploads")
-        system("svn propset svn:ignore '*' uploads/")
-        system("svn add lib/tasks/alchemy_plugins_tasks.rake")
-        system("svn add db/migrate/*")
-        system("svn commit -m 'upgraded to alchemy'")
-      end
-    end
-  end
+	desc "Upgrades database to Alchemy CMS v#{Alchemy::VERSION}."
+	task :upgrade => :environment do
+		# invoke seed task
+		Rake::Task['db:seed'].invoke
+		# Creates Language model if it does not exist (Alchemy CMS prior v1.5)
+		# Also creates missing associations between pages and languages
+		Alchemy::Page.all.each do |page|
+			if !page.language_code.blank? && page.language.nil?
+				root = page.get_language_root
+				lang = Alchemy::Language.find_or_create_by_code(
+					:name => page.language_code.capitalize,
+					:code => page.language_code,
+					:frontpage_name => root.name,
+					:page_layout => root.page_layout,
+					:public => true
+				)
+				page.language = lang
+				if page.save(:validate => false)
+					puts "== Set language for page #{page.name} to #{lang.name}"
+				end
+			else
+				puts "== Skipping! Language for page #{page.name} already set."
+			end
+		end
+		default_language = Alchemy::Language.get_default
+		Alchemy::Page.layoutpages.each do |page|
+			if page.language.class == String || page.language.nil?
+				page.language = default_language
+				if page.save(:validate => false)
+					puts "== Set language for page #{page.name} to #{default_language.name}"
+				end
+			else
+				puts "== Skipping! Language for page #{page.name} already set."
+			end
+		end
+		(Alchemy::EssencePicture.all + Alchemy::EssenceText.all).each do |essence|
+			case essence.link_target
+			when '1'
+				if essence.update_attribute(:link_target, 'blank')
+					puts "== Updated #{essence.preview_text} link target to #{essence.link_target}."
+				end
+			when '0'
+				essence.update_attribute(:link_target, nil)
+				puts "== Updated #{essence.preview_text} link target to #{essence.link_target.inspect}."
+			end
+		end
+		# Updates all essence_type of Content if not already namespaced.
+		depricated_contents = Alchemy::Content.where("essence_type LIKE ?", "Essence%")
+		if depricated_contents.any?
+			success = 0
+			errors = []
+			depricated_contents.each do |c|
+				if c.update_attribute(:essence_type, c.essence_type.gsub(/^Essence/, 'Alchemy::Essence'))
+					success += 1
+				else
+					errors << c.errors.full_messages
+				end
+			end
+			puts "== Namespaced #{success} Essence-Types." if success > 0
+			puts "!! #{errors.count} errors while namespacing Essence-Types.\n#{errors.join('\n')}" if errors.count > 0
+		else
+			puts "== Skipping! Already namespaced Essence-Types"
+		end
+	end
 end

data/spec/controllers/admin/clipboard_controller_spec.rb CHANGED Viewed

@@ -1,51 +1,49 @@
 require 'spec_helper'
-describe Admin::ClipboardController do
+describe Alchemy::Admin::ClipboardController do
 	before(:each) do
 		activate_authlogic
-    user = Factory(:admin_user)
-    user.save_without_session_maintenance
-		UserSession.create user
+	  Alchemy::UserSession.create(Factory(:admin_user))
 	end
-  context "clipboard" do
+	context "clipboard" do
-    it "should hold element ids" do
-			@page = Factory(:page, :parent_id => Page.rootpage.id)
-		  @element = Factory(:element, :page => @page)
-		  @another_element = Factory(:element, :page => @page)
-			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}] }
+		it "should hold element ids" do
+			@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+			@element = Factory(:element, :page => @page)
+			@another_element = Factory(:element, :page => @page)
+			session['clipboard'] = { 'elements' => [{:id => @element.id, :action => 'copy'}] }
 			post(:insert, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
-			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id.to_s, :action => 'copy'}]
-    end
+			session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id.to_s, :action => 'copy'}]
+		end
-    it "should not have the same element twice" do
-			@page = Factory(:page, :parent_id => Page.rootpage.id)
-		  @element = Factory(:element, :page => @page)
-			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}] }
+		it "should not have the same element twice" do
+			@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+			@element = Factory(:element, :page => @page)
+			session['clipboard'] = { 'elements' => [{:id => @element.id, :action => 'copy'}] }
 			post(:insert, {:remarkable_type => 'element', :remarkable_id => @element.id, :format => :js})
-			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}]
-    end
-    it "should remove element ids" do
-			@page = Factory(:page, :parent_id => Page.rootpage.id)
-		  @element = Factory(:element, :page => @page)
-		  @another_element = Factory(:element, :page => @page)
-			session[:clipboard] = { :elements => [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}] }
+			session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}]
+		end
+		it "should remove element ids" do
+			@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+			@element = Factory(:element, :page => @page)
+			@another_element = Factory(:element, :page => @page)
+			session['clipboard'] = { 'elements' => [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}] }
 			delete(:remove, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
-			session[:clipboard][:elements].should == [{:id => @element.id, :action => 'copy'}]
-    end
-    it "should be clearable" do
-			@page = Factory(:page, :parent_id => Page.rootpage.id)
-		  @element = Factory(:element, :page => @page)
-		  @another_element = Factory(:element, :page => @page)
-			session[:clipboard] = { :elements => [@element.id, @another_element.id] }
+			session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}]
+		end
+		it "should be clearable" do
+			@page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
+			@element = Factory(:element, :page => @page)
+			@another_element = Factory(:element, :page => @page)
+			session['clipboard'] = { 'elements' => [@element.id, @another_element.id] }
 			delete(:clear, :format => :js)
-			session[:clipboard].should == {}
-    end
+			session['clipboard'].should == {}
+		end
-  end
+	end
 end