Merge upstream/master.

Author: thirdtruck

chapters/classes_and_objects/class-variables.textile

@@ -0,0 +1,27 @@
+---
+layout: recipe
+title: Class Variables
+chapter: Classes and Objects
+---
+
+h2. Creating Class Variables
+
+You want to create a class variable.
+
+h2. Solution
+
+Use json notation in the class body; use :: to access it outside:
+
+{% highlight coffeescript %}
+class Zoo
+  MAX_ANIMALS: 50
+
+Zoo::MAX_ZOOKEEPERS = 5
+
+Zoo::MAX_ANIMALS
+# => 50
+{% endhighlight %}
+
+h2. Discussion
+
+Coffeescript will store these values on the class prototype (e.g. Zoo.prototype.MAX_ANIMALS) rather than on individual object instances, which conserves memory and gives a central location to store class-level values.

chapters/objects/cloning.textile renamed to chapters/classes_and_objects/cloning.textile

@@ -1,7 +1,7 @@
 ---
 layout: recipe
 title: Cloning an object (deep copy)
-chapter: Objects
+chapter: Classes and Objects
 ---
 
 h2. Problem

chapters/classes_and_objects/create-object-literal-if-not-exist.textile

@@ -0,0 +1,29 @@
+---
+layout: recipe
+title: Create an object literal if it does not already exist
+chapter: Classes and Objects
+---
+
+h2. Problem
+
+You want to initialize an object literal, but you do not want to overwrite the object if it already exists.
+
+
+h2. Solution
+
+Use the Existential operator
+
+{% highlight coffeescript %}
+window.MY_NAMESPACE ?= {} 
+{% endhighlight %}
+
+
+h2. Discussion
+
+This is equivalent to the following JavaScript:
+
+{% highlight javascript %}
+window.MY_NAMESPACE = window.MY_NAMESPACE || {};
+{% endhighlight %}
+
+Common JavaScript technique, using object literal to define a namespace. This saves us from clobbering the namespace if it already exists.

chapters/objects/index.textile renamed to chapters/classes_and_objects/index.textile

@@ -1,7 +1,7 @@
 ---
 layout: chapter
-title: Objects
-chapter: Objects
+title: Classes and Objects
+chapter: Classes and Objects
 ---
 
 {% capture url %}/chapters/{{ page.chapter | replace: ' ', '_' | downcase }}{% endcapture %}

chapters/index.textile

@@ -3,7 +3,7 @@ layout: default
 title: Cookbook
 chapters:
 - Syntax
-- Objects
+- Classes and Objects
 - Strings
 - Arrays
 - Dates and Times

chapters/jquery/ajax.textile

@@ -6,38 +6,50 @@ chapter: jQuery
 
 h2. Problem
 
-You want to make AJAX calls using jQuery.
+You need to make an AJAX request using jQuery.
 
 h2. Solution
 
 {% highlight coffeescript %}
-$ ?= require 'jquery' # For Node.js compatibility
+$ ?= require 'jquery' # Optional. For Node.js compatibility
+
+jQuery ->
+  console.log "document loaded"
+  $('form').submit (e) ->
+    console.log "form submit"
+    e.preventDefault()
+    form = this
+    
+    $.ajax
+      type: "POST"
+      url: $(form).attr('action')
+      data: $(form).serialize()
+      success: -> 
+        console.log("success")
 
-$(document).ready ->
-	# Basic Examples
+{% endhighlight %}
+
+h2. Discussion
+
+In addition to the Swiss Army knife of jQuery AJAX methods - _ajax()_ - the library also provides convenience methods for specific kinds of requests.  Note that the _jQuery_ and _$_ variables can be used interchangeably.
+
+{% highlight coffeescript %}
+$ ->
 	$.get '/', (data) ->
 		$('body').append "Successfully got the page."
 
 	$.post '/',
 		userName: 'John Doe'
 		favoriteFlavor: 'Mint'
 		(data) -> $('body').append "Successfully posted to the page."
+{% endhighlight %}
+
+jQuery 1.5 and later have added a new, supplimental API for handling different callbacks.
 
-	# Advanced Settings
-	$.ajax '/',
-		type: 'GET'
-		dataType: 'html' error: (jqXHR, textStatus, errorThrown) ->
-			$('body').append "AJAX Error: #{textStatus}"
-		success: (data, textStatus, jqXHR) ->
-			$('body').append "Successful AJAX call: #{data}"
-	
-	# For jQuery 1.5+
+{% highlight coffeescript %}
 	request = $.get '/'
 	request.success (data) -> $('body').append "Successfully got the page again."
 	request.error (jqXHR, textStatus, errorThrown) -> $('body').append "AJAX Error: ${textStatus}."
-
 {% endhighlight %}
 
-h2. Discussion
-
-See the "jQuery AJAX API":http://api.jquery.com/jQuery.ajax/ for additional methods and options.
+See also "Callback bindings":../jquery/callback-bindings-jquery and the "jQuery AJAX API":http://api.jquery.com/jQuery.ajax/ for additional methods and options.

chapters/math/generating-predictable-random-numbers.textile

@@ -28,36 +28,21 @@ class Rand
     @seed = seed
 
   # return a random integer 0 <= n < @modulo
-  randn:
+  randn: ->
     # new_seed = (a * seed + c) % m
     @seed = (@multiplier*@seed + @offset) % @modulo
 
  # return a random float 0 <= f < 1.0
-  rand: ->
+  randf: ->
     this.randn() / @modulo
 
   # return a random int 0 <= f < n
-  randi: (n) ->
-    Math.floor(this.rand() * n)
+  rand: (n) ->
+    Math.floor(this.randf() * n)
 
- r = new Rand 0
-r.randn().toString(16)
-# => "3c6ef35f"
-
-r.randn().toString(16)
-# => "47502932"
-
-r.randn().toString(16)
-# => "d1ccf6e9"
-
-r.randn().toString(16)
-# => "aaf95334"
-
-r.randn().toString(16)
-# => "6252e503"
-
-r.randn().toString(16)
-# => "9f2ec686"
+  # return a random int min <= f < max
+  rand2: (min, max) ->
+    min + this.rand(max-min)
 {% endhighlight %}
 
 h2. Discussion