cannonian - npm Package Compare versions

Comparing version 1.0.0 to 1.1.0

cannonianjs-latest.js

 /**
  * Cannonian.js
  * Made by Jack Cannon - c.annon.co.uk
- * v1.0.0
+ * v1.1.0
  */
@@ -99,2 +99,10 @@
 
+      } else if(helper.is.cannObject(p)) { // is Cannonian Object
+        this.cann = helper.takeTimezone.cann(helper.getCann.fromCannObject(p), this.cannTimezone);
+        this.stan = helper.convert.cannToStan(this.cann);
+        
+      } else if(helper.is.stanObject(p)) {
+        this.stan = helper.takeTimezone.stan(helper.getStan.fromStanObject(p), this.stanTimezone)
+        this.cann = helper.convert.stanToCann(this.stan);
+
       } else { // use now
@@ -146,2 +154,8 @@ this.stan = helper.takeTimezone.stan(helper.getStan.fromDate(new Date()), this.stanTimezone);
       return (typeof places == 'number') ? parseFloat(dec.toFixed(places)) : parseFloat(dec.toFixed(8)) ;
+    },
+    toCannObject: function () {
+      return helper.applyTimezone.cann(this.cann, this.cannTimezone);
+    },
+    toStanObject: function () {
+      return helper.applyTimezone.stan(this.stan, this.stanTimezone);
     }
@@ -179,2 +193,8 @@ };
         return typeof p === 'number' && p <= 100 && p >= 0;
+      },
+      cannObject: function (p) {
+        return typeof p === 'object' && typeof p.hour !== 'undefined' && (typeof p.cent !== 'undefined' || typeof p.centiminute !== 'undefined');
+      },
+      stanObject: function (p) {
+        return typeof p === 'object' && typeof p.hour !== 'undefined' && (typeof p.seco !== 'undefined' || typeof p.seco !== 'undefined');
       }
@@ -206,2 +226,5 @@ },
         return helper.fill.stan(stan);
+      },
+      fromStanObject: function (p) {
+        return helper.fill.stan(p);
       }
@@ -224,2 +247,5 @@ },
         return helper.convert.stanToCann(null, p);
+      },
+      fromCannObject: function (p) {
+        return helper.fill.cann(p);
       }
@@ -226,0 +252,0 @@ },

package.json

@@ -12,3 +12,3 @@ {
   ],
-  "version": "1.0.0",
+  "version": "1.1.0",
   "dependencies": {},
@@ -15,0 +15,0 @@ "devDependencies": {

test/testConversion.js

@@ -7,20 +7,24 @@ var Cannonian = require('../cannonianjs-latest.js');
 var checkSixFortyFive = function (cann) {
-  assert.strictEqual('6', cann.toStan(1));
-  assert.strictEqual('6:45', cann.toStan(2));
-  assert.strictEqual('6:45:00', cann.toStan(3));
-  assert.strictEqual('6:45:00:000', cann.toStan(4));
-  assert.strictEqual('6:45:00:000', cann.toStan());
 
-  assert.strictEqual('28', cann.toCann(1));
-  assert.strictEqual('28.1', cann.toCann(2));
-  assert.strictEqual('28.125', cann.toCann(3));
-  assert.strictEqual('28.125000', cann.toCann(4));
-  assert.strictEqual('28.125000', cann.toCann());
+  assert.strictEqual(cann.toStan(1), '6');
+  assert.strictEqual(cann.toStan(2), '6:45');
+  assert.strictEqual(cann.toStan(3), '6:45:00');
+  assert.strictEqual(cann.toStan(4), '6:45:00:000');
+  assert.strictEqual(cann.toStan(), '6:45:00:000');
 
-  assert.strictEqual(0.3, cann.toDec(1));
-  assert.strictEqual(0.28, cann.toDec(2));
-  assert.strictEqual(0.281, cann.toDec(3));
-  assert.strictEqual(0.2813, cann.toDec(4));
-  assert.strictEqual(0.28125, cann.toDec(5));
-  assert.strictEqual(0.28125, cann.toDec());
+  assert.strictEqual(cann.toCann(1), '28');
+  assert.strictEqual(cann.toCann(2), '28.1');
+  assert.strictEqual(cann.toCann(3), '28.125');
+  assert.strictEqual(cann.toCann(4), '28.125000');
+  assert.strictEqual(cann.toCann(), '28.125000');
+
+  assert.strictEqual(cann.toDec(1), 0.3);
+  assert.strictEqual(cann.toDec(2), 0.28);
+  assert.strictEqual(cann.toDec(3), 0.281);
+  assert.strictEqual(cann.toDec(4), 0.2813);
+  assert.strictEqual(cann.toDec(5), 0.28125);
+  assert.strictEqual(cann.toDec(), 0.28125);
+
+  assert.deepEqual(cann.toCannObject(), { hour: 28, minu: 1, cent: 25, mill: 0, minute: 1, centiminute: 25, milliminute: 0 });
+  assert.deepEqual(cann.toStanObject(), { hour: 6, minu: 45, seco: 0, mill: 0, minute: 45, second: 0, millisecond: 0 });
 };
@@ -59,4 +63,24 @@
 
+tests.fromCannObject = function () {
+  var obj = {
+    hour: 28,
+    minu: 1,
+    cent: 25
+  };
+  var cann = new Cannonian(obj, 0);
+  checkSixFortyFive(cann);
+};
+
+tests.fromStanObject = function () {
+  var obj = {
+    hour: 6,
+    minu: 45,
+    seco: 0
+  };
+  var cann = new Cannonian(obj, 0);
+  checkSixFortyFive(cann);
+};
+
 for(var t in tests) {
   tests[t]();
 }

test/testNewObject.js

@@ -55,4 +55,24 @@ var Cannonian = require('../cannonianjs-latest.js');
 
+tests.testNewObjectWhenGivenCannObject = function () {
+  var obj = {
+    hour: 1,
+    minu: 2,
+    cent: 3
+  };
+  var cann = new Cannonian(obj, 0);
+  testHasProperties(cann);
+};
+
+tests.testNewObjectWhenGivenStanObject = function () {
+  var obj = {
+    hour: 1,
+    minu: 2,
+    seco: 3
+  };
+  var cann = new Cannonian(obj, 0);
+  testHasProperties(cann);
+};
+
 for(var t in tests) {
   tests[t]();
 }

No alert changes

Improved metrics

Total package byte prevSize

66185

increased by26.73%

Number of package files

16

increased by14.29%

Lines of code

1852

increased by26.33%

No dependency changes