template-engine - npm Package Compare versions

Comparing version 0.2.21 to 0.2.22

lib/api/Ocdn.js

@@ -89,6 +89,7 @@ var Core        = require('core');
         var res = ResourceManager.getInstance().getResource(ocdnUrl.resourceName);
+        // tutaj resource jest zapewne external i jego wersja to wersja TE + wersja paczki remote
         if (res && res.version) {
-            ocdnUrl.resourceVersion = res.version;
+            ocdnUrl.resourceVersion += '/' + res.version;
         }
-
+        
         return ocdnUrl;
@@ -95,0 +96,0 @@ } else if(resourcePath.indexOf('/static/')==0){

lib/cdf/CdfYaml.js

@@ -5,2 +5,3 @@ var Class = require('core').Class;
 var CdfBlock = cdf.CdfBlock;
+var CdfApplication = cdf.CdfApplication;
 var CdfTemplate = cdf.CdfTemplate;
@@ -53,6 +54,14 @@ var CdfDatasource = cdf.CdfDatasource;
     var name, cdf ="", block = null, template = null, cdfConfig = null;
+    var isBlock = "true"; //false means cdf:application
     if(config){
         if(config.hasOwnProperty('blocks')){
             for(name in config.blocks){
-                block = new CdfBlock();
+                isBlock = (!config.blocks[name].type || config.blocks[name].type == "block") ? true : false;
+
+                if (isBlock) {
+                    block = new CdfBlock();
+                } else {
+                    block = new CdfApplication();
+                }
+
                 block.name = name;
@@ -63,16 +72,22 @@ block.encode = config.blocks[name].hasOwnProperty('encode')? config.blocks[name].encode : 'none';
                 block.onError = config.blocks[name].hasOwnProperty('onError')? config.blocks[name].onError : 'propagate';
-                
-                if(config.blocks[name].hasOwnProperty('template') && config.blocks[name].template != null){
-                    if(block.contentType == 'text/html'){
-                        block.setBody(config.blocks[name].template);
+
+                if (isBlock) {
+                    if(config.blocks[name].hasOwnProperty('template') && config.blocks[name].template != null){
+                        if(block.contentType == 'text/html'){
+                            block.setBody(config.blocks[name].template);
+                        }
+                        else{
+                            template = CdfYaml._createCdfTemplate(config.blocks[name].template);
+                            block.setBody(template.toString());   
+                        }    
                     }
                     else{
-                        template = CdfYaml._createCdfTemplate(config.blocks[name].template);
-                        block.setBody(template.toString());   
-                    }    
+                        //TODO error
+                        console.log("Error - cdf:block doesn't have template defined.");
+                    }
+                } else {
+                    block.src = config.blocks[name].hasOwnProperty('src') ? config.blocks[name].src : '';
+                    block.controllerType = config.blocks[name].controllerType;
+                    block.controller = config.blocks[name].controller;
                 }
-                else{
-                    //TODO error
-                    console.log("Error - cdf:block doesn't have template defined.");
-                }
                 
@@ -90,2 +105,3 @@ cdf += block.toString();
     }
+
     return cdf;
@@ -92,0 +108,0 @@ };

lib/ResourceMethod.js

@@ -30,2 +30,4 @@ var Core = require('core');
         var parts = params.resource.split('/').reverse();
+        
+        // resource file name
         if(parts && parts[0]){
@@ -36,10 +38,14 @@ params.resource = parts[0];
         // jezeli w urlu jest podana wersja
-        if(parts[1]) {
-            // jezeli sie roznia to podziekuj
-            if(appYaml.version != parts[1]){
-                this.dispatchEvent(new Core.Event.ErrorEvent(Core.JsonRpc.JsonRpcMethod.Event.ERROR, null, -31999, "wrong file version: " + parts[1] + '!=' + appYaml.version));
-                return;
+        if ( parts.length == 3 || parts.length == 2) {
+            var appVersion = parts[parts.length - 1];
+            if(appVersion) {
+                // jezeli sie roznia to podziekuj
+                if(appYaml.version != appVersion){
+                    this.dispatchEvent(new Core.Event.ErrorEvent(Core.JsonRpc.JsonRpcMethod.Event.ERROR, null, -31999, "wrong file version: " + appVersion + '!=' + appYaml.version));
+                    return;
+                }
             }
         }
         
+        
         var resourceManager = ResourceManager.getInstance();
@@ -46,0 +52,0 @@

lib/router/DevRouter.js

 var Fs = require('fs');
 var Class = require('core').Class;
 var Event = require('core').Event.Event;
+var Yaml = require('core').Yaml.YAML;
 var Router = require('./Router.js').Router;
@@ -21,2 +22,3 @@ var DevRoute = require('./DevRoute.js').DevRoute;
         this.actions = {};
+//        this._retrieveCdfActionsFromWildcards();
         this._retrieveCdfActionsFromDir("");
@@ -37,3 +39,18 @@ };
         }
-    }
+    };
+
+    //wildcards are not currently in use
+    this._retrieveCdfActionsFromWildcards = function () {
+        var wildcardsPath = this.actionsPath + ".wildcards.yaml",
+            wildcards;
+
+        if (Fs.statSync(wildcardsPath).isFile()) {
+            wildcards = Yaml.parseFileSync(wildcardsPath).pop();
+
+            for (rexp in wildcards) {
+                this.addRoute(new DevRoute(rexp, this.actionsPath + wildcards[rexp]));
+            }
+        }
+    };
+
     this._retrieveCdfActionsFromDir = function(dirName) {
@@ -88,2 +105,2 @@ var fullPath = this.actionsPath + dirName
 DevRouter = new Class( new DevRouter() );
-exports.DevRouter = DevRouter;
+exports.DevRouter = DevRouter;

package.json

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

tests/plugins/CssRewriteAbsoluteUrlSpec.js

@@ -70,2 +70,25 @@ var PluginAbstract = require('../../lib/plugins/PluginAbstract.js').PluginAbstract;
 
+     
+    it('data uri scheme #3', function () {
+        var baseCss = ".addthis_32x32_style a.addthis_button_compact span.at15t_compact:last-child{\n";
+	baseCss += "background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAABF9JREFUWEe9l/tPU2cYx88/4mYiKCC0Mqdb9Mf9tmQItNBCsZRylwIFCo5LEDaYsDFiKmHKZjp1m3GbWbbsotvUaWTGzThpCazcDiK0ZCxLtOecXjD57nl7AQbtQqH1JE+bnJz283me93Kel+OCl70kUTdrkPHOxlfgbDgIZx1F7ctwVu+Ho+olOCopytPhKN0HR7EcC0UyLBSmYUEbXfBFyTxjhbj+76mKZMvSyQz4blnwbPw2no3dwvLoL1i23sTywxtYfnAdvvs/w/f7T/Dd+xG+u9fgG74K353ow/3JKfxleA2Txbstfri9OFH3d9fr8N4cgvfaADyX2uC+2Ay3pQnSkAnSYB1Ecy3EfgPE3mMQuysgdpRCbC/ZUkgD7XCf68Fi+WEwNjdzLI2XLtbD8zmBP6qC9EEFJDMB3tcTsBBCVwGEE3kQWnLhalTCZcyCqzpzWyG0FcHVqsW0Lonn5hsOQDpvXAOnzAgu9BD87QK4YgxfkTepMHd0LzhHw6uQzpQHM39OcKrg06oMzOengVs0HVoDL1rJXGhXQ2imsptiU/Zww+bIk4FzGqkCZpZ5BHjtxjGXzG1Yf7F70c6NBTUJOAwHg3Ctf8z/k3kYOIPESmCeCSxUHqCyM7hmDVwBVwR4bAVoDsyX7Y8KHlMBFQk81qevZt7w/5mHxjhWQ/BYlQpurlAemO2bhMeyAnO5JPBII4sIZ5mGC8+VcxtWAbsX6flIq+NRDm1Es+rUiBNuA2WLNyIJzDIBnj4iPbBF3oafRfp/XkkCM8oUuGrCv2DiKkDMGVaBaQUJGGn2h3nDxVWgQYlptgqmSECozwkrELdJSK90oSUP0/kkMKlIhmBSR7WPb2sfMGb7+wqxQ4upAtqIJrJJ4Ljm+QgE4ay5EU4WY1JL7wI7E2jWxl+gLpC5v7OiJkfsr8SEjgT+zEqCv0WKos2KeggYvCkA97d31OaJAzWY0MsDAqzBjJtACN66Cheo15Q+NMFesg/ceCYJdFbER2AFrlrNnOCs53Sfb8ZEWTq4scw91GobohLYVLX88BwIrSH4UX+XzeCsA/NcOgF7BQnYMhPhYgK19IMo5kHEZ2uoZa9fhbs62JgH4f0MXgrpLLX/lzsxVkZz4GFWAp68U01LkVrw7QpsgOdD6F4Hp3OH50IjhC/egrWENqJ7ip28s0kDsce4PYEQ/DiVvU0FV0cIrqMlR5mfpswJzg4/3q97sDRUjd8KEnjuTs4OnVUtxz+9dATrI7MWHZWQ1mo01VgHF0Lwd9fAqeyeT9+E99s+PLnSjfG6w2Bs//lwWPGCxaZOx2J7KZ4OdkI820WmPZsPSy/cF96D+7M+uC/3w/3lKXi+MsPzzQC83w3Ce/UM3D8MQvj+NJY+bsKo8RCGVTsDh9PQdVu5Q/dr9ov8/SO78EdGAkbeSNxcHNmNkew9sCqTMJKbDGteCqyavbBpU2HTpcGml2G0VI6RkjQ80KfgrmYXz1gh7r/j52sE6JePcgAAAABJRU5ErkJggg==) no-repeat scroll 0 0 transparent !important;\n";
+        baseCss += "}";
+
+        var spy = jasmine.createSpy();
+
+        runs(function () {
+            var rewriter = new CssRewriteAbsoluteUrl(config);
+            rewriter.addEventListener(PluginAbstract.Event.READY, spy);
+            rewriter.execute(baseCss);
+        });
+
+        waitsFor(function () {
+           return spy.callCount == 1; 
+        });
+
+        runs(function () {
+            expect(spy.argsForCall[0][0].data).toEqual(baseCss);
+        });
+    });
+
     it('relative image', function () {
@@ -72,0 +95,0 @@ var baseCss = ".ui-widget-overlay {\n";

New alerts

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

5985803

increased by0.07%

Lines of code

38364

increased by0.14%

Worsened metrics

Number of low supply chain risk alerts

20

increased by5.26%

No dependency changes