Remove event passing for icons/examples from the api layer

test/red/api/library_spec.js

@@ -27,7 +27,7 @@ var auth = require("../../../red/api/auth");
 
 describe("library api", function() {
 
-    function initLibrary(_flows,_libraryEntries) {
+    function initLibrary(_flows,_libraryEntries,_examples) {
         var flows = _flows;
         var libraryEntries = _libraryEntries;
         library.init(app,{
@@ -84,6 +84,11 @@ describe("library api", function() {
             events: {
                 on: function(){},
                 removeListener: function(){}
+            },
+            nodes: {
+                getNodeExampleFlows: function() {
+                    return _examples;
+                }
             }
         });
     }
@@ -179,6 +184,22 @@ describe("library api", function() {
                 .expect(403)
                 .end(done);
         });
+        it('includes examples flows if set', function(done) {
+            var examples = {"d":{"node-module":{"f":["example-one"]}}};
+            initLibrary({},{},examples);
+            request(app)
+                .get('/library/flows')
+                .expect(200)
+                .end(function(err,res) {
+                    if (err) {
+                        throw err;
+                    }
+                    res.body.should.have.property('d');
+                    res.body.d.should.have.property('_examples_');
+                    should.deepEqual(res.body.d._examples_,examples);
+                    done();
+                });
+        });
     });
 
     describe("type", function() {

test/red/api/ui_spec.js

@@ -29,7 +29,14 @@ describe("ui api", function() {
     var app;
 
     before(function() {
-        ui.init({events:events});
+        ui.init({
+            events:events,
+            nodes: {
+                getNodeIconPath: function(module,icon) {
+                    return path.resolve(__dirname+'/../../../public/icons/arrow-in.png');
+                }
+            }
+        });
     });
     describe("slash handler", function() {
         before(function() {
@@ -71,10 +78,10 @@ describe("ui api", function() {
             res.setEncoding('binary');
             res.data = '';
             res.on('data', function (chunk) {
-                    res.data += chunk;
+                res.data += chunk;
             });
             res.on('end', function () {
-                    callback(null, new Buffer(res.data, 'binary'));
+                callback(null, new Buffer(res.data, 'binary'));
             });
         }
         function compareBuffers(b1,b2) {
@@ -83,11 +90,10 @@ describe("ui api", function() {
                 b1[i].should.equal(b2[i]);
             }
         }
-
-        it('returns the default icon when getting an unknown icon', function(done) {
+        it('returns the requested icon', function(done) {
             var defaultIcon = fs.readFileSync(path.resolve(__dirname+'/../../../public/icons/arrow-in.png'));
             request(app)
-                .get("/icons/random-module/youwonthaveme.png")
+                .get("/icons/module/icon.png")
                 .expect("Content-Type", /image\/png/)
                 .expect(200)
                 .parse(binaryParser)
@@ -101,40 +107,6 @@ describe("ui api", function() {
                 });
 
         });
-        it('returns a known icon', function(done) {
-            var injectIcon = fs.readFileSync(path.resolve(__dirname+'/../../../public/icons/inject.png'));
-            request(app)
-                .get("/icons/node-red/inject.png")
-                .expect("Content-Type", /image\/png/)
-                .expect(200)
-                .parse(binaryParser)
-                .end(function(err, res){
-                    if (err){
-                        return done(err);
-                    }
-                    Buffer.isBuffer(res.body).should.be.true();
-                    compareBuffers(res.body,injectIcon);
-                    done();
-                });
-        });
-
-        it('returns a registered icon' , function(done) {
-            var testIcon = fs.readFileSync(path.resolve(__dirname+'/../../resources/icons/test_icon.png'));
-            events.emit("node-icon-dir",{name:"test-module", path: path.resolve(__dirname+'/../../resources/icons')});
-            request(app)
-                .get("/icons/test-module/test_icon.png")
-                .expect("Content-Type", /image\/png/)
-                .expect(200)
-                .parse(binaryParser)
-                .end(function(err, res){
-                    if (err){
-                        return done(err);
-                    }
-                    Buffer.isBuffer(res.body).should.be.true();
-                    compareBuffers(res.body,testIcon);
-                    done();
-                });
-        });
     });
 
     describe("editor ui handler", function() {
@@ -174,8 +146,4 @@ describe("ui api", function() {
                 });
         });
     });
-
-
-
-
 });

test/red/runtime/nodes/index_spec.js

@@ -56,10 +56,12 @@ describe("red/nodes/index", function() {
         get: function() { return false }
     };
 
+    var EventEmitter = require('events').EventEmitter;
     var runtime = {
         settings: settings,
         storage: storage,
-        log: {debug:function() {}, warn:function() {}}
+        log: {debug:function() {}, warn:function() {}},
+        events: new EventEmitter()
     };
 
     function TestNode(n) {

test/red/runtime/nodes/library_spec.js

@@ -0,0 +1,69 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+var EventEmitter = require('events').EventEmitter;
+var events = new EventEmitter();
+
+var should = require("should");
+
+var fs = require("fs");
+var path = require("path");
+
+var library = require("../../../../red/runtime/nodes/library")
+
+describe("library api", function() {
+    it('returns null list when no modules have been registered', function() {
+        library.init({events:events});
+        should.not.exist(library.getExampleFlows());
+    });
+    it('returns null path when module is not known', function() {
+        library.init({events:events});
+        should.not.exist(library.getExampleFlowPath('foo','bar'));
+    });
+
+    it('returns a valid example path', function(done) {
+        library.init({events:events});
+        events.emit('node-examples-dir',{
+            name: "test-module",
+            path: path.resolve(__dirname+'/../../../resources/examples')
+        });
+        setTimeout(function() {
+            try {
+                var flows = library.getExampleFlows();
+                flows.should.deepEqual({"d":{"test-module":{"f":["one"]}}});
+
+                var examplePath = library.getExampleFlowPath('test-module','one');
+                examplePath.should.eql(path.resolve(__dirname+'/../../../resources/examples/one.json'))
+
+
+                events.emit('node-module-uninstalled', 'test-module');
+
+                setTimeout(function() {
+                    try {
+                        should.not.exist(library.getExampleFlows());
+                        should.not.exist(library.getExampleFlowPath('test-module','one'));
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                },20);
+            }catch(err) {
+                done(err);
+            }
+        },20);
+
+    })
+});

test/red/runtime/nodes/registry/registry_spec.js

@@ -17,6 +17,7 @@
 var should = require("should");
 var when = require("when");
 var sinon = require("sinon");
+var path = require("path");
 
 var typeRegistry = require("../../../../../red/runtime/nodes/registry/registry");
 
@@ -483,4 +484,19 @@ describe("red/nodes/registry/registry",function() {
         });
     });
 
+    describe('#getNodeIconPath', function() {
+        it('returns the default icon when getting an unknown icon', function() {
+            var defaultIcon = path.resolve(__dirname+'/../../../../../public/icons/arrow-in.png');
+            var iconPath = typeRegistry.getNodeIconPath('random-module','youwonthaveme.png');
+            iconPath.should.eql(defaultIcon);
+        });
+
+        it('returns a registered icon' , function() {
+            var testIcon = path.resolve(__dirname+'/../../../../resources/icons/test_icon.png');
+            events.emit("node-icon-dir",{name:"test-module", path: path.resolve(__dirname+'/../../../../resources/icons')});
+            var iconPath = typeRegistry.getNodeIconPath('test-module','test_icon.png');
+            iconPath.should.eql(testIcon);
+        });
+    });
+
 });