alchemy_cms 2.1.12 → 2.2.rc1

data/spec/dummy/script/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
 require 'rails/commands'

data/spec/factories.rb

@@ -1,79 +1,79 @@
 FactoryGirl.define do
-	
-	factory :user, :class => 'Alchemy::User' do
-		email 'john@doe.com'
-		login "jdoe"
-		password 's3cr3t'
-		password_confirmation 's3cr3t'
-
-		factory :admin_user do
-  		role "admin"
-  	end
-
-  	factory :registered_user do
-  		role "registered"
-  	end
-
-  	factory :author_user do
-  		role "author"
-  	end
-
-  	factory :editor_user do
-  		role "editor"
-  	end
-
-	end
-	
-	factory :language, :class => 'Alchemy::Language' do
-		language_code "kl"
-		name 'Klingonian'
-		default false
-		frontpage_name 'Tuq'
-		page_layout 'intro'
-		public true
-
-		factory :language_with_country_code do
-			country_code 'cr'
-		end
-	end
-
-	factory :page, :class => 'Alchemy::Page' do
-
-		language { Alchemy::Language.find_by_language_code('kl') || Factory(:language) }
-		name "A Page"
-		parent_id { (Alchemy::Page.find_by_language_root(true) || Factory(:language_root_page)).id }
-		page_layout "standard"
-
-		factory :language_root_page do
-			name 'Klingonian'
-			page_layout 'intro'
-			language_root true
-			public true
-			parent_id { Alchemy::Page.root.id }
-		end
-
-		factory :public_page do
-			name "A Public Page"
-			public true
-		end
-
-		factory :systempage do
-			name "Systempage"
-			parent_id { Alchemy::Page.root.id }
-			language_root false
-			page_layout nil
-			language nil
-		end
-
-	end
-
-	factory :cell, :class => 'Alchemy::Cell' do
-		page { Alchemy::Page.find_by_language_root(true) || Factory(:language_root_page) }
-		name "A Cell"
-	end
-
-	factory :element, :class => 'Alchemy::Element' do
-		name 'article'
-	end
+
+  factory :user, :class => 'Alchemy::User' do
+    email 'john@doe.com'
+    login "jdoe"
+    password 's3cr3t'
+    password_confirmation 's3cr3t'
+
+    factory :admin_user do
+      role "admin"
+    end
+
+    factory :registered_user do
+      role "registered"
+    end
+
+    factory :author_user do
+      role "author"
+    end
+
+    factory :editor_user do
+      role "editor"
+    end
+
+  end
+
+  factory :language, :class => 'Alchemy::Language' do
+    language_code "kl"
+    name 'Klingonian'
+    default false
+    frontpage_name 'Tuq'
+    page_layout 'intro'
+    public true
+
+    factory :language_with_country_code do
+      country_code 'cr'
+    end
+  end
+
+  factory :page, :class => 'Alchemy::Page' do
+
+    language { Alchemy::Language.find_by_language_code('kl') || Factory(:language) }
+    name "A Page"
+    parent_id { Factory(:language_root_page).id }
+    page_layout "standard"
+
+    factory :language_root_page do
+      name 'Klingonian'
+      page_layout 'intro'
+      language_root true
+      public true
+      parent_id { Alchemy::Page.root.id }
+    end
+
+    factory :public_page do
+      name "A Public Page"
+      public true
+    end
+
+    factory :systempage do
+      name "Systempage"
+      parent_id { Alchemy::Page.root.id }
+      language_root false
+      page_layout nil
+      language nil
+    end
+
+  end
+
+  factory :cell, :class => 'Alchemy::Cell' do
+    page { Alchemy::Page.find_by_language_root(true) || Factory(:language_root_page) }
+    name "A Cell"
+  end
+
+  factory :element, :class => 'Alchemy::Element' do
+    name 'article'
+  end
 
 end

data/spec/helpers/admin/base_helper_spec.rb

@@ -4,37 +4,37 @@ describe Alchemy::Admin::BaseHelper do
 
   context "maximum amount of images option" do
 
-		before(:each) do
-		  @options = {}
-		end
+    before(:each) do
+      @options = {}
+    end
 
     context "with max_images option" do
 
-			it "should return nil for empty string" do
-	      @options[:max_images] = ""
-				max_image_count.should be(nil)
-	    end
+      it "should return nil for empty string" do
+        @options[:max_images] = ""
+        max_image_count.should be(nil)
+      end
 
-	    it "should return an integer for string number" do
-	      @options[:max_images] = "1"
-				max_image_count.should be(1)
-	    end
+      it "should return an integer for string number" do
+        @options[:max_images] = "1"
+        max_image_count.should be(1)
+      end
 
     end
 
-		context "with maximum_amount_of_images option" do
+    context "with maximum_amount_of_images option" do
 
-			it "should return nil for empty string" do
-	      @options[:maximum_amount_of_images] = ""
-				max_image_count.should be(nil)
-	    end
+      it "should return nil for empty string" do
+        @options[:maximum_amount_of_images] = ""
+        max_image_count.should be(nil)
+      end
 
-	    it "should return an integer for string number" do
-	      @options[:maximum_amount_of_images] = "1"
-				max_image_count.should be(1)
-	    end
+      it "should return an integer for string number" do
+        @options[:maximum_amount_of_images] = "1"
+        max_image_count.should be(1)
+      end
 
-		end
+    end
 
   end
 

data/spec/helpers/admin/contents_helper_spec.rb

@@ -2,24 +2,24 @@ require 'spec_helper'
 
 describe Alchemy::Admin::ContentsHelper do
 
-	before(:each) do
-	  @element = Factory(:element)
-	end
+  before(:each) do
+    @element = Factory(:element)
+  end
 
   it "should render a dom id" do
-		helper.content_dom_id(@element.contents.first).should match(/essence_text_\d{1,}/)
-	end
+    helper.content_dom_id(@element.contents.first).should match(/essence_text_\d{1,}/)
+  end
 
-	it "should render the content name" do
-		helper.render_content_name(@element.contents.first).should == "Intro"
-	end
+  it "should render the content name" do
+    helper.render_content_name(@element.contents.first).should == "Intro"
+  end
 
-	it "should render a link to add new content to element" do
-		helper.render_new_content_link(@element).should match(/Alchemy.openWindow.+\/admin\/elements\/#{@element.id}\/contents\/new/m)
-	end
+  it "should render a link to add new content to element" do
+    helper.render_new_content_link(@element).should match(/Alchemy.openWindow.+\/admin\/elements\/#{@element.id}\/contents\/new/m)
+  end
 
-	it "should render a link to create a content in element" do
-		helper.render_create_content_link(@element).should match(/a.+href.*admin\/contents.+class.+button new_content_link.*data-method.+post/)
-	end
+  it "should render a link to create a content in element" do
+    helper.render_create_content_link(@element).should match(/a.+href.*admin\/contents.+class.+button new_content_link.*data-method.+post/)
+  end
 
 end

data/spec/helpers/admin/elements_helper_spec.rb

@@ -4,45 +4,45 @@ include Alchemy::BaseHelper
 
 describe Alchemy::Admin::ElementsHelper do
 
-	before(:each) do
-		@page = Factory(:public_page)
-	  @element = Factory(:element, :page => @page)
-	end
-
-	it "should render an element editor partial" do
-	  helper.render_editor(@element).should match(/class="content_editor".+id="essence_text_\d{1,}"/)
-	end
-
-	it "should render a picture editor partial" do
-		helper.render_picture_editor(@element).should match(/class="essence_picture_editor"/)
-	end
-
-	describe "#grouped_elements_for_select" do
-
-		before(:each) do
-		  @page.stub!(:layout_description).and_return({'name' => "foo", 'cells' => ["foo_cell"]})
-			cell_descriptions = [{'name' => "foo_cell", 'elements' => ["1", "2"]}]
-			@elements = [{'name' => '1'}, {'name' => '2'}]
-			Alchemy::Cell.stub!(:definitions).and_return(cell_descriptions)
-		end
-
-		it "should return string of elements grouped by cell for select_tag helper" do
-			helper.grouped_elements_for_select(@elements).should == helper.grouped_options_for_select({"Foo cell"=>[["1", "1#foo_cell"], ["2", "2#foo_cell"]]})
-		end
-
-		context "with empty elements array" do
-			it "should return an empty string" do
-				helper.grouped_elements_for_select([]).should == ""
-			end
-		end
-
-		context "with empty cell definitions" do
-			it "should return an empty string" do
-				@page.stub!(:layout_description).and_return({'name' => "foo"})
-				helper.grouped_elements_for_select(@elements).should == ""
-			end
-		end
-
-	end
+  before(:each) do
+    @page = Factory(:public_page)
+    @element = Factory(:element, :page => @page)
+  end
+
+  it "should render an element editor partial" do
+    helper.render_editor(@element).should match(/class="content_editor".+id="essence_text_\d{1,}"/)
+  end
+
+  it "should render a picture editor partial" do
+    helper.render_picture_editor(@element).should match(/class="essence_picture_editor"/)
+  end
+
+  describe "#grouped_elements_for_select" do
+
+    before(:each) do
+      @page.stub!(:layout_description).and_return({'name' => "foo", 'cells' => ["foo_cell"]})
+      cell_descriptions = [{'name' => "foo_cell", 'elements' => ["1", "2"]}]
+      @elements = [{'name' => '1'}, {'name' => '2'}]
+      Alchemy::Cell.stub!(:definitions).and_return(cell_descriptions)
+    end
+
+    it "should return string of elements grouped by cell for select_tag helper" do
+      helper.grouped_elements_for_select(@elements).should == helper.grouped_options_for_select({"Foo cell" => [["1", "1#foo_cell"], ["2", "2#foo_cell"]]})
+    end
+
+    context "with empty elements array" do
+      it "should return an empty string" do
+        helper.grouped_elements_for_select([]).should == ""
+      end
+    end
+
+    context "with empty cell definitions" do
+      it "should return an empty string" do
+        @page.stub!(:layout_description).and_return({'name' => "foo"})
+        helper.grouped_elements_for_select(@elements).should == ""
+      end
+    end
+
+  end
 
 end

data/spec/helpers/admin/essences_helper_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 describe Alchemy::Admin::EssencesHelper do
 
-	before(:each) do
-	  @element = Factory(:element)
-		@element.content_by_name('intro').essence.update_attributes(:body => 'hello!')
-	end
+  before(:each) do
+    @element = Factory(:element)
+    @element.content_by_name('intro').essence.update_attributes(:body => 'hello!')
+  end
 
-	it "should render an essence editor" do
-	  content = @element.content_by_name('intro')
+  it "should render an essence editor" do
+    content = @element.content_by_name('intro')
     render_essence_editor(content).should match(/input.+type="text".+value="hello!/)
-	end
+  end
 
   it "should render an essence editor by name" do
     render_essence_editor_by_name(@element, 'intro').should match(/input.+type="text".+value="hello!/)

data/spec/helpers/elements_helper_spec.rb

@@ -4,159 +4,159 @@ include Alchemy::BaseHelper
 
 describe Alchemy::ElementsHelper do
 
-	before(:each) do
-		@page = Factory(:public_page)
-		@element = Factory(:element, :page => @page)
-		session[:language_id] = @page.language_id
-	end
-
-	it "should render an element view partial" do
-		helper.render_element(@element).should match(/id="#{@element.name}_#{@element.id}"/)
-	end
-	
-	it "should render a unique dom id for element" do
-		helper.element_dom_id(@element).should == "#{@element.name}_#{@element.id}"
-	end
-
-	describe "#render_elements" do
-		
-		before(:each) do
-			helper.stub!(:configuration).and_return(true)
-		end
-
-		context "with no certain option given" do
-			it "should render all elements from @page" do
-				@another_element = Factory(:element, :page => @page)
-				# m for regex means line breaks are like every character
-				helper.render_elements.should match(/id="#{@element.name}_#{@element.id.to_s}.*id="#{@another_element.name}_#{@another_element.id.to_s}"/m)
-			end
-
-			it "should not render elements that are in a cell" do
-				cell = Factory(:cell)
-				@another_element = Factory(:element, :page => @page, :cell_id => cell.id)
-				helper.render_elements.should_not match(/id="#{@another_element.name}_#{@another_element.id}"/)
-			end
-		end
-
-		context "with except option" do
-			it "should render all elements except a certain one" do
-				@another_element = Factory(:element, :page => @page)
-				helper.render_elements(:except => @another_element.name).should_not match(/id="#{@another_element.name}_\d*"/)
-			end
-		end
-
-		context "with only option" do
-			it "should render one certain element" do
-				@another_element = Factory(:element, :name => 'headline', :page => @page)
-				helper.render_elements(:only => @element.name).should_not match(/id="#{@another_element.name}_\d*"/)
-			end
-		end
-
-		context "with from_page option" do
-			it "should render all elements from a certain page" do
-				@another_page = Factory(:public_page, :name => 'Another Page')
-				@element_on_other_page = Factory(:element, :name => 'headline', :page => @another_page)
-				helper.render_elements(:from_page => @another_page).should match(/id="#{@element_on_other_page.name}_\d*"/)
-			end
-
-			it "should not render any elements in a cell from the given page" do
-				@another_page = Factory(:public_page, :name => 'Another Page')
-				@cell = Factory(:cell, :name => "Celltest", :page => @another_page)
-				@element_not_in_cell = Factory(:element, :name => 'headline', :page => @another_page)
-				@element_in_cell = Factory(:element, :name => 'article', :cell => @cell, :page => @another_page)
-				helper.render_elements(:from_page => @another_page).should_not match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}*"/)
-			end
-
-			context "and from_cell option" do
-				it "should render all elements from the page's cell" do
-					@another_page = Factory(:public_page, :name => 'Another Page')
-					@cell = Factory(:cell, :name => "Celltest", :page => @another_page)
-					@element_not_in_cell = Factory(:element, :name => 'headline', :page => @another_page)
-					@element_in_cell = Factory(:element, :name => 'article', :cell => @cell, :page => @another_page)
-					helper.render_elements(:from_page => @another_page, :from_cell => "Celltest").should match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}*"/)
-				end
-			end
-
-		end
-
-		context "with from_cell option" do
-			it "should render all elements from a certain cell" do
-				cell = Factory(:cell)
-				@another_element = Factory(:element, :page => @page, :cell_id => cell.id)
-				helper.render_elements(:from_cell => cell).should match(/id="#{@another_element.name}_#{@another_element.id}"/)
-			end
-
-			context "with from_cell and only option" do
-				it "should render certain elements from a certain cell" do
-					cell = Factory(:cell)
-					@another_element = Factory(:element, :page => @page, :cell_id => cell.id)
-					@another_element2 = Factory(:element, :page => @page)
-					helper.render_elements(:from_cell => cell, :only => @another_element.name).should_not match(/id="#{@another_element2.name}_#{@another_element2.id}"/)
-				end
-			end
-
-			context "with from_cell and except option" do
-				it "should render all elements except certain ones from a certain cell" do
-					cell = Factory(:cell)
-					@another_element = Factory(:element, :page => @page, :cell_id => cell.id)
-					@another_element2 = Factory(:element, :page => @page, :cell_id => cell.id)
-					helper.render_elements(:from_cell => cell, :except => @another_element.name).should_not match(/id="#{@another_element.name}_#{@another_element.id}"/)
-				end
-			end
-
-		end
-
-		context "with count option" do
-			it "should render just one element because of the count option" do
-				@page.elements.delete_all
-				@another_element_1 = Factory(:element, :page => @page)
-				@another_element_2 = Factory(:element, :page => @page)
-				@another_element_3 = Factory(:element, :page => @page)
-				helper.render_elements(:count => 1).should match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
-			end
-		end
-
-		context "with offset option" do
-			it "should render all elements beginning with the second." do
-				@page.elements.delete_all
-				@another_page = Factory(:public_page, :name => 'Another Page')
-				@another_element_1 = Factory(:element, :page => @page)
-				@another_element_2 = Factory(:element, :page => @page)
-				@another_element_3 = Factory(:element, :page => @page)
-				helper.render_elements(:offset => 1).should_not match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
-			end
-		end
-		
-		context "with option fallback" do
-			it "should render the fallback element, when no element with the given name is found" do
-				@page.elements.delete_all
-				@another_element_1 = Factory(:element, :page => @page)
-				helper.render_elements(:fallback => {:for => 'foo', :with => @another_element_1.name, :from => @page.page_layout}).should match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
-			end
-		end
-		
-	end
-
-	describe "#render_cell_elements" do
-		it "should render elements for a cell" do
-			cell = Factory(:cell)
-			@element_in_cell = Factory(:element, :cell_id => cell.id)
-			helper.stub(:configuration).and_return(true)
-			helper.render_cell_elements(cell).should match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}"/)
-		end
-	end
-
-	context "in preview mode" do
-
-		it "should return the data-alchemy-element HTML attribute for element" do
-			@preview_mode = true
-			helper.element_preview_code(@element).should == " data-alchemy-element='#{@element.id}'"
-		end
-
-		it "should not return the data-alchemy-element HTML attribute if not in preview_mode" do
-			helper.element_preview_code(@element).should_not == " data-alchemy-element='#{@element.id}'"
-		end
-
-	end
+  before(:each) do
+    @page = Factory(:public_page)
+    @element = Factory(:element, :page => @page)
+    session[:language_id] = @page.language_id
+  end
+
+  it "should render an element view partial" do
+    helper.render_element(@element).should match(/id="#{@element.name}_#{@element.id}"/)
+  end
+
+  it "should render a unique dom id for element" do
+    helper.element_dom_id(@element).should == "#{@element.name}_#{@element.id}"
+  end
+
+  describe "#render_elements" do
+
+    before(:each) do
+      helper.stub!(:configuration).and_return(true)
+    end
+
+    context "with no certain option given" do
+      it "should render all elements from @page" do
+        @another_element = Factory(:element, :page => @page)
+        # m for regex means line breaks are like every character
+        helper.render_elements.should match(/id="#{@element.name}_#{@element.id.to_s}.*id="#{@another_element.name}_#{@another_element.id.to_s}"/m)
+      end
+
+      it "should not render elements that are in a cell" do
+        cell = Factory(:cell)
+        @another_element = Factory(:element, :page => @page, :cell_id => cell.id)
+        helper.render_elements.should_not match(/id="#{@another_element.name}_#{@another_element.id}"/)
+      end
+    end
+
+    context "with except option" do
+      it "should render all elements except a certain one" do
+        @another_element = Factory(:element, :page => @page)
+        helper.render_elements(:except => @another_element.name).should_not match(/id="#{@another_element.name}_\d*"/)
+      end
+    end
+
+    context "with only option" do
+      it "should render one certain element" do
+        @another_element = Factory(:element, :name => 'headline', :page => @page)
+        helper.render_elements(:only => @element.name).should_not match(/id="#{@another_element.name}_\d*"/)
+      end
+    end
+
+    context "with from_page option" do
+      it "should render all elements from a certain page" do
+        @another_page = Factory(:public_page)
+        @element_on_other_page = Factory(:element, :name => 'headline', :page => @another_page)
+        helper.render_elements(:from_page => @another_page).should match(/id="#{@element_on_other_page.name}_\d*"/)
+      end
+
+      it "should not render any elements in a cell from the given page" do
+        @another_page = Factory(:public_page)
+        @cell = Factory(:cell, :name => "Celltest", :page => @another_page)
+        @element_not_in_cell = Factory(:element, :name => 'headline', :page => @another_page)
+        @element_in_cell = Factory(:element, :name => 'article', :cell => @cell, :page => @another_page)
+        helper.render_elements(:from_page => @another_page).should_not match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}*"/)
+      end
+
+      context "and from_cell option" do
+        it "should render all elements from the page's cell" do
+          @another_page = Factory(:public_page)
+          @cell = Factory(:cell, :name => "Celltest", :page => @another_page)
+          @element_not_in_cell = Factory(:element, :name => 'headline', :page => @another_page)
+          @element_in_cell = Factory(:element, :name => 'article', :cell => @cell, :page => @another_page)
+          helper.render_elements(:from_page => @another_page, :from_cell => "Celltest").should match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}*"/)
+        end
+      end
+
+    end
+
+    context "with from_cell option" do
+      it "should render all elements from a certain cell" do
+        cell = Factory(:cell)
+        @another_element = Factory(:element, :page => @page, :cell_id => cell.id)
+        helper.render_elements(:from_cell => cell).should match(/id="#{@another_element.name}_#{@another_element.id}"/)
+      end
+
+      context "with from_cell and only option" do
+        it "should render certain elements from a certain cell" do
+          cell = Factory(:cell)
+          @another_element = Factory(:element, :page => @page, :cell_id => cell.id)
+          @another_element2 = Factory(:element, :page => @page)
+          helper.render_elements(:from_cell => cell, :only => @another_element.name).should_not match(/id="#{@another_element2.name}_#{@another_element2.id}"/)
+        end
+      end
+
+      context "with from_cell and except option" do
+        it "should render all elements except certain ones from a certain cell" do
+          cell = Factory(:cell)
+          @another_element = Factory(:element, :page => @page, :cell_id => cell.id)
+          @another_element2 = Factory(:element, :page => @page, :cell_id => cell.id)
+          helper.render_elements(:from_cell => cell, :except => @another_element.name).should_not match(/id="#{@another_element.name}_#{@another_element.id}"/)
+        end
+      end
+
+    end
+
+    context "with count option" do
+      it "should render just one element because of the count option" do
+        @page.elements.delete_all
+        @another_element_1 = Factory(:element, :page => @page)
+        @another_element_2 = Factory(:element, :page => @page)
+        @another_element_3 = Factory(:element, :page => @page)
+        helper.render_elements(:count => 1).should match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
+      end
+    end
+
+    context "with offset option" do
+      it "should render all elements beginning with the second." do
+        @page.elements.delete_all
+        @another_page = Factory(:public_page)
+        @another_element_1 = Factory(:element, :page => @page)
+        @another_element_2 = Factory(:element, :page => @page)
+        @another_element_3 = Factory(:element, :page => @page)
+        helper.render_elements(:offset => 1).should_not match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
+      end
+    end
+
+    context "with option fallback" do
+      it "should render the fallback element, when no element with the given name is found" do
+        @page.elements.delete_all
+        @another_element_1 = Factory(:element, :page => @page)
+        helper.render_elements(:fallback => {:for => 'foo', :with => @another_element_1.name, :from => @page.page_layout}).should match(/id="#{@another_element_1.name}_#{@another_element_1.id}"/)
+      end
+    end
+
+  end
+
+  describe "#render_cell_elements" do
+    it "should render elements for a cell" do
+      cell = Factory(:cell)
+      @element_in_cell = Factory(:element, :cell_id => cell.id)
+      helper.stub(:configuration).and_return(true)
+      helper.render_cell_elements(cell).should match(/id="#{@element_in_cell.name}_#{@element_in_cell.id}"/)
+    end
+  end
+
+  context "in preview mode" do
+
+    it "should return the data-alchemy-element HTML attribute for element" do
+      @preview_mode = true
+      helper.element_preview_code(@element).should == " data-alchemy-element='#{@element.id}'"
+    end
+
+    it "should not return the data-alchemy-element HTML attribute if not in preview_mode" do
+      helper.element_preview_code(@element).should_not == " data-alchemy-element='#{@element.id}'"
+    end
+
+  end
 
 end