diff --git a/documentation/coffee/assignment.coffee b/documentation/coffee/assignment.coffee deleted file mode 100644 index c0b8c3c9..00000000 --- a/documentation/coffee/assignment.coffee +++ /dev/null @@ -1,2 +0,0 @@ -greeting = "Hello CoffeeScript" -difficulty = 0.5 diff --git a/documentation/coffee/objects_and_arrays.coffee b/documentation/coffee/objects_and_arrays.coffee index 351fa75a..737bf5f8 100644 --- a/documentation/coffee/objects_and_arrays.coffee +++ b/documentation/coffee/objects_and_arrays.coffee @@ -2,13 +2,16 @@ song = ["do", "re", "mi", "fa", "so"] singers = {Jagger: 'Rock', Elvis: 'Roll'} -ages = - max: 10 - ida: 9 - tim: 11 - matrix = [ 1, 0, 1 0, 0, 1 1, 1, 0 -] \ No newline at end of file +] + +kids = + brother: + name: 'Max' + age: 11 + sister: + name: 'Ida' + age: 9 \ No newline at end of file diff --git a/documentation/css/docs.css b/documentation/css/docs.css index 1c74cfce..dc90ed8c 100644 --- a/documentation/css/docs.css +++ b/documentation/css/docs.css @@ -1,8 +1,8 @@ body { - font-size: 14px; + font-size: 13px; line-height: 20px; color: #191933; - font-family: Arial, Helvetica, sans-serif; + font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, sans-serif !important; } div.container { width: 950px; @@ -131,13 +131,15 @@ div.code { background: #fdcdcc; color: #864544; border: 1px solid #864544; - font: 10px/15px Arial; + font-size: 10px; + line-height: 15px; overflow: hidden; text-transform: uppercase; } .navigation { height: 50px; - font: bold 11px/50px Arial; + font-size: 11px; + line-height: 50px; text-transform: uppercase; position: relative; float: left; diff --git a/documentation/docs/underscore.html b/documentation/docs/underscore.html index 873fc236..8cd3661b 100644 --- a/documentation/docs/underscore.html +++ b/documentation/docs/underscore.html @@ -7,24 +7,24 @@ Portions of Underscore are inspired by or borrowed from Functional, and John Resig's Micro-Templating. For all details and documentation: -http://documentcloud.github.com/underscore/

#

Baseline setup

#

Establish the root object, window in the browser, or global on the server.

  root: this
#

Save the previous value of the _ variable.

  previousUnderscore: root._
#

Establish the object that gets thrown to break out of a loop iteration. -StopIteration is SOP on Mozilla.

  breaker: if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration
#

Helper function to escape RegExp contents, because JS doesn't have one.

  escapeRegExp: (string) -> string.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1')
#

Save bytes in the minified (but not gzipped) version:

  ArrayProto:           Array.prototype
-  ObjProto:             Object.prototype
#

Create quick reference variables for speed access to core prototypes.

  slice:                ArrayProto.slice
-  unshift:              ArrayProto.unshift
-  toString:             ObjProto.toString
-  hasOwnProperty:       ObjProto.hasOwnProperty
-  propertyIsEnumerable: ObjProto.propertyIsEnumerable
#

All ECMA5 native implementations we hope to use are declared here.

  nativeForEach:        ArrayProto.forEach
-  nativeMap:            ArrayProto.map
-  nativeReduce:         ArrayProto.reduce
-  nativeReduceRight:    ArrayProto.reduceRight
-  nativeFilter:         ArrayProto.filter
-  nativeEvery:          ArrayProto.every
-  nativeSome:           ArrayProto.some
-  nativeIndexOf:        ArrayProto.indexOf
-  nativeLastIndexOf:    ArrayProto.lastIndexOf
-  nativeIsArray:        Array.isArray
-  nativeKeys:           Object.keys
#

Create a safe reference to the Underscore object for use below.

  _: (obj) -> new wrapper(obj)
#

Export the Underscore object for CommonJS.

  if typeof(exports) != 'undefined' then exports._: _
#

Export Underscore to global scope.

  root._: _
#

Current version.

  _.VERSION: '1.0.2'
#

Collection Functions

#

The cornerstone, an each implementation. -Handles objects implementing forEach, arrays, and raw objects.

  _.each: (obj, iterator, context) ->
+http://documentcloud.github.com/underscore/

#

Baseline setup

#

Establish the root object, window in the browser, or global on the server.

  root = this
#

Save the previous value of the _ variable.

  previousUnderscore = root._
#

Establish the object that gets thrown to break out of a loop iteration. +StopIteration is SOP on Mozilla.

  breaker = if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration
#

Helper function to escape RegExp contents, because JS doesn't have one.

  escapeRegExp = (string) -> string.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1')
#

Save bytes in the minified (but not gzipped) version:

  ArrayProto           = Array.prototype
+  ObjProto             = Object.prototype
#

Create quick reference variables for speed access to core prototypes.

  slice                = ArrayProto.slice
+  unshift              = ArrayProto.unshift
+  toString             = ObjProto.toString
+  hasOwnProperty       = ObjProto.hasOwnProperty
+  propertyIsEnumerable = ObjProto.propertyIsEnumerable
#

All ECMA5 native implementations we hope to use are declared here.

  nativeForEach        = ArrayProto.forEach
+  nativeMap            = ArrayProto.map
+  nativeReduce         = ArrayProto.reduce
+  nativeReduceRight    = ArrayProto.reduceRight
+  nativeFilter         = ArrayProto.filter
+  nativeEvery          = ArrayProto.every
+  nativeSome           = ArrayProto.some
+  nativeIndexOf        = ArrayProto.indexOf
+  nativeLastIndexOf    = ArrayProto.lastIndexOf
+  nativeIsArray        = Array.isArray
+  nativeKeys           = Object.keys
#

Create a safe reference to the Underscore object for use below.

  _ = (obj) -> new wrapper(obj)
#

Export the Underscore object for CommonJS.

  if typeof(exports) != 'undefined' then exports._ = _
#

Export Underscore to global scope.

  root._ = _
#

Current version.

  _.VERSION = '1.0.2'
#

Collection Functions

#

The cornerstone, an each implementation. +Handles objects implementing forEach, arrays, and raw objects.

  _.each = (obj, iterator, context) ->
     try
       if nativeForEach and obj.forEach is nativeForEach
         obj.forEach iterator, context
@@ -35,212 +35,212 @@ Handles objects implementing forEach, arrays, and raw objects.<
     catch e
       throw e if e isnt breaker
     obj
#

Return the results of applying the iterator to each element. Use JavaScript -1.6's version of map, if possible.

  _.map: (obj, iterator, context) ->
+1.6's version of map, if possible.

  _.map = (obj, iterator, context) ->
     return obj.map(iterator, context) if nativeMap and obj.map is nativeMap
-    results: []
+    results = []
     _.each obj, (value, index, list) ->
       results.push iterator.call context, value, index, list
     results
#

Reduce builds up a single result from a list of values. Also known as -inject, or foldl. Uses JavaScript 1.8's version of reduce, if possible.

  _.reduce: (obj, memo, iterator, context) ->
+inject, or foldl. Uses JavaScript 1.8's version of reduce, if possible.

  _.reduce = (obj, memo, iterator, context) ->
     return obj.reduce(_.bind(iterator, context), memo) if nativeReduce and obj.reduce is nativeReduce
     _.each obj, (value, index, list) ->
-      memo: iterator.call context, memo, value, index, list
+      memo = iterator.call context, memo, value, index, list
     memo
#

The right-associative version of reduce, also known as foldr. Uses -JavaScript 1.8's version of reduceRight, if available.

  _.reduceRight: (obj, memo, iterator, context) ->
+JavaScript 1.8's version of reduceRight, if available.

  _.reduceRight = (obj, memo, iterator, context) ->
     return obj.reduceRight(_.bind(iterator, context), memo) if nativeReduceRight and obj.reduceRight is nativeReduceRight
     _.each _.clone(_.toArray(obj)).reverse(), (value, index) ->
-      memo: iterator.call context, memo, value, index, obj
-    memo
#

Return the first value which passes a truth test.

  _.detect: (obj, iterator, context) ->
-    result: null
+      memo = iterator.call context, memo, value, index, obj
+    memo
#

Return the first value which passes a truth test.

  _.detect = (obj, iterator, context) ->
+    result = null
     _.each obj, (value, index, list) ->
       if iterator.call context, value, index, list
-        result: value
+        result = value
         _.breakLoop()
     result
#

Return all the elements that pass a truth test. Use JavaScript 1.6's -filter, if it exists.

  _.filter: (obj, iterator, context) ->
+filter, if it exists.

  _.filter = (obj, iterator, context) ->
     return obj.filter iterator, context if nativeFilter and obj.filter is nativeFilter
-    results: []
+    results = []
     _.each obj, (value, index, list) ->
       results.push value if iterator.call context, value, index, list
-    results
#

Return all the elements for which a truth test fails.

  _.reject: (obj, iterator, context) ->
-    results: []
+    results
#

Return all the elements for which a truth test fails.

  _.reject = (obj, iterator, context) ->
+    results = []
     _.each obj, (value, index, list) ->
       results.push value if not iterator.call context, value, index, list
     results
#

Determine whether all of the elements match a truth test. Delegate to -JavaScript 1.6's every, if it is present.

  _.every: (obj, iterator, context) ->
+JavaScript 1.6's every, if it is present.

  _.every = (obj, iterator, context) ->
     iterator ||= _.identity
     return obj.every iterator, context if nativeEvery and obj.every is nativeEvery
-    result: true
+    result = true
     _.each obj, (value, index, list) ->
-      _.breakLoop() unless (result: result and iterator.call(context, value, index, list))
+      _.breakLoop() unless (result = result and iterator.call(context, value, index, list))
     result
#

Determine if at least one element in the object matches a truth test. Use -JavaScript 1.6's some, if it exists.

  _.some: (obj, iterator, context) ->
+JavaScript 1.6's some, if it exists.

  _.some = (obj, iterator, context) ->
     iterator ||= _.identity
     return obj.some iterator, context if nativeSome and obj.some is nativeSome
-    result: false
+    result = false
     _.each obj, (value, index, list) ->
-      _.breakLoop() if (result: iterator.call(context, value, index, list))
+      _.breakLoop() if (result = iterator.call(context, value, index, list))
     result
#

Determine if a given value is included in the array or object, -based on ===.

  _.include: (obj, target) ->
+based on ===.

  _.include = (obj, target) ->
     return _.indexOf(obj, target) isnt -1 if nativeIndexOf and obj.indexOf is nativeIndexOf
     for key, val of obj
       return true if val is target
-    false
#

Invoke a method with arguments on every item in a collection.

  _.invoke: (obj, method) ->
-    args: _.rest arguments, 2
-    (if method then val[method] else val).apply(val, args) for val in obj
#

Convenience version of a common use case of map: fetching a property.

  _.pluck: (obj, key) ->
-    _.map(obj, (val) -> val[key])
#

Return the maximum item or (item-based computation).

  _.max: (obj, iterator, context) ->
+    false
#

Invoke a method with arguments on every item in a collection.

  _.invoke = (obj, method) ->
+    args = _.rest arguments, 2
+    (if method then val[method] else val).apply(val, args) for val in obj
#

Convenience version of a common use case of map: fetching a property.

  _.pluck = (obj, key) ->
+    _.map(obj, (val) -> val[key])
#

Return the maximum item or (item-based computation).

  _.max = (obj, iterator, context) ->
     return Math.max.apply(Math, obj) if not iterator and _.isArray(obj)
-    result: {computed: -Infinity}
+    result = computed: -Infinity
     _.each obj, (value, index, list) ->
-      computed: if iterator then iterator.call(context, value, index, list) else value
-      computed >= result.computed and (result: {value: value, computed: computed})
-    result.value
#

Return the minimum element (or element-based computation).

  _.min: (obj, iterator, context) ->
+      computed = if iterator then iterator.call(context, value, index, list) else value
+      computed >= result.computed and (result = {value: value, computed: computed})
+    result.value
#

Return the minimum element (or element-based computation).

  _.min = (obj, iterator, context) ->
     return Math.min.apply(Math, obj) if not iterator and _.isArray(obj)
-    result: {computed: Infinity}
+    result = computed: Infinity
     _.each obj, (value, index, list) ->
-      computed: if iterator then iterator.call(context, value, index, list) else value
-      computed < result.computed and (result: {value: value, computed: computed})
-    result.value
#

Sort the object's values by a criterion produced by an iterator.

  _.sortBy: (obj, iterator, context) ->
+      computed = if iterator then iterator.call(context, value, index, list) else value
+      computed < result.computed and (result = {value: value, computed: computed})
+    result.value
#

Sort the object's values by a criterion produced by an iterator.

  _.sortBy = (obj, iterator, context) ->
     _.pluck(((_.map obj, (value, index, list) ->
-      {value: value, criteria: iterator.call(context, value, index, list)}
+      {value: value, criteria: iterator.call(context, value, index, list)}
     ).sort((left, right) ->
-      a: left.criteria; b: right.criteria
+      a = left.criteria; b = right.criteria
       if a < b then -1 else if a > b then 1 else 0
     )), 'value')
#

Use a comparator function to figure out at what index an object should -be inserted so as to maintain order. Uses binary search.

  _.sortedIndex: (array, obj, iterator) ->
+be inserted so as to maintain order. Uses binary search.

  _.sortedIndex = (array, obj, iterator) ->
     iterator ||= _.identity
-    low:  0
-    high: array.length
+    low =  0
+    high = array.length
     while low < high
-      mid: (low + high) >> 1
-      if iterator(array[mid]) < iterator(obj) then low: mid + 1 else high: mid
-    low
#

Convert anything iterable into a real, live array.

  _.toArray: (iterable) ->
+      mid = (low + high) >> 1
+      if iterator(array[mid]) < iterator(obj) then low = mid + 1 else high = mid
+    low
#

Convert anything iterable into a real, live array.

  _.toArray = (iterable) ->
     return []                   if (!iterable)
     return iterable.toArray()   if (iterable.toArray)
     return iterable             if (_.isArray(iterable))
     return slice.call(iterable) if (_.isArguments(iterable))
-    _.values(iterable)
#

Return the number of elements in an object.

  _.size: (obj) -> _.toArray(obj).length
#

Array Functions

#

Get the first element of an array. Passing n will return the first N + _.values(iterable)

#

Return the number of elements in an object.

  _.size = (obj) -> _.toArray(obj).length
#

Array Functions

#

Get the first element of an array. Passing n will return the first N values in the array. Aliased as head. The guard check allows it to work -with map.

  _.first: (array, n, guard) ->
+with map.

  _.first = (array, n, guard) ->
     if n and not guard then slice.call(array, 0, n) else array[0]
#

Returns everything but the first entry of the array. Aliased as tail. Especially useful on the arguments object. Passing an index will return the rest of the values in the array from that index onward. The guard -check allows it to work with map.

  _.rest: (array, index, guard) ->
-    slice.call(array, if _.isUndefined(index) or guard then 1 else index)
#

Get the last element of an array.

  _.last: (array) -> array[array.length - 1]
#

Trim out all falsy values from an array.

  _.compact: (array) -> item for item in array when item
#

Return a completely flattened version of an array.

  _.flatten: (array) ->
+check allows it to work with map.

  _.rest = (array, index, guard) ->
+    slice.call(array, if _.isUndefined(index) or guard then 1 else index)
#

Get the last element of an array.

  _.last = (array) -> array[array.length - 1]
#

Trim out all falsy values from an array.

  _.compact = (array) -> item for item in array when item
#

Return a completely flattened version of an array.

  _.flatten = (array) ->
     _.reduce array, [], (memo, value) ->
       return memo.concat(_.flatten(value)) if _.isArray value
       memo.push value
-      memo
#

Return a version of the array that does not contain the specified value(s).

  _.without: (array) ->
-    values: _.rest arguments
+      memo
#

Return a version of the array that does not contain the specified value(s).

  _.without = (array) ->
+    values = _.rest arguments
     val for val in _.toArray(array) when not _.include values, val
#

Produce a duplicate-free version of the array. If the array has already -been sorted, you have the option of using a faster algorithm.

  _.uniq: (array, isSorted) ->
-    memo: []
+been sorted, you have the option of using a faster algorithm.

  _.uniq = (array, isSorted) ->
+    memo = []
     for el, i in _.toArray array
       memo.push el if i is 0 || (if isSorted is true then _.last(memo) isnt el else not _.include(memo, el))
     memo
#

Produce an array that contains every item shared between all the -passed-in arrays.

  _.intersect: (array) ->
-    rest: _.rest arguments
+passed-in arrays.

  _.intersect = (array) ->
+    rest = _.rest arguments
     _.select _.uniq(array), (item) ->
       _.all rest, (other) ->
         _.indexOf(other, item) >= 0
#

Zip together multiple lists into a single array -- elements that share -an index go together.

  _.zip: ->
-    length:  _.max _.pluck arguments, 'length'
-    results: new Array length
+an index go together.

  _.zip = ->
+    length =  _.max _.pluck arguments, 'length'
+    results = new Array length
     for i in [0...length]
-      results[i]: _.pluck arguments, String i
+      results[i] = _.pluck arguments, String i
     results
#

If the browser doesn't supply us with indexOf (I'm looking at you, MSIE), we need this function. Return the position of the first occurence of an -item in an array, or -1 if the item is not included in the array.

  _.indexOf: (array, item) ->
+item in an array, or -1 if the item is not included in the array.

  _.indexOf = (array, item) ->
     return array.indexOf item if nativeIndexOf and array.indexOf is nativeIndexOf
-    i: 0; l: array.length
+    i = 0; l = array.length
     while l - i
       if array[i] is item then return i else i++
     -1
#

Provide JavaScript 1.6's lastIndexOf, delegating to the native function, -if possible.

  _.lastIndexOf: (array, item) ->
+if possible.

  _.lastIndexOf = (array, item) ->
     return array.lastIndexOf(item) if nativeLastIndexOf and array.lastIndexOf is nativeLastIndexOf
-    i: array.length
+    i = array.length
     while i
       if array[i] is item then return i else i--
     -1
#

Generate an integer Array containing an arithmetic progression. A port of -the native Python range function.

  _.range: (start, stop, step) ->
-    a:        arguments
-    solo:     a.length <= 1
-    i: start: if solo then 0 else a[0]
-    stop:     if solo then a[0] else a[1]
-    step:     a[2] or 1
-    len:      Math.ceil((stop - start) / step)
-    return [] if len <= 0
-    range:    new Array len
-    idx:      0
+the native Python range function.

  _.range = (start, stop, step) ->
+    a         = arguments
+    solo      = a.length <= 1
+    i = start = if solo then 0 else a[0]
+    stop      = if solo then a[0] else a[1]
+    step      = a[2] or 1
+    len       = Math.ceil((stop - start) / step)
+    return []   if len <= 0
+    range     = new Array len
+    idx       = 0
     loop
       return range if (if step > 0 then i - stop else stop - i) >= 0
-      range[idx]: i
+      range[idx] = i
       idx++
       i+= step
#

Function Functions

#

Create a function bound to a given object (assigning this, and arguments, -optionally). Binding with arguments is also known as curry.

  _.bind: (func, obj) ->
-    args: _.rest arguments, 2
+optionally). Binding with arguments is also known as curry.

  _.bind = (func, obj) ->
+    args = _.rest arguments, 2
     -> func.apply obj or root, args.concat arguments
#

Bind all of an object's methods to that object. Useful for ensuring that -all callbacks defined on an object belong to it.

  _.bindAll: (obj) ->
-    funcs: if arguments.length > 1 then _.rest(arguments) else _.functions(obj)
-    _.each funcs, (f) -> obj[f]: _.bind obj[f], obj
+all callbacks defined on an object belong to it.

  _.bindAll = (obj) ->
+    funcs = if arguments.length > 1 then _.rest(arguments) else _.functions(obj)
+    _.each funcs, (f) -> obj[f] = _.bind obj[f], obj
     obj
#

Delays a function for the given number of milliseconds, and then calls -it with the arguments supplied.

  _.delay: (func, wait) ->
-    args: _.rest arguments, 2
+it with the arguments supplied.

  _.delay = (func, wait) ->
+    args = _.rest arguments, 2
     setTimeout((-> func.apply(func, args)), wait)
#

Defers a function, scheduling it to run after the current call stack has -cleared.

  _.defer: (func) ->
+cleared.

  _.defer = (func) ->
     _.delay.apply _, [func, 1].concat _.rest arguments
#

Returns the first function passed as an argument to the second, allowing you to adjust arguments, run code before and after, and -conditionally execute the original function.

  _.wrap: (func, wrapper) ->
+conditionally execute the original function.

  _.wrap = (func, wrapper) ->
     -> wrapper.apply wrapper, [func].concat arguments
#

Returns a function that is the composition of a list of functions, each -consuming the return value of the function that follows.

  _.compose: ->
-    funcs: arguments
+consuming the return value of the function that follows.

  _.compose = ->
+    funcs = arguments
     ->
-      args: arguments
+      args = arguments
       for i in [(funcs.length - 1)..0]
-        args: [funcs[i].apply(this, args)]
-      args[0]
#

Object Functions

#

Retrieve the names of an object's properties.

  _.keys: nativeKeys or (obj) ->
+        args = [funcs[i].apply(this, args)]
+      args[0]
#

Object Functions

#

Retrieve the names of an object's properties.

  _.keys = nativeKeys or (obj) ->
     return _.range 0, obj.length if _.isArray(obj)
-    key for key, val of obj
#

Retrieve the values of an object's properties.

  _.values: (obj) ->
-    _.map obj, _.identity
#

Return a sorted list of the function names available in Underscore.

  _.functions: (obj) ->
-    _.filter(_.keys(obj), (key) -> _.isFunction(obj[key])).sort()
#

Extend a given object with all of the properties in a source object.

  _.extend: (obj) ->
+    key for key, val of obj
#

Retrieve the values of an object's properties.

  _.values = (obj) ->
+    _.map obj, _.identity
#

Return a sorted list of the function names available in Underscore.

  _.functions = (obj) ->
+    _.filter(_.keys(obj), (key) -> _.isFunction(obj[key])).sort()
#

Extend a given object with all of the properties in a source object.

  _.extend = (obj) ->
     for source in _.rest(arguments)
-      (obj[key]: val) for key, val of source
-    obj
#

Create a (shallow-cloned) duplicate of an object.

  _.clone: (obj) ->
+      (obj[key] = val) for key, val of source
+    obj
#

Create a (shallow-cloned) duplicate of an object.

  _.clone = (obj) ->
     return obj.slice 0 if _.isArray obj
     _.extend {}, obj
#

Invokes interceptor with the obj, and then returns obj. -The primary purpose of this method is to "tap into" a method chain, in order to perform operations on intermediate results within the chain.

  _.tap: (obj, interceptor) ->
+The primary purpose of this method is to "tap into" a method chain, in order to perform operations on intermediate results within the chain.

  _.tap = (obj, interceptor) ->
     interceptor obj
-    obj
#

Perform a deep comparison to check if two objects are equal.

  _.isEqual: (a, b) ->
#

Check object identity.

    return true if a is b
#

Different types?

    atype: typeof(a); btype: typeof(b)
+    obj
#

Perform a deep comparison to check if two objects are equal.

  _.isEqual = (a, b) ->
#

Check object identity.

    return true if a is b
#

Different types?

    atype = typeof(a); btype = typeof(b)
     return false if atype isnt btype
#

Basic equality test (watch out for coercions).

    return true if `a == b`
#

One is falsy and the other truthy.

    return false if (!a and b) or (a and !b)
#

One of them implements an isEqual()?

    return a.isEqual(b) if a.isEqual
#

Check dates' integer values.

    return a.getTime() is b.getTime() if _.isDate(a) and _.isDate(b)
#

Both are NaN?

    return true if _.isNaN(a) and _.isNaN(b)
#

Compare regular expressions.

    if _.isRegExp(a) and _.isRegExp(b)
       return a.source     is b.source and
              a.global     is b.global and
              a.ignoreCase is b.ignoreCase and
-             a.multiline  is b.multiline
#

If a is not an object by this point, we can't handle it.

    return false if atype isnt 'object'
#

Check for different array lengths before comparing contents.

    return false if a.length and (a.length isnt b.length)
#

Nothing else worked, deep compare the contents.

    aKeys: _.keys(a); bKeys: _.keys(b)
#

Different object sizes?

    return false if aKeys.length isnt bKeys.length
#

Recursive comparison of contents.

    (return false) for key, val of a when !(key in b) or !_.isEqual(val, b[key])
-    true
#

Is a given array or object empty?

  _.isEmpty: (obj) ->
+             a.multiline  is b.multiline
#

If a is not an object by this point, we can't handle it.

    return false if atype isnt 'object'
#

Check for different array lengths before comparing contents.

    return false if a.length and (a.length isnt b.length)
#

Nothing else worked, deep compare the contents.

    aKeys = _.keys(a); bKeys = _.keys(b)
#

Different object sizes?

    return false if aKeys.length isnt bKeys.length
#

Recursive comparison of contents.

    (return false) for key, val of a when !(key in b) or !_.isEqual(val, b[key])
+    true
#

Is a given array or object empty?

  _.isEmpty = (obj) ->
     return obj.length is 0 if _.isArray obj
     (return false) for key of obj when hasOwnProperty.call(obj, key)
-    true
#

Is a given value a DOM element?

  _.isElement:    (obj) -> obj and obj.nodeType is 1
#

Is a given value an array?

  _.isArray:      nativeIsArray or (obj) -> !!(obj and obj.concat and obj.unshift and not obj.callee)
#

Is a given variable an arguments object?

  _.isArguments:  (obj) -> obj and obj.callee
#

Is the given value a function?

  _.isFunction:   (obj) -> !!(obj and obj.constructor and obj.call and obj.apply)
#

Is the given value a string?

  _.isString:     (obj) -> !!(obj is '' or (obj and obj.charCodeAt and obj.substr))
#

Is a given value a number?

  _.isNumber:     (obj) -> (obj is +obj) or toString.call(obj) is '[object Number]'
#

Is a given value a boolean?

  _.isBoolean:    (obj) -> obj is true or obj is false
#

Is a given value a Date?

  _.isDate:       (obj) -> !!(obj and obj.getTimezoneOffset and obj.setUTCFullYear)
#

Is the given value a regular expression?

  _.isRegExp:     (obj) -> !!(obj and obj.exec and (obj.ignoreCase or obj.ignoreCase is false))
#

Is the given value NaN -- this one is interesting. NaN != NaN, and -isNaN(undefined) == true, so we make sure it's a number first.

  _.isNaN:        (obj) -> _.isNumber(obj) and window.isNaN(obj)
#

Is a given value equal to null?

  _.isNull:       (obj) -> obj is null
#

Is a given variable undefined?

  _.isUndefined:  (obj) -> typeof obj is 'undefined'
#

Utility Functions

#

Run Underscore.js in noConflict mode, returning the _ variable to its -previous owner. Returns a reference to the Underscore object.

  _.noConflict: ->
-    root._: previousUnderscore
-    this
#

Keep the identity function around for default iterators.

  _.identity: (value) -> value
#

Run a function n times.

  _.times: (n, iterator, context) ->
-    iterator.call(context, i) for i in [0...n]
#

Break out of the middle of an iteration.

  _.breakLoop: -> throw breaker
#

Add your own custom functions to the Underscore object, ensuring that -they're correctly added to the OOP wrapper as well.

  _.mixin: (obj) ->
+    true
#

Is a given value a DOM element?

  _.isElement   = (obj) -> obj and obj.nodeType is 1
#

Is a given value an array?

  _.isArray     = nativeIsArray or (obj) -> !!(obj and obj.concat and obj.unshift and not obj.callee)
#

Is a given variable an arguments object?

  _.isArguments = (obj) -> obj and obj.callee
#

Is the given value a function?

  _.isFunction  = (obj) -> !!(obj and obj.constructor and obj.call and obj.apply)
#

Is the given value a string?

  _.isString    = (obj) -> !!(obj is '' or (obj and obj.charCodeAt and obj.substr))
#

Is a given value a number?

  _.isNumber    = (obj) -> (obj is +obj) or toString.call(obj) is '[object Number]'
#

Is a given value a boolean?

  _.isBoolean   = (obj) -> obj is true or obj is false
#

Is a given value a Date?

  _.isDate      = (obj) -> !!(obj and obj.getTimezoneOffset and obj.setUTCFullYear)
#

Is the given value a regular expression?

  _.isRegExp    = (obj) -> !!(obj and obj.exec and (obj.ignoreCase or obj.ignoreCase is false))
#

Is the given value NaN -- this one is interesting. NaN != NaN, and +isNaN(undefined) == true, so we make sure it's a number first.

  _.isNaN       = (obj) -> _.isNumber(obj) and window.isNaN(obj)
#

Is a given value equal to null?

  _.isNull      = (obj) -> obj is null
#

Is a given variable undefined?

  _.isUndefined = (obj) -> typeof obj is 'undefined'
#

Utility Functions

#

Run Underscore.js in noConflict mode, returning the _ variable to its +previous owner. Returns a reference to the Underscore object.

  _.noConflict = ->
+    root._ = previousUnderscore
+    this
#

Keep the identity function around for default iterators.

  _.identity = (value) -> value
#

Run a function n times.

  _.times = (n, iterator, context) ->
+    iterator.call(context, i) for i in [0...n]
#

Break out of the middle of an iteration.

  _.breakLoop = -> throw breaker
#

Add your own custom functions to the Underscore object, ensuring that +they're correctly added to the OOP wrapper as well.

  _.mixin = (obj) ->
     for name in _.functions(obj)
-      addToWrapper name, _[name]: obj[name]
#

Generate a unique integer id (unique within the entire client session). -Useful for temporary DOM ids.

  idCounter: 0
-  _.uniqueId: (prefix) ->
+      addToWrapper name, _[name] = obj[name]
#

Generate a unique integer id (unique within the entire client session). +Useful for temporary DOM ids.

  idCounter = 0
+  _.uniqueId = (prefix) ->
     (prefix or '') + idCounter++
#

By default, Underscore uses ERB-style template delimiters, change the -following template settings to use alternative delimiters.

  _.templateSettings: {
-    start:        '<%'
-    end:          '%>'
-    interpolate:  /<%=(.+?)%>/g
+following template settings to use alternative delimiters.

  _.templateSettings = {
+    start:        '<%'
+    end:          '%>'
+    interpolate:  /<%=(.+?)%>/g
   }
#

JavaScript templating a-la ERB, pilfered from John Resig's Secrets of the JavaScript Ninja, page 83. -Single-quote fix from Rick Strahl.

  _.template: (str, data) ->
-    c: _.templateSettings
-    endMatch: new RegExp("'(?=[^"+c.end.substr(0, 1)+"]*"+escapeRegExp(c.end)+")","g")
-    fn: new Function 'obj',
+Single-quote fix from Rick Strahl.

  _.template = (str, data) ->
+    c = _.templateSettings
+    endMatch = new RegExp("'(?=[^"+c.end.substr(0, 1)+"]*"+escapeRegExp(c.end)+")","g")
+    fn = new Function 'obj',
       'var p=[],print=function(){p.push.apply(p,arguments);};' +
       'with(obj){p.push(\'' +
       str.replace(/[\r\t\n]/g, " ")
@@ -251,32 +251,32 @@ Single-quote fix from Rick Strahl.

.split(c.start).join("');") .split(c.end).join("p.push('") + "');}return p.join('');" - if data then fn(data) else fn
#

Aliases

  _.forEach: _.each
-  _.foldl:   _.inject:      _.reduce
-  _.foldr:   _.reduceRight
-  _.select:  _.filter
-  _.all:     _.every
-  _.any:     _.some
-  _.head:    _.first
-  _.tail:    _.rest
-  _.methods: _.functions
#

Setup the OOP Wrapper

#

If Underscore is called as a function, it returns a wrapped object that + if data then fn(data) else fn

#

Aliases

  _.forEach = _.each
+  _.foldl   = _.inject = _.reduce
+  _.foldr   = _.reduceRight
+  _.select  = _.filter
+  _.all     = _.every
+  _.any     = _.some
+  _.head    = _.first
+  _.tail    = _.rest
+  _.methods = _.functions
#

Setup the OOP Wrapper

#

If Underscore is called as a function, it returns a wrapped object that can be used OO-style. This wrapper holds altered versions of all the -underscore functions. Wrapped objects may be chained.

  wrapper: (obj) ->
-    this._wrapped: obj
-    this
#

Helper function to continue chaining intermediate results.

  result: (obj, chain) ->
-    if chain then _(obj).chain() else obj
#

A method to easily add functions to the OOP wrapper.

  addToWrapper: (name, func) ->
-    wrapper.prototype[name]: ->
-      args: _.toArray arguments
+underscore functions. Wrapped objects may be chained.

  wrapper = (obj) ->
+    this._wrapped = obj
+    this
#

Helper function to continue chaining intermediate results.

  result = (obj, chain) ->
+    if chain then _(obj).chain() else obj
#

A method to easily add functions to the OOP wrapper.

  addToWrapper = (name, func) ->
+    wrapper.prototype[name] = ->
+      args = _.toArray arguments
       unshift.call args, this._wrapped
       result func.apply(_, args), this._chain
#

Add all of the Underscore functions to the wrapper object.

  _.mixin _
#

Add all mutator Array functions to the wrapper.

  _.each ['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], (name) ->
-    method: Array.prototype[name]
-    wrapper.prototype[name]: ->
+    method = Array.prototype[name]
+    wrapper.prototype[name] = ->
       method.apply(this._wrapped, arguments)
       result(this._wrapped, this._chain)
#

Add all accessor Array functions to the wrapper.

  _.each ['concat', 'join', 'slice'], (name) ->
-    method: Array.prototype[name]
-    wrapper.prototype[name]: ->
-      result(method.apply(this._wrapped, arguments), this._chain)
#

Start chaining a wrapped Underscore object.

  wrapper::chain: ->
-    this._chain: true
-    this
#

Extracts the result from a wrapped and chained object.

  wrapper::value: -> this._wrapped
+    method = Array.prototype[name]
+    wrapper.prototype[name] = ->
+      result(method.apply(this._wrapped, arguments), this._chain)
#

Start chaining a wrapped Underscore object.

  wrapper::chain = ->
+    this._chain = true
+    this
#

Extracts the result from a wrapped and chained object.

  wrapper::value = -> this._wrapped
 
 
\ No newline at end of file diff --git a/documentation/index.html.erb b/documentation/index.html.erb index 68cfad8c..fb485fdb 100644 --- a/documentation/index.html.erb +++ b/documentation/index.html.erb @@ -39,7 +39,6 @@ Language Reference Significant Whitespace Functions and Invocation - Assignment Objects and Arrays Lexical Scoping and Variable Safety If, Else, Unless, and Conditional Assignment @@ -164,13 +163,12 @@ alert reverse '.eeffoC yrT'
on top of the Jison parser generator, and is available as a Node.js utility. The core compiler however, does not depend on Node, and can be run in other server-side-JavaScript environments, - or in the browser (see "Try CoffeeScript", above). This may be helpful, - as Node only run on flavors of nix, and not Windows, for the time being. + or in the browser (see "Try CoffeeScript", above).

To install, first make sure you have a working copy of the latest tagged version of - Node.js, currently 0.1.90 or higher. + Node.js, currently 0.1.102 or higher. Then clone the CoffeeScript source repository from GitHub, or download the latest @@ -244,7 +242,7 @@ sudo npm install coffee-script

(JavaScript Lint) command is installed, use it to check the compilation of a CoffeeScript file. (Handy in - conjunction with --watch) + conjunction with
--watch) @@ -356,34 +354,14 @@ coffee --print app/scripts/*.coffee > concatenation.js
function body. The empty function looks like this: ->

<%= code_for('functions', 'cube(5)') %> -

- If you'd like to assign a function literal to a variable, but not have - it be named, just wrap the function definition in parentheses: - ((x) -> x * x) -

- -

- - Assignment - Use a colon : to assign, as in - JSON. Equal signs are only needed for - mathy things. While colons are preferred, the two may be used interchangeably, - even within object literals. -

- <%= code_for('assignment', 'greeting') %> -

- All declaration of new variables is pushed up to the top of the nearest - lexical scope, so that assignment may always be performed within expressions. -

Objects and Arrays Object and Array literals look very similar to their JavaScript cousins. - When you spread out each assignment on a separate line, the commas are - optional. In this way, assigning object properties looks the same as - assigning local variables, and can be moved around freely. Feel free to mix - and match the two styles. + When you spread out each property on a separate line, the commas are + optional. Implicit objects may be created with indentation instead of + brackets, winding up looking quite similar to YAML.

<%= code_for('objects_and_arrays', 'song.join(",")') %>

@@ -426,7 +404,7 @@ coffee --print app/scripts/*.coffee > concatenation.js

If you'd like to create top-level variables for other scripts to use, attach them as properties on window, or on the exports - object in CommonJS. The existential operator (below), gives you a + object in CommonJS. The existential operator (covered below), gives you a reliable way to figure out where to add them, if you're targeting both CommonJS and the browser: root: exports ? this

@@ -446,11 +424,6 @@ coffee --print app/scripts/*.coffee > concatenation.js
a regular if statement inline.

<%= code_for('conditionals') %> -

- You can assign a variable to a half-expression to perform an operation - like Ruby's ||=, which only assigns a value to a variable - if the variable's current value is falsy. -

@@ -959,6 +932,27 @@ coffee --print app/scripts/*.coffee > concatenation.js

Change Log +

+ 0.9.0 + The CoffeeScript 0.9 series is considered to be a release candidate + for 1.0; let's give her a shakedown cruise. 0.9.0 introduces a massive + backwards-incompatible change: Assignment now uses =, and object + literals use :, as in JavaScript. This allows us to have implicit + object literals, and YAML-style object definitions. Half assignments are + removed, in favor of +=, or=, and friends. + Downwards range comprehensions are now safe again, and are optimized to + straight for loops when created with integer endpoints. + A fast, unguarded form of object comprehension was added: + for all key, value of object. Mentioning the super keyword + with no arguments now forwards all arguments passed to the function, + as in Ruby. If you extend class B from parent class A, if + A has an extended method defined, it will be called, passing in B — + this enables static inheritance, among other things. Cleaner output for + functions bound with the fat arrow. @variables can now be used + in parameter lists, with the parameter being automatically set as a property + on the object — useful in constructors and setter functions. + Constructor functions can now take splats. +

0.7.2 Quick bugfix (right after 0.7.1) for a problem that prevented coffee diff --git a/documentation/js/assignment.js b/documentation/js/assignment.js deleted file mode 100644 index 106a6bff..00000000 --- a/documentation/js/assignment.js +++ /dev/null @@ -1,3 +0,0 @@ -var difficulty, greeting; -greeting = "Hello CoffeeScript"; -difficulty = 0.5; \ No newline at end of file diff --git a/documentation/js/objects_and_arrays.js b/documentation/js/objects_and_arrays.js index 66cc9011..1254cc7e 100644 --- a/documentation/js/objects_and_arrays.js +++ b/documentation/js/objects_and_arrays.js @@ -1,12 +1,17 @@ -var ages, matrix, singers, song; +var kids, matrix, singers, song; song = ["do", "re", "mi", "fa", "so"]; singers = { Jagger: 'Rock', Elvis: 'Roll' }; -ages = { - max: 10, - ida: 9, - tim: 11 -}; -matrix = [1, 0, 1, 0, 0, 1, 1, 1, 0]; \ No newline at end of file +matrix = [1, 0, 1, 0, 0, 1, 1, 1, 0]; +kids = { + brother: { + name: 'Max', + age: 11 + }, + sister: { + name: 'Ida', + age: 9 + } +}; \ No newline at end of file diff --git a/index.html b/index.html index 99e116f0..c2c60ad9 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,6 @@ Language Reference Significant Whitespace Functions and Invocation - Assignment Objects and Arrays Lexical Scoping and Variable Safety If, Else, Unless, and Conditional Assignment @@ -246,13 +245,12 @@ cubes = (function() { on top of the Jison parser generator, and is available as a Node.js utility. The core compiler however, does not depend on Node, and can be run in other server-side-JavaScript environments, - or in the browser (see "Try CoffeeScript", above). This may be helpful, - as Node only run on flavors of nix, and not Windows, for the time being. + or in the browser (see "Try CoffeeScript", above).

To install, first make sure you have a working copy of the latest tagged version of - Node.js, currently 0.1.90 or higher. + Node.js, currently 0.1.102 or higher. Then clone the CoffeeScript source repository from GitHub, or download the latest @@ -326,7 +324,7 @@ sudo npm install coffee-script

(JavaScript Lint) command is installed, use it to check the compilation of a CoffeeScript file. (Handy in - conjunction with --watch) + conjunction with
--watch) @@ -453,80 +451,66 @@ square = function(x) { cube = function(x) { return square(x) * x; };;alert(cube(5));'>run: cube(5)
-

- If you'd like to assign a function literal to a variable, but not have - it be named, just wrap the function definition in parentheses: - ((x) -> x * x) -

- -

- - Assignment - Use a colon : to assign, as in - JSON. Equal signs are only needed for - mathy things. While colons are preferred, the two may be used interchangeably, - even within object literals. -

-
greeting   = "Hello CoffeeScript"
-difficulty = 0.5
-
var difficulty, greeting;
-greeting = "Hello CoffeeScript";
-difficulty = 0.5;
-

-

- All declaration of new variables is pushed up to the top of the nearest - lexical scope, so that assignment may always be performed within expressions. -

Objects and Arrays Object and Array literals look very similar to their JavaScript cousins. - When you spread out each assignment on a separate line, the commas are - optional. In this way, assigning object properties looks the same as - assigning local variables, and can be moved around freely. Feel free to mix - and match the two styles. + When you spread out each property on a separate line, the commas are + optional. Implicit objects may be created with indentation instead of + brackets, winding up looking quite similar to YAML.

song = ["do", "re", "mi", "fa", "so"]
 
 singers = {Jagger: 'Rock', Elvis: 'Roll'}
 
-ages =
-  max: 10
-  ida: 9
-  tim: 11
-
 matrix = [
   1, 0, 1
   0, 0, 1
   1, 1, 0
 ]
-
var ages, matrix, singers, song;
+
+kids =
+  brother:
+    name: 'Max'
+    age:  11
+  sister:
+    name: 'Ida'
+    age:  9
+
var kids, matrix, singers, song;
 song = ["do", "re", "mi", "fa", "so"];
 singers = {
   Jagger: 'Rock',
   Elvis: 'Roll'
 };
-ages = {
-  max: 10,
-  ida: 9,
-  tim: 11
-};
 matrix = [1, 0, 1, 0, 0, 1, 1, 1, 0];
-

+matrix = [1, 0, 1, 0, 0, 1, 1, 1, 0]; +kids = { + brother: { + name: 'Max', + age: 11 + }, + sister: { + name: 'Ida', + age: 9 + } +};;alert(song.join(","));'>run: song.join(",")

In JavaScript, you can't use reserved words, like class, as properties of an object, without quoting them as strings. CoffeeScript notices and quotes @@ -591,7 +575,7 @@ inner = changeNumbers();;alert(inner);'>run: inner
<

If you'd like to create top-level variables for other scripts to use, attach them as properties on window, or on the exports - object in CommonJS. The existential operator (below), gives you a + object in CommonJS. The existential operator (covered below), gives you a reliable way to figure out where to add them, if you're targeting both CommonJS and the browser: root: exports ? this

@@ -634,11 +618,6 @@ options or= defaults date = friday ? sue : jill; options = options || defaults;

-

- You can assign a variable to a half-expression to perform an operation - like Ruby's ||=, which only assigns a value to a variable - if the variable's current value is falsy. -

@@ -1852,6 +1831,27 @@ task('build:parser0.9.0 + The CoffeeScript 0.9 series is considered to be a release candidate + for 1.0; let's give her a shakedown cruise. 0.9.0 introduces a massive + backwards-incompatible change: Assignment now uses =, and object + literals use :, as in JavaScript. This allows us to have implicit + object literals, and YAML-style object definitions. Half assignments are + removed, in favor of +=, or=, and friends. + Downwards range comprehensions are now safe again, and are optimized to + straight for loops when created with integer endpoints. + A fast, unguarded form of object comprehension was added: + for all key, value of object. Mentioning the super keyword + with no arguments now forwards all arguments passed to the function, + as in Ruby. If you extend class B from parent class A, if + A has an extended method defined, it will be called, passing in B — + this enables static inheritance, among other things. Cleaner output for + functions bound with the fat arrow. @variables can now be used + in parameter lists, with the parameter being automatically set as a property + on the object — useful in constructors and setter functions. + Constructor functions can now take splats. +

0.7.2 Quick bugfix (right after 0.7.1) for a problem that prevented coffee