alchemy_cms 2.2.rc11 → 2.2.rc13

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

@@ -1,11 +1,17 @@
-<%- cache(content) do -%>
+<% cache(content) do -%>
 <div class="content_editor content_rtf_editor" id="<%= content_dom_id(content) %>">
   <label><%= render_content_name(content) %></label>
   <div style="position: relative">
+    <% if content.has_custom_tinymce_config? && content.settings[:tinymce] -%>
     <div class="essence_richtext_loader">
       <%= image_tag('alchemy/ajax_loader.gif') %>
     </div>
-    <%= tinymce_tag(content.form_field_name, content.ingredient) %>
+    <% end -%>
+    <%= text_area_tag(
+      content.form_field_name,
+      content.ingredient || '',
+      :class => content.tinymce_class_name
+    ) %>
   </div>
 </div>
-<%- end -%>
+<% end -%>

data/lib/alchemy/authentication_helpers.rb

@@ -0,0 +1,26 @@
+module Alchemy
+  module AuthenticationHelpers
+
+    def self.included(base)
+      base.send :helper_method, :current_user
+      base.send :alias_method, :current_alchemy_user, :current_user
+    end
+
+    def current_user
+      return @current_user if defined?(@current_user)
+      @current_user = current_user_session && current_user_session.record
+    end
+
+    def current_user_session
+      return @current_user_session if defined?(@current_user_session)
+      @current_user_session = UserSession.find
+    end
+
+    def logged_in?
+      !current_user.blank?
+    end
+
+  end
+end
+
+ApplicationController.send :include, Alchemy::AuthenticationHelpers

data/lib/alchemy/engine.rb

@@ -41,5 +41,9 @@ module Alchemy
       Alchemy::AuthEngine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
     end
 
+    initializer 'alchemy.include_authentication_helpers' do
+      require File.join(File.dirname(__FILE__), 'authentication_helpers')
+    end
+
   end
 end

data/lib/alchemy/tinymce.rb

@@ -47,5 +47,9 @@ module Alchemy
       @@init
     end
 
+    def self.custom_config_contents
+      @@custom_config_contents ||= Content.descriptions.select { |c| c['settings'] && !c['settings']['tinymce'].nil? }
+    end
+
   end
 end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc11"
+  VERSION = "2.2.rc13"
 
 end

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -1,49 +1,49 @@
 require 'spec_helper'
 
-describe Alchemy::Admin::ClipboardController do
+module Alchemy
+  describe Admin::ClipboardController do
 
-  before(:each) do
-    activate_authlogic
-    Alchemy::UserSession.create(FactoryGirl.create(:admin_user))
-  end
-
-  context "clipboard" do
+    let(:page)            { FactoryGirl.create(:public_page) }
+    let(:element)         { FactoryGirl.create(:element, :page => page) }
+    let(:another_element) { FactoryGirl.create(:element, :page => page) }
 
-    it "should hold element ids" do
-      @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'}]
+    before(:each) do
+      activate_authlogic
+      UserSession.create(FactoryGirl.create(:admin_user))
+      session[:clipboard] = Clipboard.new
     end
 
-    it "should not have the same element twice" do
-      @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'}]
+    describe "#insert" do
+
+      it "should hold element ids" do
+        post(:insert, {:remarkable_type => :elements, :remarkable_id => element.id, :format => :js})
+        session[:clipboard][:elements].should == [{:id => element.id, :action => 'copy'}]
+      end
+
+      it "should not have the same element twice" do
+        session[:clipboard][:elements] = {:id => element.id, :action => 'copy'}
+        post(:insert, {:remarkable_type => :elements, :remarkable_id => element.id, :format => :js})
+        session[:clipboard][:elements].collect { |e| e[:id] }.should_not == [element.id, element.id]
+      end
+
     end
 
-    it "should remove element ids" do
-      @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'}]
+    describe "#delete" do
+      it "should remove element ids from clipboard" do
+        session[:clipboard][:elements] = {:id => element.id, :action => 'copy'}
+        session[:clipboard][:elements] << {:id => another_element.id, :action => 'copy'}
+        delete(:remove, {:remarkable_type => :elements, :remarkable_id => another_element.id, :format => :js})
+        session[:clipboard][:elements].should == [{:id => element.id, :action => 'copy'}]
+      end
     end
 
-    it "should be clearable" do
-      @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 == {}
+    describe "#clear" do
+      it "should be clearable" do
+        session[:clipboard][:elements] = {:id => element.id}
+        delete(:clear, :format => :js)
+        session[:clipboard].should be_empty
+      end
     end
 
   end
-
 end

data/spec/controllers/admin/elements_controller_spec.rb

@@ -1,22 +1,79 @@
 require 'spec_helper'
 
-describe Alchemy::Admin::ElementsController do
+module Alchemy
+  describe Admin::ElementsController do
 
-  render_views
+    before(:each) do
+      activate_authlogic
+      Alchemy::UserSession.create FactoryGirl.create(:admin_user)
+    end
 
-  before(:each) do
-    activate_authlogic
-    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
-  end
+    let(:page) { mock_model('Page', {:id => 1, :urlname => 'lulu'}) }
+    let(:element) { mock_model('Element', {:id => 1, :page_id => page.id, :public => true, :display_name_with_preview_text => 'lalaa', :dom_id => 1}) }
 
-  let(:page) { mock_model('Page', {:id => 1, :urlname => 'lulu'}) }
-  let(:element) { mock_model('Element', {:id => 1, :page_id => page.id, :public => true, :display_name_with_preview_text => 'lalaa', :dom_id => 1}) }
+    describe '#list' do
 
-  it "should return a select tag with elements" do
-    Alchemy::Page.should_receive(:find_by_urlname_and_language_id).and_return(page)
-    Alchemy::Element.should_receive(:find_all_by_page_id_and_public).and_return([element])
-    get :list, {:page_urlname => page.urlname, :format => :js}
-    response.body.should match(/select(.*)elements_from_page_selector(.*)option/)
-  end
+      render_views
+
+      it "should return a select tag with elements" do
+        Alchemy::Page.should_receive(:find_by_urlname_and_language_id).and_return(page)
+        Alchemy::Element.should_receive(:find_all_by_page_id_and_public).and_return([element])
+        get :list, {:page_urlname => page.urlname, :format => :js}
+        response.body.should match(/select(.*)elements_from_page_selector(.*)option/)
+      end
+
+    end
+
+    describe '#new' do
+
+      context "elements in clipboard" do
+
+        let(:clipboard) { session[:clipboard] = Clipboard.new }
+
+        before(:each) do
+          clipboard[:elements] = [{:id => element.id, :action => 'copy'}]
+        end
+
+        it "should load all elements from clipboard" do
+          get :new, {:page_id => page.id, :format => :js}
+          assigns(:clipboard_items).should be_kind_of(Array)
+        end
+
+      end
+
+    end
+
+    describe '#create' do
 
+      render_views
+
+      context "with paste_from_clipboard in parameters" do
+
+        let(:clipboard) { session[:clipboard] = Clipboard.new }
+        let(:element_in_clipboard) { @element ||= FactoryGirl.create(:element, :page_id => page.id) }
+
+        before(:each) do
+          clipboard[:elements] = [{:id => element_in_clipboard.id, :action => 'cut'}]
+        end
+
+        it "should create an element from clipboard" do
+          post :create, {:paste_from_clipboard => element_in_clipboard.id, :element => {:page_id => page.id}, :format => :js}
+          response.status.should == 200
+          response.body.should match(/Succesfully added new element/)
+        end
+
+        context "and with cut as action parameter" do
+
+          it "should also remove the element id from clipboard" do
+            post :create, {:paste_from_clipboard => element_in_clipboard.id, :element => {:page_id => page.id}, :format => :js}
+            session[:clipboard].contains?(:elements, element_in_clipboard.id).should_not be_true
+          end
+
+        end
+
+      end
+
+    end
+
+  end
 end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -1,51 +1,97 @@
 require 'spec_helper'
 
-describe Alchemy::Admin::PagesController do
+module Alchemy
+  describe Admin::PagesController do
 
-  before(:each) do
-    activate_authlogic
-    Alchemy::UserSession.create FactoryGirl.create(:admin_user)
-  end
+    before(:each) do
+      activate_authlogic
+      Alchemy::UserSession.create FactoryGirl.create(:admin_user)
+    end
 
-  describe "#flush" do
+    describe "#flush" do
+
+      it "should remove the cache of all pages" do
+        post :flush, {:format => :js}
+        response.status.should == 200
+      end
 
-    it "should remove the cache of all pages" do
-      post :flush, {:format => :js}
-      response.status.should == 200
     end
 
-  end
+    describe '#new' do
 
-  describe '#copy_language_tree' do
+      context "pages in clipboard" 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
+        let(:clipboard) { session[:clipboard] = Clipboard.new }
+        let(:page) { mock_model('Page', {:id => 10, :name => 'Foobar', :parent_id => 1}) }
+
+        before(:each) do
+          clipboard[:pages] = [{:id => page.id, :action => 'copy'}]
+        end
+
+        it "should load all pages from clipboard" do
+          get :new, {:page_id => page.id, :format => :js}
+          assigns(:clipboard_items).should be_kind_of(Array)
+        end
+
+      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
+    describe '#create' do
+
+      render_views
+
+      context "with paste_from_clipboard in parameters" do
+
+        let(:clipboard) { session[:clipboard] = Clipboard.new }
+        let(:page_in_clipboard) { @page ||= FactoryGirl.create(:public_page) }
+        let(:parent) { @page ||= FactoryGirl.create(:public_page) }
+
+        before(:each) do
+          clipboard[:pages] = [{:id => page_in_clipboard.id, :action => 'cut'}]
+        end
+
+        it "should create a page from clipboard" do
+          post :create, {:paste_from_clipboard => page_in_clipboard.id, :page => {:parent_id => parent.id}, :format => :js}
+          response.status.should == 200
+          response.body.should match /window.location.*admin.*pages/
+        end
+
+      end
+
     end
 
-    it "should not set layoutpage attribute to true" do
-      @new_lang_root.layoutpage.should_not be_true
+    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
-
 end

data/spec/models/clipboard_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+
+module Alchemy
+  describe Clipboard do
+
+    let(:clipboard) { Clipboard.new }
+
+    describe "#new" do
+      it "should be a hash with empty elements and pages collections" do
+        clipboard[:elements].should == []
+        clipboard[:pages].should == []
+      end
+    end
+
+    describe '#push' do
+      it "should add item to clipboard category" do
+        clipboard.push :elements, {:id => 1}
+        clipboard[:elements].should == [{:id => 1}]
+      end
+    end
+
+    describe '#replace' do
+
+      it "should replace the category items with new item" do
+        clipboard.replace(:elements, {:id => 1})
+        clipboard[:elements].should == [{:id => 1}]
+      end
+
+      it "should replace the category items with new item collection" do
+        clipboard.replace(:elements, [{:id => 1}])
+        clipboard[:elements].should == [{:id => 1}]
+      end
+
+      it "should be aliased with []= " do
+        clipboard[:elements] = [{:id => 1}]
+        clipboard[:elements].should == [{:id => 1}]
+      end
+
+    end
+
+    describe '#empty?' do
+      it "should return true if clipboard is empty" do
+        clipboard.empty?.should be_true
+      end
+    end
+
+    context "full clipboard" do
+
+      before(:all) do
+        clipboard[:elements] = [{:id => 1}, {:id => 2}]
+        clipboard[:pages] = [{:id => 2}, {:id => 3}]
+      end
+
+      describe "#all" do
+
+        context "with :elements as parameter" do
+          it "should return all element items in clipboard" do
+            clipboard[:elements].should == [{:id => 1}, {:id => 2}]
+          end
+        end
+
+        context "with :pages as parameter" do
+          it "should return all page items in clipboard" do
+            clipboard[:pages].should == [{:id => 2}, {:id => 3}]
+          end
+        end
+
+      end
+
+      describe '#contains?' do
+        it "should return true if elements id is in collection" do
+          clipboard.contains?(:elements, 1).should be_true
+        end
+      end
+
+      describe '#remove' do
+        it "should remove item from category collection" do
+          clipboard.remove(:elements, 1)
+          clipboard[:elements].should == [{:id => 2}]
+        end
+      end
+
+      describe '#clear' do
+        it "should clear complete category collection" do
+          clipboard.clear(:elements)
+          clipboard[:elements].should be_empty
+        end
+      end
+
+      describe '#get' do
+        it "should return element from collection" do
+          clipboard[:elements] = [{:id => 1}]
+          clipboard.get(:elements, 1).should == {:id => 1}
+        end
+      end
+
+    end
+
+  end
+end