template-engine - npm Package Compare versions

Comparing version 1.0.8 to 1.0.9

lib/api/DateApi.js

@@ -155,3 +155,43 @@ var Class       = require('core').Class;
     };
-    
+
+    this.getFriendlyDate = function(date) {
+
+        var givenDate = new Date(date),
+            currentDate = new Date();
+
+        var givenTimestamp = parseFloat(givenDate.getTime() / 1000),
+            currentTimestamp = parseFloat(currentDate.getTime() / 1000);
+
+        var space = ' ';
+
+        var minutes = Math.floor((currentTimestamp - givenTimestamp) / 60);
+
+            if ( minutes <= 0) {
+                return false;
+            }
+            else if ( minutes < 60) {
+                return minutes+space+this._inflect(minutes, 'minutę', 'minuty', 'minut')+' temu';
+            }
+            else if ( minutes <= 60*24) {
+                var hourDiff = Math.floor(minutes/60);
+                return hourDiff+space+this._inflect(hourDiff, 'godzinę', 'godziny', 'godzin')+' temu';
+            }
+            else if ( minutes <= 60*24*7) {
+                var dayDiff = Math.floor(minutes/60/24);
+                return dayDiff+space+this._inflect(dayDiff, 'dzień', 'dni', 'dni')+' temu';
+            }
+            else if ( minutes <= 60*24*7*4) {
+                var weekDiff = Math.floor(minutes/60/24/7);
+                return weekDiff+space+this._inflect(weekDiff, 'tydzień', 'tygodnie', 'tygodni')+' temu';
+            }
+            else if ( minutes <= 60*24*7*4*12) {
+                var weekDiff = Math.floor(minutes/60/24/7/4);
+                return weekDiff+space+this._inflect(weekDiff, 'miesiąc', 'miesiące', 'miesięcy')+' temu';
+            }
+            else {
+                var weekDiff = Math.floor(minutes/60/24/7/4/12);
+                return weekDiff+space+this._inflect(weekDiff, 'rok', 'lata', 'lat')+' temu';
+            }
+    };
+
     this.getMonthLabel = function(date) {
@@ -158,0 +198,0 @@ var givenDate = new Date(date),

lib/driver/DriverSession.js

 var Event          = require('core').event.Event;
 var ErrorEvent     = require('core').event.ErrorEvent;
 var Loader         = require('core').http.Loader;
+var Request        = require('core').http.Request;
 var OpalLoader     = require('dl').opal.OpalLoader;
@@ -76,3 +77,3 @@ var OpalRequest    = require('dl').opal.OpalRequest;
     // *       returns 2: {firstName: 'Kevin', midName: 'van', surName: 'Zonneveld'}
-    
+
     var utf8Overhead = function (chr) {
@@ -226,10 +227,10 @@ // http://phpjs.org/functions/unserialize:571#comment_95906
  * @extends DriverAbstract
- * @requires Class 
- * @requires DriverAbstract 
- * @requires OpalLoader 
- * @requires OpalRequest 
- * @requires Event 
+ * @requires Class
+ * @requires DriverAbstract
+ * @requires OpalLoader
+ * @requires OpalRequest
+ * @requires Event
  * @requires ErrorEvent
  * @requires http
- * @requires os 
+ * @requires os
  * @requires crypto
@@ -257,7 +258,7 @@ * @param {Object} headers Parameters which contain authorization data
         }
-    
+
 };
 
 DriverSession.prototype = Object.create(DriverAbstract.prototype);
-    
+
 /**
@@ -291,3 +292,3 @@ * Validate headers cookies
     if(cookies.hasOwnProperty('onet_ubi') && cookies.onet_ubi.length >= 24) {
-        this._cookieUbi = cookies.onet_ubi;     
+        this._cookieUbi = cookies.onet_ubi;
     } else {
@@ -368,6 +369,6 @@ console.warn('DriverSession/', DriverSession.Exception.INVALID_UBI, cookies.onet_ubi);
     if(this._cookieCid !== null) {
-        bodyGetSession += this._buildPermQuery() + '\n'; 
+        bodyGetSession += this._buildPermQuery() + '\n';
     }
     if(this._cookieSid !== null) {
-        bodyGetSession += this._buildPrivQuery(); 
+        bodyGetSession += this._buildPrivQuery();
     }
@@ -433,36 +434,26 @@
     var requestBody = this._buildGetSessionBrokerBody();
-    var requestOptions = {
+
+    var sessionRequest = new Request({
         host: DriverSession.SESSION_BROKER_HOST,
         port: DriverSession.SESSION_BROKER_PORT,
         path: DriverSession.SESSION_BROKER_PATH,
-        method: 'POST',
-        headers: {
-            'Content-Length': requestBody.length
-        },
-        agent: false
-    };
-
-    var sessionRequest = http.request(requestOptions, function(sessionResponse) {
-        sessionResponse.on('data', function (chunk) {
-            responseBody += chunk;
-        });
-        sessionResponse.on('end', function () {
-            that._getUserData(responseBody);
-        });
+        method: 'POST'
     });
 
-    sessionRequest.socket.setTimeout(DriverSession.SESSION_BROKER_TIMEOUT);  
-    sessionRequest.socket.on('timeout', function() {
-        console.warn('DriverSession/', 'Session broker error: timeout');
-        sessionRequest.abort();
-        that.dispatchEvent(new Event(DriverAbstract.LOADED, DriverSession.USER_NOT_LOGGED));
+    sessionRequest.setBody(requestBody);
+
+    var loader = new Loader(sessionRequest);
+
+    loader.addEventListener(Loader.Event.LOADED, function(ev) {
+        var response = ev.data;
+        that._getUserData(response.getBody().toBuffer());
     });
 
-    sessionRequest.on('error', function(e) {
-        console.warn('DriverSession/', 'Session broker error: ', e.message);
+    loader.addEventListener(Loader.Event.ERROR, function(ev) {
+        console.warn('DriverSession/', 'Session broker error: ', ev.message);
         that.dispatchEvent(new Event(DriverAbstract.LOADED, DriverSession.USER_NOT_LOGGED));
     });
 
-    sessionRequest.write(requestBody);
-    sessionRequest.end();
+    loader.setTimeout(DriverSession.SESSION_BROKER_TIMEOUT);
+    loader.load();
 };
@@ -469,0 +460,0 @@

lib/plugins/Less.js

@@ -12,3 +12,3 @@ var Class       = require('core').Class;
     this.Extends = PluginAbstract;
-
+    
     this.initialize = function(config, appYaml){
@@ -20,3 +20,3 @@ var that = this;
 
-        // Dodajemy do LESS-a nową funkcję zwracającą url na OCDNie
+        // Dodajemy do LESS-a nową funkcję zwracającą url na OCDNie    
         less.tree.functions.ocdnurl = function(path) {
@@ -27,6 +27,6 @@ var url = that._getOcdnUrl(path.value);
     };
-
+    
     this.execute = function(data, params){
         console.log('     -- LessCSS plugin execute');
-
+       
         var that = this;
@@ -39,8 +39,2 @@ data = this._prepareArguments(data, params);
                     console.warn('     -- ERROR: ' + err.message);
-
-                    var extract = err.extract;
-                    extract.forEach(function(line) {
-                        console.log('        -- ERROR: ' + line);
-                    });
-
                     that.dispatchEvent(new ErrorEvent(PluginAbstract.Event.ERROR, err, -31996, 'LessCSS internal error'));
@@ -63,4 +57,4 @@ } else {
     };
-
-
+    
+    
     function flatten(obj, includePrototype, into, prefix) {
@@ -83,3 +77,3 @@ into = into || {};
     }
-
+    
     this._prepareArguments = function(data, args){
@@ -102,3 +96,3 @@ // console.log('LESS PARAMS -> ', args);
     };
-
+    
 };
@@ -105,0 +99,0 @@

lib/RenderMethod.js

@@ -1,13 +0,17 @@
-var Core = require('core');
+var core = require('core');
+
+var Event = core.event.Event;
+var JsonRpcMethod = core.jsonrpc.JsonRpcMethod;
+
 var RenderingController = require("./RenderingController.js").RenderingController;
 
 var RenderMethod = function () {
-    this.Extends = Core.jsonrpc.JsonRpcMethod;
-    
+    this.Extends = JsonRpcMethod;
+
     this.initialize = function (request, response, server) {
 	    this.parent(request, response, server);
 	};
-    
+
     this.execute = function (params) {
-         try {
+        try {
             var controller = new RenderingController(params, this.server.api, this.server.getTemplatePath());
@@ -20,9 +24,9 @@ controller.addEventListener(RenderingController.RENDERED, this._onSuccess, this);
             controller.render();
-         } catch(e) {
-            this._onError(e);
-         }
+        } catch(e) {
+           this._onError(e);
+        }
     };
-    
+
     this._onSuccess = function(e){
-        this.dispatchEvent( new Core.event.Event(Core.jsonrpc.JsonRpcMethod.Event.OK, e.data) );
+        this.dispatchEvent( new Event(JsonRpcMethod.Event.OK, e.data) );
     };
@@ -32,12 +36,16 @@
         console.log('  -- RenderMethod: ERROR. sending error response...');
-        if (typeof e == 'string') {
+        if (e instanceof Error) {
             console.log('     -- ' + e);
+            this.dispatchEvent( new Event(JsonRpcMethod.Event.ERROR, e.name, e.message) );
+            return;
         } else {
             console.log('     -- ' + e.code + ': ' + e.message);
-        }        
-        this.dispatchEvent( new Core.event.Event(Core.JsonRpc.JsonRpcMethod.Event.ERROR, e) );
+            this.dispatchEvent( new Event(JsonRpcMethod.Event.ERROR, e.code, e.message) );
+            return;
+        }
     };
 };
 
-RenderMethod = new Core.Class(new RenderMethod());
+RenderMethod = new core.Class(new RenderMethod());
+
 exports.RenderMethod = RenderMethod;

package.json

 {
     "name": "template-engine",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "description": "Engine that renders templates of any kind",
@@ -5,0 +5,0 @@ "contributors": [

tests/api/OcdnSpec.js

@@ -8,6 +8,6 @@ describe('Ocdn', function(){
     });
-    
-    it('static url #1', function(){ 
+
+    it('static url #1', function(){
         var Ocdn = require('../../lib/api/Ocdn.js').Ocdn;
-        var OcdnStaticUrl = require('dl').Ocdn.OcdnStaticUrl;
+        var OcdnStaticUrl = require('dl').ocdn.OcdnStaticUrl;
         var ocdn = new Ocdn();
@@ -23,6 +23,6 @@ var testUrl = "http://ocdn.eu/static/core.js";
     });
-    
+
     xit('static url #2', function(){
         var Ocdn = require('../../lib/api/Ocdn.js').Ocdn;
-        var OcdnStaticUrl = require('dl').Ocdn.OcdnStaticUrl;
+        var OcdnStaticUrl = require('dl').ocdn.OcdnStaticUrl;
         var ocdn = new Ocdn();
@@ -44,6 +44,6 @@ ocdn.configuration = {
     });
-    
-    it('files url #1', function(){ 
+
+    it('files url #1', function(){
         var Ocdn = require('../../lib/api/Ocdn.js').Ocdn;
-        var OcdnFilesUrl = require('dl').Ocdn.OcdnFilesUrl;
+        var OcdnFilesUrl = require('dl').ocdn.OcdnFilesUrl;
         var ocdn = new Ocdn();
@@ -61,6 +61,6 @@ var testUrl = "http://ocdn.eu/files/pulscms/NDI7MDA_/898a471ce2b2548b0dfa88be5d33d573.txt";
     });
-    
+
     it('file url #2', function(){
         var Ocdn = require('../../lib/api/Ocdn.js').Ocdn;
-        var OcdnFilesUrl = require('dl').Ocdn.OcdnFilesUrl;
+        var OcdnFilesUrl = require('dl').ocdn.OcdnFilesUrl;
         var ocdn = new Ocdn();
@@ -84,6 +84,6 @@ ocdn.configuration = {
     });
-    
+
     it('images url #1', function(){
         var Ocdn = require('../../lib/api/Ocdn.js').Ocdn;
-        var OcdnImagesUrl = require('dl').Ocdn.OcdnImagesUrl;
+        var OcdnImagesUrl = require('dl').ocdn.OcdnImagesUrl;
         var ocdn = new Ocdn();
@@ -101,6 +101,6 @@ var testUrl = "http://ocdn.eu/images/pulscms/ZmE7MDA_/dc854e2d0993a5402fb15d1fa19f118b.png";
     });
-    
+
     it('file url #2', function(){
         var Ocdn = require('../../lib/api/Ocdn.js').Ocdn;
-        var OcdnImagesUrl = require('dl').Ocdn.OcdnImagesUrl;
+        var OcdnImagesUrl = require('dl').ocdn.OcdnImagesUrl;
         var ocdn = new Ocdn();
@@ -124,6 +124,6 @@ ocdn.configuration = {
     });
-    
+
     it('resources url #1', function(){
         var Ocdn = require('../../lib/api/Ocdn.js').Ocdn;
-        var OcdnResourcesUrl = require('dl').Ocdn.OcdnResourcesUrl;
+        var OcdnResourcesUrl = require('dl').ocdn.OcdnResourcesUrl;
         var ocdn = new Ocdn();
@@ -142,8 +142,8 @@ var testUrl = "http://ocdn.eu/resources/fred/microsite.template-engine/resource/3f912d885f9403dd0bab8f951ce7433a/1.0/wizard.css";
     });
-    
+
     it('resources url #2', function(){
         var Ocdn = require('../../lib/api/Ocdn.js').Ocdn;
-        var OcdnResourcesUrl = require('dl').Ocdn.OcdnResourcesUrl;
+        var OcdnResourcesUrl = require('dl').ocdn.OcdnResourcesUrl;
         var ocdn = new Ocdn();
-        
+
         ocdn.configuration = {
@@ -178,4 +178,4 @@ appname: "MicrositeTemplate",
     });
-    
-    
+
+
 });

tests/jqtpl_tests/ExampleRenderTemplateSpec.js

@@ -1,7 +0,7 @@
-describe("Testing jqtpl files", function () {
+xdescribe("Testing jqtpl files", function () {
     var jqtplHelpers = require('../JqtplHelpers.js');
-    
+
     it("should test ust", function () {
         var done = false;
-        
+
         runs(function () {
@@ -12,7 +12,7 @@ jqtplHelpers.renderTemplate("exampleTest", process.cwd() + '/tests/mocks', function(data){
         });
-        
+
         waitsFor(function () {
            return done != false;
         });
-        
+
         runs(function () {
@@ -19,0 +19,0 @@ var regex = /http:\/\/my\.unit\.tests\/resources\/tests\/my-unit-tests-te\.tests\/resource\/none\/1\.0\/top\.js/;

No alert changes

Improved metrics

Total package byte prevSize

6063914

increased by0.05%

Number of package files

359

increased by0.28%

Lines of code

39720

increased by0.13%

No dependency changes