Merge pull request #9 from z-pattern-matching/7-match-string

resolves #7 match string

Author: leonardiwagner

package.json

@@ -1,6 +1,6 @@
 {
   "name": "z",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "main": "src/z.js",
   "description": "pattern matching for javascript",
   "scripts": {

src/z.js

@@ -39,7 +39,7 @@ function getParametersWithDefaultValues (f) {
 
 // create array from string for matching
 String.prototype.matches = function () {
-  return this.split('').matches.apply(this, arguments)
+  return [this].matches.apply(this, arguments)
 }
 
 // create simple array from a number for matching
@@ -54,10 +54,19 @@ Array.prototype.matches = function () {
   // cycle through matches
   for (var i = 0; i < arguments.length && arguments[i]; i++) {
     var currentPattern = getParametersWithDefaultValues(arguments[i])
+
     // empty array
     if (currentPattern.arguments.length === 0 && list.length === 0) {
       return currentPattern.function()
     }
+
+    // string
+    if (typeof list === 'string' || list instanceof String) {
+      if (currentPattern.arguments[0].value === list.toString()) {
+        return currentPattern.function(list)
+      }
+    }
+
     // single item array
     if (currentPattern.arguments.length === 1 && list.length === 1) {
       if (currentPattern.arguments[0].value === PATTERN_WITHOUT_VALUE || list[0] === currentPattern.arguments[0].value) {

tests/es6.js

@@ -84,9 +84,29 @@ describe('tests with ES6', function () {
     myReverse([1, 2, 3, 4, 5]).should.eql([5, 4, 3, 2, 1])
   })
 
+  it.skip('should match array of arrays', function () {
+    var matched = false;
+
+    [1, 2, [3]].matches(
+        (x = Array) => { matched = true },
+        (x) => { console.log('here', x) }
+    )
+
+    matched.should.eql(true)
+  })
+
   it('should match a number', function () {
     (1).matches(
-      (x) => true
+        (x) => true
+    ).should.equal(true)
+  })
+
+  it('should match a string', function () {
+    'test'.matches(
+      (x = 'testa') => false,
+      (x = 'test') => true,
+      (x = 'testo') => false,
+      function otherwise () { return false }
     ).should.equal(true)
   })
 })