Merge pull request #2 from azu/update0.8

feat(prh): update prh to 0.8

Author: azu

package.json

@@ -22,8 +22,8 @@
     "test": "test"
   },
   "scripts": {
-    "build": "babel src --out-dir lib --source-maps",
-    "watch": "babel src --out-dir lib --watch --source-maps",
+    "build": "babel --preset es2015 src --out-dir lib --source-maps",
+    "watch": "babel --preset es2015 src --out-dir lib --watch --source-maps",
     "prepublish": "npm run --if-present build",
     "test": "mocha"
   },
@@ -32,12 +32,13 @@
     "prh"
   ],
   "dependencies": {
-    "prh": "^0.7.0",
+    "babel-preset-es2015": "^6.0.15",
+    "prh": "^0.8.0",
     "structured-source": "^3.0.2",
     "textlint-rule-helper": "^1.1.3"
   },
   "devDependencies": {
-    "babel": "^5.8.23",
+    "babel-cli": "^6.0.14",
     "espower-babel": "^3.3.0",
     "mocha": "^2.3.2",
     "power-assert": "^1.0.0",

src/prh-rule.js

@@ -37,7 +37,7 @@ Please set .textlinrc:
             // to get position from index
             let src = new StructuredSource(text);
             let makeChangeSet = config.makeChangeSet(null, text);
-            makeChangeSet.forEach(function (changeSet) {
+            makeChangeSet.diffs.forEach(function (changeSet) {
                 // | ----[match]------
                 var slicedText = text.slice(changeSet.index);
                 // | ----[match------|

test/fixtures/imports-a.yml

@@ -0,0 +1,4 @@
+version: 1
+
+rules:
+  - expected: a

test/fixtures/imports-b.yml

@@ -0,0 +1,4 @@
+version: 1
+
+rules:
+  - expected: b

test/fixtures/imports.yml

@@ -0,0 +1,5 @@
+version: 1
+
+imports:
+  - imports-a.yml
+  - imports-b.yml

test/textlintrc-test.js

@@ -1,42 +1,60 @@
 // LICENSE : MIT
 "use strict";
 import assert from "power-assert";
-import {textlint} from "textlint";
+import {TextLintCore} from "textlint";
 import rule from "../src/prh-rule";
 import path from "path";
 describe(".textlinrc test", function () {
     context("when use .textlintrc", function () {
         it("should resolve path to rule.yaml", function () {
+            var textlint = new TextLintCore();
             textlint.setupRules({
                 "prh": rule
             }, {
                 "prh": {
                     "rulePaths": [path.join(__dirname, "fixtures", "rule.yaml")]
                 }
-            }, {
-                "configFile": path.join(__dirname, "fixtures", ".textlintrc")
             });
             var result = textlint.lintMarkdown("jquery");
             assert(result.messages.length === 1);
             assert(result.messages[0].line === 1);
             assert(result.messages[0].column === 1);
-            textlint.resetRules();
         });
         it("should resolve path to rule.yaml", function () {
+            var textlint = new TextLintCore();
             textlint.setupRules({
                 "prh": rule
             }, {
                 "prh": {
                     "rulePaths": [path.join(__dirname, "fixtures", "rule.yaml")]
                 }
-            }, {
-                "configFile": path.join(__dirname, "fixtures", ".textlintrc")
             });
             var result = textlint.lintMarkdown("jquery");
             assert(result.messages.length === 1);
             assert(result.messages[0].line === 1);
             assert(result.messages[0].column === 1);
-            textlint.resetRules();
+        });
+    });
+    context("prh features", function () {
+        describe("import", function () {
+            it("should work import directive", function () {
+                var textlint = new TextLintCore();
+                textlint.setupRules({
+                    "prh": rule
+                }, {
+                    "prh": {
+                        "rulePaths": [path.join(__dirname, "fixtures", "imports.yml")]
+                    }
+                });
+                var result = textlint.lintMarkdown("A");
+                assert(result.messages.length === 1);
+                var message = result.messages[0].message;
+                assert.equal(message, "A => a");
+                var resultB = textlint.lintMarkdown("B");
+                assert(resultB.messages.length === 1);
+                var messageB = resultB.messages[0].message;
+                assert.equal(messageB, "B => b");
+            });
         });
     });
 });