typo 4.1 → 4.1.1

data/public/javascripts/tiny_mce/utils/validate.js

@@ -0,0 +1,219 @@
+/**
+ * $Id: validate.js 65 2006-08-24 15:54:55Z spocke $
+ *
+ * Various form validation methods.
+ *
+ * @author Moxiecode
+ * @copyright Copyright � 2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+/**
+	// String validation:
+
+	if (!Validator.isEmail('myemail'))
+		alert('Invalid email.');
+
+	// Form validation:
+
+	var f = document.forms['myform'];
+
+	if (!Validator.isEmail(f.myemail))
+		alert('Invalid email.');
+*/
+
+var Validator = {
+	isEmail : function(s) {
+		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
+	},
+
+	isAbsUrl : function(s) {
+		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
+	},
+
+	isSize : function(s) {
+		return this.test(s, '^[0-9]+(px|%)?$');
+	},
+
+	isId : function(s) {
+		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
+	},
+
+	isEmpty : function(s) {
+		var nl, i;
+
+		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)
+			return true;
+
+		if (s.type == 'checkbox' && !s.checked)
+			return true;
+
+		if (s.type == 'radio') {
+			for (i=0, nl = s.form.elements; i<nl.length; i++) {
+				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)
+					return false;
+			}
+
+			return true;
+		}
+
+		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
+	},
+
+	isNumber : function(s, d) {
+		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
+	},
+
+	test : function(s, p) {
+		s = s.nodeType == 1 ? s.value : s;
+
+		return s == '' || new RegExp(p).test(s);
+	}
+};
+
+var AutoValidator = {
+	settings : {
+		id_cls : 'id',
+		int_cls : 'int',
+		url_cls : 'url',
+		number_cls : 'number',
+		email_cls : 'email',
+		size_cls : 'size',
+		required_cls : 'required',
+		invalid_cls : 'invalid',
+		min_cls : 'min',
+		max_cls : 'max'
+	},
+
+	init : function(s) {
+		var n;
+
+		for (n in s)
+			this.settings[n] = s[n];
+	},
+
+	validate : function(f) {
+		var i, nl, s = this.settings, c = 0;
+
+		nl = this.tags(f, 'label');
+		for (i=0; i<nl.length; i++)
+			this.removeClass(nl[i], s.invalid_cls);
+
+		c += this.validateElms(f, 'input');
+		c += this.validateElms(f, 'select');
+		c += this.validateElms(f, 'textarea');
+
+		return c == 3;
+	},
+
+	invalidate : function(n) {
+		this.mark(n.form, n);
+	},
+
+	reset : function(e) {
+		var t = new Array('label', 'input', 'select', 'textarea');
+		var i, j, nl, s = this.settings;
+
+		if (e == null)
+			return;
+
+		for (i=0; i<t.length; i++) {
+			nl = this.tags(e.form ? e.form : e, t[i]);
+			for (j=0; j<nl.length; j++)
+				this.removeClass(nl[j], s.invalid_cls);
+		}
+	},
+
+	validateElms : function(f, e) {
+		var nl, i, n, s = this.settings, st = true, va = Validator, v;
+
+		nl = this.tags(f, e);
+		for (i=0; i<nl.length; i++) {
+			n = nl[i];
+
+			this.removeClass(n, s.invalid_cls);
+
+			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.size_cls) && !va.isSize(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.id_cls) && !va.isId(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.min_cls, true)) {
+				v = this.getNum(n, s.min_cls);
+
+				if (isNaN(v) || parseInt(n.value) < parseInt(v))
+					st = this.mark(f, n);
+			}
+
+			if (this.hasClass(n, s.max_cls, true)) {
+				v = this.getNum(n, s.max_cls);
+
+				if (isNaN(v) || parseInt(n.value) > parseInt(v))
+					st = this.mark(f, n);
+			}
+		}
+
+		return st;
+	},
+
+	hasClass : function(n, c, d) {
+		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
+	},
+
+	getNum : function(n, c) {
+		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
+		c = c.replace(/[^0-9]/g, '');
+
+		return c;
+	},
+
+	addClass : function(n, c, b) {
+		var o = this.removeClass(n, c);
+		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
+	},
+
+	removeClass : function(n, c) {
+		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
+		return n.className = c != ' ' ? c : '';
+	},
+
+	tags : function(f, s) {
+		return f.getElementsByTagName(s);
+	},
+
+	mark : function(f, n) {
+		var s = this.settings;
+
+		this.addClass(n, s.invalid_cls);
+		this.markLabels(f, n, s.invalid_cls);
+
+		return false;
+	},
+
+	markLabels : function(f, n, ic) {
+		var nl, i;
+
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)
+				this.addClass(nl[i], ic);
+		}
+
+		return null;
+	}
+};

data/public/stylesheets/administration.css

@@ -228,11 +228,15 @@ h3 {
 
 /* @group Table Listings */
 
-.operation {
+td.operation {
   width: 25px;
   text-align: center;
 }
 
+th.operation {
+	text-align: center;
+}
+
 .list {
   clear: left;
 }

data/public/stylesheets/minimal.css

@@ -2,6 +2,7 @@
 
 body {
   font: 1em/1.2em Arial, Verdana, Helvetica, sans-serif;
+	background: #f00;
 }
 
 #main {

data/test/functional/admin/categories_controller_test.rb

@@ -90,9 +90,9 @@ class Admin::CategoriesControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template "_categories"
     assert_tag :tag => "table",
-      :children => { :count => Category.count + 1,
+      :children => { :count => Category.count,
         :only => { :tag => "tr",
-          :children => { :count => 3,
+          :children => { :count => 6,
             :only => { :tag => /t[dh]/ } } } }
   end
 

data/test/functional/xml_controller_test.rb

@@ -33,6 +33,11 @@ class XmlControllerTest < Test::Unit::TestCase
   fixtures :contents, :categories, :categorizations, :tags,
     :articles_tags, :users, :blogs, :resources
 
+  def assert_select(*args, &block)
+    @html_document ||= HTML::Document.new(@response.body, false, true)
+    super(*args,&block)
+  end
+
   def setup
     @controller = XmlController.new
     @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
@@ -87,7 +92,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_xml @response.body
     assert_feedvalidator @response.body, :todo
 
-    assert_rss20(7)
+    assert_rss20
   end
 
   def test_feed_rss20_comments
@@ -96,7 +101,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_xml @response.body
     assert_feedvalidator @response.body
 
-    assert_rss20(3)
+    assert_rss20
   end
 
   def test_feed_rss20_trackbacks
@@ -104,8 +109,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_xml @response.body
     assert_feedvalidator @response.body
-
-    assert_rss20(3)
+    assert_rss20
   end
 
   def test_feed_rss20_article
@@ -114,7 +118,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_xml @response.body
     assert_feedvalidator @response.body, :todo
 
-    assert_rss20(2)
+    assert_rss20
   end
 
   def test_feed_rss20_category
@@ -123,7 +127,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_xml @response.body
     assert_feedvalidator @response.body, :todo
 
-    assert_rss20(3)
+    assert_rss20
   end
 
   def test_feed_rss20_tag
@@ -132,7 +136,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_xml @response.body
     assert_feedvalidator @response.body, :todo
 
-    assert_rss20(2)
+    assert_rss20
   end
 
   def test_feed_atom10_feed
@@ -145,7 +149,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_equal(assigns(:items).sort { |a, b| b.created_at <=> a.created_at },
                  assigns(:items))
 
-    assert_atom10(7)
+    assert_atom10
   end
 
   def test_feed_atom10_comments
@@ -157,9 +161,9 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_equal(assigns(:items).sort { |a, b| b.created_at <=> a.created_at },
                  assigns(:items))
 
-    assert_atom10(3)
+    assert_atom10
 
-    assert_xpath('//title[@type="html"]')
+    assert_select 'title[type=html]'
   end
 
   def test_feed_atom10_trackbacks
@@ -171,10 +175,10 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_equal(assigns(:items).sort { |a, b| b.created_at <=> a.created_at },
                  assigns(:items))
 
-    assert_atom10(3)
+    assert_atom10
 
-    assert_xpath('//title[@type="html"]')
-    assert_xpath('//summary', "Trackback entry has no summaries")
+    assert_select 'title[type=html]'
+    assert_select 'summary'
   end
 
   def test_feed_atom10_article
@@ -186,7 +190,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_equal(assigns(:items).sort { |a, b| b.created_at <=> a.created_at },
                  assigns(:items))
 
-    assert_atom10(2)
+    assert_atom10
   end
 
   def test_feed_atom10_category
@@ -198,7 +202,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_equal(assigns(:items).sort { |a, b| b.created_at <=> a.created_at },
                  assigns(:items))
 
-    assert_atom10(3)
+    assert_atom10
   end
 
   def test_feed_atom10_tag
@@ -210,7 +214,7 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_equal(assigns(:items).sort { |a, b| b.created_at <=> a.created_at },
                  assigns(:items))
 
-    assert_atom10(2)
+    assert_atom10
   end
 
   def test_articlerss
@@ -242,7 +246,10 @@ class XmlControllerTest < Test::Unit::TestCase
     get :feed, :format => 'rss20', :type => 'feed'
     assert_response :success
 
-    assert_equal contents(:article2).created_at.rfc822, get_xpath('/rss/channel/item[title="Article 2!"]/pubDate').first.text
+    assert_select 'rss:root > channel > item' do
+      assert_select '> title', :text => 'Article 2!'
+      assert_select '~pubDate', :text => contents(:article2).created_at.rfc822
+    end
   end
 
   def test_rsd
@@ -277,16 +284,17 @@ class XmlControllerTest < Test::Unit::TestCase
     get :feed, :format => 'atom10', :type => 'feed'
     assert_response :success
     assert_match /extended content/, @response.body
-    assert_not_equal 0, get_xpath(%{//summary]}).size, "Extended feed has no summaries"
-    assert_not_equal 0, get_xpath(%{//content]}).size, "Extended feed has no content"
+    assert_select 'summary'
+    assert_select 'content'
+  end
 
-    @controller = XmlController.new
+  def test_extended_atom10_with_extended_on_rss_set_to_false
     set_extended_on_rss false
     get :feed, :format => 'atom10', :type => 'feed'
     assert_response :success
     assert_no_match /extended content/, @response.body
-    assert_not_equal 0, get_xpath(%{//summary]}).size, "Non-Extended feed has no summaries"
-    assert_equal 0, get_xpath(%{//content]}).size, "Non-extended feed has content"
+    assert_select 'summary'
+    assert_select ':not(content)'
   end
 
   def test_xml_atom10
@@ -294,7 +302,10 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_response :success
 
     # titles are escaped html
-    assert_xpath('//entry/title[text()="Associations aren\'t :dependent =&amp;gt; true anymore" and @type="html"]')
+    assert_select 'entry' do
+      assert_select '> title', :text => "Associations aren\'t :dependent =&amp;gt; true anymore"
+      assert_select '> title[type=html]'
+    end
 
     # categories are well formed
     assert_match /this &amp; that/, @response.body
@@ -305,33 +316,54 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_response :success
 
     # There's an enclosure in there somewhere
-    assert_xpath('/rss/channel/item/enclosure')
+    assert_select('rss:root > channel > item > enclosure')
 
     # There's an enclosure attached to the node with the title "Article 1!"
-    assert_xpath('/rss/channel/item[title="Article 1!"]/enclosure')
-    assert_xpath('/rss/channel/item[title="Article 2!"]/enclosure')
-
+    assert_select 'rss:root > channel > item' do
+      assert_select '>title', :text => 'Article 1!' do
+        assert_select '~enclosure', :count => 1
+      end
+    end
+    # And Article 2
+    assert_select 'rss:root > channel > item' do
+      assert_select '>title', :text => 'Article 2!' do
+        assert_select '~enclosure', :count => 1
+      end
+    end
     # Article 3 exists, but has no enclosure
-    assert_xpath('/rss/channel/item[title="Article 3!"]')
-    assert_not_xpath('/rss/channel/item[title="Article 3!"]/enclosure')
+    assert_select 'rss:root > channel > item' do
+      assert_select '>title', :text => 'Article 3!' do
+        assert_select '~enclosure', :count => 0
+      end
+    end
   end
 
   def test_enclosure_atom10
     get :feed, :format => 'atom10', :type => 'feed'
     assert_response :success
 
-    # There's an enclosure in there somewhere
-    assert_xpath('/feed/entry/link[@rel="enclosure"]')
-
     # There's an enclosure attached to "Article 1!" with a length
-    assert_xpath('/feed/entry[title="Article 1!"]/link[@rel="enclosure" and @length]')
+    assert_select 'feed > entry' do
+      assert_select '> title', :text => 'Article 1!' do
+        assert_select '~ link' do
+          assert_select '[rel=enclosure][length]'
+        end
+      end
+    end
 
     # There's an enclosure attached to "Article 2!" with no length
-    assert_xpath('/feed/entry[title="Article 2!"]/link[@rel="enclosure" and not(@length)]')
+    assert_select 'feed > entry' do
+      assert_select '> title', :text => "Article 2!" do
+        assert_select '~ link[rel=enclosure]:not([length])'
+      end
+    end
 
     # Article 3 exists, but has no enclosure
-    assert_xpath('/feed/entry[title="Article 3!"]')
-    assert_not_xpath('/feed/entry[title="Article 3!"]/link[@rel="enclosure"]')
+    assert_select 'feed > entry' do
+      assert_select '> title', :text => "Article 3!" do
+        assert_select '~ :not(link[rel=enclosure])'
+      end
+    end
   end
 
   def test_itunes
@@ -349,12 +381,12 @@ class XmlControllerTest < Test::Unit::TestCase
     assert_xml @response.body
   end
 
-  def assert_rss20(items)
-    assert_equal 1, get_xpath(%{/rss[@version="2.0"]/channel[count(child::item)=#{items}]}).size, "RSS 2.0 feed has wrong number of channel/item nodes"
+  def assert_rss20
+    assert_select 'rss:root[version=2.0] > channel item', :count => assigns(:items).size
   end
 
-  def assert_atom10(entries)
-    assert_equal 1, get_xpath(%{/feed[@xmlns="http://www.w3.org/2005/Atom" and count(child::entry)=#{entries}]}).size, "Atom 1.0 feed has wrong number of feed/entry nodes"
+  def assert_atom10
+    assert_select 'feed:root[xmlns="http://www.w3.org/2005/Atom"] > entry', :count => assigns(:items).size
   end
 
   def set_extended_on_rss(value)

data/test/test_helper.rb

@@ -7,8 +7,7 @@ $TESTING = true
 User.salt = 'change-me'
 
 class Test::Unit::TestCase
-  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
-  self.use_transactional_fixtures = true
+  self.use_transactional_fixtures = false
 
   # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
   self.use_instantiated_fixtures  = false
@@ -60,21 +59,6 @@ class Test::Unit::TestCase
     assert !tag, "expected no tag, but tag found matching #{opts.inspect} in:\n#{source.inspect}"
   end
 
-  def get_xpath(xpath)
-    rexml = REXML::Document.new(@response.body)
-    assert rexml
-
-    REXML::XPath.match(rexml, xpath)
-  end
-
-  def assert_xpath(xpath, msg=nil)
-    assert !(get_xpath(xpath).empty?), msg
-  end
-
-  def assert_not_xpath(xpath, msg=nil)
-    assert get_xpath(xpath).empty?, msg
-  end
-
   def this_blog
     Blog.default || Blog.create!
   end

data/test/unit/article_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'http_mock'
 
 class ArticleTest < Test::Unit::TestCase
-  fixtures :blogs, :contents, :articles_tags, :tags, :resources, :categories, :categorizations, :users, :notifications, :text_filters
+  fixtures :blogs, :contents, :articles_tags, :tags, :resources, :categories, :categorizations, :users, :notifications, :text_filters, :triggers
 
   def setup
     @articles = []

data/test/unit/trigger_test.rb

@@ -8,7 +8,7 @@ class Page
 end
 
 class TriggerTest < Test::Unit::TestCase
-  fixtures :contents
+  fixtures :contents, :triggers
 
   def test_post_action
     assert Trigger.post_action(Time.now + 2.seconds,

data/themes/scribbish/views/articles/_comment.rhtml

@@ -1,18 +1,14 @@
-<ol id="comments" class="comments">
-  <% if @article.published_comments.any? -%>
-    <% for comment in @article.published_comments -%>
-    <li class="comment" id="comment-<%= comment.id %>">
-      <div class="author">
-        <%= content_tag(:div, gravatar_tag(comment.email)) if this_blog.use_gravatar and comment.email %>
-        <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite>
-        <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:</abbr>
-      </div>
-      <div class="content">
-        <%= comment.html %>
-      </div>
-    </li>
-    <% end -%>
-  <% else -%>
-    <li class="dummy_comment" style="display:none">No comments</li>
+<li class="comment" id="comment-<%= comment.id %>">
+  <div class="author">
+    <%= content_tag(:div, gravatar_tag(comment.email)) if this_blog.use_gravatar and comment.email %>
+    <cite><%= (comment.url.blank?) ? h(comment.author) : link_to(h(comment.author), comment.url) %></cite>
+    <abbr title="<%= comment.created_at.xmlschema %>"><%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:</abbr>
+  </div>
+  <div class="content">
+    <%= comment.html %>
+  </div>
+  <% unless comment.published -%>
+  <div class="spamwarning"><%= _("This comment has been flagged for moderator approval.") %></div>
   <% end -%>
-</ol>
+</li>
+

data/themes/scribbish/views/articles/_comment_form.rhtml

@@ -1,7 +1,9 @@
 <%= form_remote_tag :url      => {:action => 'comment', :id => @article},
-                    :update   => 'comments_div',
-                    :loading  => 'commentLoading()',
-                    :complete => 'commentComplete()',
+                    :position => :bottom,
+                    :update   => {:success => 'commentList'},
+                    :loading  => "loading()",
+                    :complete => "complete(request)",
+                    :failure  => "failure(request)",
                     :html     => {:id => 'commentform', :class => 'comments' } %>
 
 <div id="preview" style="display:none"></div>
@@ -43,8 +45,8 @@
                          :update => 'preview',
                          :complete => "Element.show('preview')",
                          :url    => { :action => 'comment_preview' }) %>
-    <%= submit_tag 'Submit', :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>
-    <%= image_tag '/images/theme/spinner.gif', :id => 'spinner', :style => 'display:none' %>
+    <%= submit_tag 'Submit', :id => 'form-submit-button',  :onclick => "$('commentform').onsubmit();this.disabled=true;Element.hide('preview');return false;" %>
+    <%= image_tag '/images/theme/spinner.gif', :id => 'comment_loading', :style => 'display:none' %>
   </p>
 </fieldset>
 <%= end_form_tag %>

data/themes/scribbish/views/articles/_comment_list.rhtml

@@ -0,0 +1,7 @@
+<ol id="commentList" class="comments">
+  <% if @article.published_comments.any? -%>
+    <%= render(:partial => "comment", :collection => @article.published_comments) %>
+  <% else -%>
+    <li class="dummy_comment" style="display:none">No comments</li>
+  <% end -%>
+</ol>

data/themes/scribbish/views/articles/read.rhtml

@@ -35,7 +35,7 @@
   <p><a href="#commentform">Leave a response</a></p>
 
   <div id="comments_div">
-    <%= render :partial => "comment" %>
+    <%= render :partial => "comment_list" %>
   </div>
 <% end -%>
 

data/vendor/plugins/aimpresence_sidebar/views/content.rhtml

@@ -1,4 +1,4 @@
-<h3>AIM Status</h3>
+<h3><%= _("AIM Status")%></h3>
 <a class="im" href="aim:GoIM?screenname=<%= @sidebar.sn %>">
 <img alt=" " src="http://api.oscar.aol.com/SOA/key=<%= @sidebar.devkey %>/presence/<%= @sidebar.sn %>" border="0" /> <%= @sidebar.sn %>
 </a>

data/vendor/plugins/archives_sidebar/views/content.rhtml

@@ -1,5 +1,5 @@
 <% unless sidebar.archives.blank? %>
-<h3>Archives</h3>
+<h3><%= _("Archives")%></h3>
 <ul id="archives">
   <% sidebar.archives.each do |month| %>
     <li>