improved tests, lowered saturationBrightnessMin, added isAvailable

jwagner · jwagner · commit 084ff3a622cb · 2014-04-16T19:05:11.000+02:00
diff --git a/smartcrop.js b/smartcrop.js
@@ -42,7 +42,7 @@ SmartCrop.DEFAULTS = {
     skinBrightnessMax: 1.0,
     skinThreshold: 0.8,
     skinWeight: 1.8,
-    saturationBrightnessMin: 0.25,
+    saturationBrightnessMin: 0.05,
     saturationBrightnessMax: 0.9,
     saturationThreshold: 0.4,
     saturationBias: 0.2,
@@ -116,6 +116,18 @@ SmartCrop.crop = function(image, options, callback){
     callback(result);
     return result;
 };
+// check if all the dependencies are there
+SmartCrop.isAvailable = function(options){
+    try {
+        var s = new this(options),
+            c = s.canvas(16, 16);
+        if(typeof c.getContext !== 'function') return false;
+        return true;
+    }
+    catch(e){
+        return false;
+    }
+};
 SmartCrop.prototype = {
     canvas: function(w, h){
         if(this.options.canvasFactory !== null){
diff --git a/test/smartcrop.js b/test/smartcrop.js
@@ -13,7 +13,34 @@ describe("SmartCrop", function() {
         expect(result.topCrop.width).to.be.within(1, img.width);
         expect(result.topCrop.height).to.be.within(1, img.height);
     }
+    describe("isAvailable", function(){
+        it("should return true when canvas is available", function(){
+            expect(SmartCrop.isAvailable()).to.equal(true);
+        });
+        it("should return false when canvas is not available", function(){
+            expect(SmartCrop.isAvailable({canvasFactory: function(){}})).to.equal(false);
+        });
+    });
     describe("crop", function() {
+        it("should do something sane", function(done){
+            var c = document.createElement('canvas'),
+                ctx = c.getContext('2d');
+            c.width = 128;
+            c.height = 64;
+            ctx.fillStyle = 'white';
+            ctx.fillRect(0, 0, 128, 64);
+            ctx.fillStyle = 'red';
+            ctx.fillRect(96, 32, 16, 16);
+            SmartCrop.crop(c, {debug: false}, function(result){
+                //document.body.appendChild(c);
+                //document.body.appendChild(result.debugCanvas);
+                expect(result.topCrop.x).to.be.lessThan(96);
+                expect(result.topCrop.y).to.be.lessThan(32);
+                expect(result.topCrop.x+result.topCrop.width).to.be.greaterThan(112);
+                expect(result.topCrop.y+result.topCrop.height).to.be.greaterThan(48);
+                done();
+            });
+        });
         it("should adhere to minScale", function(done) {
             SmartCrop.crop(img, {minScale: 1}, function(result){
                 validResult(result);
