alchemy_cms 2.0.pre3 → 2.0.pre4

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--debug

data/Gemfile

@@ -3,9 +3,15 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in alchemy.gemspec
 gemspec
 
-group :development do
+group :development, :test do
   gem 'gettext', '~>2.0', :git => 'git://github.com/cameel/gettext.git', :require => false
-  gem "capybara", ">= 0.4.0"
-  gem "rspec-rails", ">= 2.0.0.beta"
-  gem "sqlite3"
+	gem "rspec-rails", ">= 2.0.0.beta"
+end
+
+group :test do
+	gem 'factory_girl_rails'
+	gem "capybara", ">= 0.4.0"
+	gem "launchy"
+	gem "sqlite3"
+	gem "database_cleaner"
 end

data/alchemy_cms.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Thomas von Deyen", "Robin Böning", "Carsten Fregin"]
   s.email       = ["alchemy@magiclabs.de"]
   s.homepage    = "http://alchemy-cms.com"
-  s.summary     = %q{A CMS for Rails 3}
-  s.description = %q{A CMS for Rails 3}
+  s.summary     = %q{An extremly flexbile CMS for Rails 3.}
+  s.description = %q{Alchemy is an awesome Rails CMS with an extremely flexible content storing architecture.}
   s.requirements << 'ImageMagick (libmagick), v6.6 or greater.'
   s.license = 'GPL-3'
   
@@ -33,4 +33,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<jquery-rails>, ["~> 1.0"])
   s.add_runtime_dependency(%q<tinymce_hammer>, ["~> 0.2"])
   s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.1"])
+  
+  s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
+  s.add_development_dependency(%q<rspec-rails>, [">= 2.0.0.beta"])
+  s.add_development_dependency(%q<sqlite3>)
 end

data/app/controllers/alchemy_controller.rb

@@ -19,7 +19,7 @@ class AlchemyController < ApplicationController
   before_filter :mailer_set_url_options
   
   helper_method :current_server, :configuration, :multi_language?, :current_user, :clipboard_empty?, :trash_empty?, :get_clipboard
-  helper :errors, :layout
+  helper :layout
   
   def render_errors_or_redirect(object, redicrect_url, flash_notice, button = nil)
     if object.errors.empty?
@@ -32,7 +32,7 @@ class AlchemyController < ApplicationController
   
   def render_remote_errors(object, button = nil)
     render :update do |page|
-      page << "jQuery('#errors').html('<ul>" + object.errors.sum{|a, b| "<li>" + _(b) + "</li>"} + "</ul>')"
+      page << "jQuery('#errors').html('<ul>" + object.errors.sum { |a, b| "<li>" + _(b) + "</li>" } + "</ul>')"
       page << "jQuery('#errors').show()"
       page << "Alchemy.enableButton('#{button}')" unless button.blank?
     end
@@ -137,7 +137,6 @@ private
   end
 
   def set_stamper
-    FastGettext.text_domain = 'alchemy'
     User.stamper = self.current_user
   end
 
@@ -152,7 +151,6 @@ private
 protected
 
   def init_gettext#:nodoc:
-    FastGettext.text_domain = 'alchemy'
     FastGettext.available_locales = configuration(:translations).collect { |l| l[:language_code] }
   end
 
@@ -160,9 +158,9 @@ protected
   # You can set the default_translation in your config/alchemy/config.yml file
   def set_translation
     if current_user.blank? || current_user.language.blank?
-      FastGettext.locale = configuration(:default_translation)
+      FastGettext.locale = configuration(:default_translation) || I18n.locale
     else
-      FastGettext.locale = current_user.language
+      FastGettext.locale = current_user.language || I18n.locale
     end
   end
 

data/app/helpers/pages_helper.rb

@@ -92,23 +92,15 @@ module PagesHelper
         end
         page = page_found_by_layout || page
         page = (options[:link_to_public_child] ? (page.first_public_child.blank? ? nil : page.first_public_child) : nil) if !page.public?
-      
+        
         if !page.blank?
           active = session[:language_id] == page.language.id
-          if options[:linkname]
-            if options[:linkname].to_sym == :code
-              linkname = page.language.code
-            else
-              linkname = I18n.t("alchemy.languages.#{page.language.code}.name", :default => page.language.name)
-            end
-          else
-            linkname = ""
-          end
+          linkname = page.language.label(options[:linkname])
           if options[:as_select_box]
             languages << [linkname, show_page_with_language_url(:urlname => page.urlname, :lang => page.language.code)]
           else
             languages << link_to(
-              "#{content_tag(:span, '', :class => "flag")}#{ content_tag(:span, linkname)}",
+              "#{content_tag(:span, '', :class => "flag")}#{ content_tag(:span, linkname)}".html_safe,
               show_page_with_language_path(:urlname => page.urlname, :lang => page.language.code),
               :class => "#{(active ? 'active ' : nil)}#{page.language.code} #{(i == 0) ? 'first' : (i==pages.length-1) ? 'last' : nil}",
               :title => options[:show_title] ? I18n.t("alchemy.languages.#{page.language.code}.title", :default => page.language.name) : nil
@@ -128,13 +120,11 @@ module PagesHelper
         )
       else
         if options[:spacer].blank?
-          return languages
+          return languages.html_safe
         else
-          return languages.join(options[:spacer])
+          return languages.join(options[:spacer]).html_safe
         end
       end
-    else
-      ""
     end
   end
 

data/app/models/language.rb

@@ -30,11 +30,19 @@ class Language < ActiveRecord::Base
     self.find_by_default(true)
   end
 
+  def label(attrib)
+    if attrib.to_sym == :code
+      self.code
+    else
+      I18n.t("name", :scope => "alchemy.languages.#{self.code}", :default => self.name)
+    end
+  end
+
 private
 
   def publicity_of_default_language
     if self.default? && !self.public?
-      errors.add_to_base(N_("Defaut language has to be public"))
+      errors.add(:base, N_("Defaut language has to be public"))
       return false
     else
       return true
@@ -43,7 +51,7 @@ private
 
   def presence_of_default_language
     if Language.get_default == self && self.default_changed?
-      errors.add_to_base(N_("we_need_at_least_one_default"))
+      errors.add(:base, N_("we_need_at_least_one_default"))
       return false
     else
       return true

data/app/models/page.rb

@@ -128,7 +128,7 @@ class Page < ActiveRecord::Base
   end
 
   def set_url_name
-    self.urlname = generate_url_name((self.urlname.blank? ? self.name : self.urlname))
+    self.urlname = convert_url_name((self.urlname.blank? ? self.name : self.urlname))
   end
 
   def set_title
@@ -201,6 +201,7 @@ class Page < ActiveRecord::Base
   end
 
   # Returns the translated explanation of seven the page stati.
+  # TODO: Let I18n do this!
   def humanized_status
     case self.status
     when 0
@@ -319,7 +320,7 @@ class Page < ActiveRecord::Base
   end
 
   def first_public_child
-    self.children.where(:public => true).limit(1)
+    self.children.where(:public => true).limit(1).first
   end
 
   def self.language_root_for(language_id)
@@ -455,24 +456,15 @@ private
     end
     return Page.where(conditions).order(order_direction).limit(1)
   end
-
-  def generate_url_name(url_name)
-    new_url_name = url_name.to_s.downcase
-    new_url_name = new_url_name.gsub(/[ä]/, 'ae')
-    new_url_name = new_url_name.gsub(/[ü]/, 'ue')
-    new_url_name = new_url_name.gsub(/[ö]/, 'oe')
-    new_url_name = new_url_name.gsub(/[Ä]/, 'AE')
-    new_url_name = new_url_name.gsub(/[Ü]/, 'UE')
-    new_url_name = new_url_name.gsub(/[Ö]/, 'OE')
-    new_url_name = new_url_name.gsub(/[ß]/, 'ss')
-    new_url_name = new_url_name.gsub(/[^a-zA-Z0-9_]+/, '-')
-    if(new_url_name.length < 3)
-      new_url_name = "-#{new_url_name}-"
-    else
-      new_url_name.gsub(/-+$/, '')
-    end
-  end
-
+  
+  # Converts the given nbame into an url friendly string
+  # Names shorter than 3 will be filled with dashes, so it does not collidate with the language code.
+	def convert_url_name(name)
+		url_name = name.gsub(/[äÄ]/, 'ae').gsub(/[üÜ]/, 'ue').gsub(/[öÖ]/, 'oe').parameterize
+		url_name = ('-' * (3 - url_name.length)) + url_name if url_name.length < 3
+		return url_name
+	end
+  
   # Looks in the layout_descripion, if there are elements to autogenerate.
   # If so, it generates them.
   def autogenerate_elements

data/config/alchemy/config.yml

@@ -93,6 +93,7 @@ default_language:
   :page_layout_name: contact
   :forward_to_page: false
   :mail_success_page: thanks
+  :mail_from: your.mail@your-domain.com
   :fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
   :validate_fields:
     :lastname:

data/config/initializers/fast_gettext.rb

@@ -1,2 +1,3 @@
 require 'fast_gettext'
-FastGettext.add_text_domain 'alchemy', :path => File.join(File.dirname(__FILE__), '..', '..', 'locale')
+FastGettext.add_text_domain 'alchemy', :path => File.join(File.dirname(__FILE__), '..', '..', 'locale')
+FastGettext.default_text_domain = 'alchemy'

data/config/initializers/tiny_mce_hammer.rb

@@ -2,31 +2,31 @@ if defined?(Tinymce::Hammer)
   Tinymce::Hammer.install_path = '/javascripts/alchemy/tiny_mce'
   Tinymce::Hammer.plugins = %w(safari paste fullscreen inlinepopups alchemy_link)
   Tinymce::Hammer.languages = ['de', 'en']
-  Tinymce::Hammer.init = [
-    [:paste_convert_headers_to_strong, true],
-    [:paste_convert_middot_lists, true],
-    [:paste_remove_spans, true],
-    [:paste_remove_styles, true],
-    [:paste_strip_class_attributes, true],
-    [:theme, 'advanced'],
-    [:skin, 'o2k7'],
-    [:skin_variant, 'silver'],
-    [:inlinepopups_skin, 'alchemy'],
-    [:popup_css, "/stylesheets/alchemy/alchemy_tinymce_dialog.css"],
-    [:content_css, "/stylesheets/alchemy/alchemy_tinymce_content.css"],
-    [:dialog_type, "modal"],
-    [:width, "100%"],
-    [:height, '185'],
-    [:theme_advanced_toolbar_align, 'left'],
-    [:theme_advanced_toolbar_location, 'top'],
-    [:theme_advanced_statusbar_location, 'bottom'],
-    [:theme_advanced_buttons1, 'bold,italic,underline,strikethrough,sub,sup,|,numlist,bullist,indent,outdent,|,alchemy_link,unlink,|,removeformat,cleanup,|,fullscreen'],
-    [:theme_advanced_buttons2, 'pastetext,pasteword,charmap,code,help'],
-    [:theme_advanced_buttons3, ''],
-    [:theme_advanced_resizing, 'true'],
-    [:theme_advanced_resize_horizontal, false],
-    [:theme_advanced_resizing_min_height, '185'],
-    [:fix_list_elements, true],
-    [:convert_urls, false]
-  ]
+  Tinymce::Hammer.init = {
+    :paste_convert_headers_to_strong => true,
+    :paste_convert_middot_lists => true,
+    :paste_remove_spans => true,
+    :paste_remove_styles => true,
+    :paste_strip_class_attributes => true,
+    :theme => 'advanced',
+    :skin => 'o2k7',
+    :skin_variant => 'silver',
+    :inlinepopups_skin => 'alchemy',
+    :popup_css => "/stylesheets/alchemy/alchemy_tinymce_dialog.css",
+    :content_css => "/stylesheets/alchemy/alchemy_tinymce_content.css",
+    :dialog_type => "modal",
+    :width => "100%",
+    :height => '185',
+    :theme_advanced_toolbar_align => 'left',
+    :theme_advanced_toolbar_location => 'top',
+    :theme_advanced_statusbar_location => 'bottom',
+    :theme_advanced_buttons1 => 'bold,italic,underline,strikethrough,sub,sup,|,numlist,bullist,indent,outdent,|,alchemy_link,unlink,|,removeformat,cleanup,|,fullscreen',
+    :theme_advanced_buttons2 => 'pastetext,pasteword,charmap,code,help',
+    :theme_advanced_buttons3 => '',
+    :theme_advanced_resizing => 'true',
+    :theme_advanced_resize_horizontal => false,
+    :theme_advanced_resizing_min_height => '185',
+    :fix_list_elements => true,
+    :convert_urls => false
+  }
 end

data/db/migrate/20110919110451_add_default_role_to_users.rb

@@ -0,0 +1,9 @@
+class AddDefaultRoleToUsers < ActiveRecord::Migration
+  def self.up
+    change_column_default :users, :role, "registered"
+  end
+
+  def self.down
+    change_column_default :users, :role, nil
+  end
+end

data/lib/alchemy/capistrano.rb

@@ -0,0 +1,93 @@
+# This recipe contains Capistrano recipes for handling the uploads, ferret index and picture cache files while deploying your application.
+# It also contains a ferret:rebuild_index task to rebuild the index after deploying your application.
+
+Capistrano::Configuration.instance(:must_exist).load do
+  
+  after "deploy:setup", "alchemy:shared_folders:create"
+  after "deploy:symlink", "alchemy:shared_folders:symlink"
+  
+  before "deploy:restart", "alchemy:files:copy"
+  
+  namespace :alchemy do
+
+    namespace :shared_folders do
+
+      # This task creates the shared folders for uploads, picture cache and ferret index while setting up your server.
+      # Call after deploy:setup like +after "deploy:setup", "alchemy:create_shared_folders"+ in your +deploy.rb+.
+      desc "Creates the uploads and picture cache directory in the shared folder. Call after deploy:setup"
+      task :create, :roles => :app do
+        run "mkdir -p #{shared_path}/uploads"
+        run "mkdir -p #{shared_path}/index"
+        run "mkdir -p #{shared_path}/uploads/pictures"
+        run "mkdir -p #{shared_path}/uploads/attachments"
+        run "mkdir -p #{shared_path}/cache"
+        run "mkdir -p #{shared_path}/cache/pictures"
+      end
+
+      # This task sets the symlinks for uploads, picture cache and ferret index folder.
+      # Call after deploy:symlink like +after "deploy:symlink", "alchemy:symlink_folders"+ in your +deploy.rb+.
+      desc "Sets the symlinks for uploads, picture cache and ferret index folder. Call after deploy:symlink"
+      task :symlink, :roles => :app do
+        run "rm -rf #{current_path}/public/uploads/*"
+        run "ln -nfs #{shared_path}/uploads/pictures/ #{current_path}/uploads/pictures"
+        run "ln -nfs #{shared_path}/uploads/attachments/ #{current_path}/uploads/attachments"
+        run "rm -rf #{current_path}/public/pictures"
+        run "ln -nfs #{shared_path}/cache/pictures/ #{current_path}/public/pictures"
+        run "rm -rf #{current_path}/index"
+        run "ln -nfs #{shared_path}/index/ #{current_path}/index"
+      end
+
+    end
+
+    namespace :files do
+
+      desc "Copies all assets and migration files from Alchemy to project"
+      task :copy do
+        run "cd #{current_path} && RAILS_ENV=production #{rake} alchemy:assets:copy:all"
+        run "cd #{current_path} && RAILS_ENV=production #{rake} alchemy:migrations:sync"
+      end
+
+    end
+
+  	namespace :database_yml do
+
+  		desc "Creates the database.yml file"
+  	  task :create do
+  	    db_config = ERB.new <<-EOF
+  production:
+    adapter: mysql
+    encoding: utf8
+    reconnect: false
+    pool: 5
+    database: #{ Capistrano::CLI.ui.ask("Database name: ") }
+    username: #{ Capistrano::CLI.ui.ask("Database username: ") }
+    password: #{ Capistrano::CLI.ui.ask("Database password: ") }
+    socket: #{ Capistrano::CLI.ui.ask("Database socket: ") }
+    host: #{ Capistrano::CLI.ui.ask("Database host: ") }
+  EOF
+  	    run "mkdir -p #{shared_path}/config"
+  	    put db_config.result, "#{shared_path}/config/database.yml"
+  	  end
+
+  		desc "Symlinks the database.yml file from shared folder into config folder"
+  		task :symlink, :except => { :no_release => true } do
+        run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
+      end
+
+  	end
+
+  end
+
+  namespace :ferret do
+
+    # This task rebuilds the ferret index for the EssenceText and EssenceRichtext Models.
+    # Call it before deploy:restart like +before "deploy:restart", "alchemy:rebuild_index"+ in your +deploy.rb+.
+    # It uses the +alchemy:rebuild_index+ rake task found in +vendor/plugins/alchemy/lib/tasks+.
+    desc "Rebuild the ferret index. Call before deploy:restart"
+    task :rebuild_index, :roles => :app do
+      run "cd #{current_path} && RAILS_ENV=production #{rake} ferret:rebuild_index"
+    end
+
+  end
+  
+end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   
-  VERSION = "2.0.pre3"
+  VERSION = "2.0.pre4"
   
 end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110711142057) do
+ActiveRecord::Schema.define(:version => 20110919110451) do
 
   create_table "attachments", :force => true do |t|
     t.string   "name"
@@ -242,20 +242,20 @@ ActiveRecord::Schema.define(:version => 20110711142057) do
     t.string   "login"
     t.string   "email"
     t.string   "gender"
-    t.string   "role"
+    t.string   "role",                               :default => "registered"
     t.string   "language"
-    t.string   "crypted_password",    :limit => 128, :default => "", :null => false
-    t.string   "password_salt",       :limit => 128, :default => "", :null => false
-    t.integer  "login_count",                        :default => 0,  :null => false
-    t.integer  "failed_login_count",                 :default => 0,  :null => false
+    t.string   "crypted_password",    :limit => 128, :default => "",           :null => false
+    t.string   "password_salt",       :limit => 128, :default => "",           :null => false
+    t.integer  "login_count",                        :default => 0,            :null => false
+    t.integer  "failed_login_count",                 :default => 0,            :null => false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
     t.string   "current_login_ip"
     t.string   "last_login_ip"
-    t.string   "persistence_token",                                  :null => false
-    t.string   "single_access_token",                                :null => false
-    t.string   "perishable_token",                                   :null => false
+    t.string   "persistence_token",                                            :null => false
+    t.string   "single_access_token",                                          :null => false
+    t.string   "perishable_token",                                             :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "creator_id"

data/spec/factories.rb

@@ -0,0 +1,43 @@
+FactoryGirl.define do
+	
+	factory :user do
+		email 'john@doe.com'
+		login "jdoe"
+		password 's3cr3t'
+		password_confirmation 's3cr3t'
+
+		factory :admin_user do
+  		role "admin"
+  	end
+
+  	factory :registered_user do
+  		role "registered"
+  	end
+
+  	factory :author_user do
+  		role "author"
+  	end
+
+  	factory :editor_user do
+  		role "editor"
+  	end
+
+	end
+	
+	factory :language do
+		code "kl"
+		name 'Klingonian'
+		default false
+		frontpage_name 'tuq'
+		page_layout 'intro'
+		public true
+	end
+	
+	factory :page do
+		name "tuq"
+		page_layout "intro"
+		association :language
+		public false
+	end
+	
+end

data/spec/integration/security_spec.rb

@@ -14,8 +14,8 @@ describe "Security: " do
     end
   end
   
-  context "If users are present" do
-    it "one should not to be able to signup" do
+  context "If on or more users are present" do
+    it "a visitor should not be able to signup" do
       @user = User.create({:login => 'foo', :email => 'foo@bar.com', :password => 's3cr3t', :password_confirmation => 's3cr3t'})
       visit '/admin/signup'
       within('#alchemy_greeting') { page.should_not have_content('have to signup') }

data/spec/language_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Language do
+
+	before(:all) do
+		@language = Factory(:language)
+	end
+	
+	after(:all) do
+		@language.destroy if @language
+	end
+
+	it "should return a label for code" do
+	  @language.label(:code).should == 'kl'
+	end 
+
+	it "should return a label for name" do
+		@language.label(:name).should == 'Klingonian'
+	end
+		
+	it "should not be deletable if it is the default language" do
+		@default_language = Language.find_by_default(true)
+		if !@default_language
+			@default_language = Factory(:language, :name => "default", :code => "aa", :frontpage_name => "intro", :default => true)
+		end
+		expect { @default_language.destroy }.should raise_error
+	end
+
+end

data/spec/page_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Page do
+	
+	it "should get a webfriendly urlname on create" do
+		page = Factory(:page, :name => 'klingon$&stößel ')
+		page.urlname.should == 'klingon-stoessel'
+	end
+	
+  it "should generate a three letter urlname from two letter name" do
+    page = Factory(:page, :name => 'Au')
+    page.urlname.should == '-au'
+  end
+  
+  it "should generate a three letter urlname from two letter name with umlaut" do
+    page = Factory(:page, :name => 'Aü')
+    page.urlname.should == 'aue'
+  end
+  
+  it "should generate a three letter urlname from one letter name" do
+    page = Factory(:page, :name => 'A')
+    page.urlname.should == '--a'
+  end
+  
+	context "Root pages" do
+		it "should contain one ore more rootpages" do
+			Page.where(:parent_id => nil).any?
+		end
+	end
+	
+	context "with children" do
+		before(:each) do
+			@page = Factory(:page)
+			@first_child = Factory(:page, :name => "First child", :language => @page.language, :public => false)
+			@first_child.move_to_child_of(@page)
+			
+			@first_public_child = Factory(:page, :name => "First public child", :language => @page.language, :public => true)
+			@first_public_child.move_to_child_of(@page)
+		end
+		
+		it "should return a page object (or nil if no public children exists) for first_public_child" do
+			if @page.children.any?
+				@page.first_public_child.should == @first_public_child
+			else
+				@page.first_public_child.should == nil
+			end
+		end
+	end
+	
+end

data/spec/spec_helper.rb

@@ -8,6 +8,12 @@ FastGettext.text_domain = 'alchemy'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
+require 'factory_girl'
+require 'database_cleaner'
+require 'factories.rb'
+
+DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.clean
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
@@ -27,14 +33,11 @@ ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__
 Alchemy::Seeder.seed!
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
-  # Remove this line if you don't want RSpec's should and should_not
-  # methods or matchers
   require 'rspec/expectations'
   config.include RSpec::Matchers
-
-  # == Mock Framework
   config.mock_with :rspec
+  config.use_transactional_fixtures = true
 end

data/spec/user_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe User do
+  
+  it "should have a role" do
+    @user = Factory.create(:user)
+    @user.role.should_not be_nil
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: alchemy_cms
 version: !ruby/object:Gem::Version 
-  hash: 1923831935
+  hash: 1923831921
   prerelease: 4
   segments: 
   - 2
   - 0
   - pre
-  - 3
-  version: 2.0.pre3
+  - 4
+  version: 2.0.pre4
 platform: ruby
 authors: 
 - Thomas von Deyen
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -232,7 +232,54 @@ dependencies:
         version: "0.1"
   type: :runtime
   version_requirements: *id014
-description: A CMS for Rails 3
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31098209
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        version: 2.0.0.beta
+  type: :development
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id017
+description: Alchemy is an awesome Rails CMS with an extremely flexible content storing architecture.
 email: 
 - alchemy@magiclabs.de
 executables: 
@@ -243,6 +290,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - .yardopts
 - Gemfile
 - LICENSE
@@ -278,7 +326,6 @@ files:
 - app/helpers/admin/pictures_helper.rb
 - app/helpers/alchemy_helper.rb
 - app/helpers/elements_helper.rb
-- app/helpers/errors_helper.rb
 - app/helpers/layout_helper.rb
 - app/helpers/pages_helper.rb
 - app/mailers/messages.rb
@@ -688,6 +735,8 @@ files:
 - db/migrate/20110530102804_change_pages_page_layout_column.rb
 - 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
+- lib/alchemy/capistrano.rb
 - lib/alchemy/config.rb
 - lib/alchemy/controller.rb
 - lib/alchemy/engine.rb
@@ -721,7 +770,6 @@ files:
 - lib/tasks/install.rake
 - lib/tasks/upgrade.rake
 - lib/translation_extras/alchemy_core_modules.rb
-- lib/vendor/i18n_label.rb
 - locale/alchemy.pot
 - locale/de/LC_MESSAGES/alchemy.mo
 - locale/de/alchemy.po
@@ -729,7 +777,6 @@ files:
 - locale/en/alchemy.po
 - locale/missing_translations.rb
 - locale/model_attributes.rb
-- recipes/alchemy_capistrano_tasks.rb
 - spec/alchemy_spec.rb
 - spec/config_spec.rb
 - spec/dummy/Rakefile
@@ -909,9 +956,13 @@ files:
 - spec/dummy/public/stylesheets/alchemy/jquery.sb.css
 - spec/dummy/public/stylesheets/alchemy/standard_set.css
 - spec/dummy/script/rails
+- spec/factories.rb
 - spec/integration/navigation_spec.rb
 - spec/integration/security_spec.rb
+- spec/language_spec.rb
+- spec/page_spec.rb
 - spec/spec_helper.rb
+- spec/user_spec.rb
 homepage: http://alchemy-cms.com
 licenses: 
 - GPL-3
@@ -946,7 +997,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A CMS for Rails 3
+summary: An extremly flexbile CMS for Rails 3.
 test_files: 
 - spec/alchemy_spec.rb
 - spec/config_spec.rb
@@ -1127,6 +1178,10 @@ test_files:
 - spec/dummy/public/stylesheets/alchemy/jquery.sb.css
 - spec/dummy/public/stylesheets/alchemy/standard_set.css
 - spec/dummy/script/rails
+- spec/factories.rb
 - spec/integration/navigation_spec.rb
 - spec/integration/security_spec.rb
+- spec/language_spec.rb
+- spec/page_spec.rb
 - spec/spec_helper.rb
+- spec/user_spec.rb

data/app/helpers/errors_helper.rb

@@ -1,37 +0,0 @@
-module ErrorsHelper
-
-  def error_messages_for(*params)
-    options = params.extract_options!.symbolize_keys
-    if object = options.delete(:object)
-      objects = [object].flatten
-    else
-      objects = params.collect {|object_name| instance_variable_get("@#{object_name}") }.compact
-    end
-    count   = objects.inject(0) {|sum, object| sum + object.errors.length }
-    unless count.zero?
-      html = {}
-      [:id, :class].each do |key|
-        if options.include?(key)
-          value = options[key]
-          html[key] = value unless value.blank?
-        else
-          html[key] = 'errorExplanation'
-        end
-      end
-      options[:object_name] ||= params.first
-      options[:header_message] = I18n.t("activerecord.errors.template.header", {:count => count, :model => object.class.to_s.humanize}) unless options.include?(:header_message)
-      options[:message] ||= I18n.t('activerecord.errors.template.body') unless options.include?(:message)
-      error_messages = objects.map {|object| object.errors.collect{ |column,error| content_tag( :li, error ) } }
-
-      contents = ''
-      contents << content_tag(options[:header_tag] || :h2, options[:header_message]) unless options[:header_message].blank?
-      contents << content_tag(:p, options[:message]) unless options[:message].blank?
-      contents << content_tag(:ul, error_messages)
-
-      content_tag(:div, contents, html)
-    else
-      ''
-    end
-  end
-
-end

data/lib/vendor/i18n_label.rb

@@ -1,23 +0,0 @@
-# Took from https://github.com/iain/i18n_label
-module ActionView
-  module Helpers
-    class InstanceTag
-      def to_label_tag(text = nil, options = {})
-        options = options.stringify_keys
-        name_and_id = options.dup
-        add_default_name_and_id(name_and_id)
-        options.delete("index")
-        options["for"] ||= name_and_id["id"]
-        if text.blank?
-          content = method_name.humanize
-          if object.class.respond_to?(:human_attribute_name)
-            content = object.class.human_attribute_name(method_name)
-          end
-        else
-          content = text.to_s
-        end
-        label_tag(name_and_id["id"], content, options)
-      end
-    end
-  end
-end

data/recipes/alchemy_capistrano_tasks.rb

@@ -1,83 +0,0 @@
-# This recipe contains Capistrano recipes for handling the uploads, ferret index and picture cache files while deploying your application.
-# It also contains a ferret:rebuild_index task to rebuild the index after deploying your application.
-
-namespace :alchemy do
-  
-  namespace :shared_folders do
-    
-    # This task creates the shared folders for uploads, picture cache and ferret index while setting up your server.
-    # Call after deploy:setup like +after "deploy:setup", "alchemy:create_shared_folders"+ in your +deploy.rb+.
-    desc "Creates the uploads and picture cache directory in the shared folder. Call after deploy:setup"
-    task :create, :roles => :app do
-      run "mkdir -p #{shared_path}/uploads"
-      run "mkdir -p #{shared_path}/index"
-      run "mkdir -p #{shared_path}/uploads/pictures"
-      run "mkdir -p #{shared_path}/uploads/attachments"
-      run "mkdir -p #{shared_path}/cache"
-      run "mkdir -p #{shared_path}/cache/pictures"
-    end
-    
-    # This task sets the symlinks for uploads, picture cache and ferret index folder.
-    # Call after deploy:symlink like +after "deploy:symlink", "alchemy:symlink_folders"+ in your +deploy.rb+.
-    desc "Sets the symlinks for uploads, picture cache and ferret index folder. Call after deploy:symlink"
-    task :symlink, :roles => :app do
-      run "rm -rf #{current_path}/public/uploads/*"
-      run "ln -nfs #{shared_path}/uploads/pictures/ #{current_path}/uploads/pictures"
-      run "ln -nfs #{shared_path}/uploads/attachments/ #{current_path}/uploads/attachments"
-      run "rm -rf #{current_path}/public/pictures"
-      run "ln -nfs #{shared_path}/cache/pictures/ #{current_path}/public/pictures"
-      run "rm -rf #{current_path}/index"
-      run "ln -nfs #{shared_path}/index/ #{current_path}/index"
-    end
-    
-  end
-  
-  namespace :assets do
-    
-    desc "Copies all assets from Alchemy plugin folder to public folder"
-    task :copy do
-      run "cd #{current_path} && RAILS_ENV=production rake alchemy:assets:copy:all"
-    end
-    
-  end
-  
-	namespace :database_yml do
-		
-		desc "Creates the database.yml file"
-	  task :create do
-	    db_config = ERB.new <<-EOF
-production:
-  adapter: mysql
-  encoding: utf8
-  reconnect: false
-  pool: 5
-  database: #{ Capistrano::CLI.ui.ask("Database name: ") }
-  username: #{ Capistrano::CLI.ui.ask("Database username: ") }
-  password: #{ Capistrano::CLI.ui.ask("Database password: ") }
-  socket: #{ Capistrano::CLI.ui.ask("Database socket: ") }
-  host: #{ Capistrano::CLI.ui.ask("Database host: ") }
-EOF
-	    run "mkdir -p #{shared_path}/config"
-	    put db_config.result, "#{shared_path}/config/database.yml"
-	  end
-		
-		desc "Symlinks the database.yml file from shared folder into config folder"
-		task :symlink, :except => { :no_release => true } do
-      run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml" 
-    end
-		
-	end
-
-end
-
-namespace :ferret do
-  
-  # This task rebuilds the ferret index for the EssenceText and EssenceRichtext Models.
-  # Call it before deploy:restart like +before "deploy:restart", "alchemy:rebuild_index"+ in your +deploy.rb+.
-  # It uses the +alchemy:rebuild_index+ rake task found in +vendor/plugins/alchemy/lib/tasks+.
-  desc "Rebuild the ferret index. Call before deploy:restart"
-  task :rebuild_index, :roles => :app do
-    run "cd #{current_path} && RAILS_ENV=production rake ferret:rebuild_index"
-  end
-  
-end