railties 3.0.1 → 3.0.2

data/lib/rails/ruby_version_check.rb

@@ -14,8 +14,7 @@ elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2'
   $stderr.puts <<-end_message
 
     Rails 3 doesn't officially support Ruby 1.9.1 since recent stable
-    releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2
-    before Rails 3 is released!
+    releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2.
 
     You're running
       #{RUBY_DESCRIPTION}

data/lib/rails/tasks/misc.rake

@@ -7,7 +7,7 @@ task :rails_env do
   end
 end
 
-desc 'Generate a crytographically secure secret key (this is typically used to generate a secret for cookie sessions).'
+desc 'Generate a cryptographically secure secret key (this is typically used to generate a secret for cookie sessions).'
 task :secret do
   require 'active_support/secure_random'
   puts ActiveSupport::SecureRandom.hex(64)

data/lib/rails/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 1
-
+    TINY  = 2
+        
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -14,63 +15,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-15 00:00:00 +13:00
+date: 2010-11-15 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
-        - 4
-        version: 0.8.4
+        - 7
+        version: 0.8.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 0
         - 14
-        - 0
-        version: 0.14.0
+        - 4
+        version: 0.14.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 3
         - 0
-        - 1
-        version: 3.0.1
+        - 2
+        version: 3.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 3
         - 0
-        - 1
-        version: 3.0.1
+        - 2
+        version: 3.0.2
   type: :runtime
   version_requirements: *id004
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
@@ -152,14 +161,55 @@ files:
 - guides/assets/images/tab_yellow.gif
 - guides/assets/images/tab_yellow.png
 - guides/assets/images/validation_error_messages.png
-- guides/assets/javascripts/code_highlighter.js
 - guides/assets/javascripts/guides.js
-- guides/assets/javascripts/highlighters.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushAppleScript.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushAS3.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushBash.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushColdFusion.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushCpp.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushCSharp.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushCss.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushDelphi.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushDiff.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushErlang.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushGroovy.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushJava.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushJavaFX.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushJScript.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPerl.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPhp.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPlain.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPowerShell.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushPython.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushRuby.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushSass.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushScala.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushSql.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
+- guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
+- guides/assets/javascripts/syntaxhighlighter/shCore.js
 - guides/assets/stylesheets/main.css
 - guides/assets/stylesheets/print.css
 - guides/assets/stylesheets/reset.css
 - guides/assets/stylesheets/style.css
-- guides/assets/stylesheets/syntax.css
+- guides/assets/stylesheets/syntaxhighlighter/shCore.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreDefault.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreDjango.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreEclipse.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreEmacs.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreFadeToGrey.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreMDUltra.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreMidnight.css
+- guides/assets/stylesheets/syntaxhighlighter/shCoreRDark.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeDefault.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeDjango.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeEclipse.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeEmacs.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeFadeToGrey.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeMDUltra.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeMidnight.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css
+- guides/assets/stylesheets/syntaxhighlighter/shThemeRDark.css
 - guides/rails_guides/generator.rb
 - guides/rails_guides/helpers.rb
 - guides/rails_guides/indexer.rb
@@ -201,6 +251,7 @@ files:
 - guides/source/rails_application_templates.textile
 - guides/source/rails_on_rack.textile
 - guides/source/routing.textile
+- guides/source/ruby_on_rails_guides_guidelines.textile
 - guides/source/security.textile
 - guides/source/testing.textile
 - guides/w3c_validator.rb
@@ -417,25 +468,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.

data/guides/assets/javascripts/code_highlighter.js

@@ -1,188 +0,0 @@
-/* Unobtrustive Code Highlighter By Dan Webb 11/2005
-   Version: 0.4
-
-	Usage:
-		Add a script tag for this script and any stylesets you need to use
-		to the page in question, add correct class names to CODE elements,
-		define CSS styles for elements. That's it!
-
-	Known to work on:
-		IE 5.5+ PC
-		Firefox/Mozilla PC/Mac
-		Opera 7.23 + PC
-		Safari 2
-
-	Known to degrade gracefully on:
-		IE5.0 PC
-
-	Note: IE5.0 fails due to the use of lookahead in some stylesets.  To avoid script errors
-	in older browsers use expressions that use lookahead in string format when defining stylesets.
-
-	This script is inspired by star-light by entirely cunning Dean Edwards
-	http://dean.edwards.name/star-light/.
-*/
-
-// replace callback support for safari.
-if ("a".replace(/a/, function() {return "b"}) != "b") (function(){
-  var default_replace = String.prototype.replace;
-  String.prototype.replace = function(search,replace){
-	// replace is not function
-	if(typeof replace != "function"){
-		return default_replace.apply(this,arguments)
-	}
-	var str = "" + this;
-	var callback = replace;
-	// search string is not RegExp
-	if(!(search instanceof RegExp)){
-		var idx = str.indexOf(search);
-		return (
-			idx == -1 ? str :
-			default_replace.apply(str,[search,callback(search, idx, str)])
-		)
-	}
-	var reg = search;
-	var result = [];
-	var lastidx = reg.lastIndex;
-	var re;
-	while((re = reg.exec(str)) != null){
-		var idx  = re.index;
-		var args = re.concat(idx, str);
-		result.push(
-			str.slice(lastidx,idx),
-			callback.apply(null,args).toString()
-		);
-		if(!reg.global){
-			lastidx += RegExp.lastMatch.length;
-			break
-		}else{
-			lastidx = reg.lastIndex;
-		}
-	}
-	result.push(str.slice(lastidx));
-	return result.join("")
-  }
-})();
-
-var CodeHighlighter = { styleSets : new Array };
-
-CodeHighlighter.addStyle = function(name, rules) {
-	// using push test to disallow older browsers from adding styleSets
-	if ([].push) this.styleSets.push({
-		name : name,
-		rules : rules,
-		ignoreCase : arguments[2] || false
-	})
-
-	function setEvent() {
-		// set highlighter to run on load (use LowPro if present)
-		if (typeof Event != 'undefined' && typeof Event.onReady == 'function')
-		  return Event.onReady(CodeHighlighter.init.bind(CodeHighlighter));
-
-		var old = window.onload;
-
-		if (typeof window.onload != 'function') {
-			window.onload = function() { CodeHighlighter.init() };
-		} else {
-			window.onload = function() {
-				old();
-				CodeHighlighter.init();
-			}
-		}
-	}
-
-	// only set the event when the first style is added
-	if (this.styleSets.length==1) setEvent();
-}
-
-CodeHighlighter.init = function() {
-	if (!document.getElementsByTagName) return;
-	if ("a".replace(/a/, function() {return "b"}) != "b") return; // throw out Safari versions that don't support replace function
-	// throw out older browsers
-
-	var codeEls = document.getElementsByTagName("CODE");
-	// collect array of all pre elements
-	codeEls.filter = function(f) {
-		var a =  new Array;
-		for (var i = 0; i < this.length; i++) if (f(this[i])) a[a.length] = this[i];
-		return a;
-	}
-
-	var rules = new Array;
-	rules.toString = function() {
-		// joins regexes into one big parallel regex
-		var exps = new Array;
-		for (var i = 0; i < this.length; i++) exps.push(this[i].exp);
-		return exps.join("|");
-	}
-
-	function addRule(className, rule) {
-		// add a replace rule
-		var exp = (typeof rule.exp != "string")?String(rule.exp).substr(1, String(rule.exp).length-2):rule.exp;
-		// converts regex rules to strings and chops of the slashes
-		rules.push({
-			className : className,
-			exp : "(" + exp + ")",
-			length : (exp.match(/(^|[^\\])\([^?]/g) || "").length + 1, // number of subexps in rule
-			replacement : rule.replacement || null
-		});
-	}
-
-	function parse(text, ignoreCase) {
-		// main text parsing and replacement
-		return text.replace(new RegExp(rules, (ignoreCase)?"gi":"g"), function() {
-			var i = 0, j = 1, rule;
-			while (rule = rules[i++]) {
-				if (arguments[j]) {
-					// if no custom replacement defined do the simple replacement
-					if (!rule.replacement) return "<span class=\"" + rule.className + "\">" + arguments[0] + "</span>";
-					else {
-						// replace $0 with the className then do normal replaces
-						var str = rule.replacement.replace("$0", rule.className);
-						for (var k = 1; k <= rule.length - 1; k++) str = str.replace("$" + k, arguments[j + k]);
-						return str;
-					}
-				} else j+= rule.length;
-			}
-		});
-	}
-
-	function highlightCode(styleSet) {
-		// clear rules array
-		var parsed, clsRx = new RegExp("(\\s|^)" + styleSet.name + "(\\s|$)");
-		rules.length = 0;
-
-		// get stylable elements by filtering out all code elements without the correct className
-		var stylableEls = codeEls.filter(function(item) { return clsRx.test(item.className) });
-
-		// add style rules to parser
-		for (var className in styleSet.rules) addRule(className, styleSet.rules[className]);
-
-
-		// replace for all elements
-		for (var i = 0; i < stylableEls.length; i++) {
-			// EVIL hack to fix IE whitespace badness if it's inside a <pre>
-			if (/MSIE/.test(navigator.appVersion) && stylableEls[i].parentNode.nodeName == 'PRE') {
-				stylableEls[i] = stylableEls[i].parentNode;
-
-				parsed = stylableEls[i].innerHTML.replace(/(<code[^>]*>)([^<]*)<\/code>/i, function() {
-					return arguments[1] + parse(arguments[2], styleSet.ignoreCase) + "</code>"
-				});
-				parsed = parsed.replace(/\n( *)/g, function() {
-					var spaces = "";
-					for (var i = 0; i < arguments[1].length; i++) spaces+= "&nbsp;";
-					return "\n" + spaces;
-				});
-				parsed = parsed.replace(/\t/g, "&nbsp;&nbsp;&nbsp;&nbsp;");
-				parsed = parsed.replace(/\n(<\/\w+>)?/g, "<br />$1").replace(/<br \/>[\n\r\s]*<br \/>/g, "<p><br></p>");
-
-			} else parsed = parse(stylableEls[i].innerHTML, styleSet.ignoreCase);
-
-			stylableEls[i].innerHTML = parsed;
-		}
-	}
-
-	// run highlighter on all stylesets
-	for (var i=0; i < this.styleSets.length; i++) {
-		highlightCode(this.styleSets[i]);
-	}
-}

data/guides/assets/javascripts/highlighters.js

@@ -1,90 +0,0 @@
-CodeHighlighter.addStyle("css", {
-	comment : {
-		exp  : /\/\*[^*]*\*+([^\/][^*]*\*+)*\//
-	},
-	keywords : {
-		exp  : /@\w[\w\s]*/
-	},
-	selectors : {
-		exp  : "([\\w-:\\[.#][^{};>]*)(?={)"
-	},
-	properties : {
-		exp  : "([\\w-]+)(?=\\s*:)"
-	},
-	units : {
-		exp  : /([0-9])(em|en|px|%|pt)\b/,
-		replacement : "$1<span class=\"$0\">$2</span>"
-	},
-	urls : {
-		exp  : /url\([^\)]*\)/
-	}
- });
-
-CodeHighlighter.addStyle("ruby",{
-	comment : {
-		exp  : /#[^\n]+/
-	},
-	brackets : {
-		exp  : /\(|\)/
-	},
-	string : {
-		exp  : /'[^']*'|"[^"]*"/
-	},
-	keywords : {
-		exp  : /\b(do|end|self|class|def|if|module|yield|then|else|for|until|unless|while|elsif|case|when|break|retry|redo|rescue|require|raise)\b/
-	},
-	/* Added by Shelly Fisher (shelly@agileevolved.com) */
-	symbol : {
-	  exp : /([^:])(:[A-Za-z0-9_!?]+)/
-	},
-	ivar : {
-	  exp : /\@[A-Za-z0-9_!?]+/
-	}
-});
-
-CodeHighlighter.addStyle("html", {
-	comment : {
-		exp: /&lt;!\s*(--([^-]|[\r\n]|-[^-])*--\s*)&gt;/
-	},
-	tag : {
-		exp: /(&lt;\/?)([a-zA-Z1-9]+\s?)/,
-		replacement: "$1<span class=\"$0\">$2</span>"
-	},
-	string : {
-		exp  : /'[^']*'|"[^"]*"/
-	},
-	attribute : {
-		exp: /\b([a-zA-Z-:]+)(=)/,
-		replacement: "<span class=\"$0\">$1</span>$2"
-	},
-	doctype : {
-		exp: /&lt;!DOCTYPE([^&]|&[^g]|&g[^t])*&gt;/
-	}
-});
-
-CodeHighlighter.addStyle("javascript",{
-	comment : {
-		exp  : /(\/\/[^\n]*(\n|$))|(\/\*[^*]*\*+([^\/][^*]*\*+)*\/)/
-	},
-	brackets : {
-		exp  : /\(|\)/
-	},
-	string : {
-		exp  : /'[^']*'|"[^"]*"/
-	},
-	keywords : {
-		exp  : /\b(arguments|break|case|continue|default|delete|do|else|false|for|function|if|in|instanceof|new|null|return|switch|this|true|typeof|var|void|while|with)\b/
-	},
-	global : {
-		exp  : /\b(toString|valueOf|window|element|prototype|constructor|document|escape|unescape|parseInt|parseFloat|setTimeout|clearTimeout|setInterval|clearInterval|NaN|isNaN|Infinity)\b/
-	}
-});
-
-CodeHighlighter.addStyle("yaml", {
-	keyword : {
-		exp  : /\/\*[^*]*\*+([^\/][^*]*\*+)*\//
-	},
-	value : {
-		exp  : /@\w[\w\s]*/
-	},
-});