alchemy_cms 2.3.rc5 → 2.3.0

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 1.9.3
 branches:
   only:
-    - master
+    - 2.3-stable
 before_script:
   - "phantomjs -v"
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load --trace'"
@@ -13,3 +13,6 @@ script: "bundle exec rspec spec"
 env:
   - DB=mysql
   - DB=postgresql
+matrix:
+  allow_failures:
+    - rvm: ree

data/README.md

@@ -1,7 +1,7 @@
 Alchemy CMS
 ===========
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_cms)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_cms.png?branch=2.3-stable)](http://travis-ci.org/magiclabs/alchemy_cms)
 [![Maintenance Status](http://stillmaintained.com/magiclabs/alchemy_cms.png)](http://stillmaintained.com/magiclabs/alchemy_cms)
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/magiclabs/alchemy_cms)
 [![Dependency Status](https://gemnasium.com/magiclabs/alchemy_cms.png)](https://gemnasium.com/magiclabs/alchemy_cms)
@@ -9,8 +9,6 @@ Alchemy CMS
 About
 -----
 
-**This branch is a beta development branch. For productive environments use the current rubygems version, or the [latest stable branch (2.2-stable)](https://github.com/magiclabs/alchemy_cms/tree/2.2-stable).**
-
 Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 
 Read more on the [website](http://alchemy-cms.com) and in the [guidelines](http://guides.alchemy-cms.com).
@@ -37,9 +35,9 @@ Features
 Rails Version
 -------------
 
-This version of Alchemy runs with Rails 3.2.6+.
+This version of Alchemy runs with Rails 3.2.8+.
 
-If you are looking for a Rails 3.1 compatible version check the 2.2-stable branch.
+If you are looking for a Rails 3.1 compatible version check the 2.1-stable branch.
 
 If you are looking for a Rails 3.0 compatible version check the 2.0-stable branch.
 
@@ -49,13 +47,14 @@ Ruby Version
 ------------
 
 Alchemy runs under Ruby 1.8.7, Ruby 1.9.2, Ruby 1.9.3 and REE (Ruby Enterprise Edition).
+We strongly recommend Ruby 1.9.3 for best performance and maximum security.
 
 Installation
 ------------
 
 Use the installer (recommended):
 
-    gem install alchemy_cms --pre
+    gem install alchemy_cms
     alchemy new my_magicpage
 
 Start the local server:
@@ -67,13 +66,9 @@ Then just switch to your browser and open `http://localhost:3000`
 Upgrading
 ------------
 
-Projects running with Alchemy CMS version < 2.1 needs to be upgraded.
-
-Otherwise errors will be raised like this:
-`uninitialized constant EssenceText`
+Projects running with Alchemy CMS version < 2.2 needs to be upgraded.
 
-You have to use the following Upgrade-Task.
-Run in terminal:
+Use the following Upgrade-Task:
 
     rake alchemy:upgrade
 
@@ -83,7 +78,7 @@ Add to existing Rails project
 
 In your Gemfile:
 
-    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms'
+    gem 'alchemy_cms', :github => 'magiclabs/alchemy_cms', :branch => '2.3-stable'
 
 Run in terminal:
 

data/app/assets/javascripts/alchemy/alchemy.preview.js

@@ -72,7 +72,7 @@ Alchemy.initAlchemyPreviewMode = function() {
       clickElement: function(e) {
         var $this = $(this);
         var parent$ = window.parent.jQuery;
-        var target_id = $this.attr('data-alchemy-element');
+        var target_id = $this.data('alchemy-element');
         var $element_editor = parent$('#element_area .element_editor').closest('[id="element_' + target_id + '"]');
         var $elementsWindow = parent$('#alchemyElementWindow');
         e.preventDefault();

data/app/assets/stylesheets/alchemy/frame.css.scss

@@ -217,6 +217,7 @@ div#user_info {
     float: left;
     padding: 0px 8px;
     line-height: 19px;
+    height: 21px;
     text-shadow: #fff 0 0px 4px;
     background: #d6e0e6;
     color: #444;

data/app/controllers/alchemy/pages_controller.rb

@@ -126,8 +126,8 @@ module Alchemy
               "*#{params[:query]}*",
               {:limit => :all},
               {:conditions => [
-                'alchemy_pages.public = ? AND alchemy_pages.layoutpage = ? AND alchemy_pages.restricted = ?',
-                true, false, false
+                'alchemy_pages.public = ? AND alchemy_pages.layoutpage = ? AND alchemy_pages.restricted = ? AND alchemy_pages.language_id = ?',
+                true, false, false, session[:language_id]
               ]}
             )
           end

data/app/helpers/alchemy/admin/base_helper.rb

@@ -161,20 +161,26 @@ module Alchemy
         select_options
       end
 
-      # Returns all public pages found in the database as an Array suitable or the Rails +select_tag+ helper.
+      # Returns all public pages from current language as an option tags string suitable or the Rails +select_tag+ helper.
       #
-      # * You can pass a collection of pages so it only returns these pages and does not query the database.
-      # * Pass a +Page#name+ or +Page#id+ as second parameter to be passed as selected item to the +options_for_select+ helper.
-      # * The trhird parameter is used as prompt message in the select tag
-      # * The last parameter is the method that is called on the page object to get the value that is passed with the params of the form.
+      # === Parameters
+      #
+      # 1. A collection of pages so it only returns these pages and does not query the database.
+      # 2. Pass a +Page#name+ or +Page#id+ as second parameter to be passed as selected item to the +options_for_select+ helper.
+      # 3. The third parameter is used as prompt message in the select tag
+      # 4. The fourth parameter is the method that is called on the page object to get the value that is passed with the params of the form.
       #
       def pages_for_select(pages = nil, selected = nil, prompt = "", page_attribute = :id)
         result = [[prompt.blank? ? t('Choose page') : prompt, ""]]
         if pages.blank?
-          pages = Page.with_language(session[:language_id]).published
-        end
-        pages.each do |p|
-          result << [p.name, p.send(page_attribute).to_s]
+          pages = Page.with_language(session[:language_id]).published.order(:lft)
+          pages.each do |p|
+            result << [("&nbsp;&nbsp;" * (p.level - 1) + p.name).html_safe, p.send(page_attribute).to_s]
+          end
+        else
+          pages.each do |p|
+            result << [p.name, p.send(page_attribute).to_s]
+          end
         end
         options_for_select(result, selected.to_s)
       end

data/app/helpers/alchemy/admin/essences_helper.rb

@@ -78,31 +78,42 @@ module Alchemy
         end
       end
 
-      # Renders the EssenceText editor partial with a form select for storing page urlnames
+      # Renders the EssenceSelect editor partial with a form select for storing page urlnames
       #
       # === Options:
       #
       #   :only            [Hash]     # Pagelayout names. Only pages with this page_layout will be displayed inside the select.
       #   :page_attribute  [Symbol]   # The Page attribute which will be stored.
       #   :global          [Boolean]  # Display only global pages. Default is false.
+      #   :order_by        [Symbol]   # Order pages by this attribute.
+      #
+      # NOTE: The order option only works if the +only+ option is also set.
+      # Then the default is :name.
+      # Otherwise the pages are ordered by their position in the nested set.
       #
       def page_selector(element, content_name, options = {}, select_options = {})
         default_options = {
           :page_attribute => :id,
           :global => false,
-          :prompt => t('Choose page')
+          :prompt => t('Choose page'),
+          :order_by => :name
         }
         options = default_options.merge(options)
-        pages = Page.where({
-          :language_id => session[:language_id],
-          :layoutpage => options[:global] == true,
-          :public => options[:global] == false
-        })
-        pages = pages.where({:page_layout => options[:only]}) if options[:only].present?
         content = element.content_by_name(content_name)
-        options.update(
-          :select_values => pages_for_select(pages, content ? content.ingredient : nil, options[:prompt], options[:page_attribute])
-        )
+        if options[:global] || options[:only].present?
+          pages = Page.where({
+            :language_id => session[:language_id],
+            :layoutpage => options[:global] == true,
+            :public => options[:global] == false
+          })
+          if options[:only].present?
+            pages = pages.where({:page_layout => options[:only]})
+          end
+          pages_options_tags = pages_for_select(pages.order(options[:order_by]), content ? content.ingredient : nil, options[:prompt], options[:page_attribute])
+        else
+          pages_options_tags = pages_for_select(nil, content ? content.ingredient : nil, options[:prompt], options[:page_attribute])
+        end
+        options.update(:select_values => pages_options_tags)
         if content.nil?
           render_missing_content(element, content_name, options)
         else

data/app/helpers/alchemy/elements_helper.rb

@@ -50,11 +50,10 @@ module Alchemy
         warning('Page is nil')
         return ""
       else
-        show_non_public = configuration(:cache_pages) ? false : defined?(current_user)
         if page.class == Array
-          all_elements = page.collect { |p| p.find_elements(options, show_non_public) }.flatten
+          all_elements = page.collect { |p| p.find_elements(options) }.flatten
         else
-          all_elements = page.find_elements(options, show_non_public)
+          all_elements = page.find_elements(options)
         end
         unless options[:sort_by].blank?
           all_elements = all_elements.sort_by { |e| e.contents.detect { |c| c.name == options[:sort_by] }.ingredient }
@@ -153,13 +152,13 @@ module Alchemy
     # Returns a string for the id attribute of a html element for the given element
     def element_dom_id(element)
       return "" if element.nil?
-      "#{element.name}_#{element.id}"
+      "#{element.name}_#{element.id}".html_safe
     end
 
     # Renders the data-alchemy-element HTML attribut used for the preview window hover effect.
     def element_preview_code(element)
       return "" if element.nil?
-      " data-alchemy-element='#{element.id}'" if @preview_mode && element.page == @page
+      " data-alchemy-element='#{element.id}'".html_safe if @preview_mode && element.page == @page
     end
 
     # Returns the full url containing host, page and anchor for the given element

data/app/helpers/alchemy/pages_helper.rb

@@ -460,7 +460,6 @@ module Alchemy
     # Renders the search +results+ partial from +app/views/alchemy/search/+
     def render_search_results(options={})
       default_options = {
-        :show_language => true,
         :show_result_count => true,
         :show_heading => true
       }

data/app/sweepers/alchemy/content_sweeper.rb

@@ -11,7 +11,7 @@ module Alchemy
       if object.class.to_s == "Alchemy::Element"
         expire_cache_for(object.contents)
         expire_contents_displayed_as_select
-      elsif object.class.to_s == "Alchemy::Page" && (object.urlname_changed? || object.name_changed?)
+      elsif object.class.to_s == "Alchemy::Page" && (object.public_changed? || object.urlname_changed? || object.name_changed?)
         expire_contents_displayed_as_select
       end
     end

data/app/views/alchemy/essences/_essence_select_editor.html.erb

@@ -11,20 +11,20 @@
 
     <%
     if options[:select_values].is_a?(Hash)
-      options_method = grouped_options_for_select(
+      options_tags = grouped_options_for_select(
         options[:select_values],
         content.ingredient,
         ''
       )
     else
-      options_method = options_for_select(
+      options_tags = options_for_select(
         options[:select_values],
         content.ingredient
       )
     end
     %>
 
-    <%= select_tag(content.form_field_name, options_method, {
+    <%= select_tag(content.form_field_name, options_tags, {
       :class => ["alchemy_selectbox", "essence_editor_select", html_options[:class]].join(' '),
       :style => html_options[:style]
     }) %>

data/app/views/alchemy/search/_result.html.erb

@@ -2,7 +2,6 @@
   <h3>
     <%= t('search_result_page.result_page') %>:
     <%= link_to page.name, show_alchemy_page_path(page) %>
-    <%= content_tag(:span, page.language_code.upcase, :class => 'language_code') if multi_language? && options[:show_language] %>
   </h3>
   <%- result.each do |highlight| -%>
     <p><%= sanitize highlight %></p>

data/lib/alchemy/version.rb

@@ -1,6 +1,6 @@
 module Alchemy
 
-  VERSION = "2.3.rc5"
+  VERSION = "2.3.0"
 
   def self.version
     VERSION

data/spec/helpers/admin/base_helper_spec.rb

@@ -1,149 +1,195 @@
 require 'spec_helper'
 
 module Alchemy
-  module Admin
+  describe Admin::BaseHelper do
 
-    describe BaseHelper do
+    context "maximum amount of images option" do
 
-      context "maximum amount of images option" do
+      before(:each) do
+        @options = {}
+      end
+
+      context "with max_images option" do
 
-        before(:each) do
-          @options = {}
+        it "should return nil for empty string" do
+          @options[:max_images] = ""
+          max_image_count.should be(nil)
         end
 
-        context "with max_images option" do
+        it "should return an integer for string number" do
+          @options[:max_images] = "1"
+          max_image_count.should be(1)
+        end
 
-          it "should return nil for empty string" do
-            @options[:max_images] = ""
-            max_image_count.should be(nil)
-          end
+      end
 
-          it "should return an integer for string number" do
-            @options[:max_images] = "1"
-            max_image_count.should be(1)
-          end
+      context "with maximum_amount_of_images option" do
 
+        it "should return nil for empty string" do
+          @options[:maximum_amount_of_images] = ""
+          max_image_count.should be(nil)
         end
 
-        context "with maximum_amount_of_images option" do
+        it "should return an integer for string number" do
+          @options[:maximum_amount_of_images] = "1"
+          max_image_count.should be(1)
+        end
 
-          it "should return nil for empty string" do
-            @options[:maximum_amount_of_images] = ""
-            max_image_count.should be(nil)
-          end
+      end
 
-          it "should return an integer for string number" do
-            @options[:maximum_amount_of_images] = "1"
-            max_image_count.should be(1)
-          end
+    end
 
-        end
+    describe "#merge_params" do
+      before(:each) do
+        controller.stub!(:params).and_return({:first => '1', :second => '2'})
+      end
 
+      it "returns a hash that contains the current params and additional params given as attributes" do
+        helper.merge_params(:third => '3', :fourth => '4').should == {:first => '1', :second => '2', :third => '3', :fourth => '4'}
       end
+    end
 
-      describe "#merge_params" do
-        before(:each) do
-          controller.stub!(:params).and_return({:first => '1', :second => '2'})
-        end
+    describe "#merge_params_without" do
+      before(:each) do
+        controller.stub!(:params).and_return({:first => '1', :second => '2'})
+      end
+      it "can delete a single param" do
+        helper.merge_params_without(:second).should == {:first => '1'}
+      end
 
-        it "returns a hash that contains the current params and additional params given as attributes" do
-          helper.merge_params(:third => '3', :fourth => '4').should == {:first => '1', :second => '2', :third => '3', :fourth => '4'}
-        end
+      it "can delete several params" do
+        helper.merge_params_without([:first, :second]).should == {}
       end
 
-      describe "#merge_params_without" do
-        before(:each) do
-          controller.stub!(:params).and_return({:first => '1', :second => '2'})
-        end
-        it "can delete a single param" do
-          helper.merge_params_without(:second).should == {:first => '1'}
-        end
+      it "can delete a param and add new params at the same time" do
+        helper.merge_params_without([:first], {:third => '3'}).should == {:second => '2', :third => '3'}
+      end
 
-        it "can delete several params" do
-          helper.merge_params_without([:first, :second]).should == {}
-        end
+      it "should not change params" do
+        helper.merge_params_without([:first])
+        controller.params.should == {:first => '1', :second => '2'}
+      end
+    end
 
-        it "can delete a param and add new params at the same time" do
-          helper.merge_params_without([:first], {:third => '3'}).should == {:second => '2', :third => '3'}
-        end
+    describe "#merge_params_only" do
 
-        it "should not change params" do
-          helper.merge_params_without([:first])
-          controller.params.should == {:first => '1', :second => '2'}
-        end
+      before(:each) do
+        controller.stub!(:params).and_return({:first => '1', :second => '2', :third => '3'})
       end
 
-      describe "#merge_params_only" do
+      it "can keep a single param" do
+        helper.merge_params_only(:second).should == {:second => '2'}
+      end
 
-        before(:each) do
-          controller.stub!(:params).and_return({:first => '1', :second => '2', :third => '3'})
-        end
+      it "can keep several params" do
+        helper.merge_params_only([:first, :second]).should == {:first => '1', :second => '2'}
+      end
 
-        it "can keep a single param" do
-          helper.merge_params_only(:second).should == {:second => '2'}
-        end
+      it "can keep a param and add new params at the same time" do
+        helper.merge_params_only([:first], {:third => '3'}).should == {:first => '1', :third => '3'}
+      end
 
-        it "can keep several params" do
-          helper.merge_params_only([:first, :second]).should == {:first => '1', :second => '2'}
-        end
+      it "should not change params" do
+        helper.merge_params_only([:first])
+        controller.params.should == {:first => '1', :second => '2', :third => '3'}
+      end
 
-        it "can keep a param and add new params at the same time" do
-          helper.merge_params_only([:first], {:third => '3'}).should == {:first => '1', :third => '3'}
-        end
+    end
 
-        it "should not change params" do
-          helper.merge_params_only([:first])
-          controller.params.should == {:first => '1', :second => '2', :third => '3'}
-        end
+    context "Filtering pictures depending on tags from params" do
 
+      let(:tag) do
+        mock_model(ActsAsTaggableOn::Tag, :name => "foo")
       end
 
-      context "Filtering pictures depending on tags from params" do
+      describe "#pictures_filtered_by_tag?" do
+        it "should return true if the filterlist contains the given tag" do
+          controller.params[:tagged_with] = "foo,bar,baz"
+          helper.pictures_filtered_by_tag?(tag).should == true
+        end
 
-        let(:tag) do
-          mock_model(ActsAsTaggableOn::Tag, :name => "foo")
+        it "should return false if the filterlist does not contain the given tag" do
+          controller.params[:tagged_with] = "bar,baz"
+          helper.pictures_filtered_by_tag?(tag).should == false
         end
+      end
 
-        describe "#pictures_filtered_by_tag?" do
-          it "should return true if the filterlist contains the given tag" do
-            controller.params[:tagged_with] = "foo,bar,baz"
-            helper.pictures_filtered_by_tag?(tag).should == true
+      describe "#add_to_picture_tag_filter" do
+        context "if params[:tagged_with] is not present" do
+          it "should return an Array with the given tag name" do
+            helper.add_to_picture_tag_filter(tag).should == ["foo"]
           end
+        end
 
-          it "should return false if the filterlist does not contain the given tag" do
+        context "if params[:tagged_with] contains some tag names" do
+          it "should return an Array of tag names including the given one" do
             controller.params[:tagged_with] = "bar,baz"
-            helper.pictures_filtered_by_tag?(tag).should == false
+            helper.add_to_picture_tag_filter(tag).should == ["bar", "baz", "foo"]
           end
         end
+      end
 
-        describe "#add_to_picture_tag_filter" do
-          context "if params[:tagged_with] is not present" do
-            it "should return an Array with the given tag name" do
-              helper.add_to_picture_tag_filter(tag).should == ["foo"]
-            end
+      describe "#remove_from_picture_tag_filter" do
+        context "if params[:tagged_with] is not present" do
+          it "should return an empty Array" do
+            helper.remove_from_picture_tag_filter(tag).should be_empty
           end
+        end
 
-          context "if params[:tagged_with] contains some tag names" do
-            it "should return an Array of tag names including the given one" do
-              controller.params[:tagged_with] = "bar,baz"
-              helper.add_to_picture_tag_filter(tag).should == ["bar", "baz", "foo"]
-            end
+        context "if params[:tagged_with] contains some tag names" do
+          it "should return an Array of tag names without the given one" do
+            controller.params[:tagged_with] = "bar,baz,foo"
+            helper.remove_from_picture_tag_filter(tag).should == ["bar", "baz"]
           end
         end
+      end
 
-        describe "#remove_from_picture_tag_filter" do
-          context "if params[:tagged_with] is not present" do
-            it "should return an empty Array" do
-              helper.remove_from_picture_tag_filter(tag).should be_empty
-            end
-          end
+    end
 
-          context "if params[:tagged_with] contains some tag names" do
-            it "should return an Array of tag names without the given one" do
-              controller.params[:tagged_with] = "bar,baz,foo"
-              helper.remove_from_picture_tag_filter(tag).should == ["bar", "baz"]
-            end
-          end
+    describe '#pages_for_select' do
+
+      let(:contact_form) { FactoryGirl.create(:element, :name => 'contactform', :create_contents_after_create => true) }
+      let(:page_a) { FactoryGirl.create(:public_page, :name => 'Page A') }
+      let(:page_b) { FactoryGirl.create(:public_page, :name => 'Page B') }
+      let(:page_c) { FactoryGirl.create(:public_page, :name => 'Page C', :parent_id => page_b.id) }
+
+      before do
+        # to be shure the ordering is alphabetic
+        page_b
+        page_a
+        helper.session[:language_id] = 1
+      end
+
+      context "with no arguments given" do
+
+        it "should return options for select with all pages ordered by lft" do
+          helper.pages_for_select.should match(/option.*Page B.*Page A/m)
+        end
+
+        it "should return options for select with nested page names" do
+          page_c
+          output = helper.pages_for_select
+          output.should match(/option.*Startseite.*>  Page B.*>    Page C.*>  Page A/m)
+        end
+
+      end
+
+      context "with pages passed in" do
+
+        before do
+          @pages = []
+          3.times { @pages << FactoryGirl.create(:public_page) }
+        end
+
+        it "should return options for select with only these pages" do
+          output = helper.pages_for_select(@pages)
+          output.should match(/#{@pages.collect(&:name).join('.*')}/m)
+          output.should_not match(/Page A/m)
+        end
+
+        it "should not nest the page names" do
+          output = helper.pages_for_select(@pages)
+          output.should_not match(/option.*&nbsp;/m)
         end
 
       end

data/spec/helpers/admin/essences_helper_spec.rb

@@ -21,4 +21,37 @@ describe Alchemy::Admin::EssencesHelper do
     helper.render_essence_editor_by_type(element, 'EssenceText').should match(/input.+type="text".+value="hello!/)
   end
 
+  describe '#page_selector' do
+
+    let(:contact_form)  { FactoryGirl.create(:element, :name => 'contactform', :create_contents_after_create => true) }
+    let(:contact_page)  { FactoryGirl.create(:public_page, :page_layout => 'contact', :name => 'Contact') }
+    let(:page_a)        { FactoryGirl.create(:public_page, :name => 'Page A') }
+    let(:page_b)        { FactoryGirl.create(:public_page, :name => 'Page B') }
+    let(:page_c)        { FactoryGirl.create(:public_page, :name => 'Page C') }
+
+    before do
+      helper.session[:language_id] = 1
+      contact_page
+      page_b
+      page_c
+      page_a
+    end
+
+    context "with only option set to 'standard'" do
+
+      it "should render select tag with standard pages only" do
+        output = helper.page_selector(contact_form, 'success_page', :only => 'standard')
+        output.should match(/select.*Page A/m)
+        output.should_not match(/select.*Contact/m)
+      end
+
+      it "should render select tag with pages ordered by name" do
+        output = helper.page_selector(contact_form, 'success_page', :only => 'standard')
+        output.should match(/select.*Page A.*Page B.*Page C/m)
+      end
+
+    end
+
+  end
+
 end

data/spec/integration/pages_controller_spec.rb

@@ -46,38 +46,60 @@ module Alchemy
       context "performing the search" do
 
         it "should display search results for richtext essences" do
-          element.content_by_name('text').essence.update_attributes(:body => '<p>Welcome to Peters Petshop</p>', :public => true)
+          element.content_by_name('text').essence.update_attributes(:body => '<p>Welcome to Peters Petshop</p>')
           visit('/alchemy/suche?query=Petshop')
           within('div#content .search_result') { page.should have_content('Petshop') }
         end
 
         it "should display search results for text essences" do
-          element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
+          element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop')
           visit('/alchemy/suche?query=Petshop')
           within('div#content .search_result') { page.should have_content('Petshop') }
         end
 
         it "should not find contents placed on global-pages (layoutpage => true)" do
           public_page_1.update_attributes(:layoutpage => true)
-          element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
+          element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop')
           visit('/alchemy/suche?query=Petshop')
           within('div#content') { page.should have_css('h2.no_search_results') }
         end
 
         it "should not find contents placed on unpublished pages (public => false)" do
           public_page_1.update_attributes(:public => false)
-          element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
+          element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop')
           visit('/alchemy/suche?query=Petshop')
           within('div#content') { page.should have_css('h2.no_search_results') }
         end
 
         it "should not find contents placed on restricted pages (restricted => true)" do
           public_page_1.update_attributes(:restricted => true)
-          element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop', :public => true)
+          element.content_by_name('intro').essence.update_attributes(:body => 'Welcome to Peters Petshop')
           visit('/alchemy/suche?query=Petshop')
           within('div#content') { page.should have_css('h2.no_search_results') }
         end
 
+        context "in multi_language mode" do
+
+          let(:english_language)      { FactoryGirl.create(:english) }
+          let(:english_language_root) { FactoryGirl.create(:language_root_page, :language => english_language, :name => 'Home') }
+          let(:english_page)          { FactoryGirl.create(:public_page, :parent_id => english_language_root.id, :language => english_language) }
+          let(:english_element)       { FactoryGirl.create(:element, :page_id => english_page.id, :name => 'headline', :create_contents_after_create => true) }
+
+          before do
+            element
+            english_element
+            controller.stub!(:multi_language?).and_return(true)
+          end
+
+          it "should not display search results from other languages then current" do
+            english_element.content_by_name('headline').essence.update_attributes(:body => 'Joes Hardware')
+            visit('/alchemy/de/suche?query=Hardware')
+            within('div#content') { page.should have_css('h2.no_search_results') }
+            page.should_not have_css('div#content .search_result')
+          end
+
+        end
+
       end
 
     end

data/spec/support/alchemy/specs_helpers.rb

@@ -28,8 +28,6 @@ module Alchemy
       #
       def login_into_alchemy
         visit '/alchemy/admin/login'
-        # Giving phantomjs some time to start under ruby 1.8.7 on travis-ci
-        sleep(5) if ENV['CI'] && RUBY_VERSION == "1.8.7"
         fill_in('alchemy_user_session_login', :with => 'jdoe')
         fill_in('alchemy_user_session_password', :with => 's3cr3t')
         click_on('Login')

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.rc5
-  prerelease: 4
+  version: 2.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1089,9 +1089,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -4162011237072179792
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: