hariko - npm Package Compare versions

Comparing version 1.1.2 to 1.1.4

CHANGELOG.md

@@ -0,1 +1,30 @@
+<a name="1.1.4"></a>
+## 1.1.4 (2017-02-01)
+
+
+### refacotr
+
+* refacotr(resource): formatted syntax.
+ ([f4c8562](https://github.com/rymizuki/node-hariko/commit/f4c8562))
+
+* fix routing priority
+ ([9d1d20b](https://github.com/rymizuki/node-hariko/commit/9d1d20b))
+* Merge pull request #8 from rymizuki/fix_routing_priority
+ ([8f69f70](https://github.com/rymizuki/node-hariko/commit/8f69f70))
+
+
+
+<a name="1.1.3"></a>
+## 1.1.3 (2017-01-12)
+
+
+* fix houndci-bot review
+ ([99d9670](https://github.com/rymizuki/node-hariko/commit/99d9670))
+* fix output multiple responses
+ ([2f3c66c](https://github.com/rymizuki/node-hariko/commit/2f3c66c))
+* Merge pull request #7 from 170/fix/output_multiple_responses
+ ([2054699](https://github.com/rymizuki/node-hariko/commit/2054699))
+
+
+
 <a name="1.1.2"></a>
@@ -2,0 +31,0 @@ ## 1.1.2 (2016-06-18)

lib/hariko/resource.js

@@ -100,9 +100,12 @@ var fs            = require('fs'),
       }
-      resoruces = _.sortBy(resources, function (resource) {
-        return _.chain(resource.request.uri.queries)
-          .select(function (query) {
-            return params.indexOf(query) > -1;
-          })
-          .size();
-      });
+      resources = _.chain(resources)
+        .reverse()
+        .sortBy(resources, function (resource) {
+          return _.chain(resource.request.uri.queries)
+            .select(function (query) {
+              return params.indexOf(query) > -1;
+            })
+            .size();
+        })
+        .value();
     }
@@ -117,2 +120,1 @@ return resources.shift();
 };
-

lib/hariko/resource/external.js

@@ -9,2 +9,12 @@ var fs      = require('fs'),
 function save (dest, entries) {
+  // save only first response of multiple responses
+  var saveFlags = {};
+  entries = entries.filter(function (entry) {
+    if (saveFlags[entry.file]) {
+      return false;
+    }
+    saveFlags[entry.file] = true;
+    return true;
+  });
+
   for (var i = 0; i < entries.length; i++) {
@@ -11,0 +21,0 @@ var entry     = entries[i],

lib/hariko/resource/parser.js

@@ -72,2 +72,3 @@ var URL         = require('url'),
         var action = resource.actions[iii];
+        var initialEntry = null;
 
@@ -84,8 +85,5 @@ for (var iiii = 0; iiii < action.examples.length; iiii++) {
             if (iiii === 0 && (request && request.name)) {
-              entries.push(_.cloneDeep(entry));
-              logger.verbose('  req: %s %s  res: %s',
-                entry.request.method,
-                entry.request.uri.path,
-                entry.response.statusCode);
+              initialEntry = _.cloneDeep(entry);
             }
+
             if (request && request.name) {
@@ -103,2 +101,10 @@ var uri = entry.request.uri;
         }
+
+        if (initialEntry) {
+          entries.push(initialEntry);
+          logger.verbose('  req: %s %s  res: %s',
+            initialEntry.request.method,
+            initialEntry.request.uri.path,
+            initialEntry.response.statusCode);
+        }
       }
@@ -105,0 +111,0 @@ }

package.json

 {
   "name": "hariko",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Mock Server that implements the API Blueprint specification.",
@@ -5,0 +5,0 @@ "main": "index.js",

test/hariko/resource/external.js

@@ -52,2 +52,4 @@ var expect  = require('expect.js'),
         {file: 'api/user/index-GET.json', response: {data: {"message": "hello world."}}},
+        {file: 'api/multiple-GET.json', response: {data: {"message": "first."}}},
+        {file: 'api/multiple-GET.json', response: {data: {"message": "second."}}},
       ]);
@@ -58,2 +60,4 @@ expect(fs.readFileSync('test/.output/api/app-GET.json').toString())
         .to.be.eql('{\n    message: "hello world."\n}');
+      expect(fs.readFileSync('test/.output/api/multiple-GET.json').toString())
+        .to.be.eql('{\n    message: "first."\n}');
     });
@@ -60,0 +64,0 @@ });

test/hariko/resource/parse_spec.js

@@ -122,7 +122,7 @@ var expect = require('expect.js'),
           {
-            "file": "api/item/item_id-GET.json",
+            "file": "api/item/hariko-GET.json",
             "request": {
               "method": "GET",
               "uri": {
-                "path": "/api/item/:item_id",
+                "path": "/api/item/hariko",
                 "template": "/api/item/{item_id}",
@@ -140,7 +140,7 @@ "queries": []
           {
-            "file": "api/item/hariko-GET.json",
+            "file": "api/item/deco-GET.json",
             "request": {
               "method": "GET",
               "uri": {
-                "path": "/api/item/hariko",
+                "path": "/api/item/deco",
                 "template": "/api/item/{item_id}",
@@ -158,7 +158,7 @@ "queries": []
           {
-            "file": "api/item/deco-GET.json",
+            "file": "api/item/item_id-GET.json",
             "request": {
               "method": "GET",
               "uri": {
-                "path": "/api/item/deco",
+                "path": "/api/item/:item_id",
                 "template": "/api/item/{item_id}",
@@ -174,3 +174,3 @@ "queries": []
             }
-          }
+          },
         ],
@@ -177,0 +177,0 @@ warnings: [

No alert changes

Improved metrics

Total package byte prevSize

77252

increased by2%

Number of package files

46

increased by2.22%

Lines of code

2015

increased by1.1%

No dependency changes