alchemy_cms 2.1.beta6 → 2.1.rc2

data/lib/tasks/routes.rake

@@ -0,0 +1,29 @@
+desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
+task :routes => :environment do
+	Rails.application.reload_routes!
+	all_routes = Alchemy::Engine.routes.routes
+	
+	if ENV['CONTROLLER']
+		all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] }
+	end
+
+	routes = all_routes.collect do |route|
+	
+		reqs = route.requirements.dup
+		reqs[:to] = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
+		reqs = reqs.empty? ? "" : reqs.inspect
+	
+		{:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
+	end
+	
+	 # Skip the route if it's internal info route
+	routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|^/assets} }
+	
+	name_width = routes.map{ |r| r[:name].length }.max
+	verb_width = routes.map{ |r| r[:verb].length }.max
+	path_width = routes.map{ |r| r[:path].length }.max
+	
+	routes.each do |r|
+		puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
+	end
+end

data/lib/tasks/upgrade.rake

@@ -1,72 +1,10 @@
+require File.join(File.dirname(__FILE__), '../alchemy/upgrader.rb')
+
 namespace :alchemy do
-	
+
 	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
-
+		Alchemy::Upgrader.run!
 	end
 
-end
+end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -7,7 +7,7 @@ describe Alchemy::Admin::PagesController do
 		Alchemy::UserSession.create Factory(:admin_user)
 	end
 
-	describe "#flush", :focus => true do
+	describe "#flush" do
 
 		it "should remove the cache of all pages" do
 			post :flush, {:format => :js}

data/spec/controllers/pages_controller_spec.rb

@@ -99,4 +99,35 @@ describe Alchemy::PagesController do
 
 	end
 
+	describe "url nesting" do
+
+		before(:each) do
+			@catalog = Factory(:public_page, :name => "Catalog", :parent_id => @default_language_root.id, :language => @default_language)
+			@products = Factory(:public_page, :name => "Products", :parent_id => @catalog.id, :language => @default_language)
+			@product = Factory(:public_page, :name => "Screwdriver", :parent_id => @products.id, :language => @default_language)
+			@product.elements.find_by_name('article').contents.essence_texts.first.essence.update_attribute(:body, 'screwdriver')
+			controller.stub!(:configuration) { |arg| arg == :url_nesting ? true : false }
+		end
+
+		context "with correct levelnames in params" do
+
+			it "should show the requested page" do
+				get :show, {:level1 => 'catalog', :level2 => 'products', :urlname => 'screwdriver'}
+				response.status.should == 200
+				response.body.should have_content("screwdriver")
+			end
+
+		end
+
+		context "with incorrect levelnames in params" do
+
+			it "should show 404 page" do
+				get :show, {:level1 => 'catalog', :level2 => 'faqs', :urlname => 'screwdriver'}
+				response.status.should == 404
+			end
+
+		end
+
+	end
+
 end

data/spec/factories.rb

@@ -34,33 +34,42 @@ FactoryGirl.define do
 	end
 
 	factory :page, :class => 'Alchemy::Page' do
+
 		language { Alchemy::Language.find_by_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 :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
+			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
-	
+		name 'article'
+	end
+
 end

data/spec/helpers/admin/base_helper_spec.rb

@@ -38,11 +38,4 @@ describe Alchemy::Admin::BaseHelper do
 
   end
 
-	context "modules" do
-		it "should render main navi entries for all core modules" do
-			pending 'Do not know how to test helpers defined as helper_method in controller'
-			helper.admin_main_navigation.should have_selector('a.main_navi_entry')
-		end
-	end
-
 end

data/spec/helpers/pages_helper_spec.rb

@@ -3,30 +3,61 @@ require 'spec_helper'
 include Alchemy::BaseHelper
 
 describe Alchemy::PagesHelper do
-	
+
+	before(:each) do
+		helper.stub(:configuration).and_return(false)
+	end
+
 	it "should render the current page layout" do
 		@page = Factory(:public_page)
-		helper.stub(:configuration).and_return(true)
 		render_page_layout.should have_selector('div#content')
 	end
 
 	describe "#render_navigation" do
-		it "should render the page navigation" do
+
+		before(:each) do
 			@language = Alchemy::Language.get_default
 			@root_page = Factory(:language_root_page, :language => @language, :name => 'Home')
 			@page = Factory(:public_page, :language => @language, :parent_id => @root_page.id, :visible => true)
-			helper.stub(:multi_language?).and_return(false)
-			helper.render_navigation.should have_selector('ul.navigation_level_1 li.a-public-page.active.last a.active[href="/alchemy/a-public-page"]')
 		end
+
+		context "not in multi_language mode" do
+
+			before(:each) do
+				helper.stub(:multi_language?).and_return(false)
+			end
+
+			it "should render the page navigation" do
+				helper.render_navigation.should have_selector('ul.navigation_level_1 li.a-public-page.active.last a.active[href="/alchemy/a-public-page"]')
+			end
+
+			context "with enabled url nesting" do
+
+				before(:each) do
+					helper.stub!(:configuration).and_return(true)
+					@level2 = Factory(:public_page, :parent_id => @page.id, :language => @language, :name => 'Level 2', :visible => true)
+					@page = Factory(:public_page, :parent_id => @level2.id, :language => @language, :name => 'Nested Page', :visible => true)
+				end
+
+				it "should render nested page links" do
+					helper.render_navigation(:all_sub_menues => true).should have_selector('ul li a[href="/alchemy/a-public-page/level-2/nested-page"]')
+				end
+
+			end
+
+		end
+
 	end
 	
 	describe "#render_breadcrumb" do
 		
 		before(:each) do
 			helper.stub(:multi_language?).and_return(false)
+			@root = mock_model('Page', :urlname => 'root', :name => 'Root', :title => 'Root', :visible? => false, :public? => false, :restricted? => false)
 			@language_root = mock_model('Page', :urlname => 'language_root', :name => 'Language Root', :title => 'Language Root', :visible? => true, :public? => true, :restricted? => false)
 			@page = mock_model('Page', :urlname => 'a-public-page', :name => 'A Public Page', :title => 'A Public Page', :visible? => true, :public? => true, :restricted? => false)
-			@language_root.should_receive(:parent).and_return(nil)
+			@root.should_receive(:parent).and_return(nil)
+			@language_root.should_receive(:parent).and_return(@root)
 			@page.should_receive(:parent).and_return(@language_root)
 		end
 		
@@ -227,12 +258,11 @@ describe Alchemy::PagesHelper do
 			@default_language = Alchemy::Language.get_default
 			@klingonian = Factory(:language)
 			# simulates link_to_public_child = true
-			helper.stub(:configuration).and_return(true)
 			helper.stub(:multi_language?).and_return(true)
+			helper.stub(:configuration) { |arg| arg == :redirect_to_public_child ? true : false }
 		end
 
 		it "should return nil when having only one public language" do
-			helper.stub(:configuration).and_return(true)
 			helper.language_switcher.should be nil
 		end
 
@@ -242,37 +272,32 @@ describe Alchemy::PagesHelper do
 				@default_language_root = Factory(:language_root_page, :language => @default_language, :name => 'Default Language Root')
 				@klingonian_language_root = Factory(:language_root_page)
 			end
-			
+
 			context "and config redirect_to_public_child is set to TRUE" do
-				
-				before :each do
-					# simulates link_to_public_child = true
-					helper.stub(:configuration).and_return(true)
-				end
-				
+
 				it "should return nil if only one language_root is public and both do not have children" do
 					@klingonian_language_root.update_attributes(:public => false)
 					helper.language_switcher.should == nil
 				end
-				
+
 				it "should return nil if only one language_root is public and both have none public children" do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => false, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => false, :name => "child1")
 					helper.language_switcher.should == nil
 				end
-				
+
 				it "should render two links when having two public language_root pages" do
 					helper.language_switcher.should have_selector('a', :count => 2)
 				end
-			
+
 				it "should render two links when having just one public language_root but a public children in both language_roots" do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
 					helper.language_switcher.should have_selector('a', :count => 2)
 				end
-			
+
 				it "should render two links when having two not public language_roots but a public children in both" do
 					@default_language_root.update_attributes(:public => false)
 					@klingonian_language_root.update_attributes(:public => false)
@@ -280,7 +305,7 @@ describe Alchemy::PagesHelper do
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
 					helper.language_switcher.should have_selector('a', :count => 2)
 				end
-			
+
 				it "should return nil when having two not public language_roots and a public children in only one of them" do
 					@default_language_root.update_attributes(:public => false)
 					@klingonian_language_root.update_attributes(:public => false)
@@ -288,27 +313,27 @@ describe Alchemy::PagesHelper do
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
 					helper.language_switcher.should == nil
 				end
-				
+
 			end
-		
+
 			context "and config redirect_to_public_child is set to FALSE" do
-				
+
 				before :each do
 					# simulates link_to_public_child = false
 					helper.stub(:configuration).and_return(false)
 				end
-				
+
 				it "should render two links when having two public language_root pages" do
 					helper.language_switcher.should have_selector('a', :count => 2)
 				end
-				
+
 				it "should render nil when having just one public language_root but a public children in both language_roots" do
 					@klingonian_language_root.update_attributes(:public => false)
 					@default_first_public_child = Factory(:page, :language => @default_language, :parent_id => @default_language_root.id, :public => true, :name => "child1")
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
 					helper.language_switcher.should == nil
 				end
-				
+
 				it "should render nil when having two not public language_roots but a public children in both" do
 					@default_language_root.update_attributes(:public => false)
 					@klingonian_language_root.update_attributes(:public => false)
@@ -316,11 +341,11 @@ describe Alchemy::PagesHelper do
 					@klingonian_first_public_child = Factory(:page, :language => @klingonian, :parent_id => @klingonian_language_root.id, :public => true, :name => "child1")
 					helper.language_switcher.should == nil
 				end
-				
+
 			end
-		
+
 		end
-		
+
 	end
 
 end

data/spec/helpers/url_helpers_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "URL generating" do
+
+	it "should generate a url string for cropped picture" do
+		p = show_picture_path(:id => 3, :crop => "crop", :size => "100x33", :name => "kitten", :format => "jpg")
+		p.should == "/alchemy/pictures/3/show/100x33/crop/kitten.jpg"
+	end
+
+	it "should generate a url string for cropped and masked picture" do
+		p = show_picture_path(:id => 3, :crop => "crop", :crop_from => "0x0", :crop_size => "900x300", :size => "100x33", :name => "kitten", :format => :jpg)
+		p.should == "/alchemy/pictures/3/show/100x33/crop/0x0/900x300/kitten.jpg"
+	end
+
+	it "should generate a url string for picture with default format" do
+		p = show_picture_path(:id => 3, :size => "100x33", :name => 'kitten')
+		p.should == "/alchemy/pictures/3/show/100x33/kitten.#{Alchemy::Config.get(:image_output_format)}"
+	end
+
+	it "should generate a url string for cropped thumbnail" do
+		p = thumbnail_path(:id => 3, :crop => "crop", :size => "100x33", :name => "kitten", :format => :jpg)
+		p.should == "/alchemy/pictures/3/thumbnails/100x33/crop/kitten.jpg"
+	end
+
+	it "should generate a url string for thumbnail with default name and format" do
+		p = thumbnail_path(:id => 3, :size => "100x33")
+		p.should == "/alchemy/pictures/3/thumbnails/100x33/thumbnail.png"
+	end
+
+	it "should generate a url string for cropped and masked thumbnail" do
+		p = thumbnail_path(:id => 3, :crop_from => "0x0", :crop_size => "900x300", :size => "100x33", :name => "kitten", :format => :jpg)
+		p.should == "/alchemy/pictures/3/thumbnails/100x33/0x0/900x300/kitten.jpg"
+	end
+
+	it "should generate a url string for zoomed image" do
+		p = zoom_picture_path(:id => 3, :name => "kitten", :format => :jpg)
+		p.should == "/alchemy/pictures/3/zoom/kitten.jpg"
+	end
+
+end

data/spec/integration/admin/pages_controller_spec.rb

@@ -77,9 +77,9 @@ end
 # We need this, because the before blocks losing its session under webkit-capybara (https://github.com/thoughtbot/capybara-webkit/issues/222)
 def login_to_alchemy
 	visit '/alchemy/admin/login'
-	fill_in('alchemy_user_session_login', :with => 'jdoe')
-	fill_in('alchemy_user_session_password', :with => 's3cr3t')
-	click_on('Login')
+	fill_in('Username', :with => 'jdoe')
+	fill_in('Password', :with => 's3cr3t')
+	click_on('login')
 end
 
 end