balanced-match 0.0.0 → 0.2.1

package/.npmignore

@@ -1 +1,2 @@
 node_modules
+.DS_Store

package/.travis.yml

@@ -0,0 +1,3 @@
+language: node_js
+node_js:
+  - "0.10"

package/LICENSE.md

@@ -0,0 +1,21 @@
+(MIT)
+
+Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/Makefile

@@ -0,0 +1,6 @@
+
+test:
+	@node_modules/.bin/tape test/*.js
+
+.PHONY: test
+

package/README.md

@@ -1,11 +1,15 @@
-
 # balanced-match
 
-Match balanced character pairs, like `{` and `}`.
+Match balanced string pairs, like `{` and `}` or `<b>` and `</b>`.
+
+[![build status](https://secure.travis-ci.org/juliangruber/balanced-match.svg)](http://travis-ci.org/juliangruber/balanced-match)
+[![downloads](https://img.shields.io/npm/dm/balanced-match.svg)](https://www.npmjs.org/package/balanced-match)
+
+[![testling badge](https://ci.testling.com/juliangruber/balanced-match.png)](https://ci.testling.com/juliangruber/balanced-match)
 
 ## Example
 
-Get the first non-nested matching pair of braces:
+Get the first matching pair of braces:
 
 ```js
 var balanced = require('balanced-match');
@@ -33,14 +37,16 @@ $ node example.js
 For the first non-nested matching pair of `a` and `b` in `str`, return an
 object with those keys:
 
-* **start**: the index of the first match of `a`
-* **end**: the index of the matching `b`
-* **pre**: the preamble, `a` and `b` not included
-* **body**: the match, `a` and `b` not included
-* **post**: the postscript, `a` and `b` not included
+* **start** the index of the first match of `a`
+* **end** the index of the matching `b`
+* **pre** the preamble, `a` and `b` not included
+* **body** the match, `a` and `b` not included
+* **post** the postscript, `a` and `b` not included
 
 If there's no match, `undefined` will be returned.
 
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.
+
 ## Installation
 
 With [npm](https://npmjs.org) do:

package/index.js

@@ -1,24 +1,38 @@
-module.exports = function(a, b, str) {
+module.exports = balanced;
+function balanced(a, b, str) {
   var bal = 0;
   var m = {};
+  var ended = false;
 
   for (var i = 0; i < str.length; i++) {
-    if (str[i] == a) {
+    if (a == str.substr(i, a.length)) {
       if (!('start' in m)) m.start = i;
       bal++;
     }
-    else if (str[i] == b) {
+    else if (b == str.substr(i, b.length) && 'start' in m) {
+      ended = true;
       bal--;
       if (!bal) {
         m.end = i;
         m.pre = str.substr(0, m.start);
         m.body = (m.end - m.start > 1)
-          ? str.substring(m.start + 1, m.end)
+          ? str.substring(m.start + a.length, m.end)
           : '';
-        m.post = str.slice(m.end + 1);
+        m.post = str.slice(m.end + b.length);
         return m;
       }
     }
   }
-};
 
+  // if we opened more than we closed, find the one we closed
+  if (bal && ended) {
+    var start = m.start + a.length;
+    m = balanced(a, b, str.substr(start));
+    if (m) {
+      m.start += start;
+      m.end += start;
+      m.pre = str.slice(0, start) + m.pre;
+    }
+    return m;
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "balanced-match",
   "description": "Match balanced character pairs, like \"{\" and \"}\"",
-  "version": "0.0.0",
+  "version": "0.2.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/juliangruber/balanced-match.git"
@@ -9,7 +9,7 @@
   "homepage": "https://github.com/juliangruber/balanced-match",
   "main": "index.js",
   "scripts": {
-    "test": "tape test/*.js"
+    "test": "make test"
   },
   "dependencies": {},
   "devDependencies": {
@@ -27,5 +27,21 @@
     "email": "mail@juliangruber.com",
     "url": "http://juliangruber.com"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "chrome/25..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  }
 }

package/test/balanced.js

@@ -9,6 +9,27 @@ test('balanced', function(t) {
     body: 'in{nest}',
     post: 'post'
   });
+  t.deepEqual(balanced('{', '}', '{{{{{{{{{in}post'), {
+    start: 8,
+    end: 11,
+    pre: '{{{{{{{{',
+    body: 'in',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', 'pre{body{in}post'), {
+    start: 8,
+    end: 11,
+    pre: 'pre{body',
+    body: 'in',
+    post: 'post'
+  });
+  t.deepEqual(balanced('{', '}', 'pre}{in{nest}}post'), {
+    start: 4,
+    end: 13,
+    pre: 'pre}',
+    body: 'in{nest}',
+    post: 'post'
+  });
   t.deepEqual(balanced('{', '}', 'pre{body}between{body2}post'), {
     start: 3,
     end: 8,
@@ -16,6 +37,20 @@ test('balanced', function(t) {
     body: 'body',
     post: 'between{body2}post'
   });
-  t.notOk(balanced('{', '}', 'nope'));
+  t.notOk(balanced('{', '}', 'nope'), 'should be notOk');
+  t.deepEqual(balanced('<b>', '</b>', 'pre<b>in<b>nest</b></b>post'), {
+    start: 3,
+    end: 19,
+    pre: 'pre',
+    body: 'in<b>nest</b>',
+    post: 'post'
+  });
+  t.deepEqual(balanced('<b>', '</b>', 'pre</b><b>in<b>nest</b></b>post'), {
+    start: 7,
+    end: 23,
+    pre: 'pre</b>',
+    body: 'in<b>nest</b>',
+    post: 'post'
+  });
   t.end();
 });