refinerycms 0.9.6.14 → 0.9.6.15

data/config/environment.rb

@@ -1,5 +1,2 @@
 # Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
-Refinery::Application.initialize! if Rails.version.to_f >= 3.0
+require File.expand_path('../application', __FILE__)

data/config/environments/development.rb

@@ -16,6 +16,8 @@ config.action_controller.perform_caching             = false
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false
 
+config.log_level = :info
+
 # Uncomment the following lines if you're getting
 # "A copy of XX has been removed from the module tree but is still active!"
 # or you want to develop a plugin and don't want to restart every time a change is made:

data/config/environments/production.rb

@@ -23,4 +23,4 @@ config.log_level = :info
 # Set to true in order to use Amazon's Simple Storage Service on your production machine
 # instead of the default file system for resources and images
 # Make sure to your bucket info is correct in amazon_s3.yml
-USE_S3_BACKEND = false
+Refinery.s3_backend = false

data/config/preinitializer.rb

@@ -4,7 +4,6 @@ rails_root = (defined?(Rails.root) ? Rails.root : Pathname.new(RAILS_ROOT)).clea
 if (non_gem_path = rails_root.join("vendor", "plugins", "refinery", "lib", "refinery.rb")).exist?
   require non_gem_path.realpath.to_s
 else
-  require 'rubygems'
   version = if defined? REFINERY_GEM_VERSION
     REFINERY_GEM_VERSION
   elsif ENV.include?("REFINERY_GEM_VERSION")
@@ -13,6 +12,7 @@ else
     $1 if rails_root.join("config", "application.rb").read =~ /^[^#]*REFINERY_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
   end
 
+  require "rubygems"
   if version
     gem 'refinerycms', version
   else
@@ -20,8 +20,4 @@ else
   end
 
   require 'refinery_initializer'
-end
-
-# Set to true in your environment specific file (e.g. production.rb) to use Amazon's Simple
-# Storage Service instead of the default file system for resources and images
-USE_S3_BACKEND = false unless defined?(USE_S3_BACKEND)
+end

data/db/schema.rb

@@ -1,4 +1,4 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #

data/db/seeds.rb

@@ -118,4 +118,4 @@ Page.create(:title => "Down for maintenance",
             })
 
 # Create a default themes directory.
-Rails.root.join("themes").mkdir unless Rails.root.join("themes").directory?
+Rails.root.join("themes").mkdir unless Rails.root.join("themes").directory?

data/lib/refinery/tasks/refinery.rake

@@ -0,0 +1,83 @@
+desc 'Removes trailing whitespace across the entire application.'
+task :whitespace do
+  sh %{find . -name '*.*rb' -exec sed -i '' 's/\t/  /g' {} \\; -exec sed -i '' 's/ *$//g' {} \\; }
+end
+
+namespace :test do
+  desc "Run the tests that ship with Refinery to ensure any changes you've made haven't caused instability."
+  task :refinery do
+    errors = %w(test:refinery:units test:refinery:functionals test:refinery:integration).collect do |task|
+      begin
+        Rake::Task[task].invoke
+        nil
+      rescue => e
+        task
+      end
+    end.compact
+    abort "Errors running #{errors.to_sentence(:locale => :en)}!" if errors.any?
+  end
+  namespace :refinery do
+    Rake::TestTask.new(:units => "db:test:prepare") do |t|
+      t.libs << Refinery.root.join("test").to_s
+      t.pattern = Refinery.root.join("test", "unit", "**", "*_test.rb").to_s
+      t.verbose = true
+      ENV["RAILS_ROOT"] = Rails.root.to_s
+    end
+    Rake::Task['test:refinery:units'].comment = "Run the unit tests in Refinery."
+
+    Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
+      t.libs << Refinery.root.join("test").to_s
+      t.pattern = Refinery.root.join("test", "functional", "**", "*_test.rb").to_s
+      t.verbose = true
+      ENV["RAILS_ROOT"] = Rails.root.to_s
+    end
+    Rake::Task['test:refinery:functionals'].comment = "Run the functional tests in Refinery."
+
+    Rake::TestTask.new(:integration => "db:test:prepare") do |t|
+      t.libs << Refinery.root.join("test").to_s
+      t.pattern = Refinery.root.join("test", "integration", "**", "*_test.rb").to_s
+      t.verbose = true
+      ENV["RAILS_ROOT"] = Rails.root.to_s
+    end
+    Rake::Task['test:refinery:integration'].comment = "Run the integration tests in Refinery."
+
+    Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t|
+      t.libs << Refinery.root.join("test").to_s
+      t.pattern = Refinery.root.join("test", "performance", "**", "*_test.rb")
+      t.verbose = true
+      t.options = '-- --benchmark'
+      ENV["RAILS_ROOT"] = Rails.root.to_s
+    end
+    Rake::Task['test:refinery:benchmark'].comment = 'Benchmark the performance tests in Refinery'
+  end
+end
+
+# You don't need to worry about this unless you're releasing Refinery gems.
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = %q{refinerycms}
+    s.description = %q{A beautiful open source Ruby on Rails content manager for small business. Easy to extend, easy to use, lightweight and all wrapped up in a super slick UI.}
+    s.summary = %q{A beautiful open source Ruby on Rails content manager for small business.}
+    s.email = %q{info@refinerycms.com}
+    s.homepage = %q{http://refinerycms.com}
+    s.authors = ["Resolve Digital", "David Jones", "Philip Arndt"]
+    s.extra_rdoc_files = %w(readme.md contributors.md license.md VERSION)
+    s.rdoc_options << "--inline-source"
+    s.has_rdoc = true
+  end
+
+  namespace :version do
+    namespace :bump do
+      desc "Bump the application's version by a build version."
+      task :build => [:version_required, :version] do
+        version = Jeweler::VersionHelper.new(Rails.root.to_s)
+        version.update_to(version.major, version.minor, version.patch, ((version.build || 0).to_i + 1))
+        version.write
+        $stdout.puts "Updated version: #{version.to_s}"
+      end
+    end
+  end
+rescue LoadError
+  #puts "Jeweler not available. Install it with: sudo gem install jeweler"
+end

data/lib/refinery/tasks/refinery.rb

@@ -0,0 +1,16 @@
+# Because we use plugins that are shipped via gems, we lose their rake tasks.
+# So here, we find them (if there are any) and include them into rake.
+extra_rake_tasks = []
+if defined?(Refinery) && Refinery.is_a_gem
+  extra_rake_tasks << Dir[Refinery.root.join("vendor", "plugins", "*", "**", "tasks", "**", "*", "*.rake")].sort
+end
+
+# We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:
+if $refinery_gem_plugin_lib_paths.present?
+  extra_rake_tasks << $refinery_gem_plugin_lib_paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort}
+end
+
+extra_rake_tasks << Dir[Rails.root.join("lib", "refinery", "tasks", "*.rake")]
+
+# Load in any extra tasks that we've found.
+extra_rake_tasks.flatten.compact.uniq.each {|rake| load rake }

data/public/javascripts/refinery/admin.js

@@ -35,7 +35,8 @@ init_modal_dialogs = function(){
   $('a[href*="dialog=true"]').each(function(i, anchor)
   {
     $(anchor).click(function(e){
-      $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "'></iframe>").dialog({
+      iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "'></iframe>");
+      iframe.dialog({
         title: $(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null,
         modal: true,
         resizable: false,
@@ -44,6 +45,10 @@ init_modal_dialogs = function(){
         height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473),
         beforeclose: function(){$(document.body).removeClass('hide-overflow')}
       });
+      if ($.browser.msie) {
+        iframe.css({'margin':'-2px 2px 2px -2px'});
+//        iframe..css('overflow: hidden');
+      }
       $(document.body).addClass('hide-overflow');
       e.preventDefault();
     });
@@ -232,7 +237,7 @@ var link_dialog = {
       var port = (window.location.port.length > 0 ? (":" + window.location.port) : "");
       var url = link.href.replace(window.location.protocol + "//" + window.location.hostname + port, "");
 
-      link_dialog.update_parent(url, link.rel);
+      link_dialog.update_parent(url, link.rel.replace(/\ ?<em>.+?<\/em>/, ''));
     });
   },
 
@@ -420,8 +425,8 @@ var page_options = {
       var part_id = $('#page_parts_attributes_' + stab_id + '_id').val();
       //console.log('stab_id: ' + stab_id + ' part_id: ' + part_id);
 
-      var result = confirm("This will remove the content section '" + $('#page_parts .ui-tabs-selected a').html() + "' when the page is saved and erase all content that has been entered into it, Are you sure?");
-      if(part_id && result){
+      var result = confirm("This will remove the content section '" + $('#page_parts .ui-tabs-selected a').html() + "' and erase all content that has been entered into it even if you don't save the page, are you sure?");
+      if(part_id && result) {
         $.ajax({
           url: page_options.del_part_url + '/' + part_id,
           type: 'DELETE'

data/public/javascripts/refinery/boot_wym.js

@@ -94,7 +94,7 @@ var wymeditor_boot_options = $.extend({
         + "<div id='dialog-form-actions' class='form-actions'>"
           + "<input class='wym_submit' type='button' value='{Insert}' />"
           + " or "
-          + "<a class='wym_cancel close_dialog' type='button' href=''>{Cancel}</a>"
+          + "<a href='' class='wym_cancel close_dialog'>{Cancel}</a>"
         + "</div>"
       + "</form>"
     + "</div>"
@@ -110,16 +110,30 @@ var wymeditor_boot_options = $.extend({
         + "<div id='dialog-form-actions' class='form-actions'>"
           + "<input class='wym_submit' type='button' value='{Insert}' />"
           + " or "
-          + "<a class='wym_cancel close_dialog' type='button' href=''>{Cancel}</a>"
+          + "<a href='' class='wym_cancel close_dialog'>{Cancel}</a>"
         + "</div>"
       + "</form>"
     + "</div>"
 
   , dialogPath: "/admin/dialogs/"
-  , dialogFeatures: "?width=958&height=460&modal=true&titlebar=true&auto_size_content=true&draggable=true"
-  , dialogInlineFeatures: "?width=600&height=320&modal=true&titlebar=true&auto_size_content=true&draggable=true"
+  , dialogFeatures: {
+      width: 958
+    , height: 570
+    , modal: true
+    , draggable: true
+    , resizable: false
+    , autoOpen: true
+  }
+  , dialogInlineFeatures: {
+      width: 600
+    , height: 530
+    , modal: true
+    , draggable: true
+    , resizable: false
+    , autoOpen: true
+  }
 
-  , dialogId: 'TB_window'
+  , dialogId: 'editor_dialog'
 
   , dialogHtml:
     "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>"

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -513,10 +513,12 @@ $.fn.wymeditor = function(options) {
     updateSelector:    ".wymupdate",
     updateEvent:       "click",
 
-    dialogFeatures:    "menubar=no,titlebar=no,toolbar=no,resizable=no"
-                      + ",width=560,height=300,top=0,left=0",
+    dialogFeatures:    {
+        width: 560
+      , height: 300
+    }
 
-    dialogHtml:      "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'"
+    , dialogHtml:      "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'"
                       + " 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>"
                       + "<html dir='"
                       + WYMeditor.DIRECTION
@@ -1229,7 +1231,7 @@ WYMeditor.editor.prototype.update = function() {
  * @description Opens a dialog box
  */
 WYMeditor.editor.prototype.dialog = function( dialogType ) {
-  var path = this._wym._options.dialogPath + dialogType + this._wym._options.dialogFeatures;
+  var path = this._wym._options.dialogPath + dialogType;
 
   this._current_unique_stamp = this.uniqueStamp();
   // change undo or redo on cancel to true to have this happen when a user closes (cancels) a dialogue
@@ -1266,7 +1268,6 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
   }
 
   // set up handlers.
-  imageGroup = null;
   wym = this;
   ajax_loaded_callback = function(){wym.dialog_ajax_callback(selected)}
 
@@ -1292,41 +1293,42 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
       parent_node.id = 'replace_me_with_' + this._current_unique_stamp;
     }
 
-    if (dialogType != WYMeditor.DIALOG_PASTE) {
-      path += (this._wym._options.dialogFeatures.length == 0) ? "?" : "&";
+    if (dialogType != WYMeditor.DIALOG_PASTE && dialogType != WYMeditor.DIALOG_TABLE) {
+      path += path.indexOf("?") == -1 ? "?" : "&";
       port = (window.location.port.length > 0 ? (":" + window.location.port) : "")
       path += "current_link=" + parent_node.href.replace(window.location.protocol + "//" + window.location.hostname + port, "");
       path += "&target_blank=" + (parent_node.target == "_blank" ? "true" : "false");
     }
   }
 
-  // launch thickbox
+  // launch dialog
 
-  dialog_title = this.replaceStrings(this.encloseString( dialogType ));
+  dialog_title = wym.replaceStrings(wym.encloseString( dialogType ));
+  dialog_container = $("<div id='" + wym._options.dialogId + "' class='editor_dialog'></div>");
   switch(dialogType) {
     case WYMeditor.DIALOG_TABLE: {
-      dialog_container = document.createElement("div");
-      dialog_container.id = 'inline_dialog_container';
-      dialog_container.innerHTML = this.replaceStrings(this._options.dialogTableHtml);
-      $(document.body).after(dialog_container);
+      // create and open dialog
+      dialog_container.html(wym.replaceStrings(wym._options.dialogTableHtml)).dialog($.extend(wym._options.dialogInlineFeatures, {
+        title: dialog_title
+      }));
 
-      tb_show(dialog_title, "#" + this._options.dialogInlineFeatures + "&inlineId=inline_dialog_container&TB_inline=true&modal=true", imageGroup);
       ajax_loaded_callback();
       break;
     }
     case WYMeditor.DIALOG_PASTE: {
-      dialog_container = document.createElement("div");
-      dialog_container.id = 'inline_dialog_container';
-      dialog_container.innerHTML = this.replaceStrings(this._options.dialogPasteHtml);
-      $(document.body).after(dialog_container);
+      dialog_container.html(wym.replaceStrings(wym._options.dialogPasteHtml)).dialog($.extend(wym._options.dialogInlineFeatures, {
+        title: dialog_title
+      }));
 
-      tb_show(dialog_title, "#" + this._options.dialogInlineFeatures + "&inlineId=inline_dialog_container&TB_inline=true&modal=true", imageGroup);
       ajax_loaded_callback();
       break;
     }
     default:
     {
-      tb_show(dialog_title, path, imageGroup, ajax_loaded_callback);
+      $("<img id='dialog_loading' src='/images/refinery/dialogLoadingAnimation.gif />").appendTo(dialog_container);
+      dialog_container.dialog($.extend(wym._options.dialogFeatures, {
+        title: dialog_title
+      })).load(path, ajax_loaded_callback);
       break;
     }
   }
@@ -1335,8 +1337,12 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
 
 WYMeditor.editor.prototype.dialog_ajax_callback = function(selected) {
 
-  // look for iframes
+  // set variables
   wym = this; _selected = selected;
+  // now fix the height;
+  $("#" + wym._options.dialogId + ".editor_dialog").css('height', 'auto');
+
+  // look for iframes
   (iframes = $("#" + this._options.dialogId).find('iframe')).load(function() {
     WYMeditor.INIT_DIALOG(wym, _selected);
     $(this).unbind('load');
@@ -1474,11 +1480,11 @@ WYMeditor.editor.prototype.format_block = function(selected) {
 
 WYMeditor.editor.prototype.computeBasePath = function() {
   if ((script_path = this.computeWymPath()) != null) {
-  if ((src_parts = script_path.split('/')).length > 1) { src_parts.pop(); }
-  return src_parts.join('/') + "/";
+    if ((src_parts = script_path.split('/')).length > 1) { src_parts.pop(); }
+    return src_parts.join('/') + "/";
   }
   else {
-  return null;
+    return null;
   }
 };
 
@@ -1488,13 +1494,13 @@ WYMeditor.editor.prototype.computeWymPath = function() {
 
 WYMeditor.editor.prototype.computeJqueryPath = function() {
   return $($.grep($('script'), function(s){
-  return (s.src && s.src.match(/jquery(-(.*)){0,1}(\.pack|\.min|\.packed)?\.js(\?.*)?$/ ))
+    return (s.src && s.src.match(/jquery(-(.*)){0,1}(\.pack|\.min|\.packed)?\.js(\?.*)?$/ ))
   })).attr('src');
 };
 
 WYMeditor.editor.prototype.computeCssPath = function() {
   return $($.grep($('link'), function(s){
-   return (s.href && s.href.match(/wymeditor\/skins\/(.*)screen\.css(\?.*)?$/ ))
+    return (s.href && s.href.match(/wymeditor\/skins\/(.*)screen\.css(\?.*)?$/ ))
   })).attr('href');
 };
 
@@ -1550,13 +1556,7 @@ WYMeditor.editor.prototype.mousedown = function(evt) {
  *      href - The CSS path.
  */
 WYMeditor.loadCss = function(href) {
-
-    var link = document.createElement('link');
-    link.rel = 'stylesheet';
-    link.href = href;
-
-    var head = $('head').get(0);
-    head.appendChild(link);
+  $("<link rel='stylesheet' />").attr('href', href).appendTo($('head').get(0));
 };
 
 /*
@@ -1565,42 +1565,41 @@ WYMeditor.loadCss = function(href) {
  */
 WYMeditor.editor.prototype.loadSkin = function() {
 
-    //does the user want to automatically load the CSS (default: yes)?
-    //we also test if it hasn't been already loaded by another instance
-    //see below for a better (second) test
-    if(this._options.loadSkin && !WYMeditor.SKINS[this._options.skin]) {
-
-        //check if it hasn't been already loaded
-        //so we don't load it more than once
-        //(we check the existing <link> elements)
-
-        var found = false;
-        var rExp = new RegExp(this._options.skin
-             + '\/' + WYMeditor.SKINS_DEFAULT_CSS + '$');
-
-        $('link').each( function() {
-            if(this.href.match(rExp)) found = true;
-        });
-
-        //load it, using the skin path
-        if(!found) WYMeditor.loadCss( this._options.cssSkinPath
-            + WYMeditor.SKINS_DEFAULT_CSS );
+  //does the user want to automatically load the CSS (default: yes)?
+  //we also test if it hasn't been already loaded by another instance
+  //see below for a better (second) test
+  if(this._options.loadSkin && !WYMeditor.SKINS[this._options.skin]) {
+    //check if it hasn't been already loaded
+    //so we don't load it more than once
+    //(we check the existing <link> elements)
+
+    var found = false;
+    var rExp = new RegExp(this._options.skin
+         + '\/' + WYMeditor.SKINS_DEFAULT_CSS + '$');
+
+    $('link').each( function() {
+        if(this.href.match(rExp)) found = true;
+    });
+
+    // if not found, load it, using the skin path
+    if(!found) {
+      WYMeditor.loadCss( this._options.cssSkinPath + WYMeditor.SKINS_DEFAULT_CSS );
     }
+  }
 
-    //put the classname (ex. wym_skin_default) on wym_box
-    $(this._box).addClass( "wym_skin_" + this._options.skin );
-
-    //does the user want to use some JS to initialize the skin (default: yes)?
-    //also check if it hasn't already been loaded by another instance
-    if(this._options.initSkin && !WYMeditor.SKINS[this._options.skin]) {
+  //put the classname (ex. wym_skin_default) on wym_box
+  $(this._box).addClass( "wym_skin_" + this._options.skin );
 
-        eval($.ajax({url:this._options.jsSkinPath
-            + WYMeditor.SKINS_DEFAULT_JS, async:false}).responseText);
-    }
+  //does the user want to use some JS to initialize the skin (default: yes)?
+  //also check if it hasn't already been loaded by another instance
+  if(this._options.initSkin && !WYMeditor.SKINS[this._options.skin]) {
+    eval($.ajax({url:this._options.jsSkinPath + WYMeditor.SKINS_DEFAULT_JS, async:false}).responseText);
+  }
 
-    //init the skin, if needed
-    if(WYMeditor.SKINS[this._options.skin] && WYMeditor.SKINS[this._options.skin].init)
-       WYMeditor.SKINS[this._options.skin].init(this);
+  //init the skin, if needed
+  if(WYMeditor.SKINS[this._options.skin] && WYMeditor.SKINS[this._options.skin].init) {
+    WYMeditor.SKINS[this._options.skin].init(this);
+  }
 
 };
 
@@ -1615,6 +1614,9 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
   var dialogType = dialog.find('#wym_dialog_type').val();
   var replaceable = wym._selected_image ? $(wym._selected_image) : $(wym._doc.body).find('#replace_me_with_' + wym._current_unique_stamp);
 
+  // focus first textarea or input type text element
+  dialog.find('input[type=text], textarea').first().focus();
+
   dialog.find(".close_dialog").click(function(e){
     wym.close_dialog(e, true);
   });
@@ -1648,11 +1650,13 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
           link.attr({'style': replaceable.attr('style'), 'class': replaceable.attr('class')});
           replaceable.after(link);
           link.html(replaceable.html());
+
+          // now we can get rid of the replaceable element.
           replaceable.remove();
         }
         else
         {
-          if ((parent = replaceable.get(0).parentNode) != null && parent.tagName.toUpperCase() == "A") {
+          if ((parent = replaceable.parent().get(0)) != null && parent.tagName.toUpperCase() == "A") {
             $(parent).attr({href: link.attr('href'), title: $(wym._options.titleSelector).val(), target: target});
           }
           else {
@@ -1671,7 +1675,7 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
       }
     }
     // fire a click event on the dialogs close button
-    wym.close_dialog()
+    wym.close_dialog();
   });
 
   $(wym._options.dialogImageSelector).find(wym._options.submitSelector).click(function() {
@@ -1756,9 +1760,7 @@ WYMeditor.editor.prototype.close_dialog = function(e, cancelled) {
     this._iframe.contentWindow.focus();
   }
 
-  $('#inline_dialog_container').remove();
-
-  tb_remove();
+  $("#" + wym._options.dialogId).dialog("close").remove();
 
   if (e) {
     e.preventDefault();