yaml 0.1.2 → 0.2.3

package/History.md

@@ -1,4 +1,26 @@
 
+0.2.3 / 2011-12-05 
+==================
+
+  * Added a "null.yaml" test case in the examples.
+  * Added support for NULL values.
+  * Fixed a global leak
+
+0.2.2 / 2011-08-31 
+==================
+
+  * Made it so the first indentation in the input determines the indentation ammount (instead of it being statically set to 2 spaces) [joelverhagen]
+
+0.2.1 / 2011-05-22 
+==================
+
+  * Fixed boolean support [Adrian Olaru]
+
+0.2.0 / 2011-05-21 
+==================
+
+  * Added support for dates [Adrian Olaru]
+
 0.1.1 / 2010-12-15 
 ==================
 

package/Makefile

@@ -9,5 +9,6 @@ examples:
 	@node examples/run.js examples/list.nested.yml
 	@node examples/run.js examples/hash.yml
 	@node examples/run.js examples/config.yml
+	@node examples/run.js examples/dates.yml
 	
-.PHONY: test examples
+.PHONY: test examples

package/examples/boolean.yaml

@@ -0,0 +1,7 @@
+---
+  title: Some Title
+  falseme: I can see this
+  what: no
+  say: yes
+  trueme: found
+  hope: to see this

package/examples/config.yml

@@ -5,4 +5,4 @@
   timeout: 15
   servers: 2
   require: []
-
+  dbg-mode: false

package/examples/dates.yaml

@@ -0,0 +1,7 @@
+---
+  date0: 2011-05-21
+  date1: 2011-5-21
+  date2: 2011-1-2
+  date3: 2011-02-21 17:56
+  date4: 2011-04-21 5:35
+  date5: 2011-06-02 20:45:30

package/examples/null.yaml

@@ -0,0 +1,8 @@
+---
+  test: A test for null values
+  thisis: null
+  thistoo: NULL
+  notnull: yes
+  tildeis: ~
+  capitalized: Null
+  end: test passed?

package/lib/yaml.js

@@ -1,11 +1,10 @@
-
 // YAML - Core - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
 
 /**
  * Version triplet.
  */
 
-exports.version = '0.1.2'
+exports.version = '0.2.3'
 
 // --- Helpers
 
@@ -37,10 +36,12 @@ var tokens = [
   ['comment', /^#[^\n]*/],
   ['indent', /^\n( *)/],
   ['space', /^ +/],
-  ['true', /^(enabled|true|yes|on)/],
-  ['false', /^(disabled|false|no|off)/],
+  ['true', /^\b(enabled|true|yes|on)\b/],
+  ['false', /^\b(disabled|false|no|off)\b/],
+  ['null', /^\b(null|Null|NULL|~)\b/],
   ['string', /^"(.*?)"/],
   ['string', /^'(.*?)'/],
+  ['timestamp', /^((\d{4})-(\d\d?)-(\d\d?)(?:(?:[ \t]+)(\d\d?):(\d\d)(?::(\d\d))?)?)/],
   ['float', /^(\d+\.\d+)/],
   ['int', /^(\d+)/],
   ['doc', /^---/],
@@ -52,7 +53,7 @@ var tokens = [
   ['-', /^\-/],
   [':', /^[:]/],
   ['string', /^(?![^:\n\s]*:[^\/]{2})(([^:,\]\}\n\s]|(?!\n)\s(?!\s*?\n)|:\/\/|,(?=[^\n]*\s*[^\]\}\s\n]\s*\n)|[\]\}](?=[^\n]*\s*[^\]\}\s\n]\s*\n))*)(?=[,:\]\}\s\n]|$)/], 
-  ['id', /^([\w ]+)/],
+  ['id', /^([\w][\w -]*)/]
 ]
 
 /**
@@ -65,8 +66,8 @@ var tokens = [
 
 exports.tokenize = function (str) {
   var token, captures, ignore, input,
-      indents = lastIndents = 0,
-      stack = []
+      indents = 0, lastIndents = 0,
+      stack = [], indentAmount = -1
   while (str.length) {
     for (var i = 0, len = tokens.length; i < len; ++i)
       if (captures = tokens[i][1].exec(str)) {
@@ -77,8 +78,13 @@ exports.tokenize = function (str) {
             ignore = true
             break
           case 'indent':
-            lastIndents = indents
-            indents = token[1][1].length / 2
+            lastIndents = indents 
+            // determine the indentation amount from the first indent
+            if (indentAmount == -1) {
+              indentAmount = token[1][1].length
+            }
+
+            indents = token[1][1].length / indentAmount
             if (indents === lastIndents)
               ignore = true
             else if (indents > lastIndents + 1)
@@ -217,6 +223,7 @@ Parser.prototype.ignoreWhitespace = function() {
  * | int
  * | true
  * | false
+ * | null
  */
 
 Parser.prototype.parse = function() {
@@ -233,14 +240,18 @@ Parser.prototype.parse = function() {
       return this.parseHash()
     case 'string':
       return this.advanceValue()
+    case 'timestamp':
+      return this.parseTimestamp()
     case 'float':
       return parseFloat(this.advanceValue())
     case 'int':
       return parseInt(this.advanceValue())
     case 'true':
-      return true
+      this.advanceValue(); return true
     case 'false':
-      return false
+      this.advanceValue(); return false
+    case 'null':
+      this.advanceValue(); return null
   }
 }
 
@@ -337,6 +348,30 @@ Parser.prototype.parseInlineList = function() {
   return list
 }
 
+/**
+ * yyyy-mm-dd hh:mm:ss
+ *
+ * For full format: http://yaml.org/type/timestamp.html
+ */
+
+Parser.prototype.parseTimestamp = function() {
+  var token = this.advance()[1]
+  var date = new Date
+  var year = token[2]
+    , month = token[3]
+    , day = token[4]
+    , hour = token[5] || 0 
+    , min = token[6] || 0
+    , sec = token[7] || 0
+
+  date.setUTCFullYear(year, month-1, day)
+  date.setUTCHours(hour)
+  date.setUTCMinutes(min)
+  date.setUTCSeconds(sec)
+  date.setUTCMilliseconds(0)
+  return date
+}
+
 /**
  * Evaluate a _str_ of yaml.
  *

package/package.json

@@ -1,5 +1,5 @@
 { "name": "yaml",
-  "version": "0.1.2",
+  "version": "0.2.3",
   "description": "Yaml parser",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "main": "./lib/yaml.js"

package/spec/fixtures/comments.yml

@@ -1,6 +0,0 @@
--1
-# rawr
--2
-# foo bar
-# something
--3

package/spec/fixtures/document.yml

@@ -1,4 +0,0 @@
----
-  - 1
-  - 2
-  - 3

package/spec/fixtures/hash.hash.yml

@@ -1,7 +0,0 @@
-pets:
-  niko: 2
-  simon: 14
-birthMonths:
-  niko: "May"
-  simon: "June"
-

package/spec/fixtures/hash.inline.invalid.yml

@@ -1 +0,0 @@
-{ name: "tj" email: "tj@vision-media.ca" }

package/spec/fixtures/hash.inline.whitespace.yml

@@ -1,4 +0,0 @@
-tj: {
-  name: "tj",
-  age: 23
-}

package/spec/fixtures/hash.inline.yml

@@ -1 +0,0 @@
-{ name: "tj", email: "tj@vision-media.ca" }

package/spec/fixtures/hash.list.yml

@@ -1,3 +0,0 @@
-pets:
-  - "niko"
-  - "simon"

package/spec/fixtures/hash.yml

@@ -1,2 +0,0 @@
-a: 1
-b: 2

package/spec/fixtures/list.hash.yml

@@ -1,4 +0,0 @@
--
-  name: "tj"
--
-  name: "simon"

package/spec/fixtures/list.inline.invalid.yml

@@ -1 +0,0 @@
-[1 1]

package/spec/fixtures/list.inline.yml

@@ -1 +0,0 @@
-["tj", 23]

package/spec/fixtures/list.invalid.yml

@@ -1,5 +0,0 @@
--
-  - 1
-  - 2
-      - 
-        - 3

package/spec/fixtures/list.list.yml

@@ -1,7 +0,0 @@
--
-  - 1    
-  - 2  
-  - 3  
-  -
-    - 4
-    - 5

package/spec/fixtures/list.lists.yml

@@ -1,6 +0,0 @@
-- 1
--
-  - 2
-  -
-    - 3
-- 4

package/spec/fixtures/list.yml

@@ -1,3 +0,0 @@
-- 1
-- 2
-- 3

package/spec/lib/jspec.css

@@ -1,149 +0,0 @@
-body.jspec {
-  margin: 45px 0;
-  font: 12px "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
-  background: #efefef url(images/bg.png) top left repeat-x;
-  text-align: center;
-}
-#jspec {
-  margin: 0 auto;
-  padding-top: 30px;
-  width: 1008px;
-  background: url(images/vr.png) top left repeat-y;
-  text-align: left;
-}
-#jspec-top {
-  position: relative;
-  margin: 0 auto;
-  width: 1008px;
-  height: 40px;
-  background: url(images/sprites.bg.png) top left no-repeat;
-}
-#jspec-bottom {
-  margin: 0 auto;
-  width: 1008px;
-  height: 15px;
-  background: url(images/sprites.bg.png) bottom left no-repeat;
-}
-#jspec .loading {
-  margin-top: -45px;
-  width: 1008px;
-  height: 80px;
-  background: url(images/loading.gif) 50% 50% no-repeat;
-}
-#jspec-title {
-  position: absolute;
-  top: 15px;
-  left: 20px;
-  width: 160px;
-  font-size: 22px;
-  font-weight: normal;
-  background: url(images/sprites.png) 0 -126px no-repeat;
-  text-align: center;
-}
-#jspec-title em {
-  font-size: 10px;
-  font-style: normal;
-  color: #BCC8D1;
-}
-#jspec-report * {
-	margin: 0;
-	padding: 0;
-	background: none;
-	border: none;
-}
-#jspec-report {
-  padding: 15px 40px;
-	font: 11px "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
-	color: #7B8D9B;
-}
-#jspec-report.has-failures {
-  padding-bottom: 30px;
-}
-#jspec-report .hidden {
-  display: none;
-}
-#jspec-report .heading {
-  margin-bottom: 15px;
-}
-#jspec-report .heading span {
-  padding-right: 10px;
-}
-#jspec-report .heading .passes em {
-  color: #0ea0eb;
-}
-#jspec-report .heading .failures em {
-  color: #FA1616;
-}
-#jspec-report table {
-  font-size: 11px;
-  border-collapse: collapse;
-}
-#jspec-report td {
-  padding: 8px;
-  text-indent: 30px;
-  color: #7B8D9B;
-}
-#jspec-report tr.body {
-  display: none;
-}
-#jspec-report tr.body pre {
-  margin: 0;
-  padding: 0 0 5px 25px;
-}
-#jspec-report tr.even:hover + tr.body, 
-#jspec-report tr.odd:hover + tr.body {
-  display: block;
-}
-#jspec-report tr td:first-child em {
-	display: block;
-	clear: both;
-  font-style: normal;
-  font-weight: normal;
-  color: #7B8D9B;
-}
-#jspec-report tr.even:hover, 
-#jspec-report tr.odd:hover {
-  text-shadow: 1px 1px 1px #fff;
-  background: #F2F5F7;
-}
-#jspec-report td + td {
-  padding-right: 0;
-  width: 15px;
-}
-#jspec-report td.pass {
-  background: url(images/sprites.png) 3px -7px no-repeat;
-}
-#jspec-report td.fail {
-  background: url(images/sprites.png) 3px -158px no-repeat;
-  font-weight: bold;
-  color: #FC0D0D;
-}
-#jspec-report td.requires-implementation {
-  background: url(images/sprites.png) 3px -333px no-repeat;
-}
-#jspec-report tr.description td {
-  margin-top: 25px;
-  padding-top: 25px;
-  font-size: 12px;
-  font-weight: bold;
-  text-indent: 0;
-  color: #1a1a1a;
-}
-#jspec-report tr.description:first-child td {
-  border-top: none;  
-}
-#jspec-report .assertion {
-  display: block;
-  float: left;
-  margin: 0 0 0 1px;
-  padding: 0;
-  width: 1px;
-  height: 5px;
-  background: #7B8D9B;
-}
-#jspec-report .assertion.failed {
-  background: red;
-}
-.jspec-sandbox {
-  display: none;
-}

package/spec/lib/jspec.growl.js

@@ -1,115 +0,0 @@
-
-// JSpec - Growl - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
-
-;(function(){
-  
-  Growl = {
-    
-    // --- Version
-    
-    version: '1.0.0',
-    
-    /**
-     * Execute the given _cmd_, returning an array of lines from stdout.
-     *
-     * Examples:
-     *
-     *   Growl.exec('growlnotify', '-m', msg)
-     *
-     * @param  {string ...} cmd
-     * @return {array}
-     * @api public
-     */
-
-    exec: function(cmd) {
-      var lines = [], line
-      with (JavaImporter(java.lang, java.io)) {
-        var proccess = Runtime.getRuntime().exec(Array.prototype.slice.call(arguments))
-        var stream = new DataInputStream(proccess.getInputStream())
-        while (line = stream.readLine())
-          lines.push(line + '')
-        stream.close()    
-      }
-      return lines
-    },
-    
-    /**
-     * Return the extension of the given _path_ or null.
-     *
-     * @param  {string} path
-     * @return {string}
-     * @api private
-     */
-    
-    extname: function(path) {
-      return path.lastIndexOf('.') != -1 ? 
-        path.slice(path.lastIndexOf('.') + 1, path.length) :
-          null
-    },
-
-    /**
-     * Version of the 'growlnotify' binary.
-     *
-     * @return {string}
-     * @api private
-     */
-
-    binVersion: function() {
-      try { return this.exec('growlnotify', '-v')[0].split(' ')[1] } catch (e) {}
-    },
-
-    /**
-     * Send growl notification _msg_ with _options_.
-     *
-     * Options:
-     *
-     *  - title   Notification title
-     *  - sticky  Make the notification stick (defaults to false)
-     *  - name    Application name (defaults to growlnotify)
-     *  - image
-     *    - path to an icon sets --iconpath
-     *    - path to an image sets --image
-     *    - capitalized word sets --appIcon
-     *    - filename uses extname as --icon
-     *    - otherwise treated as --icon
-     *
-     * Examples:
-     *
-     *   Growl.notify('New email')
-     *   Growl.notify('5 new emails', { title: 'Thunderbird' })
-     *
-     * @param {string} msg
-     * @param {options} hash
-     * @api public
-     */
-
-    notify: function(msg, options) {
-      options = options || {}
-      var args = ['growlnotify', '-m', msg]
-      if (!this.binVersion()) throw new Error('growlnotify executable is required')
-      if (image = options.image) {
-        var flag, ext = this.extname(image)
-        flag = flag || ext == 'icns' && 'iconpath'
-        flag = flag || /^[A-Z]/.test(image) && 'appIcon'
-        flag = flag || /^png|gif|jpe?g$/.test(ext) && 'image'
-        flag = flag || ext && (image = ext) && 'icon'
-        flag = flag || 'icon'
-        args.push('--' + flag, image)
-      }
-      if (options.sticky) args.push('--sticky')
-      if (options.name) args.push('--name', options.name)
-      if (options.title) args.push(options.title)
-      this.exec.apply(this, args)
-    }
-  }
-  
-  JSpec.include({
-    name: 'Growl',
-    reporting: function(options){
-      var stats = JSpec.stats
-      if (stats.failures) Growl.notify('failed ' + stats.failures + ' assertions', { title: 'JSpec'})
-      else Growl.notify('passed ' + stats.passes + ' assertions', { title: 'JSpec' })
-    }
-  })
-  
-})()

package/spec/lib/jspec.jquery.js

@@ -1,79 +0,0 @@
-
-// JSpec - jQuery - Copyright TJ Holowaychuk <tj@vision-media.ca> (MIT Licensed)
-
-JSpec
-.requires('jQuery', 'when using jspec.jquery.js')
-.include({
-  name: 'jQuery',
-  
-  // --- Initialize
-  
-  init : function() {
-    jQuery.ajaxSetup({ async: false })
-  },
-  
-  // --- Utilities
-  
-  utilities : {
-    element:  jQuery,
-    elements: jQuery,
-    sandbox : function() {
-      return jQuery('<div class="sandbox"></div>')
-    }
-  },
-  
-  // --- Matchers
-  
-  matchers : {    
-    have_tag      : "jQuery(expected, actual).length === 1",
-    have_one      : "alias have_tag",
-    have_tags     : "jQuery(expected, actual).length > 1",
-    have_many     : "alias have_tags",
-    have_any      : "alias have_tags",
-    have_child    : "jQuery(actual).children(expected).length === 1",
-    have_children : "jQuery(actual).children(expected).length > 1",
-    have_text     : "jQuery(actual).text() === expected",
-    have_value    : "jQuery(actual).val() === expected",
-    be_enabled    : "!jQuery(actual).attr('disabled')",
-    have_class    : "jQuery(actual).hasClass(expected)",
-    be_animated   : "jQuery(actual).queue().length > 0",        
-        
-    be_visible : function(actual) {
-      return jQuery(actual).css('display') != 'none' &&
-             jQuery(actual).css('visibility') != 'hidden' &&
-             jQuery(actual).attr('type') != 'hidden'
-    },
-    
-    be_hidden : function(actual) {
-      return !JSpec.does(actual, 'be_visible')
-    },
-    
-    have_classes : function(actual) {
-      return !JSpec.any(JSpec.toArray(arguments, 1), function(arg){
-        return !JSpec.does(actual, 'have_class', arg)
-      })
-    },
-
-    have_attr : function(actual, attr, value) {
-      return value ? jQuery(actual).attr(attr) == value:
-                     jQuery(actual).attr(attr)
-    },
-    
-    have_event_handlers : function(actual, expected) {
-      return jQuery(actual).data('events') ?
-        jQuery(actual).data('events').hasOwnProperty(expected) :
-          false
-    },
-    
-    'be disabled selected checked' : function(attr) {
-      return 'jQuery(actual).attr("' + attr + '")'
-    },
-    
-    'have type id title alt href src sel rev name target' : function(attr) {
-      return function(actual, value) {
-        return JSpec.does(actual, 'have_attr', attr, value)
-      }
-    }
-  }
-})
-