alchemy_cms 2.2.rc11 → 2.2.rc13

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
-bundler_args: --without development
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
   - ree
+  - rbx-19mode
 branches:
   only:
     - master
@@ -15,3 +15,6 @@ env:
   - DB=mysql
   - DB=postgresql
   - DB=sqlite
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
@@ -10,12 +10,10 @@ 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 'factory_girl_rails', '~> 1.7.0'
-  gem "capybara"
-  gem 'capybara-webkit'       unless ENV['CI']
-  gem "launchy"               unless ENV['CI']
-  gem "database_cleaner"
+  unless ENV['CI']
+    gem 'capybara-webkit'
+    gem 'launchy'
+  end
 end
 
 group :assets do
@@ -25,6 +23,9 @@ group :assets do
 end
 
 group :development do
-  gem 'guard-spork'
-  gem 'yard'
+  unless ENV['CI']
+    gem 'guard-spork'
+    gem 'ruby-debug19', :require => 'ruby-debug', :platform => :ruby_19
+    gem 'ruby-debug', :platform => :ruby_18
+  end
 end

data/alchemy_cms.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency(%q<rails>, ["~> 3.2.1"])
+  s.add_runtime_dependency(%q<rails>, ["~> 3.2.5"])
   s.add_runtime_dependency(%q<authlogic>)
   s.add_runtime_dependency(%q<awesome_nested_set>, ["~> 2.0"])
   s.add_runtime_dependency(%q<declarative_authorization>, ["~> 0.5.4"])
@@ -32,10 +32,14 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<dynamic_form>, ["~> 1.1"])
   s.add_runtime_dependency(%q<jquery-rails>, ["~> 2.0.0"])
   s.add_runtime_dependency(%q<attachment_magic>, ["~> 0.2.1"])
-  s.add_runtime_dependency('sass-rails', ['~> 3.2.3'])
+  s.add_runtime_dependency(%q<sass-rails>, ['~> 3.2.3'])
 
-  s.add_development_dependency(%q<rspec-rails>, ["~> 2.8"])
+  s.add_development_dependency(%q<bumpy>)
+  s.add_development_dependency(%q<capybara>)
+  s.add_development_dependency(%q<database_cleaner>)
+  s.add_development_dependency(%q<factory_girl_rails>, ['~> 1.7.0'])
+  s.add_development_dependency(%q<rspec-rails>)
   s.add_development_dependency(%q<sqlite3>)
-  s.add_development_dependency(%q<jasminerice>)
+  s.add_development_dependency(%q<yard>)
 
 end

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

@@ -118,19 +118,6 @@ if (typeof(Alchemy) === 'undefined') {
       }
     },
 
-    saveElement:function (form) {
-      // disabled for now. I think we don't need this.
-      return true;
-      // remove this comment if you have problems with saving tinymce content
-      // var $rtf_contents = $(form).find('div.content_rtf_editor');
-      // if ($rtf_contents.size() > 0) {
-      //   $rtf_contents.each(function() {
-      //     var id = $(this).children('textarea.tinymce').attr('id');
-      //     tinymce.get(id).save();
-      //   });
-      // }
-    },
-
     setElementSaved:function (selector) {
       var $element = $(selector);
       Alchemy.setElementClean(selector);

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

@@ -8,12 +8,14 @@ if (typeof(Alchemy) === 'undefined') {
 
     ElementDirtyObserver:function (selector) {
       var $elements = $(selector);
-      $elements.find('textarea.tinymce').map(function () {
+      $elements.find('textarea.default_tinymce').map(function () {
         var $this = $(this);
         var ed = tinymce.get(this.id);
-        ed.onChange.add(function (ed, l) {
-          Alchemy.setElementDirty($this.parents('.element_editor'));
-        });
+        if (ed) {
+          ed.onChange.add(function (ed, l) {
+            Alchemy.setElementDirty($this.parents('.element_editor'));
+          });
+        }
       });
       $elements.find('input[type="text"]').bind('change', function () {
         $(this).addClass('dirty');

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

@@ -47,13 +47,13 @@ if (typeof(Alchemy) === 'undefined') {
           });
         },
         start:function (event, ui) {
-          var $textareas = ui.item.find('textarea.tinymce');
+          var $textareas = ui.item.find('textarea.default_tinymce, textarea.custom_tinymce');
           $textareas.each(function () {
             tinymce.get(this.id).remove();
           });
         },
         stop:function (event, ui) {
-          var $textareas = ui.item.find('textarea.tinymce');
+          var $textareas = ui.item.find('textarea.default_tinymce, textarea.custom_tinymce');
           $textareas.each(function () {
             Alchemy.Tinymce.addEditor(this.id);
           });

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

@@ -634,8 +634,8 @@ div.essence_richtext_loader {
   z-index: 1;
   width: 100%;
   height: 100%;
-  background-color: #ededed;
-  @include opacity(75);
+  background-color: #F0E8D7;
+  @include opacity(90);
 }
 
 div.essence_richtext_loader img {
@@ -828,11 +828,8 @@ textarea {
   height: 140px;
 }
 
-textarea.tinymce {
-  padding: 0;
-  margin: 0;
-  width: 100%;
-  border: 0 none;
+textarea.default_tinymce, textarea.custom_tinymce {
+  visibility: hidden;
 }
 
 .text_short_float_left {

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

@@ -59,9 +59,8 @@ module Alchemy
         end
       end
 
-      def get_clipboard(category = nil)
-        clipboard = (session[:clipboard] ||= {})
-        clipboard[category.to_s.pluralize] ||= [] if category
+      def get_clipboard
+        session[:clipboard] ||= Clipboard.new
       end
 
       def clipboard_empty?(category = nil)

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

@@ -4,18 +4,18 @@ module Alchemy
     class ClipboardController < Alchemy::Admin::BaseController
 
       def index
-        clipboard = get_clipboard(params[:remarkable_type])
-        @clipboard_items = model_class.all_from_clipboard(clipboard)
+        @clipboard = get_clipboard
+        @clipboard_items = model_class.all_from_clipboard(@clipboard.all(params[:remarkable_type]))
         respond_to do |format|
           format.html { render :layout => false }
         end
       end
 
       def insert
-        @clipboard = get_clipboard(params[:remarkable_type])
+        @clipboard = get_clipboard
         @item = model_class.find(params[:remarkable_id])
-        unless @clipboard.collect { |i| i[:id].to_s }.include?(params[:remarkable_id])
-          @clipboard.push({:id => params[:remarkable_id], :action => params[:remove] ? 'cut' : 'copy'})
+        unless @clipboard.contains? params[:remarkable_type], params[:remarkable_id]
+          @clipboard.push params[:remarkable_type], {:id => params[:remarkable_id], :action => params[:remove] ? 'cut' : 'copy'}
         end
         respond_to do |format|
           format.js
@@ -23,19 +23,19 @@ module Alchemy
       end
 
       def remove
-        @clipboard = get_clipboard(params[:remarkable_type])
+        @clipboard = get_clipboard
         @item = model_class.find(params[:remarkable_id])
-        @clipboard.delete_if { |i| i[:id].to_s == params[:remarkable_id] }
+        @clipboard.remove params[:remarkable_type], params[:remarkable_id]
         respond_to do |format|
           format.js
         end
       end
 
       def clear
-        session[:clipboard] = {}
+        session[:clipboard].clear(params[:remarkable_type])
       end
 
-      private
+    private
 
       def model_class
         "alchemy/#{params[:remarkable_type]}".classify.constantize
@@ -43,4 +43,4 @@ module Alchemy
 
     end
   end
-end
+end

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

@@ -27,7 +27,7 @@ module Alchemy
         @page = Page.find_by_id(params[:page_id])
         @element = @page.elements.build
         @elements = Element.all_for_page(@page)
-        clipboard_elements = get_clipboard('elements')
+        clipboard_elements = get_clipboard[:elements]
         unless clipboard_elements.blank?
           @clipboard_items = Element.all_from_clipboard_for_page(clipboard_elements, @page)
         end
@@ -43,7 +43,7 @@ module Alchemy
           @element = Element.copy(source_element, {:page_id => @page.id})
           if element_from_clipboard[:action] == 'cut'
             @cutted_element_id = source_element.id
-            @clipboard.delete_if { |i| i[:id].to_i == source_element.id }
+            @clipboard.remove :elements, source_element.id
             source_element.destroy
           end
         else
@@ -115,8 +115,8 @@ module Alchemy
       end
 
       def element_from_clipboard
-        @clipboard = get_clipboard(:elements)
-        @clipboard.detect { |i| i[:id].to_i == params[:paste_from_clipboard].to_i }
+        @clipboard = get_clipboard
+        @clipboard.get(:elements, params[:paste_from_clipboard])
       end
 
     end

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

@@ -39,7 +39,7 @@ module Alchemy
       def new
         @page = Page.new(:layoutpage => params[:layoutpage] == 'true', :parent_id => params[:parent_id])
         @page_layouts = PageLayout.get_layouts_for_select(session[:language_id], @page.layoutpage?)
-        @clipboard_items = Page.all_from_clipboard_for_select(get_clipboard('pages'), session[:language_id], @page.layoutpage?)
+        @clipboard_items = Page.all_from_clipboard_for_select(get_clipboard[:pages], session[:language_id], @page.layoutpage?)
         render :layout => false
       end
 
@@ -104,7 +104,6 @@ module Alchemy
         session[:language_id] = @page.language_id
         if @page.destroy
           @page_root = Page.language_root_for(session[:language_id])
-          get_clipboard('pages').delete(@page.id)
           @message = t("Page deleted", :name => name)
           flash[:notice] = @message
           respond_to do |format|

data/app/controllers/alchemy/base_controller.rb

@@ -9,7 +9,7 @@ module Alchemy
     before_filter :set_language
     before_filter :mailer_set_url_options
 
-    helper_method :current_server, :current_user, :t
+    helper_method :current_server, :t
 
     # Returns a host string with the domain the app is running on.
     def current_server
@@ -30,20 +30,6 @@ module Alchemy
       Language.published.count > 1
     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
-
     def raise_not_found_error
       raise ActionController::RoutingError.new('Not Found')
     end

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

@@ -31,18 +31,13 @@ module Alchemy
           :resizable => false
         }
         options = default_options.merge(options)
-        link_to_function(
+        size = options[:size].to_s.split('x')
+        size_x = options[:size] ? size[0] : 'auto'
+        size_y = options[:size] ? size[1] : 'auto'
+        link_to(
           content,
-          "Alchemy.openWindow(
-            \'#{url}\',
-            \'#{options[:title]}\',
-            \'#{options[:size] ? options[:size].split('x')[0].to_s : 'auto'}\',
-            \'#{options[:size] ? options[:size].split('x')[1].to_s : 'auto'}\',
-            #{options[:resizable]},
-            #{options[:modal]},
-            #{options[:overflow]}
-          )",
-          html_options
+          '#',
+          html_options.merge(:onclick => "Alchemy.openWindow('#{url}', '#{options[:title]}', '#{size}', '#{size_y}', #{options[:resizable]}, #{options[:modal]}, #{options[:overflow]})")
         )
       end
 
@@ -90,18 +85,17 @@ module Alchemy
         }
         options = default_options.merge(options)
         options[:onkeyup] << ";jQuery('#search_field').val().length >= 1 ? jQuery('.js_filter_field_clear').show() : jQuery('.js_filter_field_clear').hide();"
-        filter_field = "<div class=\"js_filter_field_box\">"
+        filter_field = '<div class="js_filter_field_box">'
         filter_field << text_field_tag("filter", '', options)
         filter_field << content_tag('span', '', :class => 'icon search')
-        filter_field << link_to_function(
-          "",
-          "jQuery('##{options[:id]}').val('');#{options[:onkeyup]}",
+        filter_field << link_to('', '#', {
+          :onclick => "jQuery('##{options[:id]}').val('');#{options[:onkeyup]}",
           :class => "js_filter_field_clear",
           :style => "display:none",
           :title => t("click_to_show_all")
-        )
-        filter_field << "<label for=\"search_field\">" + t("search") + "</label>"
-        filter_field << "</div>"
+        })
+        filter_field << %(<label for="search_field">#{t(:search)}</label>)
+        filter_field << '</div>'
         filter_field.html_safe
       end
 
@@ -122,10 +116,10 @@ module Alchemy
         title = t("please_confirm")
         ok_lable = t("Yes")
         cancel_lable = t("No")
-        link_to_function(
+        link_to(
           link_string,
-          "Alchemy.confirmToDeleteWindow('#{url}', '#{title}', '#{message}', '#{ok_lable}', '#{cancel_lable}');",
-          html_options
+          '#',
+          html_options.merge(:onclick => "Alchemy.confirmToDeleteWindow('#{url}', '#{title}', '#{message}', '#{ok_lable}', '#{cancel_lable}');")
         )
       end
 

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

@@ -70,12 +70,6 @@ module Alchemy
         )
       end
 
-      # Returns a textarea ready to use with tinymce
-      def tinymce_tag(name, content = '', options = {})
-        append_class_name(options, 'tinymce')
-        text_area_tag(name, content, options)
-      end
-
     end
   end
 end

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

@@ -11,34 +11,69 @@ module Alchemy
           end
         end
         init = init.collect { |key, value| "#{key} : #{value.to_json}" }.join(', ')
-
         setup = "init.setup = #{Alchemy::Tinymce.setup};" if Alchemy::Tinymce.setup
-        return "
-    <script type='text/javascript'>
-      jQuery(function(){
-        if (typeof(Alchemy) !== 'object') { Alchemy = {}; };
-        Alchemy.Tinymce = {
-          init : function(callback) {
-            var init = { #{init} };
-            init.mode = 'specific_textareas';
-            init.editor_selector = 'tinymce';
-            init.plugins = '#{Alchemy::Tinymce.plugins.join(',')}';
-            init.language = '#{::I18n.locale.to_s.split('-')[0].downcase }';
-            init.init_instance_callback = function(inst) {
-              jQuery('#' + inst.editorId).prev('.essence_richtext_loader').hide();
-            }
-            if (callback)
-              init.oninit = callback;
-            #{setup}
-            tinymce.init(init);
-          },
-          addEditor : function(dom_id) {
-            tinymce.execCommand('mceAddControl', true, dom_id);
-          }
-        };
-        Alchemy.Tinymce.init();
-      });
-    </script>".html_safe
+        tinymce_javascript_string = "
+        <script type='text/javascript'>
+          jQuery(function($) {
+            if (typeof(Alchemy) !== 'object') { Alchemy = {}; };
+            Alchemy.Tinymce = {
+              init : function(callback) {
+                var init = { #{init} };
+                init.mode = 'specific_textareas';
+                init.editor_selector = 'default_tinymce';
+                init.plugins = '#{Alchemy::Tinymce.plugins.join(',')}';
+                init.language = '#{::I18n.locale.to_s.split('-')[0].downcase }';
+                init.init_instance_callback = function(inst) {
+                  $('#' + inst.editorId).prev('.essence_richtext_loader').hide();
+                }
+                if (callback)
+                  init.oninit = callback;
+                #{setup}
+                tinymce.init(init);
+              },
+              addEditor : function(dom_id) {
+                tinymce.execCommand('mceAddControl', true, dom_id);
+              }
+            };
+          });
+        </script>"
+        if Alchemy::Tinymce.custom_config_contents.any?
+          (tinymce_javascript_string + custom_tinymce_javascript_tags).html_safe
+        else
+          tinymce_javascript_string.html_safe
+        end
+      end
+
+      def custom_tinymce_javascript_tags
+        custom_config_string = "
+          <script type='text/javascript'>
+            jQuery(function($) {
+              Alchemy.Tinymce.customInits = [];"
+        Alchemy::Tinymce.custom_config_contents.each do |content|
+          next unless content['settings']['tinymce']
+          config = Alchemy::Tinymce.init.merge(content['settings']['tinymce'].symbolize_keys)
+          config = config.collect { |key, value| "#{key} : #{value.to_json}" }.join(', ')
+          custom_config_string += "
+              Alchemy.Tinymce.customInits.push(function(callback) {
+                var init = { #{config} };
+                init.mode = 'specific_textareas';
+                init.editor_selector = /custom_tinymce #{Regexp.escape(content['name'])}/;
+                init.plugins = '#{Alchemy::Tinymce.plugins.join(',')}';
+                init.language = '#{::I18n.locale.to_s.split('-')[0].downcase }';
+                init.init_instance_callback = function(inst) {
+                  var $this = $('#' + inst.editorId);
+                  $this.prev('.essence_richtext_loader').hide();
+                  inst.onChange.add(function (ed, l) {
+                    Alchemy.setElementDirty($this.parents('.element_editor'));
+                  });
+                }
+                tinymce.init(init);
+              });"
+        end
+        custom_config_string += "
+            });
+          </script>"
+        custom_config_string.html_safe
       end
 
     end