true 2.0.0.alpha.4 → 2.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e47d57acd1a657e398b93a6552f5b3c167fb866
-  data.tar.gz: 2fc755c6ac44d775c55666bae450abb446e798a8
+  metadata.gz: 82b889e126441092c78fae0935640eddff42dd26
+  data.tar.gz: 5ced6822242622c9d5b2c535a020595c4e27af45
 SHA512:
-  metadata.gz: b625764346d9b96172c3537fe473aca943fd80cb322b7be47eccba863785c4a6464b5554c9325f4fb5bcf29b17b18c083c6f9d42b8f5ca105a33a511d30bbe80
-  data.tar.gz: e393a372934285e50f3c284f9fe2b966646d1bae3ab8becdfb0a8371e1417cb6fcb7230ace34554b352abbbe5703f554f6fdfd4775ce9cf2bb3059c7bed6624e
+  metadata.gz: 5a0aefdab1acf74ad6a17293014f084f626f16d858ea61fa6b54f67ba066889c0de896d0613907d8d1e6ef26d10e74a024b7d10b395fd0e0d07642f681d46e44
+  data.tar.gz: e170d9287c8043791a2936dd894aad9c7a3c3a1e6553e5fddb944de40df1535f1bbc0975dd704616c17dbae8d1958e18fb8d44de17817da761b7dc7ff4e83219

data/CHANGELOG.md

@@ -5,8 +5,11 @@ True Changelog
 ----------------
 - Improve internal logic, and namespace private functions behind `_true-*`.
 - Add `assert()`, `input`, and `expect` mixins for testing CSS output.
-- Support for LibSass
+- Support for LibSass.
+- Add Mocha JS integration.
+— Create NPM package.
 - Simplify output options down to single `$true-terminal-output` setting.
+  Defaults to `false` (required for libsass).
 
 
 1.0.1 (10/18/14)

data/README.md

@@ -34,12 +34,15 @@ bower install true
 Command Line
 ------------
 
+_This command-line tool uses Ruby
+and the Ruby Sass compiler._
+
 ```bash
 true-cli [options] PATH
 ```
 
 Options:
-* `-s` slient
+* `-s` silent
 * `-c` config file
 * `-d` debug config file settings
 
@@ -93,15 +96,12 @@ Usage
 Settings
 --------
 
-There is only one setting.
-`$true-terminal-output` controls what output (if any)
-is shown in the terminal.
-The default setting is `true`,
-which will show warnings in the terminal
-when an assertion fails.
-You can set it to `false` to turn off all terminal output,
-or `details` to show more `@debug` info on failures,
-and a final summary of the results.
-
-* LibSass doesn't support `@debug`.
-* The Ruby CLI requires the final summary output.
+There is only one setting:
+`$true-terminal-output`
+toggles output to the terminal on and off.
+
+- `true` will display a final summary of your test results in the terminal,
+  and show detailed information on failing assertions.
+  *Required for `true-cli`.*
+- `false` to turn off all terminal output.
+  *Required for Libsass.*

data/VERSION

@@ -1 +1 @@
-2.0.0.alpha.3
+2.0.0.beta.0

data/bin/true-cli

@@ -8,7 +8,7 @@ COLORS = {
   :fail => "\033[91m",
   :end => "\033[0m"
 }
-options = {'debug' => false, 'slient' => false, 'color' => false}
+options = {'debug' => false, 'silent' => false, 'color' => false}
 config_file = File.join(Dir.pwd, 'test', 'true.yml')
 OptionParser.new do |opts|
   opts.banner = "Usage: true-cli [options] file"
@@ -19,8 +19,8 @@ OptionParser.new do |opts|
   opts.on('-d', '--debug') do
     options['debug'] = true
   end
-  opts.on('-s', '--slient') do
-    options['slient'] = true
+  opts.on('-s', '--silent') do
+    options['silent'] = true
   end
 end.parse!(ARGV)
 
@@ -35,7 +35,7 @@ def with_captured_stdout
   end
 end
 if File.exists?(config_file)
-  puts "Using config file: #{config_file}" unless options['slient']
+  puts "Using config file: #{config_file}" unless options['silent']
   config_options = YAML.load(File.read(config_file))
   options.merge!(config_options['options']) if config_options.has_key?('options')
   if options['debug']
@@ -68,16 +68,16 @@ end
 if matches[:failed] == '0'
   if options['color']
     noun = matches[:tests].to_i == 1 ? 'Test' : 'Tests'
-    puts COLORS[:ok] + "#{matches[:tests]} #{noun}, #{matches[:passed]} Passed, #{matches[:failed]} Failed" + COLORS[:end] unless options['slient']
+    puts COLORS[:ok] + "#{matches[:tests]} #{noun}, #{matches[:passed]} Passed, #{matches[:failed]} Failed" + COLORS[:end] unless options['silent']
   else
-    puts output unless options['slient']
+    puts output unless options['silent']
   end
   exit(0)
 else
   if options['color']
-    puts COLORS[:fail] + output + COLORS[:end] unless options['slient']
+    puts COLORS[:fail] + output + COLORS[:end] unless options['silent']
   else
-    puts output unless options['slient']
+    puts output unless options['silent']
   end
   exit(3)
 end

data/lib/main.js

@@ -0,0 +1,147 @@
+var _ = require('underscore');
+var parseCss = require('css').parse;
+var sass = require('node-sass');
+var CssSelectorParser = require('css-selector-parser').CssSelectorParser;
+var selectorParser = new CssSelectorParser();
+
+
+// @@@ maybe catch errors and display as warnings instead?
+
+
+module.exports.runSass = function (options, describe, it) {
+  var assert = require('assert');
+  var css = sass.renderSync(options);
+  var modules = parse(css);
+
+  _.each(modules, function (module) {
+    describe(module.module, function () {
+      _.each(module.tests, function (test) {
+        it(test.test, function () {
+          _.each(test.assertions, function (assertion) {
+            if (!assertion.passed) {
+              var msg = (
+                assertion.description + ' ("' +
+                  assertion.returned + '" ' +
+                  assertion.assert + ' "' +
+                  assertion.expected +
+                  '")'
+              );
+              assert.fail(
+                assertion.returned,
+                assertion.expected,
+                msg,
+                assertion.assert
+              );
+            }
+          });
+        });
+      });
+    });
+  });
+};
+
+// parse True output CSS and return an array of test modules.
+var parse = module.exports.parse = function (css) {
+  var modules = [];
+  var ast = parseCss(css);
+
+  _.each(_.where(ast.stylesheet.rules, {type: 'rule'}), function (rule) {
+    var decls = _.where(rule.declarations, {type: 'declaration'});
+    var declPairs = _.zip(
+      _.pluck(decls, 'property'),
+      _.pluck(decls, 'value')
+    );
+    var declInfo = _.object(declPairs);
+    var curAssertion, declString;
+    _.each(rule.selectors, function (sel) {
+      var selInfo = parseSelector(sel);
+      if (!selInfo) {
+        throw new Error("Can't understand selector: " + sel);
+      }
+      var curModule = _.findWhere(modules, {module: selInfo.module});
+      if (!curModule) {
+        curModule = {module: selInfo.module, tests: []};
+        modules.push(curModule);
+      }
+      var curTest = _.findWhere(curModule.tests, {test: selInfo.test});
+      if (!curTest) {
+        curTest = {test: selInfo.test, assertions: []};
+        curModule.tests.push(curTest);
+      }
+      if (selInfo.output) {
+        curAssertion = _.findWhere(
+          curTest.assertions, {description: selInfo.assert});
+        if (!curAssertion) {
+          curAssertion = {
+            description: selInfo.assert,
+            assert: 'equal',
+          };
+          curTest.assertions.push(curAssertion);
+        }
+        declString = _.map(declPairs, function (pair) {
+          return pair[0] + ': ' + pair[1] + ';';
+        }).join(' ');
+        if (selInfo.type === 'input') {
+          curAssertion.returned = declString;
+        } else { // if (selInfo.type == 'expect') {
+          curAssertion.expected = declString;
+        }
+        if (curAssertion.returned && curAssertion.expected) {
+          curAssertion.passed = curAssertion.returned === curAssertion.expected;
+        }
+      } else {
+        curAssertion = {
+          assert: selInfo.assert,
+          description: (declInfo['-description'] || '""').slice(1, -1),
+          passed: declInfo['-result'] === 'PASS',
+        };
+        _.each(_.pairs(declInfo), function (pair) {
+          if (_.contains(['-expected--', '-returned--'], pair[0].slice(0, 11))) {
+            var attr = pair[0].slice(1, 9);
+            var type = pair[0].slice(11);
+            var val = pair[1];
+            curAssertion[attr] = type + ': ' + val;
+          }
+        });
+        curTest.assertions.push(curAssertion);
+      }
+    });
+  });
+
+  return modules;
+};
+
+
+var parseSelector = module.exports.parseSelector = function (sel) {
+  var rule = selectorParser.parse(sel).rule;
+  var ret = {output: false};
+  var attrName = function (rule, name) {
+    return (rule &&
+            rule.attrs &&
+            rule.attrs.length == 1 &&
+            rule.attrs[0].name === name
+           );
+  };
+  if (attrName(rule, 'data-module')) {
+    ret.module = rule.attrs[0].value;
+    rule = rule.rule;
+    if (attrName(rule, 'data-test')) {
+      ret.test = rule.attrs[0].value;
+      rule = rule.rule;
+      if (attrName(rule, 'data-assert')) {
+        ret.output = true;
+        ret.assert = rule.attrs[0].value;
+        rule = rule.rule;
+        if (rule.classNames.length === 1 &&
+            _.contains(['input', 'expect'], rule.classNames[0])) {
+          ret.type = rule.classNames[0];
+          return ret;
+        }
+      } else if (rule.classNames.length === 1 &&
+                 rule.classNames[0].slice(0, 7) === 'assert-') {
+        ret.assert = rule.classNames[0].slice(7);
+        return ret;
+      }
+    }
+  }
+};

data/sass/true/_assert.scss

@@ -143,7 +143,7 @@
   -expected--#{$expected-type}: _true-inspect($expected);
   -returned--#{$returned-type}: _true-inspect($returned);
 
-  @if $terminal == details {
+  @if $terminal {
     @debug '[FAIL] #{_true-context(test)} » #{_true-context(assert)}';
     @debug 'Expected #{$expected-type} »';
     @debug _true-inspect($expected);
@@ -151,7 +151,5 @@
     @debug _true-inspect($returned);
   }
 
-  @if $terminal {
-    @warn '#{_true-context(test)} » #{_true-context(assert)}';
-  }
+  @warn '#{_true-context(test)} » #{_true-context(assert)}';
 }

data/sass/true/_results.scss

@@ -143,7 +143,7 @@ $_true-results: (
   @include _true-message($message, comments);
   @include _true-message('--------------------', comments);
 
-  @if $terminal == details {
+  @if $terminal {
     $message: _true-report-message(global, single);
     @include _true-message($message, debug);
   }

data/sass/true/_settings.scss

@@ -1,7 +1,7 @@
 // True Settings
 // =============
 
-$true-terminal-output: true !default;
+$true-terminal-output: false !default;
 
 
 // Context (private)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 'true'
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.4
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Eric Suzanne
@@ -41,6 +41,7 @@ extra_rdoc_files:
 - lib/true.rb
 files:
 - lib/compass-true.rb
+- lib/main.js
 - lib/true.rb
 - sass/_true.scss
 - sass/true/_assert.scss