Merge pull request #81 from cwmyers/develop

Alpha 2 release

README.md

@@ -35,7 +35,7 @@ Simply download and add to your html pages or we also support [bower].  You can
 bower install monet --save
 
 # or to install a specific version
-bower install monet#0.9.0-alpha.1
+bower install monet#0.9.0-alpha.2
 ```
 
 ### Node installation
@@ -44,7 +44,7 @@ bower install monet#0.9.0-alpha.1
 npm install monet --save
 
 # or to install a specific version
-npm install [email protected].1
+npm install [email protected].2
 ```
 
 ## A note on types

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "monet",
-  "version": "0.9.0-alpha.1",
+  "version": "0.9.0-alpha.2",
   "main": "src/main/javascript/monet.js",
   "ignore": [
     "**/.*",

dist/monet-pimp.js

@@ -1,5 +1,5 @@
 /**
- * monet-pimp.js 0.9.0-alpha.1
+ * monet-pimp.js 0.9.0-alpha.2
  *
  * This file needs to be included after monet.js
  *

dist/monet.js

@@ -1,5 +1,5 @@
 /**
- * Monet.js 0.9.0-alpha.1
+ * Monet.js 0.9.0-alpha.2
  *
  * (c) 2012-2016 Chris Myers
  * @license Monet.js may be freely distributed under the MIT license.
@@ -135,8 +135,17 @@
     function cons(head, tail) {
         return tail.cons(head);
     }
-    function List(head, tail) {
-        return new List.fn.init(head, tail);
+    function List() {
+        switch (arguments.length) {
+          case 0:
+            return new List.fn.init();
+
+          case 1:
+            return new List.fn.init(arguments[0]);
+
+          default:
+            return new List.fn.init(arguments[0], arguments[1]);
+        }
     }
     root.List = List;
     var listEach = function(effectFn, l) {
@@ -197,15 +206,17 @@
     };
     var Nil;
     List.fn = List.prototype = {
-        init: function(head, tail) {
-            if (head == null) {
+        init: function() {
+            var head = arguments[0];
+            var tail = arguments[1];
+            if (arguments.length === 0) {
                 this.isNil = true;
                 this.size_ = 0;
             } else {
                 this.isNil = false;
                 this.head_ = head;
-                this.tail_ = tail == null ? Nil : tail;
-                this.size_ = tail == null ? 0 : tail.size() + 1;
+                this.tail_ = tail || Nil;
+                this.size_ = this.tail_.size() + 1;
             }
         },
         of: function(value) {
@@ -824,7 +835,7 @@
         return Return(a);
     };
     Free.liftF = function(functor) {
-        return Suspend(functor.map(Return));
+        return isFunction(functor) ? Suspend(compose(Return, functor)) : Suspend(functor.map(Return));
     };
     Free.fn = Free.prototype = {
         init: function(val, isSuspend) {
@@ -841,9 +852,9 @@
             });
         },
         bind: function(fn) {
-            return this.isSuspend ? Suspend(isFunction(this.functor) ? compose(function(free) {
+            return this.isSuspend ? isFunction(this.functor) ? Suspend(compose(function(free) {
                 return free.bind(fn);
-            }, this.functor) : this.functor.map(function(free) {
+            }, this.functor)) : Suspend(this.functor.map(function(free) {
                 return free.bind(fn);
             })) : fn(this.val);
         },
@@ -966,7 +977,7 @@
     }).cata(function() {
         return assign(Monet, root);
     }, function(rootObj) {
-        assign(rootGlobalObject, root);
+        assign(rootObj, root);
         return Monet;
     });
 });

karma.conf.js

@@ -4,7 +4,7 @@ module.exports = function (config) {
     basePath: '',
     frameworks: ['jasmine'],
     files: [
-      'src/*.js',
+      'src/monet.js',
       'test/*-helper.js',
       'test/*-spec.js'
     ],

package.json

@@ -5,7 +5,7 @@
   ],
   "name": "monet",
   "description": "Monadic types library for JavaScript",
-  "version": "0.9.0-alpha.1",
+  "version": "0.9.0-alpha.2",
   "homepage": "https://github.com/cwmyers/monet.js",
   "repository": {
     "type": "git",
@@ -30,8 +30,9 @@
   "scripts": {
     "test": "karma start && tsc -m system --noEmit --listFiles",
     "test-typings": "tsc -m system --noEmit --listFiles",
-    "tdd": "karma start --auto-watch  --no-single-run --browsers Chrome,Firefox,PhantomJS",
-    "tdd-osx": "karma start --auto-watch  --no-single-run --browsers Chrome,Firefox,PhantomJS,Safari",
+    "tdd": "karma start --auto-watch --no-single-run",
+    "tdd-full": "karma start --auto-watch --no-single-run --browsers Chrome,Firefox,PhantomJS",
+    "tdd-full-osx": "karma start --auto-watch --no-single-run --browsers Chrome,Firefox,PhantomJS,Safari",
     "minify:monet": "uglifyjs dist/monet.js -o dist/monet.min.js --source-map dist/monet.min.js.map -m -c unsafe -v --comments --keep-fnames",
     "minify:monet-pimp": "uglifyjs dist/monet-pimp.js -o dist/monet-pimp.min.js --source-map dist/monet-pimp.min.js.map -m -c unsafe -v --comments --keep-fnames",
     "minify": "npm run minify:monet && npm run minify:monet-pimp",

src/monet-pimp.js

@@ -1,5 +1,5 @@
 /**
- * monet-pimp.js 0.9.0-alpha.1
+ * monet-pimp.js 0.9.0-alpha.2
  *
  * This file needs to be included after monet.js
  *

src/monet.js

@@ -1,5 +1,5 @@
 /**
- * Monet.js 0.9.0-alpha.1
+ * Monet.js 0.9.0-alpha.2
  *
  * (c) 2012-2016 Chris Myers
  * @license Monet.js may be freely distributed under the MIT license.
@@ -166,9 +166,12 @@
     }
 
     // List monad
-
-    function List(head, tail) {
-        return new List.fn.init(head, tail)
+    function List() {
+        switch (arguments.length) {
+            case 0: return new List.fn.init()
+            case 1: return new List.fn.init(arguments[0])
+            default: return new List.fn.init(arguments[0], arguments[1])
+        }
     }
 
     root.List = List
@@ -250,15 +253,17 @@
     var Nil
 
     List.fn = List.prototype = {
-        init: function (head, tail) {
-            if (head == null) {
+        init: function () {
+            var head = arguments[0];
+            var tail = arguments[1];
+            if (arguments.length === 0) {
                 this.isNil = true
                 this.size_ = 0
             } else {
                 this.isNil = false
                 this.head_ = head
-                this.tail_ = tail == null ? Nil : tail
-                this.size_ = tail == null ? 0 : tail.size() + 1
+                this.tail_ = tail || Nil
+                this.size_ = this.tail_.size() + 1
             }
         },
         of: function (value) {
@@ -899,7 +904,7 @@
     }
 
     Reader.of = function (x) {
-        return Reader(function (_) {
+        return Reader(function (_ /* do not remove - it's for currying purposes */) {
             return x
         })
     }
@@ -959,7 +964,9 @@
     }
 
     Free.liftF = function (functor) {
-        return Suspend(functor.map(Return))
+        return isFunction(functor) ?
+            Suspend(compose(Return, functor)) :
+            Suspend(functor.map(Return))
     }
 
     Free.fn = Free.prototype = {
@@ -977,14 +984,19 @@
             })
         },
         bind: function (fn) {
+
             return this.isSuspend ?
-                Suspend(isFunction(this.functor) ?
-                    compose(function (free) {
+
+                isFunction(this.functor) ?
+
+                    Suspend(compose(function (free) {
                         return free.bind(fn)
-                    }, this.functor) :
-                    this.functor.map(function (free) {
+                    }, this.functor)) :
+
+                    Suspend(this.functor.map(function (free) {
                         return free.bind(fn)
                     })) :
+
                 fn(this.val)
         },
         ap: function (ff) {
@@ -1127,7 +1139,7 @@
     return Maybe.fromNull(rootGlobalObject)
         .filter(function (rootObj) { return Boolean(rootObj.notUseMonetGlobalObject) })
         .cata(function () { return assign(Monet, root) }, function (rootObj) {
-            assign(rootGlobalObject, root)
+            assign(rootObj, root)
             return Monet
         })
 }))

test/either-spec.js

@@ -198,7 +198,8 @@ describe('An Either', function () {
 
     })
 
-    describe("will pimp an object", function () {
+    // TODO: Provide additional test suite for `monet-pimp`
+    xdescribe("will pimp an object", function () {
         it("with right", function () {
             expect("hello".right()).toBeRightWith("hello")
         })