alchemy_cms 2.1.beta6 → 2.1.rc2

data/spec/models/picture_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Alchemy::Picture 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
+
+		context "image has no suffix" do
+
+			before(:each) do
+				@pic = stub_model(Alchemy::Picture, :image_filename => 'kitten')
+			end
+
+			it "should return empty string" do
+				@pic.suffix.should == ""
+			end
+
+		end
+
+	end
+
+	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 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
+
+			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
+
+		end
+
+	end
+
+end

data/spec/page_layout_spec.rb

@@ -5,7 +5,7 @@ describe Alchemy::PageLayout do
 	context "method get_layouts" do
 
 	  it "should generally return page_layouts, nothing else!" do
-			Alchemy::PageLayout.get_layouts.should be_instance_of(Array)
+			Alchemy::PageLayout.read_layouts_file.should be_instance_of(Array)
 	  end
 
 	end
@@ -19,7 +19,7 @@ describe Alchemy::PageLayout do
 			File.open(layouts_file,'w') do |page_layouts|
 				page_layouts.puts "- name: testlayout\n  elements:"
 			end
-			Alchemy::PageLayout.get_layouts.first.values.should include("testlayout")
+			Alchemy::PageLayout.read_layouts_file.first.values.should include("testlayout")
 		end
 
 		after(:each) do

data/spec/routing_spec.rb

@@ -14,7 +14,7 @@ describe "The Routing", :type => :routing do
 				:action => "download",
 				:id => "32",
 				:name => "Presseveranstaltung",
-				:suffix => "pdf"
+				:format => "pdf"
 			)
 		end
 
@@ -52,4 +52,208 @@ describe "The Routing", :type => :routing do
 
 	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

data/spec/spec_helper.rb

@@ -1,43 +1,64 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
+begin
+	require 'spork'
+rescue LoadError => e
+end
+
+def configure
+	# Configure Rails Environment
+	ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+	require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
-require 'database_cleaner'
-DatabaseCleaner.strategy = :truncation
-DatabaseCleaner.clean
+	require 'database_cleaner'
+	DatabaseCleaner.strategy = :truncation
 
-# Seed the database
-Alchemy::Seeder.seed!
+	require 'authlogic/test_case'
+	include Authlogic::TestCase
 
-require 'authlogic/test_case'
-include Authlogic::TestCase
+	require "rails/test_help"
+	require "rspec/rails"
+	require 'factory_girl'
+	require 'factories.rb'
 
-require "rails/test_help"
-require "rspec/rails"
-require 'factory_girl'
-require 'factories.rb'
+	ActionMailer::Base.delivery_method = :test
+	ActionMailer::Base.perform_deliveries = true
+	ActionMailer::Base.default_url_options[:host] = "test.com"
 
-ActionMailer::Base.delivery_method = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = "test.com"
+	Rails.backtrace_cleaner.remove_silencers!
 
-Rails.backtrace_cleaner.remove_silencers!
+	# Configure capybara for integration testing
+	require "capybara/rails"
+	require 'capybara-webkit'
+	Capybara.default_driver   = :rack_test
+	Capybara.default_selector = :css
+	Capybara.javascript_driver = :webkit
 
-# Configure capybara for integration testing
-require "capybara/rails"
-require 'capybara-webkit'
-Capybara.default_driver   = :rack_test
-Capybara.default_selector = :css
-Capybara.javascript_driver = :webkit
+	# Load support files
+	Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+	RSpec.configure do |config|
+		require 'rspec/expectations'
+		config.include RSpec::Matchers
+		config.include Alchemy::Engine.routes.url_helpers
+		config.mock_with :rspec
+		config.use_transactional_fixtures = true
+	end
+	
+end
 
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+def seed
+	# This code will be run each time you run your specs.
+	DatabaseCleaner.clean
+
+	# Seed the database
+	Alchemy::Seeder.seed!
+
+end
 
-RSpec.configure do |config|
-	require 'rspec/expectations'
-	config.include RSpec::Matchers
-	config.include Alchemy::Engine.routes.url_helpers
-	config.mock_with :rspec
-	config.use_transactional_fixtures = true
+if defined?(Spork)
+	Spork.prefork  { configure }
+	Spork.each_run { seed }
+else
+	configure
+	seed
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.beta6
+  version: 2.1.rc2
   prerelease: 4
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70121821390860 !ruby/object:Gem::Requirement
+  requirement: &70147981731880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70121821390860
+  version_requirements: *70147981731880
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70121821401520 !ruby/object:Gem::Requirement
+  requirement: &70147981731420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121821401520
+  version_requirements: *70147981731420
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70121821409460 !ruby/object:Gem::Requirement
+  requirement: &70147981730800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121821409460
+  version_requirements: *70147981730800
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70121821407360 !ruby/object:Gem::Requirement
+  requirement: &70147981730220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70121821407360
+  version_requirements: *70147981730220
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70121821414800 !ruby/object:Gem::Requirement
+  requirement: &70147981729700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70121821414800
+  version_requirements: *70147981729700
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70121817605760 !ruby/object:Gem::Requirement
+  requirement: &70147981729220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121817605760
+  version_requirements: *70147981729220
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70121817604900 !ruby/object:Gem::Requirement
+  requirement: &70147981728720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70121817604900
+  version_requirements: *70147981728720
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70121817603820 !ruby/object:Gem::Requirement
+  requirement: &70147981728240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70121817603820
+  version_requirements: *70147981728240
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70121817601740 !ruby/object:Gem::Requirement
+  requirement: &70147981727760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70121817601740
+  version_requirements: *70147981727760
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70121817600740 !ruby/object:Gem::Requirement
+  requirement: &70147982232860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70121817600740
+  version_requirements: *70147982232860
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70121817599680 !ruby/object:Gem::Requirement
+  requirement: &70147982232380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *70121817599680
+  version_requirements: *70147982232380
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70121817897460 !ruby/object:Gem::Requirement
+  requirement: &70147982231900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,21 +144,21 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70121817897460
+  version_requirements: *70147982231900
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70121817896720 !ruby/object:Gem::Requirement
+  requirement: &70147982231420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70121817896720
+  version_requirements: *70147982231420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70121817895920 !ruby/object:Gem::Requirement
+  requirement: &70147982231040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,18 +166,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121817895920
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70121817894440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70121817894440
+  version_requirements: *70147982231040
 description: Alchemy is an awesome Rails CMS with an extremely flexible content storing
   architecture.
 email:
@@ -192,6 +181,7 @@ files:
 - .travis.yml
 - .yardopts
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -216,18 +206,23 @@ files:
 - app/assets/javascripts/alchemy/alchemy.base.js
 - app/assets/javascripts/alchemy/alchemy.buttons.js
 - app/assets/javascripts/alchemy/alchemy.dirty.js
-- app/assets/javascripts/alchemy/alchemy.dragndrop.js.erb
+- app/assets/javascripts/alchemy/alchemy.dragndrop.js
 - app/assets/javascripts/alchemy/alchemy.element_editor_selector.js
+- app/assets/javascripts/alchemy/alchemy.elements_window.js
 - app/assets/javascripts/alchemy/alchemy.growler.js
 - app/assets/javascripts/alchemy/alchemy.image_cropper.js
+- app/assets/javascripts/alchemy/alchemy.jquery_loader.js
 - app/assets/javascripts/alchemy/alchemy.js
 - app/assets/javascripts/alchemy/alchemy.js_extensions.js
 - app/assets/javascripts/alchemy/alchemy.link_overlay.js
+- app/assets/javascripts/alchemy/alchemy.menubar.js
 - app/assets/javascripts/alchemy/alchemy.page_sorter.js
 - app/assets/javascripts/alchemy/alchemy.preview.js
+- app/assets/javascripts/alchemy/alchemy.preview_window.js
 - app/assets/javascripts/alchemy/alchemy.routes.js.erb
 - app/assets/javascripts/alchemy/alchemy.swf_upload.js
 - app/assets/javascripts/alchemy/alchemy.windows.js
+- app/assets/javascripts/alchemy/menubar.js
 - app/assets/javascripts/alchemy/preview.js
 - app/assets/javascripts/tiny_mce/plugins/alchemy_link/editor_plugin.js
 - app/assets/javascripts/tiny_mce/plugins/alchemy_link/langs/de.js
@@ -241,6 +236,7 @@ files:
 - app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss
 - app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss
 - app/assets/stylesheets/alchemy/jquery.sb.css.scss
+- app/assets/stylesheets/alchemy/menubar.css.scss
 - app/assets/stylesheets/alchemy/print.css
 - app/assets/stylesheets/alchemy/standard_set.css
 - app/assets/stylesheets/alchemy/tinymce_content.css.scss
@@ -431,6 +427,8 @@ files:
 - app/views/alchemy/elements/_claim_view.html.erb
 - app/views/alchemy/elements/_contactform_editor.html.erb
 - app/views/alchemy/elements/_contactform_view.html.erb
+- app/views/alchemy/elements/_download_editor.html.erb
+- app/views/alchemy/elements/_download_view.html.erb
 - app/views/alchemy/elements/_editor_not_found.html.erb
 - app/views/alchemy/elements/_footnote_editor.html.erb
 - app/views/alchemy/elements/_footnote_view.html.erb
@@ -559,20 +557,21 @@ files:
 - db/migrate/20110707190728_add_render_size_to_essence_pictures.rb
 - db/migrate/20110711142057_change_open_link_in_new_window_to_link_target.rb
 - db/migrate/20110919110451_add_default_role_to_users.rb
-- db/migrate/20111116125112_namespace_models.rb
+- db/migrate/20111116125112_namespace_alchemy_models.rb
 - lib/alchemy/auth_engine.rb
 - lib/alchemy/capistrano.rb
 - lib/alchemy/config.rb
 - lib/alchemy/engine.rb
 - lib/alchemy/essence.rb
-- lib/alchemy/file_utilz.rb
 - lib/alchemy/i18n.rb
 - lib/alchemy/modules.rb
+- lib/alchemy/mount_point.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/upgrader.rb
 - lib/alchemy/version.rb
 - lib/alchemy_cms.rb
 - lib/extensions/action_view.rb
@@ -598,8 +597,10 @@ files:
 - lib/rails/generators/alchemy/scaffold/files/pages.html.erb
 - lib/rails/generators/alchemy/scaffold/scaffold_generator.rb
 - lib/rails/templates/alchemy.rb
+- lib/tasks/ferret.rake
 - lib/tasks/fleximage.rake
 - lib/tasks/install.rake
+- lib/tasks/routes.rake
 - lib/tasks/upgrade.rake
 - script/rails
 - spec/alchemy_spec.rb
@@ -651,6 +652,7 @@ files:
 - spec/helpers/elements_helper_spec.rb
 - spec/helpers/essences_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
+- spec/helpers/url_helpers_spec.rb
 - spec/integration/admin/pages_controller_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/integration/pages_controller_spec.rb
@@ -660,6 +662,7 @@ files:
 - spec/models/essence_richtext_spec.rb
 - spec/models/language_spec.rb
 - spec/models/page_spec.rb
+- spec/models/picture_spec.rb
 - spec/models/user_spec.rb
 - spec/page_layout_spec.rb
 - spec/routing_spec.rb
@@ -788,7 +791,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1117988886947097574
+      hash: 2407653424282561050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -852,6 +855,7 @@ test_files:
 - spec/helpers/elements_helper_spec.rb
 - spec/helpers/essences_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
+- spec/helpers/url_helpers_spec.rb
 - spec/integration/admin/pages_controller_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/integration/pages_controller_spec.rb
@@ -861,6 +865,7 @@ test_files:
 - spec/models/essence_richtext_spec.rb
 - spec/models/language_spec.rb
 - spec/models/page_spec.rb
+- spec/models/picture_spec.rb
 - spec/models/user_spec.rb
 - spec/page_layout_spec.rb
 - spec/routing_spec.rb