Merge branch 'release/0.8.3'

Author: Chris Myers

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "monet",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "main": ["src/main/javascript/monet.js","src/main/javascript/monet-pimp.js"],
   "ignore": [
     "**/.*",

component.json

@@ -1,6 +1,6 @@
 {
     "name": "monet",
-    "version": "0.8.2",
+    "version": "0.8.3",
     "scripts": [
         "src/main/javascript/monet.js",
         "src/main/javascript/monet-pimp.js"

package.json

@@ -2,7 +2,7 @@
   "author": "Chris Myers",
   "name": "monet",
   "description": "Monadic types library for JavaScript",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "homepage": "https://github.com/cwmyers/monet.js",
   "repository": {
     "type": "git",

src/main/javascript/monet-pimp.js

@@ -1,4 +1,4 @@
-//     monet-pimp.js 0.8.2
+//     monet-pimp.js 0.8.3
 
 //     This file needs to be included after monet.js
 

src/main/javascript/monet.js

@@ -1,4 +1,4 @@
-//     Monet.js 0.8.2
+//     Monet.js 0.8.3
 
 //     (c) 2012-2014 Chris Myers
 //     Monet.js may be freely distributed under the MIT license.
@@ -25,7 +25,7 @@
     };
 
 
-   var isFunction = function (f) {
+    var isFunction = function (f) {
         return !!(f && f.constructor && f.call && f.apply)
     };
 
@@ -147,6 +147,12 @@
         return list.foldLeft(Nil)(swap(cons))
     }
 
+    var listFilter = function(list, fn) {
+      return list.foldRight(Nil)(function(a, acc) {
+        return fn(a) ? cons(a,acc): acc
+      })
+    }
+
     var cons = function (head, tail) {
         return tail.cons(head)
     }
@@ -200,6 +206,9 @@
         append: function (list2) {
             return append(this, list2)
         },
+        filter: function(fn) {
+          return listFilter(this, fn)
+        },
         flatten: function () {
             return foldRight(append, this, Nil)
         },
@@ -345,6 +354,9 @@
         foldLeft: function (initialValue) {
             return this.toList().foldLeft(initialValue)
         },
+        filter: function (fn) {
+            return listFilter(this.toList(), fn)
+        },
         append: function (list2) {
             return NEL.fromList(this.toList().append(list2.toList())).some()
         },

src/test/javascript/list_spec.js

@@ -196,14 +196,22 @@ describe("An immutable list", function () {
         it("will return None for headMaybe", function () {
             expect(Nil.headMaybe()).toBeNoneMaybe()
         })
+        it("will return an empty list on filter", function() {
+          expect(Nil.filter(function() {return true})).toEqual(Nil)
+        })
     })
 
     describe("that has multiple elements", function () {
         it("will return the first element in a Some for headMaybe", function () {
             expect(list.headMaybe()).toBeSomeMaybeWith(1)
 
         })
+      it("will return the elements that pass the filter", function () {
+        expect(list.filter(function (a) {return a%2==0}).toArray()).toEqual([2,4])
+
+      })
     })
+
     describe("that is huge, must not blow the stack", function () {
         var list1 = [], list2 = []
         var size = 1000;

src/test/javascript/nel_spec.js

@@ -76,5 +76,11 @@ describe("A Non-Empty immutable list", function () {
         expect(nAppend.toArray()).toEqual([1,2,3,4,5,6,7,8])
     })
 
+  it("will be filtered", function() {
+    var n1 = NEL.fromList([1,2,3,4,5,6,7,8].list()).some()
+    expect(n1.filter(function(a){return a%2==0}).toArray()).toEqual([2,4,6,8])
+
+  })
+
 })
 

src/test/javascript/reader_spec.js

@@ -1,47 +1,52 @@
 describe("A Reader Monad", function () {
 
-    var config1 = {
-        url: "http://test1.com",
-        port: 8080,
-        key: "s3cr3t"
-    }
-    var config2 = {
-        url: "http://test2.com",
-        port: 8081
-    }
-    var connect = function (endpoint, config) {
-        return "POST " + config.url + ":" + config.port + "/" + endpoint
-    }.reader()
-
-
-    it("must inject config with run()", function () {
-        expect(connect("user").run(config1)).toBe("POST http://test1.com:8080/user")
-        expect(connect("session").run(config2)).toBe("POST http://test2.com:8081/session")
+  var config1 = {
+    url: "http://test1.com",
+    port: 8080,
+    key: "s3cr3t"
+  }
+  var config2 = {
+    url: "http://test2.com",
+    port: 8081
+  }
+  var connect = function (endpoint, config) {
+    return "POST " + config.url + ":" + config.port + "/" + endpoint
+  }.reader()
+
+  var format = function (url) {
+    return "!" + url + "!"
+  }.reader()
+
+  it("must inject config with run()", function () {
+    expect(connect("user").run(config1)).toBe("POST http://test1.com:8080/user")
+    expect(connect("session").run(config2)).toBe("POST http://test2.com:8081/session")
+  })
+
+  it("must be mappable", function () {
+    var reader = connect("session").map(function (s) {
+      return s + "?secure=true"
     })
+    expect(reader.run(config1)).toBe("POST http://test1.com:8080/session?secure=true")
 
-    it("must be mappable", function() {
-        var reader = connect("session").map(function (s) {return s + "?secure=true"})
-        expect(reader.run(config1)).toBe("POST http://test1.com:8080/session?secure=true")
+  })
 
-    })
-
-    it("must be flatMappable", function() {
-        var reader = connect("something").flatMap(
-            function(connectionString, config){
-                return connectionString+"?secretKey="+config.key
-            }.reader())
-        expect(reader.run(config1)).toBe("POST http://test1.com:8080/something?secretKey=s3cr3t")
-    })
+  it("must be flatMappable", function () {
+    var reader = connect("something").flatMap(
+      function (connectionString, config) {
+        return connectionString + "?secretKey=" + config.key
+      }.reader())
+    expect(reader.run(config1)).toBe("POST http://test1.com:8080/something?secretKey=s3cr3t")
+  })
 
-    it("must be applicable", function() {
-        var reader = connect("something").ap(Reader(function(config) {
-            return function(c) {
-                return "**"+c+"**"
-            }
+  it("must be applicable", function () {
+    var reader = connect("something").ap(Reader(function (config) {
+      return function (c) {
+        return "**" + c + "**"
+      }
 
-        }))
-        expect(reader.run(config1)).toBe("**POST http://test1.com:8080/something**")
+    }))
+    expect(reader.run(config1)).toBe("**POST http://test1.com:8080/something**")
 
-    })
+  })
 
 })