alchemy_cms 2.1.12 → 2.2.rc1

data/spec/models/picture_spec.rb

@@ -2,53 +2,53 @@ require 'spec_helper'
 
 describe Alchemy::Picture do
 
-	describe '#suffix' do
+  describe '#suffix' do
 
-		it "should return the suffix of original filename" do
-			pic = stub_model(Alchemy::Picture, :image_filename => 'kitten.JPG')
-			pic.suffix.should == "jpg"
-		end
+    it "should return the suffix of original filename" do
+      pic = stub_model(Alchemy::Picture, :image_filename => 'kitten.JPG')
+      pic.suffix.should == "jpg"
+    end
 
-		context "image has no suffix" do
+    context "image has no suffix" do
 
-			before(:each) do
-				@pic = stub_model(Alchemy::Picture, :image_filename => 'kitten')
-			end
+      before(:each) do
+        @pic = stub_model(Alchemy::Picture, :image_filename => 'kitten')
+      end
 
-			it "should return empty string" do
-				@pic.suffix.should == ""
-			end
+      it "should return empty string" do
+        @pic.suffix.should == ""
+      end
 
-		end
+    end
 
-	end
+  end
 
-	describe '#humanized_name' do
+  describe '#humanized_name' do
 
-		it "should return a humanized version of original filename" do
-			pic = stub_model(Alchemy::Picture, :image_filename => 'cute_kitten.JPG')
-			pic.humanized_name.should == "Cute kitten"
-		end
+    it "should return a humanized version of original filename" do
+      pic = stub_model(Alchemy::Picture, :image_filename => 'cute_kitten.JPG')
+      pic.humanized_name.should == "Cute kitten"
+    end
 
-		it "should not remove incidents of suffix from filename" do
-			pic = stub_model(Alchemy::Picture, :image_filename => 'cute_kitten_mo.jpgi.JPG')
-			pic.humanized_name.should == "Cute kitten mo.jpgi"
-			pic.humanized_name.should_not == "Cute kitten moi"
-		end
+    it "should not remove incidents of suffix from filename" do
+      pic = stub_model(Alchemy::Picture, :image_filename => 'cute_kitten_mo.jpgi.JPG')
+      pic.humanized_name.should == "Cute kitten mo.jpgi"
+      pic.humanized_name.should_not == "Cute kitten moi"
+    end
 
-		context "image has no suffix" do
+    context "image has no suffix" do
 
-			before(:each) do
-				@pic = stub_model(Alchemy::Picture, :image_filename => 'cute_kitten')
-				@pic.stub!(:suffix).and_return("")
-			end
+      before(:each) do
+        @pic = stub_model(Alchemy::Picture, :image_filename => 'cute_kitten')
+        @pic.stub!(:suffix).and_return("")
+      end
 
-			it "should return humanized name" do
-				@pic.humanized_name.should == "Cute kitten"
-			end
+      it "should return humanized name" do
+        @pic.humanized_name.should == "Cute kitten"
+      end
 
-		end
+    end
 
-	end
+  end
 
 end

data/spec/models/user_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 describe Alchemy::User do
-  
+
   it "should have a role" do
     @user = Factory.build(:user)
     @user.save_without_session_maintenance
     @user.role.should_not be_nil
   end
-  
+
 end

data/spec/page_layout_spec.rb

@@ -1,31 +1,35 @@
 require 'spec_helper'
 
 describe Alchemy::PageLayout do
-	
-	context "method get_layouts" do
 
-	  it "should generally return page_layouts, nothing else!" do
-			Alchemy::PageLayout.read_layouts_file.should be_instance_of(Array)
-	  end
+  context "method get_layouts" do
 
-	end
+    it "should generally return page_layouts, nothing else!" do
+      Alchemy::PageLayout.read_layouts_file.should be_instance_of(Array)
+    end
 
-	context "with custom page layouts" do
+  end
 
-		it "should return the users page_layouts if exists in the application" do
-			@config_path = Rails.root.join("config/alchemy")
-			FileUtils.mkdir_p(@config_path)
-			layouts_file = File.join(@config_path, 'page_layouts.yml')
-			File.open(layouts_file,'w') do |page_layouts|
-				page_layouts.puts "- name: testlayout\n  elements:"
-			end
-			Alchemy::PageLayout.read_layouts_file.first.values.should include("testlayout")
-		end
+  context "with custom page layouts" do
 
-		after(:each) do
-			FileUtils.rm_rf(@config_path)
-		end
+    it "should return the users page_layouts if exists in the application" do
+      @config_path = Rails.root.join("config/alchemy")
+      FileUtils.mkdir_p(@config_path)
+      layouts_file = File.join(@config_path, 'page_layouts.yml')
+      File.open(layouts_file, 'w') do |page_layouts|
+        page_layouts.puts "- name: testlayout\n  elements:"
+      end
+      Alchemy::PageLayout.read_layouts_file.first.values.should include("testlayout")
+    end
 
-	end
+    after(:each) do
+      FileUtils.rm_rf(@config_path)
+    end
+
+  end
+  
+  it "should not display hidden page layouts" do
+    Alchemy::PageLayout.selectable_layouts(Factory(:language)).each { |e| e["hide"].should_not == true }
+  end
 
 end

data/spec/routing_spec.rb

@@ -2,258 +2,258 @@ 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
-			{
-				:get => "/attachment/32/download/Presseveranstaltung.pdf"
-			}.should route_to(
-				:controller => "alchemy/attachments",
-				:action => "download",
-				:id => "32",
-				:name => "Presseveranstaltung",
-				:format => "pdf"
-			)
-		end
-
-		it "should have a route for legacy Alchemy 1.x downloads" do
-			{
-				:get => "/attachment/32/download?name=Presseveranstaltung.pdf"
-			}.should route_to(
-				:controller => "alchemy/attachments",
-				:action => "download",
-				:id => "32"
-			)
-		end
-
-		it "should have a route for legacy washAPP downloads" do
-			{
-				:get => "/wa_files/download/11"
-			}.should route_to(
-				:controller => "alchemy/attachments",
-				:action => "download",
-				:id => "11"
-			)
-		end
-
-		it "should have a route for legacy WebMate downloads" do
-			{
-				:get => "/uploads/files/0000/0028/Pressetext.pdf"
-			}.should route_to(
-				:controller => "alchemy/attachments",
-				:action => "download",
-				:id => "0028",
-				:name => "Pressetext",
-				:suffix => "pdf"
-			)
-		end
-
-	end
-
-	describe "nested url" do
-
-		context "one level deep nested" do
-
-			it "should route to pages show" do
-				{
-					:get => "/products/my-product"
-				}.should route_to(
-					:controller => "alchemy/pages",
-					:action => "show",
-					:level1 => "products",
-					:urlname => "my-product"
-				)
-			end
-
-			context "and language" do
-
-				it "should route to pages show" do
-					{
-						:get => "/de/products/my-product"
-					}.should route_to(
-						:controller => "alchemy/pages",
-						:action => "show",
-						:level1 => "products",
-						:urlname => "my-product",
-						:lang => "de"
-					)
-				end
-
-			end
-
-		end
-
-		context "two levels deep nested" do
-
-			it "should route to pages show" do
-				{
-					:get => "/catalog/products/my-product"
-				}.should route_to(
-					:controller => "alchemy/pages",
-					:action => "show",
-					:level1 => "catalog",
-					:level2 => "products",
-					:urlname => "my-product"
-				)
-			end
-
-			context "and language" do
-
-				it "should route to pages show" do
-					{
-						:get => "/de/catalog/products/my-product"
-					}.should route_to(
-						:controller => "alchemy/pages",
-						:action => "show",
-						:level1 => "catalog",
-						:level2 => "products",
-						:urlname => "my-product",
-						:lang => "de"
-					)
-				end
-
-			end
-
-		end
-
-		context "with a blog date url" do
-
-			it "should route to pages show" do
-				{
-					:get => "/2011/12/08/my-post"
-				}.should route_to(
-					:controller => "alchemy/pages",
-					:action => "show",
-					:level1 => "2011",
-					:level2 => "12",
-					:level3 => "08",
-					:urlname => "my-post"
-				)
-			end
-
-			context "and language" do
-
-				it "should route to pages show" do
-					{
-						:get => "/de/2011/12/08/my-post"
-					}.should route_to(
-						:controller => "alchemy/pages",
-						:action => "show",
-						:level1 => "2011",
-						:level2 => "12",
-						:level3 => "08",
-						:urlname => "my-post",
-						:lang => "de"
-					)
-				end
-
-			end
-
-		end
-
-	end
-
-	describe "for displaying pictures" do
-
-		it "should route to show action" do
-			{
-				:get => "/pictures/3/show/900x300/kitten.jpg"
-			}.should route_to(
-				:controller => "alchemy/pictures",
-				:action => "show",
-				:id => "3",
-				:size => "900x300",
-				:name => "kitten",
-				:format => "jpg"
-			)
-		end
-
-		it "should route to cropped show action" do
-			{
-				:get => "/pictures/3/show/900x300/crop/kitten.jpg"
-			}.should route_to(
-				:controller => "alchemy/pictures",
-				:action => "show",
-				:id => "3",
-				:size => "900x300",
-				:crop => "crop",
-				:name => "kitten",
-				:format => "jpg"
-			)
-		end
-
-		it "should route to cropped mask show action" do
-			get(
-				"/pictures/3/show/300x300/crop/200x50/100x100/kitten.jpg"
-			).should route_to(
-				:controller => "alchemy/pictures",
-				:action => "show",
-				:id => "3",
-				:size => "300x300",
-				:crop => "crop",
-				:crop_from => "200x50",
-				:crop_size => "100x100",
-				:name => "kitten",
-				:format => "jpg"
-			)
-		end
-
-		it "should route to thumbnail action" do
-			get(
-				"/pictures/3/thumbnails/small/kitten.jpg"
-			).should route_to(
-				:controller => "alchemy/pictures",
-				:action => "thumbnail",
-				:id => "3",
-				:size => "small",
-				:name => "kitten",
-				:format => "jpg"
-			)
-		end
-
-		it "should route to cropped thumbnail action" do
-			get(
-				"/pictures/3/thumbnails/small/crop/kitten.jpg"
-			).should route_to(
-				:controller => "alchemy/pictures",
-				:action => "thumbnail",
-				:id => "3",
-				:crop => "crop",
-				:size => "small",
-				:name => "kitten",
-				:format => "jpg"
-			)
-		end
-
-		it "should route to cropped and masked thumbnail" do
-			get(
-				"/pictures/3/thumbnails/small/0x0/200x200/kitten.jpg"
-			).should route_to(
-				:controller => "alchemy/pictures",
-				:action => "thumbnail",
-				:id => "3",
-				:crop_from => "0x0",
-				:crop_size => "200x200",
-				:size => "small",
-				:name => "kitten",
-				:format => "jpg"
-			)
-		end
-
-		it "should route to zoomed picture" do
-			get(
-				"/pictures/3/zoom/kitten.jpg"
-			).should route_to(
-				:controller => "alchemy/pictures",
-				:action => "zoom",
-				:id => "3",
-				:name => "kitten",
-				:format => "jpg"
-			)
-		end
-
-	end
+  before(:each) { @routes = Alchemy::Engine.routes }
+
+  context "for downloads" do
+
+    it "should have a named route" do
+      {
+        :get => "/attachment/32/download/Presseveranstaltung.pdf"
+      }.should route_to(
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "32",
+                 :name => "Presseveranstaltung",
+                 :format => "pdf"
+               )
+    end
+
+    it "should have a route for legacy Alchemy 1.x downloads" do
+      {
+        :get => "/attachment/32/download?name=Presseveranstaltung.pdf"
+      }.should route_to(
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "32"
+               )
+    end
+
+    it "should have a route for legacy washAPP downloads" do
+      {
+        :get => "/wa_files/download/11"
+      }.should route_to(
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "11"
+               )
+    end
+
+    it "should have a route for legacy WebMate downloads" do
+      {
+        :get => "/uploads/files/0000/0028/Pressetext.pdf"
+      }.should route_to(
+                 :controller => "alchemy/attachments",
+                 :action => "download",
+                 :id => "0028",
+                 :name => "Pressetext",
+                 :suffix => "pdf"
+               )
+    end
+
+  end
+
+  describe "nested url" do
+
+    context "one level deep nested" do
+
+      it "should route to pages show" do
+        {
+          :get => "/products/my-product"
+        }.should route_to(
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "products",
+                   :urlname => "my-product"
+                 )
+      end
+
+      context "and language" do
+
+        it "should route to pages show" do
+          {
+            :get => "/de/products/my-product"
+          }.should route_to(
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "products",
+                     :urlname => "my-product",
+                     :lang => "de"
+                   )
+        end
+
+      end
+
+    end
+
+    context "two levels deep nested" do
+
+      it "should route to pages show" do
+        {
+          :get => "/catalog/products/my-product"
+        }.should route_to(
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "catalog",
+                   :level2 => "products",
+                   :urlname => "my-product"
+                 )
+      end
+
+      context "and language" do
+
+        it "should route to pages show" do
+          {
+            :get => "/de/catalog/products/my-product"
+          }.should route_to(
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "catalog",
+                     :level2 => "products",
+                     :urlname => "my-product",
+                     :lang => "de"
+                   )
+        end
+
+      end
+
+    end
+
+    context "with a blog date url" do
+
+      it "should route to pages show" do
+        {
+          :get => "/2011/12/08/my-post"
+        }.should route_to(
+                   :controller => "alchemy/pages",
+                   :action => "show",
+                   :level1 => "2011",
+                   :level2 => "12",
+                   :level3 => "08",
+                   :urlname => "my-post"
+                 )
+      end
+
+      context "and language" do
+
+        it "should route to pages show" do
+          {
+            :get => "/de/2011/12/08/my-post"
+          }.should route_to(
+                     :controller => "alchemy/pages",
+                     :action => "show",
+                     :level1 => "2011",
+                     :level2 => "12",
+                     :level3 => "08",
+                     :urlname => "my-post",
+                     :lang => "de"
+                   )
+        end
+
+      end
+
+    end
+
+  end
+
+  describe "for displaying pictures" do
+
+    it "should route to show action" do
+      {
+        :get => "/pictures/3/show/900x300/kitten.jpg"
+      }.should route_to(
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "900x300",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
+    end
+
+    it "should route to cropped show action" do
+      {
+        :get => "/pictures/3/show/900x300/crop/kitten.jpg"
+      }.should route_to(
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "900x300",
+                 :crop => "crop",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
+    end
+
+    it "should route to cropped mask show action" do
+      get(
+        "/pictures/3/show/300x300/crop/200x50/100x100/kitten.jpg"
+      ).should route_to(
+                 :controller => "alchemy/pictures",
+                 :action => "show",
+                 :id => "3",
+                 :size => "300x300",
+                 :crop => "crop",
+                 :crop_from => "200x50",
+                 :crop_size => "100x100",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
+    end
+
+    it "should route to thumbnail action" do
+      get(
+        "/pictures/3/thumbnails/small/kitten.jpg"
+      ).should route_to(
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
+    end
+
+    it "should route to cropped thumbnail action" do
+      get(
+        "/pictures/3/thumbnails/small/crop/kitten.jpg"
+      ).should route_to(
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :crop => "crop",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
+    end
+
+    it "should route to cropped and masked thumbnail" do
+      get(
+        "/pictures/3/thumbnails/small/0x0/200x200/kitten.jpg"
+      ).should route_to(
+                 :controller => "alchemy/pictures",
+                 :action => "thumbnail",
+                 :id => "3",
+                 :crop_from => "0x0",
+                 :crop_size => "200x200",
+                 :size => "small",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
+    end
+
+    it "should route to zoomed picture" do
+      get(
+        "/pictures/3/zoom/kitten.jpg"
+      ).should route_to(
+                 :controller => "alchemy/pictures",
+                 :action => "zoom",
+                 :id => "3",
+                 :name => "kitten",
+                 :format => "jpg"
+               )
+    end
+
+  end
 
 end