alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/lib/alchemy/resources_helper.rb

@@ -2,7 +2,7 @@ module Alchemy
   module ResourcesHelper
 
     def resource_window_size
-      @resource_window_size ||= "400x#{100 + resource_handler.attributes.length * 35}"
+      @resource_window_size ||= "420x#{100 + resource_handler.attributes.length * 40}"
     end
 
     def resource_instance_variable
@@ -60,5 +60,12 @@ module Alchemy
       end
       obj
     end
+
+    def resource_help_text(attribute)
+      if help_text = resource_handler.help_text_for(attribute)
+        content_tag(:p, help_text, class: 'foot_note')
+      end
+    end
+
   end
 end

data/lib/alchemy/upgrader.rb

@@ -22,6 +22,7 @@ module Alchemy
         convert_picture_storage
         upgrade_to_sites
         removed_standard_set_notice
+        renamed_t_method
 
         display_todos
       end
@@ -256,6 +257,14 @@ WARN
         warn = <<-WARN
 We removed the standard set from Alchemy core!
 In order to get the standard set back, install the `alchemy-demo_kit` gem.
+WARN
+        todo warn
+      end
+
+      def renamed_t_method
+        warn = <<-WARN
+We renamed alchemy's `t` method override into `_t` to avoid conflicts with Rails own t method!
+If you use the `t` method to translate alchemy scoped keys, then you have to use the `_t` method from now on.
 WARN
         todo warn
       end

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.5.0.b5"
+  VERSION = "2.5.0.b9"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -26,15 +26,10 @@ if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'alchemy/auth_engine'
   require 'alchemy/engine'
   require 'alchemy/picture_attributes'
-  %w(config essence page_layout modules tinymce i18n scoped_pagination_url_helper resource resources_helper ferret_search).each do |class_name|
+  %w(config logger errors essence page_layout modules tinymce i18n scoped_pagination_url_helper resource resources_helper ferret_search).each do |class_name|
     require File.join(File.dirname(__FILE__), "alchemy", class_name)
   end
   require File.join(File.dirname(__FILE__), "alchemy", "seeder")
 else
   raise "Alchemy 2.5 needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
 end
-
-module Alchemy
-  class EssenceError < StandardError;
-  end
-end

data/lib/rails/generators/alchemy/scaffold/files/elements.yml

@@ -1,12 +1,12 @@
 # == In this configuration you setup Alchemy´s element layouts.
-# 
+#
 # Use rails generate alchemy:scaffold to generate this file for your app.
-# 
+#
 # Elements containing all necessary basic tools for displaying and editing content inside Alchemy.
 # They consists of composed contents (different essence-types) as shown in the illustration of an elements-sheme below.
 #
 # == Schema of an element
-# 
+#
 #   =================================
 #   #  Content 1 (EssenceText)      #
 #   #                               #
@@ -16,7 +16,7 @@
 #   =================================
 #
 # == Example of a basic element layout
-# 
+#
 #   - name: a_unique_name (Used for the partial name in +app/views/elements+ and translated as Element.display_name)
 #     unique: Bool //pass true if this element only can be displayed once on page
 #     contents:
@@ -36,34 +36,34 @@
 # * EssenceFlash              (Used to store attachment ids from attachments assigned through the library. The view renders an embeded object.)
 # * EssenceDate               (Used to store a DateTime object. The view output is passed through Rails I18n Library, so it will be fully localized.)
 # * EssenceHtml               (Used to store a String (max. 255 Chars.). The view output renders the raw, not sanitized or unescaped String. So be carefull!)
-# 
+#
 # After finishing the setup of your element layouts, you need to generate the files for the elements before using them in Alchemy.
 # For creating these files, use the following command in your terminal:
-# 
-#   rails generate elements
-# 
+#
+#   rails generate alchemy:elements
+#
 # All new elements will be created as two different partials in Rails.root/app/views/elements.
 # For each element there is an editor-view wich will be rendered when editing them in Alchemy and another view for the website´s frontend.
-# 
+#
 #   app/views/elements/_elements_name_editor.html.erb
 #   app/views/elements/_elements_name_view.html.erb
-# 
-# For most contents in an element you can specify additional options, so they get rendered in a specific way.
+#
+# For most contents of an element you can specify additional options, so they get rendered in a specific way.
 # These options can be defined as symbols, but its too much to list them up here.
 # You can find these options described in the application_helper.rb, most of them at the render_essence method.
 #
 # == Setting a content as preview-text for the element
-# 
+#
 # You can set a content-essence as preview-text for its element like this
 # take_me_for_preview: true
 #
 #
 # == Adding contents dynamically in the frontend
-# 
+#
 # You are able to add content-essences dynamically to the element from the Alchemy frontend.
 # You just have to make contents available for adding them.
 # This example enables this feature
-# 
+#
 #   - name: headline
 #     unique: false
 #     contents:
@@ -77,15 +77,37 @@
 #
 # Now an Alchemy user can add the content 'big_text' from the element as much as desired.
 #
-# === Translate element names
-# 
-# Element names are passed through the I18n library. So you can translate them in your config/locales language yml file.
-# 
+#
+# == Deactivate indexing (Ferret search) for certain contents
+#
+# Contents of type EssenceText and EssenceRichtext can be excluded from being indexed by the Ferret search engine.
+#
 # Example:
-#   
+#
+#   - name: contactform
+#     unique: true
+#     contents:
+#     - name: mail_to
+#       type: EssenceText
+#       do_not_index: true
+#
+#
+# == Validate contents before updating the element
+#
+# More informations in [Content#essence_validations]
+#
+#
+# == Translate element and content names
+#
+# Element and content names are passed through the I18n library. So you can translate them in your config/locales language yml file.
+#
+# Example:
+#
 #   de:
 #     alchemy:
 #       element_names:
 #         contact: Kontakt
 #         search: Suche
+#       content_names:
+#         headline: Überschrift
 

data/lib/rails/generators/alchemy/scaffold/scaffold_generator.rb

@@ -4,6 +4,7 @@ module Alchemy
   module Generators
     class ScaffoldGenerator < ::Rails::Generators::Base
       desc "This generator generates the Alchemy scaffold."
+      class_option :copy_views, :default => false, :type => :boolean, :desc => "Copy all Alchemy views into your app.", :aliases => '-v'
       source_root File.expand_path('templates', File.dirname(__FILE__))
 
       def create_config_dir
@@ -15,6 +16,10 @@ module Alchemy
         empty_directory Rails.root.join("app/views/alchemy/page_layouts")
       end
 
+      def copy_view_dirs
+        copy_alchemy_views if @options['copy_views']
+      end
+
       def copy_config
         copy_file "#{config_path}/config.yml", "#{Rails.root}/config/alchemy/config.yml"
       end
@@ -31,6 +36,14 @@ module Alchemy
         @config_path ||= File.expand_path('../../../../../config/alchemy', File.dirname(__FILE__))
       end
 
+      def copy_alchemy_views
+        %w(messages navigation notifications search).each do |dir|
+          src = File.expand_path("../../../../../app/views/alchemy/#{dir}", File.dirname(__FILE__))
+          dest = Rails.root.join('app/views/alchemy', dir)
+          directory src, dest
+        end
+      end
+
     end
   end
 end

data/lib/tasks/alchemy/db.rake

@@ -6,19 +6,13 @@ namespace :alchemy do
       Alchemy::Seeder.seed!
     end
 
-    desc "Dumps the database into 'db/dumps'. NOTE: This only works with MySQL yet."
+    desc "Dumps the database to STDOUT (Pass DUMP_FILENAME to store the dump into a file). NOTE: This only works with MySQL yet."
     task :dump => :environment do
       db_conf = Rails.configuration.database_configuration.fetch(Rails.env)
-      raise "Alchemy only supports MySQL database dumping at the moment." unless db_conf['adapter'] =~ /mysql/
-      FileUtils.mkdir_p(Rails.root.join('db/dumps'))
-      `mysqldump -u#{db_conf['username']}#{db_conf['password'].present? ? " -p'#{db_conf['password']}'" : nil} #{db_conf['database']} > #{Rails.root.join('db/dumps', dump_name)}`
-    end
-
-    def dump_name
-      return ENV['DUMP_FILENAME'] if ENV['DUMP_FILENAME'].present?
-      app_name = Rails.application.class.name.underscore.split('/').first
-      timestamp = Time.now.strftime('%Y-%m-%d-%H-%M')
-      dump_name = "#{app_name}-#{timestamp}.sql"
+      raise "Sorry, but Alchemy only supports MySQL database dumping at the moment." unless db_conf['adapter'] =~ /mysql/
+      dump_store = ENV['DUMP_FILENAME'] ? " > #{Rails.root.join('db/dumps', dump_name)}" : ""
+      cmd = "mysqldump --user='#{db_conf['username']}'#{db_conf['password'].present? ? " --password='#{db_conf['password']}'" : nil} #{db_conf['database']}#{dump_store}"
+      system cmd
     end
 
   end

data/lib/tasks/alchemy/install.rake

@@ -3,16 +3,16 @@ require 'thor'
 class Alchemy::RoutesInjector < Thor
   include Thor::Actions
 
-  def initialize; super; end
-
   no_tasks do
     def inject
-      @mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
-      @mountpoint = "/" if @mountpoint.empty?
+      mountpoint = ask "\nWhere do you want to mount Alchemy CMS? (/)"
+      mountpoint = "/" if mountpoint.empty?
       sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
-      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{@mountpoint}'\n", { :after => sentinel, :verbose => true }
+      inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { :after => sentinel, :verbose => true }
+      mountpoint
     end
   end
+
 end
 
 namespace :alchemy do
@@ -37,7 +37,7 @@ Now cd into your app folder and
 
 2. Open your browser and enter the following URL:
 
-  http://localhost:3000/#{@mountpoint}
+  http://localhost:3000/#{@mountpoint.gsub(/^\//, '')}
 
 3. Follow the instructions to complete the installation!
 
@@ -56,7 +56,7 @@ EOF
 
   desc "Mounts Alchemy into your routes."
   task :mount do
-    Alchemy::RoutesInjector.new.inject
+    @mountpoint = Alchemy::RoutesInjector.new.inject
   end
 
 end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -39,13 +39,13 @@ module Alchemy
 
     describe '#create' do
 
-      render_views
+      let(:parent) { FactoryGirl.create(:public_page) }
 
       context "with paste_from_clipboard in parameters" do
+        render_views
 
         let(:clipboard) { session[:clipboard] = Clipboard.new }
         let(:page_in_clipboard) { FactoryGirl.create(:public_page) }
-        let(:parent) { FactoryGirl.create(:public_page) }
 
         before(:each) do
           clipboard[:pages] = [{:id => page_in_clipboard.id, :action => 'cut'}]
@@ -59,6 +59,18 @@ module Alchemy
 
       end
 
+      context "with redirect_to in the parameters" do
+
+        let(:page_params) do
+          {:name => "Foobar", :page_layout => 'standard', :parent_id => parent.id}
+        end
+
+        it "should redirect to given url" do
+          post :create, :page => page_params, :redirect_to => admin_users_path
+          response.should redirect_to(admin_users_path)
+        end
+      end
+
     end
 
     describe '#copy_language_tree' do

data/spec/controllers/pages_controller_spec.rb

@@ -2,26 +2,21 @@ require 'spec_helper'
 
 describe Alchemy::PagesController do
 
-  render_views
-
-  before(:each) do
-    @default_language = Alchemy::Language.get_default
-    @default_language_root = FactoryGirl.create(:language_root_page, :language => @default_language, :name => 'Home', :public => true)
-  end
+  let(:default_language)      { Alchemy::Language.get_default }
+  let(:default_language_root) { FactoryGirl.create(:language_root_page, :language => default_language, :name => 'Home', :public => true) }
 
   context "requested for a page containing a feed" do
+    render_views
 
-    before(:each) do
-      @page = FactoryGirl.create(:public_page, :parent_id => @default_language_root.id, :page_layout => 'news', :name => 'News', :language => @default_language, :do_not_autogenerate => false)
-    end
+    let(:page) { FactoryGirl.create(:public_page, :parent_id => default_language_root.id, :page_layout => 'news', :name => 'News', :language => default_language, :do_not_autogenerate => false) }
 
     it "should render a rss feed" do
-      get :show, :urlname => 'news', :format => :rss
+      get :show, :urlname => page.urlname, :format => :rss
       response.content_type.should == 'application/rss+xml'
     end
 
     it "should include content" do
-      @page.elements.first.content_by_name('news_headline').essence.update_attributes({:body => 'Peters Petshop'})
+      page.elements.first.content_by_name('news_headline').essence.update_attributes({:body => 'Peters Petshop'})
       get :show, :urlname => 'news', :format => :rss
       response.body.should match /Peters Petshop/
     end
@@ -31,7 +26,7 @@ describe Alchemy::PagesController do
   context "requested for a page that does not contain a feed" do
 
     it "should render xml 404 error" do
-      get :show, :urlname => 'home', :format => :rss
+      get :show, :urlname => default_language_root.urlname, :format => :rss
       response.status.should == 404
     end
 
@@ -59,11 +54,14 @@ describe Alchemy::PagesController do
 
     context "with params layout set to not existing layout" do
       it "should raise ActionView::MissingTemplate" do
-        expect { get :show, :urlname => :home, :layout => 'lkuiuk' }.to raise_error(ActionView::MissingTemplate)
+        expect {
+          get :show, :urlname => default_language_root.urlname, :layout => 'lkuiuk'
+        }.to raise_error(ActionView::MissingTemplate)
       end
     end
 
     context "with param layout set to a custom layout" do
+      render_views
 
       before do
         @custom_layout = Rails.root.join('app/views/layouts', 'custom.html.erb')
@@ -73,7 +71,7 @@ describe Alchemy::PagesController do
       end
 
       it "should render the custom layout" do
-        get :show, :urlname => :home, :layout => 'custom'
+        get :show, :urlname => default_language_root.urlname, :layout => 'custom'
         response.body.should have_content('I am a custom layout')
       end
 
@@ -85,11 +83,12 @@ describe Alchemy::PagesController do
   end
 
   describe "url nesting" do
+    render_views
 
     before(:each) do
-      @catalog = FactoryGirl.create(:public_page, :name => "Catalog", :parent_id => @default_language_root.id, :language => @default_language)
-      @products = FactoryGirl.create(:public_page, :name => "Products", :parent_id => @catalog.id, :language => @default_language)
-      @product = FactoryGirl.create(:public_page, :name => "Screwdriver", :parent_id => @products.id, :language => @default_language, :do_not_autogenerate => false)
+      @catalog = FactoryGirl.create(:public_page, :name => "Catalog", :parent_id => default_language_root.id, :language => default_language)
+      @products = FactoryGirl.create(:public_page, :name => "Products", :parent_id => @catalog.id, :language => default_language)
+      @product = FactoryGirl.create(:public_page, :name => "Screwdriver", :parent_id => @products.id, :language => default_language, :do_not_autogenerate => false)
       @product.elements.find_by_name('article').contents.essence_texts.first.essence.update_column(:body, 'screwdriver')
       controller.stub!(:configuration) { |arg| arg == :url_nesting ? true : false }
     end
@@ -164,4 +163,38 @@ describe Alchemy::PagesController do
     end
   end
 
+  describe 'Redirecting to legacy page urls' do
+    context 'Request a page with legacy url' do
+
+      # otherwise we are redirected to signup
+      before { FactoryGirl.create(:admin_user) }
+
+      let(:page)        { FactoryGirl.create(:public_page, :name => 'New page name') }
+      let(:second_page) { FactoryGirl.create(:public_page, :name => 'Second Page') }
+      let(:legacy_page) { FactoryGirl.create(:public_page, :name => 'Legacy Url') }
+      let(:legacy_url)  { Alchemy::LegacyPageUrl.create(:urlname => 'legacy-url', :page => page) }
+      let(:legacy_url2) { Alchemy::LegacyPageUrl.create(:urlname => 'legacy-url', :page => second_page) }
+
+      it "should redirect permanently to page that belongs to legacy page url." do
+        get :show, :urlname => legacy_url.urlname
+        response.status.should == 301
+        response.should redirect_to('/alchemy/new-page-name')
+      end
+
+      it "should only redirect to legacy url if no page was found for urlname" do
+        legacy_url
+        get :show, :urlname => legacy_page.urlname
+        response.status.should == 200
+        response.should_not redirect_to('/alchemy/new-page-name')
+      end
+
+      it "should redirect to last page that has that legacy url" do
+        legacy_url
+        get :show, :urlname => legacy_url2.urlname
+        response.should redirect_to('/alchemy/second-page')
+      end
+
+    end
+  end
+
 end

data/spec/dummy/config/application.rb

@@ -37,7 +37,7 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    config.i18n.default_locale = :en
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"