testing selectors, and some addition fixes

index.js

@@ -1,7 +1,17 @@
 // Use source if we have coffeescript otherwise use lib
 try {
-    require('coffee-script');
-    module.exports = require(__dirname + "/src/cheerio.coffee");
+  require('coffee-script');
+  base = './src/'
 } catch (e) {
-    module.exports = require(__dirname + "/lib/cheerio.js");
-}
+  base = './lib/'
+}
+
+exports = module.exports = require(base + 'cheerio')
+
+exports.parse = require(base + 'parse')
+exports.render = require(base + 'render')
+exports.utils = require(base + 'utils')
+
+/*
+  Attach other modules on here, this will allow testing to be done in mocha without recompiling
+*/

lib/cheerio.js

@@ -1,12 +1,13 @@
 (function() {
-  var api, cheerio, parser, path, plugin, soupselect, _, _i, _len;
+  var api, cheerio, parse, path, plugin, soupselect, _, _i, _len;
   path = require("path");
   soupselect = require("cheerio-soupselect");
   _ = require("underscore");
-  parser = require("./parser");
+  parse = require("./parse");
   cheerio = (function() {
     var quickExpr, trimLeft, trimRight;
     cheerio = function(selector, context, root) {
+      console.log('zzz');
       return new cheerio.fn.init(selector, context, root);
     };
     quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/;
@@ -37,7 +38,7 @@
           }
           if (match && (match[1] || !context)) {
             if (match[1]) {
-              root = parser.parse(selector);
+              root = parse(selector);
               return cheerio.merge(this, root.children);
             } else {
               elems = soupselect.select(context, selector);
@@ -52,7 +53,7 @@
             return this.constructor(context || root).find(selector);
           } else {
             if (_.isString(context)) {
-              context = parser.parse(context);
+              context = parse(context);
             }
             return this.constructor(context).find(selector);
           }

src/api/manipulation.coffee

@@ -1,6 +1,6 @@
 _ = require 'underscore'
 $ = require '../cheerio'
-parser = require '../parser'
+parse = require '../parse'
 
 removeChild = (parent, elem) ->
  $.each parent.children, (i, child) ->
@@ -10,7 +10,7 @@ removeChild = (parent, elem) ->
 append = exports.append = (elems...) ->
   dom = []
   for elem in elems
-    dom = dom.concat parser.eval(elem)
+    dom = dom.concat parse.eval(elem)
 
   this.each ->
     if _.isFunction elems[0]
@@ -26,7 +26,7 @@ append = exports.append = (elems...) ->
 prepend = exports.prepend = (elems...) ->
   dom = []
   for elem in elems
-    dom = dom.concat parser.eval(elem)
+    dom = dom.concat parse.eval(elem)
 
   this.each ->
     if _.isFunction elems[0]
@@ -43,7 +43,7 @@ prepend = exports.prepend = (elems...) ->
 after = exports.after = (elems...) ->
   dom = []
   for elem in elems
-    dom = dom.concat parser.eval(elem)
+    dom = dom.concat parse.eval(elem)
 
   this.each ->
     siblings = this.parent.children
@@ -61,7 +61,7 @@ after = exports.after = (elems...) ->
 before = exports.before = (elems...) ->
   dom = []
   for elem in elems
-    dom = dom.concat parser.eval(elem)
+    dom = dom.concat parse.eval(elem)
 
   this.each ->
     siblings = this.parent.children
@@ -92,7 +92,7 @@ remove = exports.remove = (selector) ->
   return this
 
 replaceWith = exports.replaceWith = (content) ->
-  elems = parser.eval(content)
+  elems = parse.eval(content)
 
   this.each ->
     siblings = this.parent.children
@@ -110,7 +110,7 @@ empty = exports.empty = () ->
 
 html = exports.html = (htmlString) ->
   if typeof htmlString isnt "object" and htmlString isnt undefined
-    htmlElement = parser.eval htmlString
+    htmlElement = parse.eval htmlString
 
     this.each (i) ->
       this.children = htmlElement

src/api/utils.coffee

@@ -1,8 +1,8 @@
 _ = require "underscore"
 $ = require "../cheerio"
 
-parser = require "../parser"
-renderer = require "../renderer"
+parse = require "../parse"
+render = require "../render"
 
 # [[Class]] -> type pairs
 class2type = {}
@@ -83,7 +83,7 @@ merge = exports.merge = (first, second) ->
 
 makeArray = exports.makeArray = (array, results) ->
   ret = results or []
-  if array?
+  if array
     type = $.type(array)
     if not array.length? or type == "string" or type == "function" or type == "regexp"
       push.call ret, array
@@ -208,24 +208,24 @@ text = exports.text = (elems) ->
 
 
 load = exports.load = (html) ->
-  root = parser.parse html
+  root = parse html
 
   $.extend
     'root' : root
 
   fn = (selector, context, r) ->
     if r
-      root = parser.parse r
+      root = parse r
 
     $ selector, context, root
 
   return _(fn).extend $
 
 html = exports.html = (dom) ->
   if dom isnt undefined and dom.type
-    return renderer.render dom
+    return render dom
   else if this.root and this.root.children
-    return renderer.render this.root.children
+    return render this.root.children
   else
     return ""
 

src/cheerio.coffee

@@ -3,7 +3,7 @@ path = require "path"
 soupselect = require "cheerio-soupselect"
 _ = require "underscore"
 
-parser = require "./parser"
+parse = require "./parse"
 
 cheerio = do ->
   cheerio = (selector, context, root) ->
@@ -24,7 +24,7 @@ cheerio = do ->
       # Handle $(""), $(null), or $(undefined)
       if not selector
         return this
-
+      
       if root
         cheerio.extend
           'root' : root
@@ -43,7 +43,7 @@ cheerio = do ->
         if match && (match[1] || !context)
           if match[1]
             # It's an HTML string
-            root = parser.parse selector
+            root = parse selector
             return cheerio.merge this, root.children
           else 
             # Classes, IDs just defer to soupselect
@@ -61,12 +61,10 @@ cheerio = do ->
         # HANDLE: $(expr, context)
         else
           if _.isString context
-            context = parser.parse context
+            context = parse context
           return this.constructor(context).find selector
 
       return cheerio.makeArray( selector, this );    
-      # if context
-        # return cheerio selector, parser.parse con
 
     selector : ""
     sort : [].sort
@@ -79,7 +77,7 @@ cheerio = do ->
   # Use underscores extend
   cheerio.extend = cheerio.fn.extend = (obj) ->
     return _.extend this, obj
-  
+
   return cheerio
 
 module.exports = cheerio