alchemy_cms 2.1.beta5 → 2.1.beta6

data/spec/integration/pages_controller_spec.rb

@@ -17,7 +17,7 @@ describe Alchemy::PagesController do
 			within('div#content div.article div.intro') { page.should have_content('Welcome to Peters Petshop') }
 		end
 
-		it "should have show the navigation with all visible pages" do
+		it "should show the navigation with all visible pages" do
 			pages = [
 				Factory(:public_page, :language => @default_language, :visible => true, :name => 'Page 1', :parent_id => @default_language_root.id),
 				Factory(:public_page, :language => @default_language, :visible => true, :name => 'Page 2', :parent_id => @default_language_root.id)
@@ -119,7 +119,7 @@ describe Alchemy::PagesController do
 				page.current_path.should == '/alchemy/a-public-page'
 			end
 
-			context "with no lang parameter", :focus => true do
+			context "with no lang parameter" do
 
 				it "should have defaults language language_id in the session" do
 					get show_page_path(:urlname => 'a-public-page')

data/spec/models/content_spec.rb

@@ -8,4 +8,44 @@ describe Alchemy::Content do
 		Alchemy::Content.first.ingredient.should == Alchemy::EssenceText.first.ingredient
   end
 
+	describe '.normalize_essence_type' do
+
+		context "passing namespaced essence type" do
+
+			it "should not add alchemy namespace" do
+				Alchemy::Content.normalize_essence_type('Alchemy::EssenceText').should == "Alchemy::EssenceText"
+			end
+
+		end
+
+		context "passing not namespaced essence type" do
+
+			it "should add alchemy namespace" do
+				Alchemy::Content.normalize_essence_type('EssenceText').should == "Alchemy::EssenceText"
+			end
+
+		end
+
+	end
+
+	describe '#normalized_essence_type' do
+
+		context "without namespace in essence_type column" do
+
+			it "should return the namespaced essence type" do
+				Alchemy::Content.new(:essence_type => 'EssenceText').normalized_essence_type.should == 'Alchemy::EssenceText'
+			end
+
+		end
+
+		context "with namespace in essence_type column" do
+
+			it "should return the namespaced essence type" do
+				Alchemy::Content.new(:essence_type => 'Alchemy::EssenceText').normalized_essence_type.should == 'Alchemy::EssenceText'
+			end
+
+		end
+
+	end
+
 end

data/spec/models/element_spec.rb

@@ -103,4 +103,54 @@ describe Alchemy::Element do
 	  expect { Alchemy::Element.all_for_page(nil) }.should raise_error(TypeError)
 	end
 
+	describe "#content_by_type" do
+
+		before(:each) do
+			@element = Factory(:element, :name => 'headline')
+			@content = @element.contents.first
+		end
+
+		context "with namespaced essence type" do
+
+			it "should return content by passing a essence type" do
+				@element.content_by_type('Alchemy::EssenceText').should == @content
+			end
+
+		end
+
+		context "without namespaced essence type" do
+
+			it "should return content by passing a essence type" do
+				@element.content_by_type('EssenceText').should == @content
+			end
+
+		end
+
+	end
+
+	describe "#all_contents_by_type" do
+
+		before(:each) do
+			@element = Factory(:element)
+			@contents = @element.contents.select { |c| c.essence_type == 'Alchemy::EssenceText' }
+		end
+
+		context "with namespaced essence type" do
+
+			it "should return content by passing a essence type" do
+				@element.all_contents_by_type('Alchemy::EssenceText').should == @contents
+			end
+
+		end
+
+		context "without namespaced essence type" do
+
+			it "should return content by passing a essence type" do
+				@element.all_contents_by_type('EssenceText').should == @contents
+			end
+
+		end
+
+	end
+
 end

data/spec/models/page_spec.rb

@@ -263,4 +263,48 @@ describe Alchemy::Page do
 
 	end
 
-end
+	describe '.all_from_clipboard_for_select' do
+
+		context "with clipboard holding pages having non unique page layout" do
+
+			it "should return the pages" do
+				page_1 = Factory(:page, :language => @language)
+				page_2 = Factory(:page, :language => @language)
+				clipboard = [
+					{:id => page_1.id, :action => "copy"},
+					{:id => page_2.id, :action => "copy"}
+				]
+				Alchemy::Page.all_from_clipboard_for_select(clipboard, @language.id).should == [page_1, page_2]
+			end
+
+		end
+
+		context "with clipboard holding a page having unique page layout" do
+
+			it "should not return any pages" do
+				page_1 = Factory(:page, :language => @language, :page_layout => 'contact')
+				clipboard = [
+					{:id => page_1.id, :action => "copy"}
+				]
+				Alchemy::Page.all_from_clipboard_for_select(clipboard, @language.id).should == []
+			end
+
+		end
+
+		context "with clipboard holding two pages. One having a unique page layout." do
+
+			it "should return one page" do
+				page_1 = Factory(:page, :language => @language, :page_layout => 'standard')
+				page_2 = Factory(:page, :language => @language, :page_layout => 'contact')
+				clipboard = [
+					{:id => page_1.id, :action => "copy"},
+					{:id => page_2.id, :action => "copy"}
+				]
+				Alchemy::Page.all_from_clipboard_for_select(clipboard, @language.id).should == [page_1]
+			end
+
+		end
+
+	end
+
+end

data/spec/routing_spec.rb

@@ -2,56 +2,54 @@ require 'spec_helper'
 
 describe "The Routing", :type => :routing do
 
+	before(:each) { @routes = Alchemy::Engine.routes }
+
 	context "for downloads" do
-	
+
 		it "should have a named route" do
-			pending "Because Rspec does not support namespaced engines yet!"
-		  {
-				:get => "/alchemy/attachment/32/download/Presseveranstaltung.pdf"
+			{
+				:get => "/attachment/32/download/Presseveranstaltung.pdf"
 			}.should route_to(
-	    	:controller => "alchemy/attachments",
-	    	:action => "download",
-	    	:id => "32",
+				:controller => "alchemy/attachments",
+				:action => "download",
+				:id => "32",
 				:name => "Presseveranstaltung",
 				:suffix => "pdf"
 			)
 		end
-		
+
 		it "should have a route for legacy Alchemy 1.x downloads" do
-			pending "Because Rspec does not support namespaced engines yet!"
-		  {
-				:get => "/alchemy/attachment/32/download?name=Presseveranstaltung.pdf"
+			{
+				:get => "/attachment/32/download?name=Presseveranstaltung.pdf"
 			}.should route_to(
-	    	:controller => "alchemy/attachments",
-	    	:action => "download",
-	    	:id => "32"
+				:controller => "alchemy/attachments",
+				:action => "download",
+				:id => "32"
 			)
 		end
-		
-	  it "should have a route for legacy washAPP downloads" do
-			pending "Because Rspec does not support namespaced engines yet!"
+
+		it "should have a route for legacy washAPP downloads" do
 			{
-				:get => "/alchemy/wa_files/download/11"
+				:get => "/wa_files/download/11"
 			}.should route_to(
-		    :controller => "alchemy/attachments",
-		    :action => "download",
-		    :id => "11"
-		  )
+				:controller => "alchemy/attachments",
+				:action => "download",
+				:id => "11"
+			)
 		end
 
 		it "should have a route for legacy WebMate downloads" do
-			pending "Because Rspec does not support namespaced engines yet!"
-		  {
-				:get => "/alchemy/uploads/files/0000/0028/Pressetext.pdf"
+			{
+				:get => "/uploads/files/0000/0028/Pressetext.pdf"
 			}.should route_to(
-	    	:controller => "alchemy/attachments",
-	    	:action => "download",
-	    	:id => "0028",
+				:controller => "alchemy/attachments",
+				:action => "download",
+				:id => "0028",
 				:name => "Pressetext",
 				:suffix => "pdf"
 			)
 		end
-		
+
 	end
 
 end

data/spec/spec_helper.rb

@@ -26,10 +26,10 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Configure capybara for integration testing
 require "capybara/rails"
-#require 'capybara-webkit'
+require 'capybara-webkit'
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
-#Capybara.javascript_driver = :webkit
+Capybara.javascript_driver = :webkit
 
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.beta5
+  version: 2.1.beta6
   prerelease: 4
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000 Z
+date: 2011-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70094896643500 !ruby/object:Gem::Requirement
+  requirement: &70121821390860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70094896643500
+  version_requirements: *70121821390860
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70094896643060 !ruby/object:Gem::Requirement
+  requirement: &70121821401520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70094896643060
+  version_requirements: *70121821401520
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70094896642500 !ruby/object:Gem::Requirement
+  requirement: &70121821409460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70094896642500
+  version_requirements: *70121821409460
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70094896641960 !ruby/object:Gem::Requirement
+  requirement: &70121821407360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70094896641960
+  version_requirements: *70121821407360
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70094896641360 !ruby/object:Gem::Requirement
+  requirement: &70121821414800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70094896641360
+  version_requirements: *70121821414800
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70094896640800 !ruby/object:Gem::Requirement
+  requirement: &70121817605760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70094896640800
+  version_requirements: *70121817605760
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70094896640060 !ruby/object:Gem::Requirement
+  requirement: &70121817604900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70094896640060
+  version_requirements: *70121817604900
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70094896639240 !ruby/object:Gem::Requirement
+  requirement: &70121817603820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70094896639240
+  version_requirements: *70121817603820
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70094896638760 !ruby/object:Gem::Requirement
+  requirement: &70121817601740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70094896638760
+  version_requirements: *70121817601740
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70094896638060 !ruby/object:Gem::Requirement
+  requirement: &70121817600740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70094896638060
+  version_requirements: *70121817600740
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70094896637320 !ruby/object:Gem::Requirement
+  requirement: &70121817599680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,21 +133,21 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70094896637320
+  version_requirements: *70121817599680
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70094896636700 !ruby/object:Gem::Requirement
+  requirement: &70121817897460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70094896636700
+  version_requirements: *70121817897460
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70094896636160 !ruby/object:Gem::Requirement
+  requirement: &70121817896720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70094896636160
+  version_requirements: *70121817896720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70094896630060 !ruby/object:Gem::Requirement
+  requirement: &70121817895920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70094896630060
+  version_requirements: *70121817895920
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70094896629480 !ruby/object:Gem::Requirement
+  requirement: &70121817894440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,7 +177,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70094896629480
+  version_requirements: *70121817894440
 description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
   architecture.
 email:
@@ -380,6 +380,7 @@ files:
 - app/views/alchemy/admin/pages/update.js.erb
 - app/views/alchemy/admin/partials/_flash.html.erb
 - app/views/alchemy/admin/partials/_flash_notices.html.erb
+- app/views/alchemy/admin/partials/_language_tree_select.html.erb
 - app/views/alchemy/admin/partials/_main_navigation_entry.html.erb
 - app/views/alchemy/admin/partials/_pagination_links.html.erb
 - app/views/alchemy/admin/partials/_remote_pagination_links.html.erb
@@ -569,6 +570,7 @@ files:
 - lib/alchemy/modules.rb
 - lib/alchemy/page_layout.rb
 - lib/alchemy/remote_pagination_link_renderer.rb
+- lib/alchemy/scoped_pagination_link_renderer.rb
 - lib/alchemy/seeder.rb
 - lib/alchemy/tinymce.rb
 - lib/alchemy/version.rb
@@ -605,6 +607,7 @@ files:
 - spec/controllers/admin/clipboard_controller_spec.rb
 - spec/controllers/admin/contents_controller_spec.rb
 - spec/controllers/admin/elements_controller_spec.rb
+- spec/controllers/admin/pages_controller_spec.rb
 - spec/controllers/admin/trash_controller_spec.rb
 - spec/controllers/base_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
@@ -615,7 +618,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
-- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/.gitkeep
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -785,7 +788,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1600513939610307668
+      hash: 1117988886947097574
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -805,6 +808,7 @@ test_files:
 - spec/controllers/admin/clipboard_controller_spec.rb
 - spec/controllers/admin/contents_controller_spec.rb
 - spec/controllers/admin/elements_controller_spec.rb
+- spec/controllers/admin/pages_controller_spec.rb
 - spec/controllers/admin/trash_controller_spec.rb
 - spec/controllers/base_controller_spec.rb
 - spec/controllers/pages_controller_spec.rb
@@ -815,7 +819,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
-- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/.gitkeep
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb