refinerycms 0.9.5.21 → 0.9.5.22

data/.gems

@@ -1,6 +1,8 @@
 rake --version '>= 0.8.3'
-friendly_id --version '>= 2.1.4'
-mislav-will_paginate --version '>= 2.3.11'
-rails --version '>= 2.3.2'
-rubyist-aasm --version '>= 2.1.1'
-unicode --version '>= 0.1'
+friendly_id --version '>= 2.2.2'
+will_paginate --version '>= 2.3.11'
+rails --version '>= 2.3.5'
+aasm --version '>= 2.1.3'
+unicode --version '>= 0.1'
+slim_scrooge --version '>= 1.0.1'
+hpricot --version '= 0.8.1'

data/README

@@ -50,15 +50,15 @@ You will be prompted to setup your first user.
 
 == Environment required
 
-Refinery runs using a number of gems which (as of Refinery version 0.9.5) are outlined below:
+Refinery runs using a number of gems which (as of Refinery version 0.9.5.21) are outlined below:
 
 - "rake", :version => ">= 0.8.3"
 - "friendly_id", :version => ">= 2.2.2"
 - "will_paginate", :version => ">= 2.3.11"
-- "rails", :version => ">= 2.3.4"
+- "rails", :version => ">= 2.3.5"
 - "aasm", :version => ">= 2.1.3"
 - "unicode", :version => ">= 0.1"
-- "slim_scrooge", :version => ">= 1.0.1" (Note: This gem is disabled under Windows as we've had reports it doesn't work on Windows.)
+- "slim_scrooge", :version => ">= 1.0.3"
 - "hpricot", :version => "= 0.8.1"
 
 == Updates to core files

data/VERSION

@@ -1 +1 @@
-0.9.5.21
+0.9.5.22

data/config/environment.rb

@@ -66,10 +66,10 @@ eval("#{(defined? Refinery::Initializer) ? Refinery : Rails}::Initializer").run
   config.gem "rake", :version => ">= 0.8.3", :lib => "rake"
   config.gem "friendly_id", :version => ">= 2.2.2", :lib => "friendly_id"
   config.gem "will_paginate", :version => ">= 2.3.11", :lib => "will_paginate", :source => "http://gemcutter.org"
-  config.gem "rails", :version => ">= 2.3.4", :lib => "rails"
+  config.gem "rails", :version => ">= 2.3.5", :lib => "rails"
   config.gem "aasm", :version => ">= 2.1.3", :lib => "aasm", :source => "http://gemcutter.org"
   config.gem "unicode", :version => ">= 0.1", :lib => "unicode"
-  config.gem "slim_scrooge", :version => ">= 1.0.1", :lib => "slim_scrooge", :source => "http://gemcutter.org" unless RUBY_PLATFORM =~ /mswin|mingw/ # kill gem when windows is running.
+  config.gem "slim_scrooge", :version => ">= 1.0.3", :lib => "slim_scrooge", :source => "http://gemcutter.org" #unless RUBY_PLATFORM =~ /mswin|mingw/ # kill gem when windows is running.
   config.gem "hpricot", :version => "= 0.8.1", :lib => "hpricot", :source => "http://gemcutter.org"
   #===REFINERY END OF REQUIRED GEMS===
 end

data/db/migrate/20091207033335_add_superuser_to_users.rb

@@ -0,0 +1,12 @@
+class AddSuperuserToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :superuser, :boolean, :default => false
+    unless (user = User.first).nil?
+      user.update_attribute(:superuser, true)
+    end
+  end
+
+  def self.down
+    remove_column :users, :superuser
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091130040711) do
+ActiveRecord::Schema.define(:version => 20091207033335) do
 
   create_table "images", :force => true do |t|
     t.integer  "parent_id"
@@ -145,6 +145,7 @@ ActiveRecord::Schema.define(:version => 20091130040711) do
     t.datetime "deleted_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "superuser",                               :default => false
   end
 
   add_index "users", ["id"], :name => "index_users_on_id"

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

@@ -1236,7 +1236,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
 				}
 			}
 		}
-		}
+	}
 
 	// set up handlers.
 	imageGroup = null;
@@ -1250,7 +1250,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
 		parent_node = selected;
 	}
 
-	if (parent_node != null && parent_node.tagName.toLowerCase() != WYMeditor.A)
+	if ((parent_node != null) && (dialogType != WYMeditor.DIALOG_PASTE) && (parent_node.tagName.toLowerCase() != WYMeditor.A))
 	{
 		// wrap the current selection with a funky span (not required for safari)
 		if (!this._selected_image && !jQuery.browser.safari)
@@ -1260,15 +1260,17 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
 	}
 	else {
 		if (!this._selected_image) {
-			parent_node._id_before_replaceable = parent.id;
+			parent_node._id_before_replaceable = parent_node.id;
 			parent_node.id = 'replace_me_with_' + this._current_unique_stamp;
 		}
 
-		path += (this._wym._options.dialogFeatures.length == 0) ? "?" : "&"
-		port = (window.location.port.length > 0 ? (":" + window.location.port) : "")
-		path += "current_link=" + parent_node.href.gsub(window.location.protocol + "//" + window.location.hostname + port, "");
-		path += "&target_blank=" + (parent_node.target == "_blank" ? "true" : "false")
-	}
+    if (dialogType != WYMeditor.DIALOG_PASTE) {
+      path += (this._wym._options.dialogFeatures.length == 0) ? "?" : "&";
+      port = (window.location.port.length > 0 ? (":" + window.location.port) : "")
+      path += "current_link=" + parent_node.href.gsub(window.location.protocol + "//" + window.location.hostname + port, "");
+      path += "&target_blank=" + (parent_node.target == "_blank" ? "true" : "false");
+    }
+  }
 
 	// launch thickbox
 
@@ -1332,9 +1334,14 @@ WYMeditor.editor.prototype.uniqueStamp = function() {
 };
 
 WYMeditor.editor.prototype.paste = function(sData) {
-//console.log('pasting..');
+
+  this.format_block();
+
 	var sTmp;
-	var container = this.selected();
+	replaceable = jQuery(this._doc.body).find('#replace_me_with_' + this._current_unique_stamp);
+
+  // replaceable doesn't actually get replaced here, it's just used as a marker for where the cursor was.
+	var container = replaceable[0] || this.selected();
 
 	//split the data, using double newlines as the separator
 	var aP = sData.split(this._newLine + this._newLine);
@@ -1343,19 +1350,31 @@ WYMeditor.editor.prototype.paste = function(sData) {
 	//add a P for each item
 	if(container && container.tagName.toLowerCase() != WYMeditor.BODY) {
 		for(x = aP.length - 1; x >= 0; x--) {
-				sTmp = aP[x];
-				//simple newlines are replaced by a break
-				sTmp = sTmp.replace(rExp, "<br />");
-				jQuery(container).after("<p>" + sTmp + "</p>");
+  		sTmp = aP[x];
+  		//simple newlines are replaced by a break
+  		sTmp = sTmp.replace(rExp, "<br />");
+  		if (x == aP.length-1 && jQuery(container).html().gsub(/<br\ ?\/?>/, "").length == 0) {
+		    jQuery(container).html(sTmp);
+		  } else {
+  		  jQuery(container).after("<p>" + sTmp + "</p>");
+		  }
 		}
 	} else {
 		for(x = 0; x < aP.length; x++) {
-				sTmp = aP[x];
-				//simple newlines are replaced by a break
-				sTmp = sTmp.replace(rExp, "<br />");
-				jQuery(this._doc.body).append("<p>" + sTmp + "</p>");
+			sTmp = aP[x];
+			//simple newlines are replaced by a break
+			sTmp = sTmp.replace(rExp, "<br />");
+			if (x == 0 && jQuery(container).html().gsub(/<br\ ?\/?>/, "").length == 0) {
+		    jQuery(container).html(sTmp);
+		  } else {
+  		  jQuery(this._doc.body).append("<p>" + sTmp + "</p>");
+		  }
 		}
+	}
 
+	if (replaceable[0] != null) {
+	  // set the id of the container back.
+    replaceable[0].id = replaceable[0]._id_before_replaceable;
 	}
 };
 
@@ -1363,7 +1382,7 @@ WYMeditor.editor.prototype.insert = function(html) {
 		// Do we have a selection?
 		if (this._iframe.contentWindow.getSelection().focusNode != null) {
 				// Overwrite selection with provided html
-				this._exec( WYMeditor.INSERT_HTML, html);
+				this._exec(WYMeditor.INSERT_HTML, html);
 		} else {
 				// Fall back to the internal paste function if there's no selection
 				this.paste(html);
@@ -1398,6 +1417,32 @@ WYMeditor.editor.prototype.addCssRules = function(doc, aCss) {
 	}
 };
 
+WYMeditor.editor.prototype.format_block = function(selected) {
+
+  //'this' should be the wymeditor instance.
+	var wym = this;
+
+  var container = selected || wym.selected();
+
+  wym._selected_image = null;
+
+	var name = container.tagName.toLowerCase();
+
+	//fix forbidden main containers
+	if(
+		name == "strong" ||
+		name == "b" ||
+		name == "em" ||
+		name == "i" ||
+		name == "sub" ||
+		name == "sup" ||
+		name == "a"
+
+	) name = container.parentNode.tagName.toLowerCase();
+
+	if(name == WYMeditor.BODY) wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P);
+};
+
 /********** CONFIGURATION **********/
 
 WYMeditor.editor.prototype.computeBasePath = function() {
@@ -4470,71 +4515,36 @@ WYMeditor.WymClassMozilla.prototype.keyup = function(evt) {
 
 	//'this' is the doc
 	var wym = WYMeditor.INSTANCES[this.title];
-
-	wym._selected_image = null;
-	var container = null;
-
-	if(evt.keyCode == 13 && !evt.shiftKey) {
-
-		//RETURN key
-		//cleanup <br><br> between paragraphs
-		jQuery(wym._doc.body).children(WYMeditor.BR).remove();
-
-		//fix PRE bug #73
-		container = wym.selected();
-		if(container && container.tagName.toLowerCase() == WYMeditor.PRE)
-				wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P); //create P after PRE
-	}
-
-	else if(evt.keyCode != 8
-			 && evt.keyCode != 17
-			 && evt.keyCode != 46
-			 && evt.keyCode != 224
-			 && !evt.metaKey
-			 && !evt.ctrlKey) {
-		//NOT BACKSPACE, NOT DELETE, NOT CTRL, NOT COMMAND
-		//text nodes replaced by P
-
-		wym.format_block();
-	}
+  if (wym != null) {
+  	wym._selected_image = null;
+  	var container = null;
+
+  	if(evt.keyCode == 13 && !evt.shiftKey) {
+
+  		//RETURN key
+  		//cleanup <br><br> between paragraphs
+  		jQuery(wym._doc.body).children(WYMeditor.BR).remove();
+
+  		//fix PRE bug #73
+  		container = wym.selected();
+  		if(container && container.tagName.toLowerCase() == WYMeditor.PRE)
+  				wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P); //create P after PRE
+  	}
+
+  	else if(evt.keyCode != 8
+  			 && evt.keyCode != 17
+  			 && evt.keyCode != 46
+  			 && evt.keyCode != 224
+  			 && !evt.metaKey
+  			 && !evt.ctrlKey) {
+  		//NOT BACKSPACE, NOT DELETE, NOT CTRL, NOT COMMAND
+  		//text nodes replaced by P
+
+  		wym.format_block();
+  	}
+  }
 };
 
-WYMeditor.WymClassMozilla.prototype.paste = function(evt) {
-
-	var wym = WYMeditor.INSTANCES[this.title];
-
-	wym.format_block();
-
-};
-
-WYMeditor.WymClassMozilla.prototype.format_block = function(selected) {
-
-  //'this' should be the wymeditor instance.
-	var wym = this;
-
-  selected = selected || wym.selected();
-
-  wym._selected_image = null;
-	var container = null;
-
-	container = wym.selected();
-	var name = container.tagName.toLowerCase();
-
-	//fix forbidden main containers
-	if(
-		name == "strong" ||
-		name == "b" ||
-		name == "em" ||
-		name == "i" ||
-		name == "sub" ||
-		name == "sup" ||
-		name == "a"
-
-	) name = container.parentNode.tagName.toLowerCase();
-
-	if(name == WYMeditor.BODY) wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P);
-}
-
 WYMeditor.WymClassMozilla.prototype.enableDesignMode = function() {
 		if(this.designMode == "off") {
 			try {

data/vendor/plugins/authentication/app/controllers/users_controller.rb

@@ -17,29 +17,30 @@ class UsersController < ApplicationController
       render :text => "User signup is disabled", :layout => true
     else
       begin
-          cookies.delete :auth_token
-          # protects against session fixation attacks, wreaks havoc with
-          # request forgery protection.
-          # uncomment at your own risk
-          # reset_session
-          @user = User.new(params[:user])
-          @selected_plugin_titles = params[:user][:plugins] || []
-
-          @user.register! if @user.valid?
-          if @user.errors.empty?
-            @user.plugins = @selected_plugin_titles
-            self.current_user = @user
-            current_user.activate!
-            redirect_back_or_default(admin_root_url)
-
-            flash[:notice] = "Welcome to Refinery, #{current_user.login}."
-            if User.count == 1 or RefinerySetting[:site_name] == "Company Name"
-              refinery_setting = RefinerySetting.find_by_name("site_name")
-              flash[:notice] << " First let's give the site a name. <a href='#{edit_admin_refinery_setting_url(refinery_setting)}'>Go here</a> to edit your website's name"
-            end
-          else
-            render :action => 'new'
+        cookies.delete :auth_token
+        # protects against session fixation attacks, wreaks havoc with
+        # request forgery protection.
+        # uncomment at your own risk
+        # reset_session
+        @user = User.new(params[:user])
+        @selected_plugin_titles = params[:user][:plugins] || []
+
+        @user.register! if @user.valid?
+        if @user.errors.empty?
+          @user.plugins = @selected_plugin_titles
+          self.current_user = @user
+          current_user.activate!
+          current_user.update_attribute(:superuser, true) if User.count == 1 # this is the superuser if this user is the only user.
+          redirect_back_or_default(admin_root_url)
+
+          flash[:notice] = "Welcome to Refinery, #{current_user.login}."
+          if User.count == 1 or RefinerySetting[:site_name] == "Company Name"
+            refinery_setting = RefinerySetting.find_by_name("site_name")
+            flash[:notice] << "<br/>First let's give the site a name. <a href='#{edit_admin_refinery_setting_url(refinery_setting)}'>Go here</a> to edit your website's name"
           end
+        else
+          render :action => 'new'
+        end
       end
     end
   end
@@ -50,7 +51,7 @@ class UsersController < ApplicationController
       current_user.activate!
       flash[:notice] = "Signup complete!"
     end
-    redirect_back_or_default('/')
+    redirect_back_or_default(root_url)
   end
 
   def suspend
@@ -84,4 +85,4 @@ protected
     User.count == 0
   end
 
-end
+end

data/vendor/plugins/authentication/app/models/user.rb

@@ -121,6 +121,10 @@ class User < ActiveRecord::Base
     @activated
   end
 
+  def ui_deletable?(current_user = self)
+    !self.superuser and User.count > 1 and (current_user.nil? or self.id != current_user.id)
+  end
+
   protected
     # before filter
     def encrypt_password

data/vendor/plugins/authentication/app/views/admin/users/index.html.erb

@@ -16,7 +16,7 @@
               <%= link_to refinery_icon_tag('delete.png'), admin_user_path(user),
                 :confirm => "Are you sure you want to delete '#{user.login}'?",
                 :class => "cancel", :method => :delete,
-                :title => "Remove this user forever" if @users.size > 1 and user.id != current_user.id %>
+                :title => "Remove this user forever" if user.ui_deletable?(current_user) %>
               <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_user_path(user),
                 :title => 'Edit this user' %>
               <%= mail_to user.email, refinery_icon_tag('email_go.png'), :title => 'Email this user' %>

data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb

@@ -9,7 +9,7 @@
   </div>
 </div>
 <% unless @page.live? %>
-  <div style='border: 1px solid #A00027;color: #A00027;background: #FFB1B1;padding:3px 9px;font-weight:bold;width:auto'>
+  <div class='page_not_live'>
     This page is NOT live for public viewing.
   </div>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.21
+  version: 0.9.5.22
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +13:00
+date: 2009-12-08 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,7 @@ files:
 - db/migrate/20091029034951_remove_blurb_from_news_items.rb
 - db/migrate/20091109012126_add_missing_indexes.rb
 - db/migrate/20091130040711_add_down_for_maintenance_page.rb
+- db/migrate/20091207033335_add_superuser_to_users.rb
 - db/schema.rb
 - db/seeds.rb
 - lib/refinery_initializer.rb