alchemy_cms 2.1.9 → 2.1.9.1

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -181,8 +181,7 @@ module Alchemy
 				new_language_root = Page.copy(
 					original_language_root,
 					:language_id => params[:languages][:new_lang_id],
-					:language_code => session[:language_code],
-					:layoutpage => params[:layoutpage]
+					:language_code => session[:language_code]
 				)
 				new_language_root.move_to_child_of Page.root
 				original_language_root.copy_children_to(new_language_root)

data/app/controllers/alchemy/pages_controller.rb

@@ -17,7 +17,7 @@ module Alchemy
 			:cache_path => proc { show_page_url(:urlname => params[:urlname], :lang => multi_language? ? params[:lang] : nil) },
 			:if => proc {
 				if Alchemy::Config.get(:cache_pages)
-					page = Page.find_by_urlname_and_language_id_and_public(
+					page = Page.contentpages.find_by_urlname_and_language_id_and_public(
 						params[:urlname],
 						session[:language_id],
 						true,
@@ -70,10 +70,10 @@ module Alchemy
 			if params[:urlname].blank?
 				@page = Page.language_root_for(Language.get_default.id)
 			else
-				@page = Page.find_by_urlname_and_language_id(params[:urlname], session[:language_id])
+				@page = Page.contentpages.find_by_urlname_and_language_id(params[:urlname], session[:language_id])
 				# try to find the page in another language
 				if @page.nil?
-					@page = Page.find_by_urlname(params[:urlname])
+					@page = Page.contentpages.find_by_urlname(params[:urlname])
 				else
 					return @page
 				end

data/app/models/alchemy/page.rb

@@ -24,11 +24,11 @@ module Alchemy
 		attr_accessor :do_not_sweep
 		attr_accessor :do_not_validate_language
 
-		before_validation :set_url_name, :unless => proc { |page| page.systempage? || page.redirects_to_external? }
-		before_save :set_title, :unless => proc { |page| page.systempage? || page.redirects_to_external? || !page.title.blank? }
+		before_validation :set_url_name, :if => :contentpage?
+		before_save :set_title, :if => :contentpage?, :unless => proc { |page| !page.title.blank? }
 		before_save :set_language_code, :unless => :systempage?
-		before_save :set_restrictions_to_child_pages, :if => proc { |page| !page.systempage? && page.restricted_changed? }
-		before_save :inherit_restricted_status, :if => proc { |page| !page.systempage? && page.parent && page.parent.restricted? }
+		before_save :set_restrictions_to_child_pages, :if => proc { |page| page.contentpage? && page.restricted_changed? }
+		before_save :inherit_restricted_status, :if => proc { |page| page.contentpage? && page.parent && page.parent.restricted? }
 		after_create :autogenerate_elements, :unless => proc { |page| page.systempage? || page.do_not_autogenerate }
 		after_create :create_cells, :unless => :systempage?
 
@@ -48,9 +48,9 @@ module Alchemy
 		scope :all_last_edited_from, lambda { |user| where(:updater_id => user.id).order('`alchemy_pages`.`updated_at` DESC').limit(5) }
 		# Returns all pages that have the given language_id
 		scope :with_language, lambda { |language_id| where(:language_id => language_id) }
+		scope :contentpages, where(:layoutpage => [false, nil]).where("`alchemy_pages`.`parent_id` IS NOT NULL")
 		# Returns all pages that are not locked and public.
 		# Used for flushing all page caches at once.
-		scope :contentpages, where("`alchemy_pages`.`layoutpage` = 0 AND `alchemy_pages`.`parent_id` IS NOT NULL")
 		scope :flushables, not_locked.published.contentpages
 		scope :searchables, not_restricted.published.contentpages
 
@@ -496,6 +496,10 @@ module Alchemy
 			rootpage? || (self.parent_id == Page.root.id && !self.language_root?)
 		end
 
+		def contentpage?
+			!systempage? && !redirects_to_external? && !layoutpage?
+		end
+
 		def self.rootpage
 			self.root
 		end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-	VERSION = "2.1.9"
+	VERSION = "2.1.9.1"
 
 end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -16,4 +16,35 @@ describe Alchemy::Admin::PagesController do
 
 	end
 
+	describe '#copy_language_tree' do
+
+		before(:each) do
+			@language = Alchemy::Language.get_default
+			@language_root = Factory(:language_root_page, :language => @language, :name => 'Intro')
+			@level_1 = Factory(:public_page, :language => @language, :parent_id => @language_root.id, :visible => true, :name => 'Level 1')
+			@level_2 = Factory(:public_page, :language => @language, :parent_id => @level_1.id, :visible => true, :name => 'Level 2')
+			@level_3 = Factory(:public_page, :language => @language, :parent_id => @level_2.id, :visible => true, :name => 'Level 3')
+			@level_4 = Factory(:public_page, :language => @language, :parent_id => @level_3.id, :visible => true, :name => 'Level 4')
+			@new_language = Factory(: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 = Alchemy::Page.language_root_for(@new_language.id)
+		end
+
+		it "should copy all pages" do
+			@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
+		end
+
+		it "should not set layoutpage attribute to true" do
+			@new_lang_root.layoutpage.should_not be_true
+		end
+
+	end
+
 end

data/spec/integration/pages_controller_spec.rb

@@ -26,6 +26,19 @@ describe Alchemy::PagesController do
 			within('div#navigation ul') { page.should have_selector('li a[href="/alchemy/page-1"], li a[href="/alchemy/page-2"]') }
 		end
 
+		context "when a global page with the same urlname as the requested page exists in the language tree" do
+
+			it "should render the content page, not the global page" do
+				globalpage = Factory(:public_page, :layoutpage => true, :language => @default_language, :name => "samename", :urlname => "samename", :parent_id => @default_language_root.id)
+				contentpage = Factory(:public_page, :layoutpage => false, :language => @default_language, :name => "samename", :urlname => "samename", :parent_id => @default_language_root.id)
+				article = contentpage.elements.find_by_name('article')
+				article.content_by_name('intro').essence.update_attributes(:body => 'rendered on contentpage', :public => true)
+				visit("/alchemy/samename")
+				within('div#content div.article div.intro') { page.should have_content('rendered on contentpage') }
+			end
+
+		end
+
 	end
 
 	describe "fulltext search" do

data/spec/models/page_spec.rb

@@ -105,6 +105,38 @@ describe Alchemy::Page do
 	
 	end
 
+	describe "#contentpage" do
+
+		it "should return false if its a systempage" do
+			@page = Factory(:page, :language => @language, :parent_id => @language_root.id)
+			@page.stub!(:systempage?).and_return(true)
+			@page.stub!(:redirects_to_external?).and_return(false)
+			@page.contentpage?.should be_false
+		end
+		
+		it "should return false if it redirects to an external website" do
+			@page = Factory(:page, :layoutpage => false, :language => @language, :parent_id => @language_root.id)
+			@page.stub!(:systempage?).and_return(false)
+			@page.stub!(:redirects_to_external?).and_return(true)
+			@page.contentpage?.should be_false
+		end
+
+		it "should return false if its a layoutpage" do
+			@page = Factory(:page, :layoutpage => true, :language => @language, :parent_id => @language_root.id)
+			@page.stub!(:systempage?).and_return(false)
+			@page.stub!(:redirects_to_external?).and_return(false)
+			@page.contentpage?.should be_false
+		end
+
+		it "should return true if its not a layoutpage, does not redirect to an external website and its not a systempage" do
+			@page = Factory(:page, :language => @language, :parent_id => @language_root.id)
+			@page.stub!(:systempage?).and_return(false)
+			@page.stub!(:redirects_to_external?).and_return(false)
+			@page.contentpage?.should be_true
+		end
+
+	end
+
 	describe '#create' do
 
 		context "before/after filter" do
@@ -134,6 +166,20 @@ describe Alchemy::Page do
 				page.urlname.should == '--a'
 			end
 
+			context "with attribute :layoutpage set to true (global page)" do
+				
+				it "should not set the title from its name if its a global page" do
+					page = Factory(:page, :layoutpage => true, :name => 'Page with no title', :language => @language, :parent_id => @language_root.id)
+					page.title.should be_blank
+				end
+
+				it "should not set an urlname" do
+					page = Factory(:page, :layoutpage => true, :name => 'Page with no urlname', :language => @language, :parent_id => @language_root.id)
+					page.urlname.should be_blank
+				end
+
+			end
+
 		end
 
 	end
@@ -180,6 +226,30 @@ describe Alchemy::Page do
 
 	end
 
+	context ".contentpages" do
+
+		before(:each) do
+			@klingonian = Factory(:language)
+			@layoutroot = Alchemy::Page.find_or_create_layout_root_for(@klingonian.id)
+			@layoutpage = Factory(:public_page, :name => 'layoutpage', :layoutpage => true, :parent_id => @layoutroot.id, :language => @klingonian)
+			@klingonian_lang_root = Factory(:language_root_page, :name => 'klingonian_lang_root', :layoutpage => nil, :language => @klingonian)
+			@contentpage = Factory(:public_page, :name => 'contentpage', :parent_id => @language_root.id, :language => @language)
+		end
+
+		it "should return a collection of contentpages" do
+			Alchemy::Page.contentpages.to_a.should == [@language_root, @klingonian_lang_root, @contentpage]
+		end
+
+		it "should not contain pages with attribute :layoutpage set to true" do
+			Alchemy::Page.contentpages.to_a.select { |p| p.layoutpage == true }.should be_empty
+		end
+
+		it "should contain pages with attribute :layoutpage set to nil" do
+			Alchemy::Page.contentpages.to_a.select { |p| p.layoutpage == nil }.should == [@klingonian_lang_root]
+		end
+
+	end
+
 	context ".public" do
 
 		it "should return pages that are public" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70348038225060 !ruby/object:Gem::Requirement
+  requirement: &70284747089940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70348038225060
+  version_requirements: *70284747089940
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70348038223480 !ruby/object:Gem::Requirement
+  requirement: &70284747092840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348038223480
+  version_requirements: *70284747092840
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70348038222140 !ruby/object:Gem::Requirement
+  requirement: &70284747084300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348038222140
+  version_requirements: *70284747084300
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70348038221160 !ruby/object:Gem::Requirement
+  requirement: &70284746634060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70348038221160
+  version_requirements: *70284746634060
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70348038219940 !ruby/object:Gem::Requirement
+  requirement: &70284746630840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348038219940
+  version_requirements: *70284746630840
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70348038218800 !ruby/object:Gem::Requirement
+  requirement: &70284740758960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348038218800
+  version_requirements: *70284740758960
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70348038231900 !ruby/object:Gem::Requirement
+  requirement: &70284740785920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70348038231900
+  version_requirements: *70284740785920
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70348038230440 !ruby/object:Gem::Requirement
+  requirement: &70284740784760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70348038230440
+  version_requirements: *70284740784760
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70348038227800 !ruby/object:Gem::Requirement
+  requirement: &70284740782660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70348038227800
+  version_requirements: *70284740782660
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70348038242760 !ruby/object:Gem::Requirement
+  requirement: &70284740797300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70348038242760
+  version_requirements: *70284740797300
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70348038241540 !ruby/object:Gem::Requirement
+  requirement: &70284740796020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70348038241540
+  version_requirements: *70284740796020
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70348038240380 !ruby/object:Gem::Requirement
+  requirement: &70284740792180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70348038240380
+  version_requirements: *70284740792180
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70348038239560 !ruby/object:Gem::Requirement
+  requirement: &70284740791220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70348038239560
+  version_requirements: *70284740791220
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70348038238780 !ruby/object:Gem::Requirement
+  requirement: &70284740804680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,10 +166,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70348038238780
+  version_requirements: *70284740804680
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70348038238080 !ruby/object:Gem::Requirement
+  requirement: &70284740803480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,7 +177,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70348038238080
+  version_requirements: *70284740803480
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -816,7 +816,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2174257304759105634
+      hash: 219358527196005840
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -825,7 +825,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2174257304759105634
+      hash: 219358527196005840
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: