Merge branch 'master' of git://github.com/assaf/zombie into merge

CHANGELOG.md

@@ -6,7 +6,9 @@ zombie.js-changelog(7) -- Changelog
 
 Properly use the existance operator so empty strings are sent (José Valim).
 
-Fixs to XPath evaluation and sorting by document order (José Valim).
+Fix to XPath evaluation and sorting by document order (José Valim).
+
+Update to HTML5 0.2.9.
 
     231 Tests
     3.4 sec to complete

Cakefile

@@ -165,9 +165,13 @@ publishDocs = (callback)->
     log stdout, green
     callback err
 task "doc:publish", "Publish documentation to site", ->
-  generateDocs (err)->
-    onerror error
-    publishDocs onerror
+  documentPages (err)->
+    onerror err
+    documentSource (err)->
+      onerror err
+      generatePDF (err)->
+        onerror err
+        publishDocs onerror
 
 task "publish", "Publish new version (Git, NPM, site)", ->
   # Run tests, don't publish unless tests pass.
@@ -195,18 +199,9 @@ task "publish", "Publish new version (Git, NPM, site)", ->
           log "Publishing to NPM ...", green
           build (err)->
             onerror err
-            # Beware: npm publish pushes everything it finds to the Web,
-            # don't run it on your working copy.  Here we create a clean
-            # directory with only the files we *want* to publish.
-            files = package.files.slice(0)
-            files.push path for n,path of package.directories
-            exec "rm -rf clean && mkdir clean", (err)->
+            exec "npm publish", (err, stdout, stderr)->
+              log stdout, green
               onerror err
-              exec "cp -R #{files.join(" ")} clean/", (err)->
-                onerror err
-                exec "npm publish clean", (err, stdout, stderr)->
-                  log stdout, green
-                  onerror err
 
           # We can do this in parallel.
           publishDocs onerror

TODO.md

@@ -1,6 +1,23 @@
 zombie.js-todo(7) -- Wishlist
 =============================
 
+* CSS support
+  * Add `style` attribute, parsed on-demand
+  * Add stylesheets to document
+  * Add feature to load/parse internal and external stylesheets
+  * Add browser option to control CSS loading (similar to `runScripts`)
+  * Make sure `DOMContentLoaded` event fires after all stylesheets
+    are loaded
+
+* New script context
+  * The execution context for all scripts on the page is the `Window`
+    object itself
+  * Node's `runInContext` accepts a sandbox, then creates an actual V8
+    context by copying properties to/from, which breaks asynchronous
+    scripts (timer, XHR, etc) which run in the contex, not the sandbox
+
+* Fix site links to not require `.html`.
+
 * Navigation: Browser.open/close should work as a pair; look into supporting
   window.open; fire unload event when navigating away from page.
 
@@ -10,6 +27,3 @@ zombie.js-todo(7) -- Wishlist
   and timezone; allow changing browser timezone and default to system's.
 
 * Prompts: handle window.confirm and window.alert.
-
-* CSS support: DOM API support for stylesheets and the style attribute;
-  optionally loading so we don't impact performance.

package.json

@@ -36,7 +36,7 @@
   "dependencies": {
     "base64": "1.0.1",
     "cssom": "0.2.0",
-    "html5": "0.2.7",
+    "html5": "0.2.9",
     "jsdom": "0.1.23",
     "mime": "1.1.0"
   },
@@ -60,4 +60,4 @@
       "url": "http://github.com/assaf/zombie/raw/master/MIT-LICENSE"
     }
   ]
-}
+}

src/zombie/eventloop.coffee

@@ -19,7 +19,7 @@ class EventLoop
             if typeof fn == "function"
               fn.apply this
             else
-              eval fn
+              browser.evaluate fn
           finally
             delete timers[handle]
       handle = ++lastHandle
@@ -38,7 +38,7 @@ class EventLoop
             if typeof fn == "function"
               fn.apply this
             else
-              eval fn
+              browser.evaluate fn
           finally
             timer.when = browser.clock + delay
       handle = ++lastHandle