Merge pull request #13 from PrimaxLite/develop

Merged develope branch to v0.2 release

.travis.yml

@@ -0,0 +1 @@
+language: node_js

index.js

@@ -1,4 +1,2 @@
-var tecaj = require('./tecaj.js');
-tecaj.getTecaj(process.argv[2], function(result) {
-  console.log('THIS IS A RESULT: ' + JSON.stringify(result));
-});
+var tecaj = require('./lib/tecaj.js');
+module.exports = tecaj;

tecaj.js → lib/tecaj.js

@@ -1,8 +1,13 @@
-var logger = require('winston'),
+var winston = require('winston'),
+    logger = new (winston.Logger)({
+        transports: [
+            new (winston.transports.Console)({ level: 'error' })
+        ]
+    }),
     request = require("request"),
     usedDate = '',
     d = new Date(),
-    helpers = require('./lib/helpers'),
+    helpers = require('./helpers'),
 /* Variable that, when set, represent a function
     that will be called when tecaj.js successfully receives JSON */
     resultCallback,
@@ -37,9 +42,17 @@ var logger = require('winston'),
         }
     }
 
-module.exports = { getTecaj : function(date, results) {
-    resultCallback = results;
-    usedDate = date || dateString(d);
-    var link = "http://www.hnb.hr/tecajn/f" + usedDate + ".dat";
-    request(link, callback); }
+module.exports = { 
+    getTecaj : function(date, results) {
+        if(typeof date === 'function'){
+            resultCallback = date;
+            usedDate = dateString(d);
+        }
+        else{
+            resultCallback = results;
+            usedDate = date || dateString(d);
+        }
+        var link = "http://www.hnb.hr/tecajn/f" + usedDate + ".dat";
+        request(link, callback);
+    }
 }

package.json

@@ -22,10 +22,13 @@
   "bugs": {
     "url": "https://github.com/PrimaxLite/hnb_script/issues"
   },
-  "main": "tecaj.js",
-  "devDependencies": {},
+  "main": "index.js",
+  "devDependencies": {
+    "should": "~2.0.2",
+    "mocha": "~1.14.0"
+  },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "mocha -R spec ./test/tests.js"
   },
   "keywords": [
     "hnb",

test/tests.js

@@ -0,0 +1,20 @@
+var should = require('should');
+var tecaj = require('../index');
+
+describe('tecaj', function(){
+    it('should have a getTecaj method', function(){
+        tecaj.should.have.property('getTecaj').with.type('function');
+    });
+    it('should return a value when called with 2 parameters', function(done){
+        tecaj.getTecaj(null, function(t){
+            should.exist(t); 
+            done();
+        });
+    });
+    it('should return a value when called with just a callback', function(done){
+        tecaj.getTecaj(function(t){
+            should.exist(t);
+            done();
+        });
+    });
+});