gina 0.0.9-p91c → 0.1.1-alpha.3

package/{core/utils → framework/v0.1.1-alpha.3}/lib/math/index.js

@@ -1,6 +1,7 @@
+//'use strict';
 /*
  * This file is part of the gina package.
- * Copyright (c) 2016 Rhinostone <gina@rhinostone.com>
+ * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,11 +15,11 @@ var crypto      = require('crypto');
  * MathHelper
  *
  * @package     gina.utils.math
- * @author      Rhinostone <gina@rhinostone.com>
+ * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
 
-function Math() {
+function MathHelper() {
 
     var self = this;
 
@@ -40,17 +41,17 @@ function Math() {
      * e.g.:
      *
      *  var operate = require("gina").utils.math.operate;
-     *  var calculation = "10*2";
-     *  var result = operate(calculation);
+     *  var computation = "10*2";
+     *  var result = operate(computation);
      *      => 20
      *
      *  @param {string} calcultation
      *
-     *  @return {number} result
+     *  @returns {number} result
      * */
-    this.operate = function(calculation) {
-        return new Function('return ' + calculation)()
-    }
+    self.operate = function(computation) {
+        return new Function('return ' + computation)();
+    };
 
     /**
      * Checksum
@@ -60,18 +61,18 @@ function Math() {
      * @param {string} algorithm
      * @param {string} [ encoding ] - e.g.: hex
      *
-     * @return {string} checksum
+     * @returns {string} checksum
      * */
     var checkSum = function (str, algorithm, encoding) {
         try {
             return crypto
                 .createHash(algorithm || 'md5')
                 .update(str, 'utf8')
-                .digest(encoding || 'hex')
+                .digest(encoding || 'hex');
         } catch (err) {
-            return err
+            return err;
         }
-    }
+    };
 
     /**
      * Checksum
@@ -84,64 +85,88 @@ function Math() {
      *  @param {object|string} err
      *  @param {string} checksum
      * */
-    this.checkSum = function(filename, algorithm, encoding, cb) {
+    self.checkSum = async function(filename, algorithm, encoding, isCheckingFromData, cb) {
         var err = false, sum = null;
-
-        if ( /\./.test(filename) ) {
-            fs.readFile(filename, function (err, data) {
-                sum = checkSum(data, algorithm, encoding);
+        isCheckingFromData = ( typeof(isCheckingFromData) != 'undefined' ) ? isCheckingFromData : false;
+        
+        if ( !isCheckingFromData && /\./.test(filename) ) {
+            fs.readFile(filename, async function (err, data) {
+                sum = await checkSum(data, algorithm, encoding);
                 if( sum instanceof Error) {
                     err = sum;
-                    sum = undefined
+                    sum = undefined;
                 }
 
-                cb(err, sum)
+                cb(err, sum);
             })
         } else {
-            sum = checkSum(filename, algorithm, encoding);
+            sum = await checkSum(filename, algorithm, encoding);
             if( sum instanceof Error) {
                 err = sum;
-                sum = undefined
+                sum = undefined;
             }
 
-            cb(err, sum)
+            cb(err, sum);
         }
     }
 
+    var objectToString = function(obj) {
+        var str = '';
+        if (Array.isArray(obj)) {
+            obj = JSON.stringify(obj.sort(), null, 0);
+        } else {
+            var arr = [], i = 0;
+            for (let k in obj) {
+                if ( /function/i.test(typeof(obj[k])) )
+                    continue;
+                arr[i] = k +':'+ obj[k];
+                ++i;
+            }
+            str = arr.sort().join(',');
+        }
+        
+        return str;
+    };
+    
     /**
      * Check sum from file or form data
      *
-     * @param {string} filename|data
+     * @param {string|ojbect|array} filename|data
      * @param {string} algorithm
      * @param {string} encoding
      *
-     * @return {string} checksum
+     * @returns {string} checksum
      * */
-    this.checkSumSync = function(filename, algorithm, encoding) {
+    self.checkSumSync = function(filename, algorithm, encoding) {
         var sum = null;
         try {
+            
+            if ( typeof(filename) == 'object' ) {
+                filename = objectToString(filename);                
+            }
+            
             if ( /(\.[a-z]{3})$/.test(filename) ) { // must be a string
                 // from filename
                 sum = checkSum( fs.readFileSync(filename), algorithm, encoding )
             } else {
                 // from data
-                sum = checkSum( filename, algorithm, encoding )
+                sum = checkSum( filename, algorithm, encoding, true )
             }
 
             if (sum instanceof Error)
                 throw sum;
             else
-                return sum
+                return sum;
 
         } catch (err) {
             //console.error(err.stack||err.message);
             //return undefined
-            throw err
+            throw err;
         }
-    }
+    };
 
     // for big files only: > 1Mb
-    //this.checkSumBig= function(filename, cb) {
+    //self.checkSumBig= function(filename, cb) {
     //    var hash = crypto.createHash('md5');
     //    var encryption = encryption || 'sha1';
     //
@@ -154,8 +179,6 @@ function Math() {
     //        hash.digest('hex');
     //    })
     //}
-
-    //init();
-    return this
+    return self;
 }
-module.exports = Math()
+module.exports = MathHelper();

package/{core/utils → framework/v0.1.1-alpha.3}/lib/merge/README.md

@@ -65,5 +65,10 @@ console.log(JSON.stringify(result, null, 4));
 }
 ```
 
+## Debuging your test with nodeunit
+
+```tty
+ node --inspect-brk=6959 `which nodeunit` ./test/01c-merging_three_objects.js
+```
 
 

package/{core/utils → framework/v0.1.1-alpha.3}/lib/merge/example/merge.js

@@ -17,7 +17,7 @@ var b = {
     "status": "ko",
     "msg": "hello Jane !",
     "page": {
-        "action": "home",
+        "control": "home",
         "ext": ".html",
         "content": "home.html"
     }

package/{core/utils → framework/v0.1.1-alpha.3}/lib/merge/example/merge_and_preserve_first.js

@@ -73,8 +73,10 @@ var c = {
     ]
 };
 
+
 var result = merge(a, b, c, true);
 console.log(JSON.stringify(result, null, 4));
+
 //=>
 //{
 //    "actress": "julia roberts",

package/{core/utils → framework/v0.1.1-alpha.3}/lib/merge/package.json

@@ -5,10 +5,10 @@
   "authors": [
     {
       "name": "Maritn-Luther ETOUMAN",
-      "email": "gina@rhinosotne.com"
+      "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2016 Rhinostone <gina@rhinostone.com>",
+  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },