total refactor

matthewmueller · Mar 9, 2016 · 6d30434 · 6d30434
1 parent 0a9895d
commit 6d30434
Show file tree

Hide file tree

Showing 31 changed files with 827 additions and 823 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+ - "stable"
+ - "5"
+ - "4"
+ - "0.12"
+ - "0.10"
+ - "iojs"
diff --git a/Makefile b/Makefile
diff --git a/bin/x-ray b/bin/x-ray
@@ -1,33 +1,33 @@
 #!/usr/bin/env node
 
-var Crawler = require('x-ray-crawler');
-var Context = require('http-context');
-var cheerio = require('cheerio');
-var pj = require('prettyjson');
-var isUrl = require('is-url');
-var chalk = require('chalk');
-var repl = require('repl');
-var Xray = require('../');
-var fs = require('fs');
-var slice = [].slice;
-var actions = {};
+var Crawler = require('x-ray-crawler')
+var Context = require('http-context')
+var cheerio = require('cheerio')
+var pj = require('prettyjson')
+var isUrl = require('is-url')
+var chalk = require('chalk')
+var repl = require('repl')
+var Xray = require('../')
+var fs = require('fs')
+var slice = [].slice
+var actions = {}
 
 /**
  * Locals
  */
 
-var highlight = require('../lib/highlight');
-var isHTML = require('../lib/is-html');
-var pretty = require('../lib/pretty');
-var params = require('../lib/params');
+var highlight = require('../lib/highlight')
+var isHTML = require('../lib/is-html')
+var pretty = require('../lib/pretty')
+var params = require('../lib/params')
 
 /**
  * Default state
  */
 
 var xray = Xray()
-var request = Crawler();
-var ctx = Context();
+var request = Crawler()
+var ctx = Context()
 
 /**
  * Help
@@ -42,13 +42,13 @@ var help = [
  ' select [scope] <selector>',
  ' html',
  ''
-].join('\n');
+].join('\n')
 
 /**
  * Regexps
  */
 
-var rcmd = /^(help|load|paginate|select|\$)/i;
+var rcmd = /^(help|load|paginate|select|\$)/i
 
 /**
  * Start the repl
@@ -60,65 +60,65 @@ repl.start({
  output: process.stdout,
  ignoreUndefined: true,
  eval: evaluate
-});
+})
 
 /**
  * Evaluate the input
  */
 
-function evaluate(cmd, ctx, filename, fn) {
- cmd = cmd.replace(/[\(\n\)]/g, '');
- if (!cmd) return fn(null, undefined);
- var args = cmd.split(' ');
- cmd = args.shift().toLowerCase();
+function evaluate (cmd, ctx, filename, fn) {
+ cmd = cmd.replace(/[\(\n\)]/g, '')
+ if (!cmd) return fn(null, undefined)
+ var args = cmd.split(' ')
+ cmd = args.shift().toLowerCase()
  if ('help' == cmd || !rcmd.test(cmd)) {
- console.log(help);
- return fn(null, undefined);
+ console.log(help)
+ return fn(null, undefined)
  }
 
- actions[cmd].apply(null, args.concat(function(err, val) {
- if (err) return fn(err);
- else if (val) console.log(val);
- fn(null, undefined);
- }));
+ actions[cmd].apply(null, args.concat(function (err, val) {
+ if (err) return fn(err)
+ else if (val) console.log(val)
+ fn(null, undefined)
+ }))
 }
 
 /**
  * Load
  */
 
-actions.load = function load(url, fn) {
+actions.load = function load (url, fn) {
  if (arguments.length == 1) {
- fn = url;
- return fn(null, help);
+ fn = url
+ return fn(null, help)
  }
 
  if (isUrl(url)) {
- success('loading: %s', url);
- request(url, function(err, res) {
- if (err) return fn(err);
- ctx.status = res.status;
- ctx.body = res.body;
- success('loaded: %s', res.url);
- console.log(pretty(res.url));
- fn(null);
+ success('loading: %s', url)
+ request(url, function (err, res) {
+ if (err) return fn(err)
+ ctx.status = res.status
+ ctx.body = res.body
+ success('loaded: %s', res.url)
+ console.log(pretty(res.url))
+ fn(null)
  })
  } else if (isHTML(url)) {
- success('loading: <html string>');
- ctx.status = 200;
- ctx.body = url;
- success('loaded: <html string>');
- console.log(pretty(url));
- fn(null);
+ success('loading: <html string>')
+ ctx.status = 200
+ ctx.body = url
+ success('loaded: <html string>')
+ console.log(pretty(url))
+ fn(null)
  } else {
- success('loading: %s', url);
- fs.readFile(url, 'utf8', function(err, str) {
- if (err) return fn(err);
- ctx.status = 200;
- ctx.body = str;
- success('loaded: %s', url);
- response(pretty(str));
- fn(null);
+ success('loading: %s', url)
+ fs.readFile(url, 'utf8', function (err, str) {
+ if (err) return fn(err)
+ ctx.status = 200
+ ctx.body = str
+ success('loaded: %s', url)
+ response(pretty(str))
+ fn(null)
  })
  }
 }
@@ -128,73 +128,73 @@ actions.load = function load(url, fn) {
  */
 
 actions.select =
-actions.$ = function select(scope, selector, fn) {
- if (arguments.length == 1) {
- response(ctx.body);
- fn(null);
- return;
- } else if (arguments.length == 2) {
- fn = selector;
- selector = coerce(scope);
- scope = null;
- } else {
- scope = coerce(scope);
- selector = coerce(selector);
- }
-
- var $ = cheerio.load(ctx.body);
- $ = highlight($, scope, selector);
- var html = $.html();
- response(html);
- fn(null);
+ actions.$ = function select (scope, selector, fn) {
+  if (arguments.length == 1) {
+  response(ctx.body)
+  fn(null)
+  return
+  } else if (arguments.length == 2) {
+  fn = selector
+  selector = coerce(scope)
+  scope = null
+  } else {
+  scope = coerce(scope)
+  selector = coerce(selector)
+  }
+
+  var $ = cheerio.load(ctx.body)
+  $ = highlight($, scope, selector)
+  var html = $.html()
+  response(html)
+  fn(null)
 }
 
 /**
  * string(...)
  */
 
-function string(str) {
- str = unstring(str);
- return '"' + str + '"';
+function string (str) {
+ str = unstring(str)
+ return '"' + str + '"'
 }
 
 /**
  * unstring(str)
  */
 
-function unstring(str) {
- return str.replace(/^['"]|['"]$/g, '');
+function unstring (str) {
+ return str.replace(/^['"]|['"]$/g, '')
 }
 
 /**
  * coerce
  */
 
-function coerce(str) {
+function coerce (str) {
  return '[' == str[0] && ']' == str[str.length - 1]
  ? [str.slice(1, -1)]
- : str;
+ : str
 }
 
 /**
  * Success
  */
 
-function success(str) {
- var args = slice.call(arguments).slice(1);
- console.error.apply(console.error, [chalk.green(' ' + str)].concat(args));
+function success (str) {
+ var args = slice.call(arguments).slice(1)
+ console.error.apply(console.error, [chalk.green(' ' + str)].concat(args))
 }
 
-function response(str) {
- var args = slice.call(arguments).slice(1);
- console.error.apply(console.error, [chalk.gray(' ' + str)].concat(args));
+function response (str) {
+ var args = slice.call(arguments).slice(1)
+ console.error.apply(console.error, [chalk.gray(' ' + str)].concat(args))
 }
 
 /**
  * Error
  */
 
-function error(str) {
- var args = slice.call(arguments).slice(1);
- console.error.apply(console.error, [chalk.red(' ' + str)].concat(args));
+function error (str) {
+ var args = slice.call(arguments).slice(1)
+ console.error.apply(console.error, [chalk.red(' ' + str)].concat(args))
 }
diff --git a/examples/array-of-arrays.js b/examples/array-of-arrays.js
diff --git a/examples/array-of-arrays.html → examples/array-of-arrays/index.html b/examples/array-of-arrays.html → examples/array-of-arrays/index.html
diff --git a/examples/array-of-arrays/index.js b/examples/array-of-arrays/index.js
@@ -0,0 +1,8 @@
+var read = require('fs').readFileSync
+var html = read(__dirname + '/index.html')
+var Xray = require('..')
+var x = Xray()
+
+x(html, '.tags', [['li']])(function (err, arr) {
+ console.log(arr)
+})
diff --git a/examples/arrays.js b/examples/arrays.js
diff --git a/examples/arrays.html → examples/arrays/index.html b/examples/arrays.html → examples/arrays/index.html
diff --git a/examples/arrays/index.js b/examples/arrays/index.js
@@ -0,0 +1,8 @@
+var read = require('fs').readFileSync
+var html = read(__dirname + '/index.html')
+var Xray = require('..')
+var x = Xray()
+
+x(html, ['a'])(function (err, arr) {
+ console.log(arr)
+})
diff --git a/examples/collection-of-collections.js b/examples/collection-of-collections.js
diff --git a/examples/collection-of-collections.html → ...ples/collection-of-collections/index.html b/examples/collection-of-collections.html → ...ples/collection-of-collections/index.html
diff --git a/examples/collection-of-collections/index.js b/examples/collection-of-collections/index.js
@@ -0,0 +1,11 @@
+var read = require('fs').readFileSync
+var html = read(__dirname + '/index.html')
+var Xray = require('..')
+var x = Xray()
+
+x(html, '.item', [{
+ title: 'h2',
+ tags: x('.tags', ['li'])
+}])(function (err, arr) {
+ console.log(arr)
+})
diff --git a/examples/collections.html → examples/collections/index.html b/examples/collections.html → examples/collections/index.html
diff --git a/examples/collections.js → examples/collections/index.js b/examples/collections.js → examples/collections/index.js
@@ -1,12 +1,12 @@
 var read = require('fs').readFileSync
-var html = read(__dirname + '/collections.html')
+var html = read(__dirname + '/index.html')
 var Xray = require('..')
 var x = Xray()
 
 x(html, {
  title: '.title',
  image: 'img@src',
  tags: ['li']
-})(function(err, obj) {
- console.log(obj);
+})(function (err, obj) {
+ console.log(obj)
 })
diff --git a/test.js → examples/example.js b/test.js → examples/example.js
@@ -1,9 +1,9 @@
-var Xray = require('./');
-var x = Xray();
+var Xray = require('./')
+var x = Xray()
 
 x('http://google.com', {
  main: 'title',
  image: x('https://images.google.com', 'title')
-})(function(err, obj) {
+})(function (err, obj) {
  console.log(obj); // => { main: 'Google', image: 'Google Images' }
 })
diff --git a/examples/selector.js b/examples/selector.js
diff --git a/examples/selector.html → examples/selector/index.html b/examples/selector.html → examples/selector/index.html