true 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a045ef63ebc6f352c5668afb0d8251379d830c
-  data.tar.gz: 18c0453a7cc95d0da01379a2206a336d070ed417
+  metadata.gz: a6a3b24624df5c06f4fcdb1da05e91c508e43d1f
+  data.tar.gz: dc4fbcdbd8bd5e8ad8d33a4354ee8eacb94e1312
 SHA512:
-  metadata.gz: cee45ce13ae771d1bd1047b03c7020a6aa3cdef61dc3ba2806dcf8a902948fc8a6fbe43b2ac726ac6c2f764c75c3c6e9133ad0c01fa637c6e73b8d7c5a3b79d5
-  data.tar.gz: ac9b47b83202b70f4f70619e5f4d6d91ab1417ddfd37ffd3ec968645f24756943443ed43353568be2ea5548da9959ea3019cd2797bafd7d173a4a851e5807d15
+  metadata.gz: f0bc90f7aecd98a9fcf877487c13cfccff8b5ef1617d37e86e44b82d412e3f63b9f5199cd743ffa44df248845339252cbc6d059605928e6627f7cfe2bfba8768
+  data.tar.gz: 1dfa2bcd589cdb764dda6720c0cf0dd3fdc244c2831e62d215df77c6b579cb0b6fb7fd1fb2227fc0bdc8f10be16d3f436988ce9c3f70b0bd94ba0dcc150c377a

data/README.md

@@ -1,7 +1,7 @@
 True
 ====
 
-[![Build Status](https://travis-ci.org/oddbird/true.png?branch=master)](https://travis-ci.org/ericam/true)
+[![Build Status](https://api.travis-ci.org/oddbird/true.svg)](https://travis-ci.org/oddbird/true)
 
 *Verb*
 
@@ -33,7 +33,8 @@ npm install sass-true
 Usage
 -----
 
-### In Sass
+With any Sass compiler
+~~~~~~~~~~~~~~~~~~~~~~
 
 ```scss
 @import "true";
@@ -84,7 +85,8 @@ in the output code.
 Version control can make that much easier than it sounds.
 
 
-### With node-sass and Mocha (or other JS test runners)
+With node-sass and Mocha (or other JS test runners)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 1. Install `true` via npm (`npm install sass-true`).
 
@@ -115,7 +117,36 @@ be usable in the same way; just pass your test runner's `describe` and `it`
 equivalents into `runSass`.
 
 
-### With ruby-sass on the command line
+#### With Grunt...
+
+Run Mocha using the Grunt task supplied by
+[grunt-mocha-cli](https://github.com/Rowno/grunt-mocha-cli)
+
+Install `grunt-mocha-cli`:
+
+```
+npm install grunt-mocha-cli --save-dev
+```
+
+Configure task:
+
+```javascript
+grunt.loadNpmTasks('grunt-mocha');
+
+mochacli: {
+   all: ['test/test_sass.js']
+},
+```
+
+Run tests:
+
+```bash
+grunt mochacli
+```
+
+
+With ruby-sass on the command line
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ```bash
 true-cli [options] PATH

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/lib/main.js

@@ -3,9 +3,28 @@ var css = require('css');
 var path = require('path');
 var sass = require('node-sass');
 
+// Tokens defining the True CSS output language.
+var MODULE_TOKEN = '# Module: ';
+var MODULE_NESTING_TOKEN = ' :: ';
+var SUMMARY_TOKEN = '# SUMMARY ';
+var END_SUMMARY_TOKEN = '----------';
+var TEST_TOKEN = 'Test: ';
+var PASS_TOKEN = '✔ ';
+var FAIL_TOKEN = '✖ FAILED [';
+var END_FAIL_TOKEN = ']';
+var ASSERT_TOKEN = 'ASSERT: ';
+var FAILURE_DETAIL_TOKEN = '- ';
+var FAILURE_TYPE_START_TOKEN = '[';
+var FAILURE_TYPE_END_TOKEN = ']';
+var OUTPUT_TOKEN = 'Output ';
+var EXPECTED_TOKEN = 'Expected ';
+var OUTPUT_START_TOKEN = 'OUTPUT';
+var OUTPUT_END_TOKEN = 'END_OUTPUT';
+var EXPECTED_START_TOKEN = 'EXPECTED';
+var EXPECTED_END_TOKEN = 'END_EXPECTED';
+var ASSERT_END_TOKEN = 'END_ASSERT';
 
 module.exports.runSass = function (options, describe, it) {
-  var assert = require('assert');
   var sassPath = path.join(__dirname, '..', 'sass');
   if (options.includePaths) {
     options.includePaths.push(sassPath);
@@ -16,26 +35,34 @@ module.exports.runSass = function (options, describe, it) {
   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.output + '" ' +
-                  assertion.assertionType + ' "' +
-                  assertion.expected +
-                  '")'
-              );
-              assert.fail(
-                assertion.output,
-                assertion.expected,
-                msg,
-                assertion.assertionType
-              );
-            }
-          });
+    describeModule(module, describe, it);
+  });
+};
+
+var describeModule = function (module, describe, it) {
+  var assert = require('assert');
+  describe(module.module, function () {
+    _.each(module.modules, function (submodule) {
+      describeModule(submodule, describe, it);
+    });
+    _.each(module.tests, function (test) {
+      it(test.test, function () {
+        _.each(test.assertions, function (assertion) {
+          if (!assertion.passed) {
+            var msg = (
+              assertion.description + ' ("' +
+                assertion.output + '" ' +
+                assertion.assertionType + ' "' +
+                assertion.expected +
+                '")'
+            );
+            assert.fail(
+              assertion.output,
+              assertion.expected,
+              msg,
+              assertion.assertionType
+            );
+          }
         });
       });
     });
@@ -59,9 +86,12 @@ var parse = module.exports.parse = function (rawCss) {
 
 
 var parseError = function (msg, seeking, pos) {
-  throw new Error(
-    'Line ' + pos.start.line + ', column ' + pos.start.column + ': ' +
-      msg + '; looking for ' + seeking);
+  return new Error(
+    'Line ' + pos.start.line + ', ' +
+    'column ' + pos.start.column + ': ' +
+    msg + '; ' +
+    'looking for ' + seeking
+  );
 }
 
 
@@ -70,29 +100,30 @@ var parseModule = function (rule, ctx) {
   if (rule.type === 'comment') {
     var text = rule.comment.trim();
     if (!text) { return parseModule; }
-    if (text.substring(0, 10) === '# Module: ') {
+    if (startsWith(text, MODULE_TOKEN)) {
       finishCurrentModule(ctx);
-      ctx.currentModule = { module: text.substring(10), tests: [] };
+      ctx.currentModule = { module: text.substring(MODULE_TOKEN.length), tests: [] };
       return parseTest;
     }
-    if (text.substring(0, 10) === '# SUMMARY ') {
+    if (startsWith(text, SUMMARY_TOKEN)) {
       return ignoreUntilEndSummary;
     }
-    parseError('Unexpected comment "' + text + '"', 'module header', rule.position);
+    // ignore un-recognized comments, keep looking for module header.
+    return parseModule;
   }
-  parseError('Unexpected rule type "' + rule.type + '"', 'module header', rule.position);
+  throw parseError('Unexpected rule type "' + rule.type + '"', 'module header', rule.position);
 };
 
 
 var ignoreUntilEndSummary = function (rule, ctx) {
   if (rule.type === 'comment') {
     var text = rule.comment.trim();
-    if (text.substring(0, 10) === '----------') {
+    if (startsWith(text, END_SUMMARY_TOKEN)) {
       return parseModule;
     }
     return ignoreUntilEndSummary;
   }
-  parseError('Unexpected rule type "' + rule.type + '"', 'end summary', rule.position);
+  throw parseError('Unexpected rule type "' + rule.type + '"', 'end summary', rule.position);
 };
 
 
@@ -103,63 +134,63 @@ var parseTest = function (rule, ctx) {
     if (text.match(/^-+$/)) {
       return parseTest;
     }
-    if (text.substring(0, 6) === 'Test: ') {
+    if (startsWith(text, TEST_TOKEN)) {
       finishCurrentTest(ctx);
-      ctx.currentTest = { test: text.substring(6), assertions: [] };
+      ctx.currentTest = { test: text.substring(TEST_TOKEN.length), assertions: [] };
       return parseAssertion;
     }
     return parseModule(rule, ctx);
   }
-  parseError('Unexpected rule type "' + rule.type + '"', 'test', rule.position);
+  throw parseError('Unexpected rule type "' + rule.type + '"', 'test', rule.position);
 };
 
 
 var parseAssertion = function (rule, ctx) {
   if (rule.type === 'comment') {
-    var text = rule.comment.trim();
+    var text = rule.comment.trimLeft();
     if (!text) { return parseAssertion; }
-    if (text.substring(0, 2) === '✔ ') {
+    if (startsWith(text, PASS_TOKEN)) {
       finishCurrentAssertion(ctx);
       ctx.currentAssertion = {
-        description: text.substring(2),
+        description: text.substring(PASS_TOKEN.length).trim() || '<no description>',
         passed: true
       };
       return parseAssertion;
-    } else if (text.substring(0, 10) === '✖ FAILED [') {
+    } else if (startsWith(text, FAIL_TOKEN)) {
       finishCurrentAssertion(ctx);
-      var endAssertionType = text.indexOf(']');
+      var endAssertionType = text.indexOf(END_FAIL_TOKEN);
       ctx.currentAssertion = {
         description: text.substring(endAssertionType + 2).trim(),
         passed: false,
-        assertionType: text.substring(10, endAssertionType),
+        assertionType: text.substring(FAIL_TOKEN.length, endAssertionType).trim(),
       };
       return parseFailureDetail;
-    } else if (text.substring(0, 8) === 'ASSERT: ') {
+    } else if (startsWith(text, ASSERT_TOKEN)) {
       finishCurrentAssertion(ctx);
       ctx.currentAssertion = {
-        description: text.substring(8),
+        description: text.substring(ASSERT_TOKEN.length).trim(),
         assertionType: 'equal'
       };
       return parseAssertionOutputStart;
     }
     return parseTest(rule, ctx);
   }
-  parseError('Unexpected rule type "' + rule.type + '"', 'assertion', rule.position);
+  throw parseError('Unexpected rule type "' + rule.type + '"', 'assertion', rule.position);
 }
 
 
 var parseFailureDetail = function (rule, ctx) {
   if (rule.type === 'comment') {
     var text = rule.comment.trim();
-    if (text.substring(0, 2) === '- ') {
-      var startType = text.indexOf('[');
-      var endType = text.indexOf(']');
+    if (startsWith(text, FAILURE_DETAIL_TOKEN)) {
+      var startType = text.indexOf(FAILURE_TYPE_START_TOKEN);
+      var endType = text.indexOf(FAILURE_TYPE_END_TOKEN);
       var type = text.substring(startType, endType + 1);
       var content = text.substring(endType + 3);
       var outputOrExpected;
-      if (text.substring(2, startType) === 'Output ') {
+      if (text.substring(FAILURE_DETAIL_TOKEN.length, startType) === OUTPUT_TOKEN) {
         outputOrExpected = 'output';
-      } else if (text.substring(2, startType) === 'Expected ') {
+      } else if (text.substring(FAILURE_DETAIL_TOKEN.length, startType) === EXPECTED_TOKEN) {
         outputOrExpected = 'expected';
       }
       if (outputOrExpected) {
@@ -169,7 +200,7 @@ var parseFailureDetail = function (rule, ctx) {
     }
     return parseAssertion(rule, ctx);
   }
-  parseError('Unexpected rule type "' + rule.type + '"', 'output/expected', rule.position);
+  throw parseError('Unexpected rule type "' + rule.type + '"', 'output/expected', rule.position);
 };
 
 
@@ -177,19 +208,19 @@ var parseAssertionOutputStart = function (rule, ctx) {
   if (rule.type === 'comment') {
     var text = rule.comment.trim();
     if (!text) { return parseAssertionOutputStart; }
-    if (text === 'OUTPUT') {
+    if (text === OUTPUT_START_TOKEN) {
       ctx.currentOutputRules = [];
       return parseAssertionOutput;
     }
-    parseError('Unexpected comment "' + text + '"', 'OUTPUT', rule.position);
+    throw parseError('Unexpected comment "' + text + '"', 'OUTPUT', rule.position);
   }
-  parseError('Unexpected rule type "' + rule.type + '"', 'OUTPUT', rule.position);
+  throw parseError('Unexpected rule type "' + rule.type + '"', 'OUTPUT', rule.position);
 };
 
 
 var parseAssertionOutput = function (rule, ctx) {
   if (rule.type === 'comment') {
-    if (rule.comment.trim() === 'END_OUTPUT') {
+    if (rule.comment.trim() === OUTPUT_END_TOKEN) {
       ctx.currentAssertion.output = css.stringify(
         { stylesheet: { rules: ctx.currentOutputRules }});
       delete ctx.currentOutputRules;
@@ -205,19 +236,19 @@ var parseAssertionExpectedStart = function (rule, ctx) {
   if (rule.type === 'comment') {
     var text = rule.comment.trim();
     if (!text) { return parseAssertionExpectedStart; }
-    if (text === 'EXPECTED') {
+    if (text === EXPECTED_START_TOKEN) {
       ctx.currentExpectedRules = [];
       return parseAssertionExpected;
     }
-    parseError('Unexpected comment "' + text + '"', 'EXPECTED', rule.position);
+    throw parseError('Unexpected comment "' + text + '"', 'EXPECTED', rule.position);
   }
-  parseError('Unexpected rule type "' + rule.type + '"', 'EXPECTED', rule.position);
+  throw parseError('Unexpected rule type "' + rule.type + '"', 'EXPECTED', rule.position);
 };
 
 
 var parseAssertionExpected = function (rule, ctx) {
   if (rule.type === 'comment') {
-    if (rule.comment.trim() === 'END_EXPECTED') {
+    if (rule.comment.trim() === EXPECTED_END_TOKEN) {
       ctx.currentAssertion.expected = css.stringify(
         { stylesheet: { rules: ctx.currentExpectedRules }});
       delete ctx.currentExpectedRules;
@@ -235,20 +266,22 @@ var parseEndAssertion = function (rule, ctx) {
   if (rule.type === 'comment') {
     var text = rule.comment.trim();
     if (!text) { return parseEndAssertion; }
-    if (text === 'END_ASSERT') {
+    if (text === ASSERT_END_TOKEN) {
       finishCurrentAssertion(ctx);
       return parseAssertion;
     }
-    parseError('Unexpected comment "' + text + '"', 'END_ASSERT', rule.position);
+    throw parseError('Unexpected comment "' + text + '"', 'END_ASSERT', rule.position);
   }
-  parseError('Unexpected rule type "' + rule.type + '"', 'END_ASSERT', rule.position);
+  throw parseError('Unexpected rule type "' + rule.type + '"', 'END_ASSERT', rule.position);
 };
 
 
 var finishCurrentModule = function (ctx) {
   finishCurrentTest(ctx);
   if (ctx.currentModule) {
-    ctx.modules.push(ctx.currentModule);
+    var path = ctx.currentModule.module.split(MODULE_NESTING_TOKEN);
+    ctx.currentModule.module = _.last(path);
+    insertModule(path, ctx.currentModule, ctx);
     delete ctx.currentModule;
   }
 }
@@ -269,3 +302,24 @@ var finishCurrentAssertion = function (ctx) {
     delete ctx.currentAssertion;
   }
 }
+
+
+var insertModule = function (path, module, ctx) {
+  if (!ctx.modules) { ctx.modules = [] };
+
+  if (path.length > 1) {
+    var newCtx = _.findWhere(ctx.modules, {module: path[0]});
+    if (!newCtx) {
+      newCtx = {module: path[0]};
+      ctx.modules.push(newCtx);
+    }
+    insertModule(path.slice(1), module, newCtx);
+  } else {
+    ctx.modules.push(module);
+  }
+}
+
+
+var startsWith = function (text, token) {
+  return text.substring(0, token.length) === token;
+}

data/sass/_true.scss

@@ -1,10 +1,10 @@
 // Susy partials
 // =============
 
-@import "true/settings";
-@import "true/utilities";
-@import "true/messages";
-@import "true/results";
-@import "true/modules";
-@import "true/tests";
-@import "true/assert";
+@import 'true/settings';
+@import 'true/utilities';
+@import 'true/messages';
+@import 'true/results';
+@import 'true/modules';
+@import 'true/tests';
+@import 'true/assert';

data/sass/true/_assert.scss

@@ -14,8 +14,10 @@
   $assert,
   $description: ''
 ) {
-  @include _true-context('assert', $description);
-  @include _true-assert-results('assert-true', $assert, true);
+  $default: '"#{inspect($assert)}" should be truthy';
+
+  @include _true-context('assert', $description or $default);
+  @include _true-assert-results('assert-true', not not $assert, true);
 }
 
 /// Assert that a parameter is `false`
@@ -30,7 +32,9 @@
   $assert,
   $description: ''
 ) {
-  @include _true-context('assert', $description);
+  $default: '"#{inspect($assert)}" should be falsey';
+
+  @include _true-context('assert', $description or $default);
   @include _true-assert-results('assert-false', $assert, false);
 }
 
@@ -48,7 +52,9 @@
   $expected,
   $description: ''
 ) {
-  @include _true-context('assert', $description);
+  $default: '"#{inspect($assert)}" and "#{inspect($expected)}" should be equal';
+
+  @include _true-context('assert', $description or $default);
   @include _true-assert-results('assert-equal', $assert, $expected);
 }
 
@@ -66,7 +72,9 @@
   $expected,
   $description: ''
 ) {
-  @include _true-context('assert', $description);
+  $default: '"#{inspect($assert)}" and "#{inspect($expected)}" should not be equal';
+
+  @include _true-context('assert', $description or $default);
   @include _true-assert-results('assert-unequal', $assert, $expected, 'unequal');
 }
 
@@ -83,18 +91,21 @@
 /// @require {mixin} _true-assert-stop
 /// @require {function} _true-selector
 @mixin assert(
-  $description
+  $description: ''
 ) {
+  $default: _true-context('test') or 'CSS output should match expected output';
+
   @include _true-context('assert', $description);
   @include _true-message('  ASSERT: #{$description}  ', 'comments');
 
   @content;
 
-  @include _true-update('test', 'output-to-css');
-  @include _true-context('assert', null);
+  @include _true-update('output-to-css');
+  @include _true-context-pop();
   @include _true-message('  END_ASSERT  ', 'comments');
 }
 
+
 /// Describe the test content to be evaluated
 /// The output will be compared against the results of the `expect()` mixin.
 /// @access public
@@ -186,6 +197,6 @@
     }
   }
 
-  @include _true-update('test', $result);
-  @include _true-context('assert', null);
+  @include _true-update($result);
+  @include _true-context-pop();
 }

data/sass/true/_modules.scss

@@ -24,15 +24,14 @@
 /// @access private
 /// @group x_private
 /// @param {String} $name - Module name
-/// @require {mixin} _true-reset
 /// @require {mixin} _true-context
 /// @require {mixin} _true-message
 @mixin _true-module-start(
   $name
 ) {
-  @include _true-reset(module);
   @include _true-context(module, $name);
-  @include _true-message('# Module: #{$name}', 'comments');
+  $modules: _true-context-all('module');
+  @include _true-message('# Module: #{_true-str-join($modules, ' :: ')}', 'comments');
 
   $underline: '----------';
 
@@ -50,12 +49,9 @@
 /// Module stop helper
 /// @access private
 /// @group x_private
-/// @require {mixin} _true-reset
 /// @require {mixin} _true-context
 /// @require {mixin} _true-message
 @mixin _true-module-stop {
-  @include _true-update(global, null);
-  @include _true-reset(module);
-  @include _true-context(module, null);
+  @include _true-context-pop();
   @include _true-message('', 'comments');
 }

data/sass/true/_results.scss

@@ -1,105 +1,17 @@
 // Results
 // =======
 
-/// Initialized results map
+/// Results map
 /// @access private
 /// @group x_private
 /// @type Map
-$_true-results-reset: (
+$_true-results: (
   run: 0,
   pass: 0,
   fail: 0,
   output-to-css: 0,
 );
 
-/// Results map
-/// @access private
-/// @group x_private
-/// @type Map
-/// @require $_true-results-reset
-/// @prop {Map} global [$_true-results-reset] - Global results
-/// @prop {Map} module [$_true-results-reset] - Results for current module
-/// @prop {Map} test [$_true-results-reset] - Results for current test
-$_true-results: (
-  global: $_true-results-reset,
-  module: $_true-results-reset,
-  test: $_true-results-reset,
-);
-
-
-// Reset
-// -----
-
-/// Reset helper
-/// @access private
-/// @group x_private
-/// @param {String} $scope - Scope to reset
-/// @require $_true-results-reset
-/// @require $_true-results
-@mixin _true-reset(
-  $scope
-) {
-  @if $scope == global {
-    $_true-results: (
-      global: $_true-results-reset,
-      module: $_true-results-reset,
-      test: $_true-results-reset,
-    ) !global;
-  } @else if $scope == module {
-    $update: (
-      module: $_true-results-reset,
-      test: $_true-results-reset,
-    );
-    $_true-results: map-merge($_true-results, $update) !global;
-  } @else if $scope == test {
-    $update: (
-      test: $_true-results-reset
-    );
-    $_true-results: map-merge($_true-results, $update) !global;
-  } @else {
-    @warn "#{$scope} is not a valid scope for _true-reset().";
-  }
-}
-
-
-// Get Results
-// -----------
-
-/// Results getter
-/// @access private
-/// @group x_private
-/// @param {String} $scope - Scope to get results from
-/// @require $_true-results
-@function _true-get-results(
-  $scope
-) {
-  @return map-get($_true-results, $scope);
-}
-
-
-// Get Result
-// ----------
-
-/// Single result getter
-/// @access private
-/// @group x_private
-/// @param {String} $scope - Scope to get result form
-/// @require {function} _true-get-results
-@function _true-get-result(
-  $scope
-) {
-  $results: _true-get-results($scope);
-  $return: if(map-get($results, output-to-css) > 0, output-to-css, null);
-
-  @if map-get($results, fail) > 0 {
-    @return if($return, $return fail, fail);
-  } @else if map-get($results, pass) > 0 {
-    @return if($return, $return pass, pass);
-  } @else {
-    @return $return;
-  }
-}
-
 
 // Update
 // ------
@@ -107,30 +19,14 @@ $_true-results: (
 /// Update results
 /// @access private
 /// @group x_private
-/// @param {String} $scope - Scope to update results from
-/// @param {List} $results - Results
-/// @require {function} _true-get-results
+/// @param {String} $result - Result (pass/fail/output-to-css)
 /// @require {function} _true-map-increment
 /// @require $_true-results
-@mixin _true-update(
-  $scope,
-  $results
-) {
-  $current: _true-get-results($scope);
-  $update: (run: 1);
-
-  @if $scope == global {
-    $update: _true-get-results(module);
-  } @else {
-    @each $result in $results {
-      @if $result {
-        $update: map-merge($update, ($result: 1));
-      }
-    }
-  }
-
-  $scope: ($scope: _true-map-increment($current, $update));
-  $_true-results: map-merge($_true-results, $scope) !global;
+@mixin _true-update($result) {
+  $_true-results: _true-map-increment($_true-results, (
+    run: 1,
+    $result: 1,
+  )) !global;
 }
 
 
@@ -148,11 +44,10 @@ $_true-results: (
   $scope: 'test',
   $lines: 'single'
 ) {
-  $results: _true-get-results($scope);
-  $run: map-get($results, 'run');
-  $pass: map-get($results, 'pass');
-  $fail: map-get($results, 'fail');
-  $output-to-css: map-get($results, 'output-to-css');
+  $run: map-get($_true-results, 'run');
+  $pass: map-get($_true-results, 'pass');
+  $fail: map-get($_true-results, 'fail');
+  $output-to-css: map-get($_true-results, 'output-to-css');
 
   $items: null;
   $message: null;
@@ -160,7 +55,7 @@ $_true-results: (
   @if $scope == 'global' or $scope == 'module' {
     $items: 'Tests';
   } @else if $scope == 'test' {
-    $items: Assertions;
+    $items: 'Assertions';
   }
 
   @if $lines == 'single' {
@@ -187,13 +82,13 @@ $_true-results: (
 @mixin report(
   $terminal: $true-terminal-output
 ) {
-  $message: _true-report-message(global, multiple);
-  @include _true-message('# SUMMARY ----------', comments);
-  @include _true-message($message, comments);
-  @include _true-message('--------------------', comments);
+  $message: _true-report-message('global', 'multiple');
+  @include _true-message('# SUMMARY ----------', 'comments');
+  @include _true-message($message, 'comments');
+  @include _true-message('--------------------', 'comments');
 
   @if $terminal {
-    $message: _true-report-message(global, single);
-    @include _true-message($message, debug);
+    $message: _true-report-message('global', 'single');
+    @include _true-message($message, 'debug');
   }
 }

data/sass/true/_settings.scss

@@ -18,11 +18,7 @@ $true-terminal-output: true !default;
 /// @prop {String} module [null]
 /// @prop {String} test [null]
 /// @prop {String} assert [null]
-$_true-context: (
-  module: null,
-  test: null,
-  assert: null,
-);
+$_true-context: ();
 
 /// Update the current context
 /// @access private
@@ -34,7 +30,15 @@ $_true-context: (
   $scope,
   $name
 ) {
-  $_true-context: map-merge($_true-context, ($scope: $name)) !global;
+  $_true-context: append($_true-context, ($scope, $name)) !global;
+}
+
+@mixin _true-context-pop() {
+  $new: ();
+  @for $i from 1 to length($_true-context) {
+    $new: append($new, nth($_true-context, $i));
+  }
+  $_true-context: $new !global;
 }
 
 /// Get information on current context
@@ -45,5 +49,31 @@ $_true-context: (
 @function _true-context(
   $scope
 ) {
-  @return map-get($_true-context, $scope);
+  @for $i from length($_true-context) through 1 {
+    $entry: nth($_true-context, $i);
+    $entry-scope: nth($entry, 1);
+    @if $entry-scope == $scope {
+      @return nth($entry, 2);
+    }
+  }
+  @return null;
+}
+
+/// Get list of context names
+/// @access private
+/// @group x_private
+/// @param {String} $scope - Either `module`, `test` or `assert`
+/// @return {List}
+@function _true-context-all(
+  $scope
+) {
+  $list: ();
+  @for $i from 1 through length($_true-context) {
+    $entry: nth($_true-context, $i);
+    $entry-scope: nth($entry, 1);
+    @if $entry-scope == $scope {
+      $list: append($list, nth($entry, 2));
+    }
+  }
+  @return $list;
 }

data/sass/true/_tests.scss

@@ -25,14 +25,12 @@
 /// @access private
 /// @group x_private
 /// @param {String} $name - Test name
-/// @require {mixin} _true-reset
 /// @require {mixin} _true-context
 /// @require {mixin} _true-message
 @mixin _true-test-start(
   $name
 ) {
-  @include _true-reset(test);
-  @include _true-context(test, $name);
+  @include _true-context('test', $name);
   @include _true-message('Test: #{$name}', 'comments');
 }
 
@@ -43,13 +41,10 @@
 /// Test stop helper
 /// @access private
 /// @group x_private
-/// @require {mixin} _true-reset
 /// @require {mixin} _true-context
 /// @require {mixin} _true-message
 /// @require {function} _true-get-result
 @mixin _true-test-stop {
-  @include _true-update(module, _true-get-result(test));
-  @include _true-reset(test);
-  @include _true-context(test, null);
+  @include _true-context-pop();
   @include _true-message('', 'comments');
 }

data/sass/true/_utilities.scss

@@ -37,7 +37,7 @@
   $strings: ();
   $found-at: str-index($string, $substring);
   @while $found-at {
-    $strings: append($strings, if($found-at > 1, str-slice($string, 1, $found-at - 1), ""));
+    $strings: append($strings, if($found-at > 1, str-slice($string, 1, $found-at - 1), ''));
     $string: str-slice($string, $found-at + str-length($substring));
     $found-at: str-index($string, $substring);
   }
@@ -45,6 +45,31 @@
   @return $strings;
 }
 
+/// Join a list of strings
+/// @access private
+/// @group x_private
+/// @param {List} $list - List to join
+/// @param {String} $separator - Separator
+/// @return {String} - Joined string
+@function _true-str-join(
+  $list,
+  $separator
+) {
+  $length: length($list);
+
+  @if ($length == 0) {
+    @return '';
+  }
+
+  $result: nth($list, 1);
+  @if $length > 1 {
+    @for $index from 2 through $length {
+      $result: $result + $separator + nth($list, $index);
+    }
+  }
+  @return $result;
+}
+
 
 /// Check for strict equality
 /// @access private
@@ -53,9 +78,9 @@
 /// @param {*} $two - Second value
 /// @return {Bool}
 @function _true-is-equal($one, $two) {
-  @if type-of($one) == number and type-of($two) == number {
+  @if type-of($one) == 'number' and type-of($two) == 'number' {
     @if unit($one) == unit($two) {
-      @return $one == $two;
+      @return inspect($one) == inspect($two);
     } @else {
       @return false;
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 'true'
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Miriam Eric Suzanne