added unit tests

Author: xomaczar

index.js

@@ -1,55 +1,9 @@
 // /* jshint node: true */
 // 'use strict';
 
-// /* default reload css extensions */
-// var styleExtensions = ['css', 'scss', 'sass', 'less', 'styl'];
-// var reloadCssPattern = new RegExp('.(' + styleExtensions.join('|') + ')$');
-
-// function LiveStyleReloader(options){
-
-//     var noop = function(){},
-//         options = options,
-//         appCssPattern = new RegExp('^' + options.project.root + '/app/styles/*'),
-//         ui = options.ui,
-//         http = null,
-//         liveReloadHost = options.liveReloadHost || options.host
-//         liveReloadHostname = [(options.ssl ? 'https://' :'http://'), liveReloadHost, ':', options.liveReloadPort].join(''),
-//         reloadCssPattern = options.reloadCssPattern;
-
-//     var getDirtyAsset = function(changedFilePath){
-//         if (changedFilePath.match(appCssPattern)){
-//             return options.project.pkg.name + '.css';
-//         }
-//         return 'vendor.css';
-//     };
-
-//     var fileDidChange = function(results){
-//         var filePath = results.filePath || '';
-//         var dirtyAsset = getDirtyAsset(filePath);
-
-//         if (filePath.match(reloadCssPattern)){
-//             ui.writeLine("Reloading " + dirtyAsset + " only");
-//             http.get(liveReloadHostname + '/changed?files=' + dirtyAsset)
-//                 .on('error', noop);
-//         }
-//     };
-
-//     this.startObserving = function(watcher){
-//         if (options.liveReload){
-//             ui.writeLine('StyleReloader watches ' + styleExtensions.join('|'));
-//             http = require('http');
-//             watcher.on('change', fileDidChange.bind(this));
-//         }
-//     };
-// };
-
 module.exports = {
   name: 'ember-cli-styles-reloader',
 
-  isDevelopingAddon: function() {
-    return true;
-  },
-
   serverMiddleware: function(config){
     var lsReloader = require('./lib/styles-reloader')(config.options);
     lsReloader.run();

lib/styles-reloader.js

@@ -2,62 +2,80 @@
 'use strict';
 
 var path = require('path');
-var http = require('http');
 
-/* default reload css extensions */
+// default reload css extensions
 var styleExtensions = ['css', 'scss', 'sass', 'less', 'styl'];
 var reloadCssPattern = new RegExp('\.(' + styleExtensions.join('|') + ')$');
 
 var noop = function(){};
 
 module.exports = function StylesReloader(options){
   var options = options;
-  var liveReloadEnabled = options.liveReload;
   var fsWatcher = options.watcher;
   var ui = options.ui;
+  var _isRunning = false;
+  var lsProxy = options.ssl ? require('https') : require('http');
 
-  // Build app style pattern
+  // build app style pattern
   var appStylePath = options.project.root + path.join('/app', 'styles', '*');
   var appStylePattern = new RegExp('^' + appStylePath);
   var appStyleResource = options.project.pkg.name + '.css';
 
-  // Livereload host/port
+  // livereload hostname
   var liveReloadHostname = [
     (options.ssl ? 'https://' :'http://'),
     (options.liveReloadHost || options.host),
     ':',
     options.liveReloadPort
   ].join('');
 
-  function getChangedStyle(filePath){
-    if (filePath.match(appStylePattern)){
-      return appStyleResource;
-    }
-    return 'vendor.css';
+
+  function shouldReload(filePath){
+    return filePath.match(reloadCssPattern);
+  };
+
+  function getReloadResource(filePath){
+    return filePath.match(appStylePattern) ? appStyleResource : 'vendor.css';
   };
 
   function fileDidChange(results){
     var filePath = results.filePath || '';
-    var liveReloadFile = getChangedStyle(filePath);
 
-    if (filePath.match(reloadCssPattern)){
-      ui.writeLine('Reloading ' + liveReloadFile + ' only');
-      http.get(liveReloadHostname + '/changed?files=' + liveReloadFile)
+    // notify livereload server if needed
+    if (shouldReload(filePath)){
+      var reloadResource = getReloadResource(filePath);
+      ui.writeLine('Reloading ' + reloadResource + ' only');
+      lsProxy.get(liveReloadHostname + '/changed?files=' + reloadResource)
           .on('error', noop);
     }
   };
 
-  function updateReloadFilters(){
+  function mergeReloadFilters(){
     options.project.liveReloadFilterPatterns.push(reloadCssPattern);
   };
 
   return {
+
     run: function(){
-      if (liveReloadEnabled){
-        ui.writeLine('StylesReloader watches ' + styleExtensions.join('|'));
-        updateReloadFilters();
+      if (!options.liveReload) {
+        ui.writeLine('StylesReloader is disabled');
+        return;
+      }
+
+      if (this.isRunning()){
+        return;
+      }
+
+      ui.writeLine('StylesReloader watches ' + styleExtensions.join('|'));
+      if (fsWatcher) {
+        mergeReloadFilters();
         fsWatcher.on('change', fileDidChange.bind(this));
+        _isRunning = !_isRunning;
       }
+    },
+
+    isRunning: function(){
+      return _isRunning;
     }
   };
 };

tests/reloader-test.js

@@ -1,12 +1,70 @@
 var sReloader = require('../lib/styles-reloader');
+var expect = require('chai').expect;
+var should = require('chai').should();
+
 
 describe("styles reloader", function(){
+  var watcher = {
+    _handlers: [],
+
+    on: function(event, handler){
+      this._handlers[event] = handler;
+    },
+
+    trigger: function(event, args){
+      this._handlers[event].call(this, args);
+    }
+  };
+  var opts = {
+    uiMsg: [],
+    liveReload: true,
+    ui: { writeLine: function(msg){ opts.uiMsg.push(msg); }},
+    project: { root: 'app', pkg: {name:'app'}, liveReloadFilterPatterns:[]},
+    watcher: watcher
+  };
+
+  var resetOptions = function(){
+    watcher._handlers.length = 0;
+    opts.uiMsg.length = 0;
+    opts.liveReload = true;
+    opts.project.liveReloadFilterPatterns.length = 0;
+    opts.watcher = watcher;
+  };
+
+  beforeEach(function(){
+   resetOptions();
+  });
+
+  it('does not run when liveReload is disabled. Must inform the user', function(done){
+    opts.liveReload = false;
+    var rl = sReloader(opts);
+    rl.run();
+    rl.isRunning().should.equal(false);
+    opts.uiMsg.length.should.equal(1);
+    opts.uiMsg[0].should.equal('StylesReloader is disabled');
+    done();
+  });
+
+  it('does not run if watcher is not defined.', function(done){
+    delete opts.watcher;
+    var rl = sReloader(opts);
+    rl.run();
+    rl.isRunning().should.equal(false);
+    done();
+  });
 
-  it('this must work', function(done){
+  it('attach default live reload style pattern', function(done){
+    opts.project.liveReloadFilterPatterns.should.be.empty;
+    sReloader(opts).run();
+    opts.project.liveReloadFilterPatterns.should.deep.equal([/.(css|scss|sass|less|styl)$/]);
     done();
   });
 
-  it('worked again', function(done){
+  it('runs as expected', function(done){
+    var rl = sReloader(opts);
+    rl.run();
+    rl.isRunning().should.equal(true);
+    opts.uiMsg[0].should.have.string('StylesReloader watches');
     done();
   });