alchemy_cms 2.2.rc6 → 2.2.rc7

data/.rspec

@@ -1,2 +1 @@
---format Fuubar
 --color

data/.travis.yml

@@ -9,8 +9,9 @@ branches:
   only:
     - master
 before_script:
-  #- "mysql -e 'create database alchemy_cms_test;'"
-  - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:schema:load'"
+  - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:create db:schema:load --trace'"
 script: "bundle exec rspec spec"
-# env:
-#   - DB=mysql
+env:
+  - DB=mysql
+  - DB=postgresql
+  - DB=sqlite

data/Gemfile

@@ -7,14 +7,15 @@ gem 'jasmine'
 gem 'jasminerice'
 
 group :test do
+  gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
+  gem 'mysql2'                if ENV['DB'] == 'mysql'
+  gem 'pg'                    if ENV['DB'] == 'postgresql'
   gem 'rspec-rails'
-  gem 'sqlite3'
-  gem 'factory_girl_rails', '1.4.0'
+  gem 'factory_girl_rails', '~> 1.7.0'
   gem "capybara"
-  gem 'capybara-webkit', '~>0.8.0'
-  gem "launchy"
+  gem 'capybara-webkit'       unless ENV['CI']
+  gem "launchy"               unless ENV['CI']
   gem "database_cleaner"
-  gem "fuubar"
 end
 
 group :assets do
@@ -24,8 +25,6 @@ group :assets do
 end
 
 group :development do
-  gem 'ruby-debug19', :require => 'ruby-debug', :platform => :ruby_19
-  gem 'ruby-debug', :platform => :ruby_18
   gem 'guard-spork'
   gem 'yard'
-end
+end

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -181,8 +181,7 @@ module Alchemy
         new_language_root = Page.copy(
           original_language_root,
           :language_id => params[:languages][:new_lang_id],
-          :language_code => session[:language_code],
-          :layoutpage => params[:layoutpage]
+          :language_code => session[:language_code]
         )
         new_language_root.move_to_child_of Page.root
         original_language_root.copy_children_to(new_language_root)

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -16,7 +16,7 @@ module Alchemy
         else
           search_terms = ActiveRecord::Base.sanitize("%#{params[:query]}%")
           items = resource_handler.model.where(resource_handler.searchable_attributes.map { |attribute|
-            "`#{resource_handler.namespaced_model_name.pluralize}`.`#{attribute[:name]}` LIKE #{search_terms}"
+            "#{resource_handler.namespaced_model_name.pluralize}.#{attribute[:name]} LIKE #{search_terms}"
           }.join(" OR "))
         end
         instance_variable_set("@#{resource_handler.resources_name}", items.page(params[:page] || 1).per(per_page_value_for_screen_size))

data/app/controllers/alchemy/base_controller.rb

@@ -88,7 +88,8 @@ module Alchemy
     end
 
     def store_language_in_session(language)
-      if language
+      if language && language.id
+        return if language.id == session[:language_id]
         session[:language_code] = language.code
         session[:language_id] = language.id
       else

data/app/controllers/alchemy/pages_controller.rb

@@ -72,12 +72,12 @@ module Alchemy
       if params[:urlname].blank?
         @page = Page.language_root_for(Language.get_default.id)
       else
-        @page = Page.find_by_urlname_and_language_id(params[:urlname], session[:language_id])
-        # try to find the page in another language
-        if @page.nil?
-          @page = Page.find_by_urlname(params[:urlname])
-        else
+        if params[:lang].blank?
+          @page = Page.contentpages.find_by_urlname(params[:urlname])
+          store_language_in_session(@page.language) if @page.present?
           return @page
+        else
+          @page = Page.contentpages.find_by_urlname_and_language_id(params[:urlname], session[:language_id])
         end
       end
     end

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

@@ -253,6 +253,8 @@ module Alchemy
         if alchemy_module['engine_name']
           eval(alchemy_module['engine_name']).url_for(url_options)
         else
+          # hack to prefix any controller-path with / so it doesn't refer to alchemy/...
+          url_options[:controller] = url_options[:controller].gsub(/^([^\/])/, "/#{$1}")
           main_app.url_for(url_options)
         end
       end

data/app/models/alchemy/attachment.rb

@@ -13,7 +13,8 @@ module Alchemy
     validates_as_attachment
 
     def self.find_paginated(params, per_page)
-      cond = "name LIKE '%#{params[:query]}%' OR filename LIKE '%#{params[:query]}%'"
+      attachments = Attachment.arel_table
+      cond = attachments[:name].matches("%#{params[:query]}%").or(attachments[:filename].matches("%#{params[:query]}%"))
       self.where(cond).page(params[:page] || 1).per(per_page).order(:name)
     end
 

data/app/models/alchemy/element.rb

@@ -29,30 +29,26 @@ module Alchemy
 
     # TODO: add a trashed column to elements table
     scope :trashed, where(:page_id => nil).order('updated_at DESC')
-    scope :not_trashed, where('`alchemy_elements`.`page_id` IS NOT NULL')
+    scope :not_trashed, where(Element.arel_table[:page_id].not_eq(nil))
     scope :published, where(:public => true)
-    scope :named, lambda { |names| where(arel_table[:name].in(names)) }
+    scope :named, lambda { |names| where(:name => names) }
     scope :excluded, lambda { |names| where(arel_table[:name].not_in(names)) }
     scope :not_in_cell, where(:cell_id => nil)
 
-    # Returns next Element on self.page or nil. Pass a Element.name to get next of this kind.
+    # Returns next public element from same page.
+    # Pass an element name to get next of this kind.
     def next(name = nil)
-      if name.nil?
-        find_conditions = ["public = 1 AND page_id = ? AND position > ?", self.page.id, self.position]
-      else
-        find_conditions = ["public = 1 AND page_id = ? AND name = ? AND position > ?", self.page.id, name, self.position]
-      end
-      self.class.where(find_conditions).order("position ASC").limit(1)
+      elements = page.elements.published.where(Element.arel_table[:position].gt(position))
+      elements = elements.where(:name => name) if name.present?
+      elements.order("position ASC").limit(1).first
     end
 
-    # Returns previous Element on self.page or nil. Pass a Element.name to get previous of this kind.
+    # Returns previous public element from same page.
+    # Pass an element name to get previous of this kind.
     def prev(name = nil)
-      if name.nil?
-        find_conditions = ["public = 1 AND page_id = ? AND position < ?", self.page.id, self.position]
-      else
-        find_conditions = ["public = 1 AND page_id = ? AND name = ? AND position < ?", self.page.id, name, self.position]
-      end
-      self.class.where(find_conditions).order("position DESC").limit(1)
+      elements = page.elements.published.where(Element.arel_table[:position].lt(position))
+      elements = elements.where(:name => name) if name.present?
+      elements.order("position DESC").limit(1).first
     end
 
     # Stores the page into `to_be_sweeped_pages` (Pages that have to be sweeped after updating element).

data/app/models/alchemy/page.rb

@@ -3,11 +3,15 @@ module Alchemy
   class Page < ActiveRecord::Base
 
     attr_accessible(
+      :do_not_autogenerate,
       :do_not_sweep,
       :language_code,
+      :language,
       :language_id,
       :language_root,
       :layoutpage,
+      :locked,
+      :locked_by,
       :meta_description,
       :meta_keywords,
       :name,
@@ -64,14 +68,14 @@ module Alchemy
     scope :restricted, where(:restricted => true)
     scope :not_restricted, where(:restricted => false)
     scope :public_language_roots, lambda {
-      where(:language_root => true).where("`alchemy_pages`.`language_code` IN ('#{Language.all_codes_for_published.join('\',\'')}')").where(:public => true)
+      where(:language_root => true, :language_code => Language.all_codes_for_published, :public => true)
     }
-    scope :all_last_edited_from, lambda { |user| where(:updater_id => user.id).order('`alchemy_pages`.`updated_at` DESC').limit(5) }
+    scope :all_last_edited_from, lambda { |user| where(:updater_id => user.id).order('updated_at DESC').limit(5) }
     # Returns all pages that have the given language_id
     scope :with_language, lambda { |language_id| where(:language_id => language_id) }
+    scope :contentpages, where(:layoutpage => [false, nil]).where(Page.arel_table[:parent_id].not_eq(nil))
     # Returns all pages that are not locked and public.
     # Used for flushing all page caches at once.
-    scope :contentpages, where("`alchemy_pages`.`layoutpage` = 0 AND `alchemy_pages`.`parent_id` IS NOT NULL")
     scope :flushables, not_locked.published.contentpages
     scope :searchables, not_restricted.published.contentpages
 
@@ -402,7 +406,7 @@ module Alchemy
         :locked => false,
         :locked_by => nil
       )
-      page = self.new(attributes.except(:id, :updated_at, :created_at, :created_id, :updater_id, :lft, :rgt, :depth))
+      page = self.new(attributes.except(:id, :updated_at, :created_at, :creator_id, :updater_id, :lft, :rgt, :depth))
       if page.save
         # copy the page´s cells
         source.cells.each do |cell|

data/config/locales/alchemy.en.yml

@@ -161,7 +161,7 @@ en:
     "Image size": "Imagesize"
     "Image deleted successfully": "Image deleted successfully."
     "Mandatory": "Mandatory fields"
-    "Page deleted": "Page: '%{name}' deleted."
+    "Page deleted": "Page: %{name} deleted."
     "Page saved": "Page: '%{name}' saved."
     "Password": "Password"
     "Paste from clipboard": "Paste from clipboard"

data/db/migrate/20101216151419_add_language_id_to_pages.rb

@@ -3,8 +3,16 @@ class AddLanguageIdToPages < ActiveRecord::Migration
     add_column :pages, :language_id, :integer
     rename_column :pages, :language, :language_code
     rename_column :pages, :language_root_for, :language_root
-    change_column :pages, :language_root, :boolean
-    execute("UPDATE pages SET language_root = 1 WHERE language_root IS NOT NULL")
+    # PostgreSQL does not support changing string columns to boolean.
+    # We do not have existing Alchemy installations running on postgresql to support anyway,
+    # so it's not critical to recreate the column.
+    if ActiveRecord::Base.connection_config[:adapter] == "postgresql"
+      remove_column :pages, :language_root
+      add_column :pages, :language_root, :boolean
+    else
+      change_column :pages, :language_root, :boolean
+      execute("UPDATE pages SET language_root = 1 WHERE language_root IS NOT NULL")
+    end
     add_index :pages, :language_id
   end
 
@@ -12,8 +20,8 @@ class AddLanguageIdToPages < ActiveRecord::Migration
     remove_index :pages, :language_id
     change_column :pages, :language_root, :string
     rename_column :pages, :language_root, :language_root_for
+    execute("UPDATE pages SET language_root_for = 1 WHERE language_root_for IS NOT NULL")
     rename_column :pages, :language_code, :language
-    execute("UPDATE pages SET language_root_for = language WHERE language_root IS NOT NULL")
     remove_column :pages, :language_id
   end
 end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc6"
+  VERSION = "2.2.rc7"
 
 end

data/lib/alchemy_cms.rb

@@ -1,4 +1,4 @@
-if defined?(Rails) && Rails::VERSION::MAJOR == 3
+if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'acts_as_list'
   require 'attachment_magic'
   require 'authlogic'
@@ -23,7 +23,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3
   end
   require File.join(File.dirname(__FILE__), "alchemy", "seeder")
 else
-  raise "Alchemy 2.1 needs Rails 3.1 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
+  raise "Alchemy 2.2 needs Rails 3.2 or higher. You are currently using Rails #{Rails::VERSION::STRING}"
 end
 
 module Alchemy

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -4,41 +4,41 @@ describe Alchemy::Admin::ClipboardController do
 
   before(:each) do
     activate_authlogic
-    Alchemy::UserSession.create(Factory(:admin_user))
+    Alchemy::UserSession.create(FactoryGirl.create(:admin_user))
   end
 
   context "clipboard" do
 
     it "should hold element ids" do
-      @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-      @element = Factory(:element, :page => @page)
-      @another_element = Factory(:element, :page => @page)
+      @page = FactoryGirl.create(:page, :parent_id => Alchemy::Page.rootpage.id)
+      @element = FactoryGirl.create(:element, :page => @page)
+      @another_element = FactoryGirl.create(:element, :page => @page)
       session['clipboard'] = {'elements' => [{:id => @element.id, :action => 'copy'}]}
       post(:insert, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
       session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id.to_s, :action => 'copy'}]
     end
 
     it "should not have the same element twice" do
-      @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-      @element = Factory(:element, :page => @page)
+      @page = FactoryGirl.create(:page, :parent_id => Alchemy::Page.rootpage.id)
+      @element = FactoryGirl.create(:element, :page => @page)
       session['clipboard'] = {'elements' => [{:id => @element.id, :action => 'copy'}]}
       post(:insert, {:remarkable_type => 'element', :remarkable_id => @element.id, :format => :js})
       session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}]
     end
 
     it "should remove element ids" do
-      @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-      @element = Factory(:element, :page => @page)
-      @another_element = Factory(:element, :page => @page)
+      @page = FactoryGirl.create(:page, :parent_id => Alchemy::Page.rootpage.id)
+      @element = FactoryGirl.create(:element, :page => @page)
+      @another_element = FactoryGirl.create(:element, :page => @page)
       session['clipboard'] = {'elements' => [{:id => @element.id, :action => 'copy'}, {:id => @another_element.id, :action => 'copy'}]}
       delete(:remove, {:remarkable_type => 'element', :remarkable_id => @another_element.id, :format => :js})
       session['clipboard']['elements'].should == [{:id => @element.id, :action => 'copy'}]
     end
 
     it "should be clearable" do
-      @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-      @element = Factory(:element, :page => @page)
-      @another_element = Factory(:element, :page => @page)
+      @page = FactoryGirl.create(:page, :parent_id => Alchemy::Page.rootpage.id)
+      @element = FactoryGirl.create(:element, :page => @page)
+      @another_element = FactoryGirl.create(:element, :page => @page)
       session['clipboard'] = {'elements' => [@element.id, @another_element.id]}
       delete(:clear, :format => :js)
       session['clipboard'].should == {}

data/spec/controllers/admin/contents_controller_spec.rb

@@ -4,11 +4,11 @@ describe Alchemy::Admin::ContentsController do
 
   before(:each) do
     activate_authlogic
-    Alchemy::UserSession.create Factory(:admin_user)
+    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
   end
 
   it "should update a content via ajax" do
-    @element = Factory(:element)
+    @element = FactoryGirl.create(:element)
     post :update, {:id => @element.contents.find_by_name('intro').id, :content => {:body => 'Peters Petshop'}, :format => :js}
     @element.ingredient('intro').should == "Peters Petshop"
   end
@@ -18,7 +18,7 @@ describe Alchemy::Admin::ContentsController do
     context "with content_ids in params" do
 
       before(:each) do
-        @element = Factory(:element)
+        @element = FactoryGirl.create(:element)
       end
 
       it "should reorder the contents" do

data/spec/controllers/admin/elements_controller_spec.rb

@@ -6,7 +6,7 @@ describe Alchemy::Admin::ElementsController do
 
   before(:each) do
     activate_authlogic
-    Alchemy::UserSession.create Factory(:admin_user)
+    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
   end
 
   let(:page) { mock_model('Page', {:id => 1, :urlname => 'lulu'}) }

data/spec/controllers/admin/languages_controller_spec.rb

@@ -7,7 +7,7 @@ describe Alchemy::Admin::LanguagesController do
 
   before(:each) do
     activate_authlogic
-    Alchemy::UserSession.create Factory(:admin_user)
+    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
   end
 
   describe "new" do

data/spec/controllers/admin/pages_controller_spec.rb

@@ -4,7 +4,7 @@ describe Alchemy::Admin::PagesController do
 
   before(:each) do
     activate_authlogic
-    Alchemy::UserSession.create Factory(:admin_user)
+    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
   end
 
   describe "#flush" do
@@ -16,4 +16,36 @@ describe Alchemy::Admin::PagesController do
 
   end
 
+  describe '#copy_language_tree' do
+
+    before(:each) do
+      @language = Alchemy::Language.get_default
+      @language_root = FactoryGirl.create(:language_root_page, :language => @language, :name => 'Intro')
+      @level_1 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @language_root.id, :visible => true, :name => 'Level 1')
+      @level_2 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_1.id, :visible => true, :name => 'Level 2')
+      @level_3 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_2.id, :visible => true, :name => 'Level 3')
+      @level_4 = FactoryGirl.create(:public_page, :language => @language, :parent_id => @level_3.id, :visible => true, :name => 'Level 4')
+      @new_language = FactoryGirl.create(:language)
+      session[:language_code] = @new_language.code
+      session[:language_id] = @new_language.id
+      post :copy_language_tree, {:languages => {:new_lang_id => @new_language.id, :old_lang_id => @language.id}}
+      @new_lang_root = Alchemy::Page.language_root_for(@new_language.id)
+    end
+
+    it "should copy all pages" do
+      @new_lang_root.should_not be_nil
+      @new_lang_root.descendants.count.should == 4
+      @new_lang_root.descendants.collect(&:name).should == ["Level 1 (Copy)", "Level 2 (Copy)", "Level 3 (Copy)", "Level 4 (Copy)"]
+    end
+
+    it "should not set layoutpage attribute to nil" do
+      @new_lang_root.layoutpage.should_not be_nil
+    end
+
+    it "should not set layoutpage attribute to true" do
+      @new_lang_root.layoutpage.should_not be_true
+    end
+
+  end
+
 end

data/spec/controllers/admin/trash_controller_spec.rb

@@ -6,12 +6,12 @@ describe Alchemy::Admin::TrashController do
 
   before(:each) do
     activate_authlogic
-    Alchemy::UserSession.create Factory(:admin_user)
+    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
   end
 
   it "should hold trashed elements" do
-    @page = Factory(:page, :parent_id => Alchemy::Page.rootpage.id)
-    @element = Factory(:element, :page => nil, :public => false, :position => 0, :folded => true)
+    @page = FactoryGirl.create(:page, :parent_id => Alchemy::Page.rootpage.id)
+    @element = FactoryGirl.create(:element, :page => nil, :public => false, :position => 0, :folded => true)
     get :index, :page_id => @page.id
     response.body.should have_selector("#trash_items #element_#{@element.id}.element_editor")
   end

data/spec/controllers/base_controller_spec.rb

@@ -11,14 +11,14 @@ describe Alchemy::BaseController do
     end
 
     it "should set the language from code" do
-      @language = Factory(:language, :code => 'kl')
+      @language = FactoryGirl.create(:language, :code => 'kl')
       controller.send :set_language_from, "kl"
       controller.session[:language_id].should == @language.id
       controller.session[:language_code].should == @language.code
     end
 
     it "should set the language from id as string" do
-      @language = Factory(:language)
+      @language = FactoryGirl.create(:language)
       controller.send :set_language_from, @language.id.to_s
       controller.session[:language_id].should == @language.id
       controller.session[:language_code].should == @language.code
@@ -42,7 +42,7 @@ describe Alchemy::BaseController do
     context "with lang param" do
 
       it "should set the language" do
-        @language = Factory(:language)
+        @language = FactoryGirl.create(:language)
         controller.stub!(:params).and_return({:lang => 'kl'})
         controller.send :set_language
         controller.session[:language_id].should == @language.id