pace_rails 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0301d0a18968cf240c42a23cceb004c1e3a090a4
-  data.tar.gz: 159f46b0d4d956d91e9008343355e0ffde783d3d
+  metadata.gz: 25cfa7c3604bb6bc7e1353b2164c976727d3dcdf
+  data.tar.gz: f129e824a3284f9ca2bd83fab80c648a70bd8143
 SHA512:
-  metadata.gz: df20b3cbf0ad5c149708bb156fc348e4a149b61c5ad06b889e8bd45f7e6143a28293b605e649eb2137495b5f9b1066ff9d06cfad1ed3e353a22194074228d49e
-  data.tar.gz: 4d884cc937fac35e106b8cd199707d60839bf26ae12ba70fa9a8f0763827622d74e32261fded1106e30cb3bf08748dcfba776e72a78bd9d535ef1cd681f50855
+  metadata.gz: 98b3a92e52082a12702719c383894ae773045019751898dfb807df91686b56ebeab2d64f7df9b850fcc089017cd81ce9f4900280c7781250301ce269149271f8
+  data.tar.gz: 65a2c379c034a8a23345266a6d044773a1cbe3e24688b662c27d143caf4168a98cdd94393e35776e6b63b3fcfeec6bdc6b3b68e1e987afa7f15806db10e07b35

data/README.md

@@ -1,4 +1,4 @@
-# pace_rails
+# pace_rails [![Gem Version](https://badge.fury.io/rb/pace_rails.png)](http://badge.fury.io/rb/pace_rails)
 
 This is basically a ruby gem for asset pipeline which include the version 0.4.3 od the awesome [Pace][Pace] library.
 

data/app/assets/javascripts/pace/pace.js

@@ -1,5 +1,5 @@
 (function() {
-  var AjaxMonitor, Bar, DocumentMonitor, ElementMonitor, ElementTracker, EventLagMonitor, Events, RequestIntercept, SOURCE_KEYS, Scaler, SocketRequestTracker, XHRRequestTracker, animation, bar, cancelAnimation, cancelAnimationFrame, defaultOptions, extend, extendNative, firstLoad, getFromDOM, handlePushState, init, intercept, now, options, requestAnimationFrame, result, runAnimation, scalers, sources, uniScaler, _WebSocket, _XDomainRequest, _XMLHttpRequest, _pushState, _replaceState,
+  var AjaxMonitor, Bar, DocumentMonitor, ElementMonitor, ElementTracker, EventLagMonitor, Events, NoTargetError, RequestIntercept, SOURCE_KEYS, Scaler, SocketRequestTracker, XHRRequestTracker, animation, avgAmplitude, bar, cancelAnimation, cancelAnimationFrame, defaultOptions, extend, extendNative, getFromDOM, getIntercept, handlePushState, init, now, options, requestAnimationFrame, result, runAnimation, scalers, sources, uniScaler, _WebSocket, _XDomainRequest, _XMLHttpRequest, _intercept, _pushState, _ref, _replaceState,
     __slice = [].slice,
     __hasProp = {}.hasOwnProperty,
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
@@ -14,18 +14,20 @@
     easeFactor: 1.25,
     startOnPageLoad: true,
     restartOnPushState: true,
-    restartOnBackboneRoute: true,
+    restartOnRequestAfter: 500,
     target: 'body',
     elements: {
       checkInterval: 100,
       selectors: ['body']
     },
     eventLag: {
-      minSamples: 10
+      minSamples: 10,
+      sampleCount: 3,
+      lagThreshold: 3
     },
     ajax: {
       trackMethods: ['GET'],
-      trackWebSockets: true
+      trackWebSockets: false
     }
   };
 
@@ -91,6 +93,17 @@
     return out;
   };
 
+  avgAmplitude = function(arr) {
+    var count, sum, v, _i, _len;
+    sum = count = 0;
+    for (_i = 0, _len = arr.length; _i < _len; _i++) {
+      v = arr[_i];
+      sum += Math.abs(v);
+      count++;
+    }
+    return sum / count;
+  };
+
   getFromDOM = function(key, json) {
     var data, e, el;
     if (key == null) {
@@ -121,6 +134,18 @@
 
   options = Pace.options = extend(defaultOptions, window.paceOptions, getFromDOM());
 
+  NoTargetError = (function(_super) {
+    __extends(NoTargetError, _super);
+
+    function NoTargetError() {
+      _ref = NoTargetError.__super__.constructor.apply(this, arguments);
+      return _ref;
+    }
+
+    return NoTargetError;
+
+  })(Error);
+
   Bar = (function() {
     function Bar() {
       this.progress = 0;
@@ -129,10 +154,13 @@
     Bar.prototype.getElement = function() {
       var targetElement;
       if (this.el == null) {
+        targetElement = document.querySelector(options.target);
+        if (!targetElement) {
+          throw new NoTargetError;
+        }
         this.el = document.createElement('div');
         this.el.className = "pace pace-active";
         this.el.innerHTML = '<div class="pace-progress">\n  <div class="pace-progress-inner"></div>\n</div>\n<div class="pace-activity"></div>';
-        targetElement = document.querySelector(options.target);
         if (targetElement.firstChild != null) {
           targetElement.insertBefore(this.el, targetElement.firstChild);
         } else {
@@ -167,14 +195,14 @@
       el = this.getElement();
       el.children[0].style.width = "" + this.progress + "%";
       if (!this.lastRenderedProgress || this.lastRenderedProgress | 0 !== this.progress | 0) {
-        el.setAttribute('data-progress-text', "" + (this.progress | 0) + "%");
+        el.children[0].setAttribute('data-progress-text', "" + (this.progress | 0) + "%");
         if (this.progress >= 100) {
           progressStr = '99';
         } else {
           progressStr = this.progress < 10 ? "0" : "";
           progressStr += this.progress | 0;
         }
-        el.setAttribute('data-progress', "" + progressStr);
+        el.children[0].setAttribute('data-progress', "" + progressStr);
       }
       return this.lastRenderedProgress = this.progress;
     };
@@ -193,12 +221,12 @@
     }
 
     Events.prototype.trigger = function(name, val) {
-      var binding, _i, _len, _ref, _results;
+      var binding, _i, _len, _ref1, _results;
       if (this.bindings[name] != null) {
-        _ref = this.bindings[name];
+        _ref1 = this.bindings[name];
         _results = [];
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          binding = _ref[_i];
+        for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+          binding = _ref1[_i];
           _results.push(binding.call(this, val));
         }
         return _results;
@@ -252,8 +280,8 @@
         var _open;
         _open = req.open;
         return req.open = function(type, url, async) {
-          var _ref;
-          if (_ref = (type != null ? type : 'GET').toUpperCase(), __indexOf.call(options.ajax.trackMethods, _ref) >= 0) {
+          var _ref1;
+          if (_ref1 = (type != null ? type : 'GET').toUpperCase(), __indexOf.call(options.ajax.trackMethods, _ref1) >= 0) {
             _this.trigger('request', {
               type: type,
               url: url,
@@ -299,13 +327,53 @@
 
   })(Events);
 
-  intercept = new RequestIntercept;
+  _intercept = null;
+
+  getIntercept = function() {
+    if (_intercept == null) {
+      _intercept = new RequestIntercept;
+    }
+    return _intercept;
+  };
+
+  if (options.restartOnRequestAfter !== false) {
+    getIntercept().on('request', function(_arg) {
+      var args, request, type;
+      type = _arg.type, request = _arg.request;
+      if (!Pace.running) {
+        args = arguments;
+        return setTimeout(function() {
+          var source, stillActive, _i, _len, _ref1, _ref2, _results;
+          if (type === 'socket') {
+            stillActive = request.readyState < 2;
+          } else {
+            stillActive = (0 < (_ref1 = request.readyState) && _ref1 < 4);
+          }
+          if (stillActive) {
+            Pace.restart();
+            _ref2 = Pace.sources;
+            _results = [];
+            for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
+              source = _ref2[_i];
+              if (source instanceof AjaxMonitor) {
+                source.watch.apply(source, args);
+                break;
+              } else {
+                _results.push(void 0);
+              }
+            }
+            return _results;
+          }
+        }, options.restartOnRequestAfter);
+      }
+    });
+  }
 
   AjaxMonitor = (function() {
     function AjaxMonitor() {
       var _this = this;
       this.elements = [];
-      intercept.on('request', function() {
+      getIntercept().on('request', function() {
         return _this.watch.apply(_this, arguments);
       });
     }
@@ -327,7 +395,7 @@
 
   XHRRequestTracker = (function() {
     function XHRRequestTracker(request) {
-      var event, size, _i, _len, _onreadystatechange, _ref,
+      var event, size, _i, _len, _onreadystatechange, _ref1,
         _this = this;
       this.progress = 0;
       if (window.ProgressEvent != null) {
@@ -339,9 +407,9 @@
             return _this.progress = _this.progress + (100 - _this.progress) / 2;
           }
         });
-        _ref = ['load', 'abort', 'timeout', 'error'];
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          event = _ref[_i];
+        _ref1 = ['load', 'abort', 'timeout', 'error'];
+        for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+          event = _ref1[_i];
           request.addEventListener(event, function() {
             return _this.progress = 100;
           });
@@ -349,8 +417,8 @@
       } else {
         _onreadystatechange = request.onreadystatechange;
         request.onreadystatechange = function() {
-          var _ref1;
-          if ((_ref1 = request.readyState) === 0 || _ref1 === 4) {
+          var _ref2;
+          if ((_ref2 = request.readyState) === 0 || _ref2 === 4) {
             _this.progress = 100;
           } else if (request.readyState === 3) {
             _this.progress = 50;
@@ -366,12 +434,12 @@
 
   SocketRequestTracker = (function() {
     function SocketRequestTracker(request) {
-      var event, _i, _len, _ref,
+      var event, _i, _len, _ref1,
         _this = this;
       this.progress = 0;
-      _ref = ['error', 'open'];
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        event = _ref[_i];
+      _ref1 = ['error', 'open'];
+      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+        event = _ref1[_i];
         request.addEventListener(event, function() {
           return _this.progress = 100;
         });
@@ -384,7 +452,7 @@
 
   ElementMonitor = (function() {
     function ElementMonitor(options) {
-      var selector, _i, _len, _ref;
+      var selector, _i, _len, _ref1;
       if (options == null) {
         options = {};
       }
@@ -392,9 +460,9 @@
       if (options.selectors == null) {
         options.selectors = [];
       }
-      _ref = options.selectors;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        selector = _ref[_i];
+      _ref1 = options.selectors;
+      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+        selector = _ref1[_i];
         this.elements.push(new ElementTracker(selector));
       }
     }
@@ -437,9 +505,9 @@
     };
 
     function DocumentMonitor() {
-      var _onreadystatechange, _ref,
+      var _onreadystatechange, _ref1,
         _this = this;
-      this.progress = (_ref = this.states[document.readyState]) != null ? _ref : 100;
+      this.progress = (_ref1 = this.states[document.readyState]) != null ? _ref1 : 100;
       _onreadystatechange = document.onreadystatechange;
       document.onreadystatechange = function() {
         if (_this.states[document.readyState] != null) {
@@ -455,21 +523,28 @@
 
   EventLagMonitor = (function() {
     function EventLagMonitor() {
-      var avg, last, points,
+      var avg, interval, last, points, samples,
         _this = this;
       this.progress = 0;
       avg = 0;
+      samples = [];
       points = 0;
       last = now();
-      setInterval(function() {
+      interval = setInterval(function() {
         var diff;
         diff = now() - last - 50;
         last = now();
-        avg = avg + (diff - avg) / 15;
-        if (points++ > options.eventLag.minSamples && Math.abs(avg) < 3) {
-          avg = 0;
+        samples.push(diff);
+        if (samples.length > options.eventLag.sampleCount) {
+          samples.shift();
+        }
+        avg = avgAmplitude(samples);
+        if (++points >= options.eventLag.minSamples && avg < options.eventLag.lagThreshold) {
+          _this.progress = 100;
+          return clearInterval(interval);
+        } else {
+          return _this.progress = 100 * (3 / (avg + 3));
         }
-        return _this.progress = 100 * (3 / (avg + 3));
       }, 50);
     }
 
@@ -535,6 +610,8 @@
 
   cancelAnimation = null;
 
+  Pace.running = false;
+
   handlePushState = function() {
     if (options.restartOnPushState) {
       return Pace.restart();
@@ -557,40 +634,6 @@
     };
   }
 
-  firstLoad = true;
-
-  if (options.restartOnBackboneRoute) {
-    setTimeout(function() {
-      if (window.Backbone == null) {
-        return;
-      }
-      return Backbone.history.on('route', function(router, name) {
-        var routeName, rule, _i, _len, _results;
-        if (!(rule = options.restartOnBackboneRoute)) {
-          return;
-        }
-        if (firstLoad) {
-          firstLoad = false;
-          return;
-        }
-        if (typeof rule === 'object') {
-          _results = [];
-          for (_i = 0, _len = rule.length; _i < _len; _i++) {
-            routeName = rule[_i];
-            if (!(routeName === name)) {
-              continue;
-            }
-            Pace.restart();
-            break;
-          }
-          return _results;
-        } else {
-          return Pace.restart();
-        }
-      });
-    }, 0);
-  }
-
   SOURCE_KEYS = {
     ajax: AjaxMonitor,
     elements: ElementMonitor,
@@ -599,18 +642,18 @@
   };
 
   (init = function() {
-    var source, type, _i, _j, _len, _len1, _ref, _ref1, _ref2;
+    var source, type, _i, _j, _len, _len1, _ref1, _ref2, _ref3;
     Pace.sources = sources = [];
-    _ref = ['ajax', 'elements', 'document', 'eventLag'];
-    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-      type = _ref[_i];
+    _ref1 = ['ajax', 'elements', 'document', 'eventLag'];
+    for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
+      type = _ref1[_i];
       if (options[type] !== false) {
         sources.push(new SOURCE_KEYS[type](options[type]));
       }
     }
-    _ref2 = (_ref1 = options.extraSources) != null ? _ref1 : [];
-    for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
-      source = _ref2[_j];
+    _ref3 = (_ref2 = options.extraSources) != null ? _ref2 : [];
+    for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
+      source = _ref3[_j];
       sources.push(new source(options));
     }
     Pace.bar = bar = new Bar;
@@ -619,6 +662,7 @@
   })();
 
   Pace.stop = function() {
+    Pace.running = false;
     bar.destroy();
     cancelAnimation = true;
     if (animation != null) {
@@ -636,17 +680,18 @@
   };
 
   Pace.go = function() {
+    Pace.running = true;
     bar.render();
     cancelAnimation = false;
     return animation = runAnimation(function(frameTime, enqueueNextFrame) {
-      var avg, count, done, element, elements, i, j, remaining, scaler, scalerList, source, start, sum, _i, _j, _len, _len1, _ref;
+      var avg, count, done, element, elements, i, j, remaining, scaler, scalerList, source, start, sum, _i, _j, _len, _len1, _ref1;
       remaining = 100 - bar.progress;
       count = sum = 0;
       done = true;
       for (i = _i = 0, _len = sources.length; _i < _len; i = ++_i) {
         source = sources[i];
         scalerList = scalers[i] != null ? scalers[i] : scalers[i] = [];
-        elements = (_ref = source.elements) != null ? _ref : [source];
+        elements = (_ref1 = source.elements) != null ? _ref1 : [source];
         for (j = _j = 0, _len1 = elements.length; _j < _len1; j = ++_j) {
           element = elements[j];
           scaler = scalerList[j] != null ? scalerList[j] : scalerList[j] = new Scaler(element);
@@ -664,7 +709,8 @@
       if (bar.done() || done || cancelAnimation) {
         bar.update(100);
         return setTimeout(function() {
-          return bar.finish();
+          bar.finish();
+          return Pace.running = false;
         }, Math.max(options.ghostTime, Math.min(options.minTime, now() - start)));
       } else {
         return enqueueNextFrame();
@@ -674,7 +720,12 @@
 
   Pace.start = function(_options) {
     extend(options, _options);
-    bar.render();
+    Pace.running = true;
+    try {
+      bar.render();
+    } catch (_error) {
+      NoTargetError = _error;
+    }
     if (!document.querySelector('.pace')) {
       return setTimeout(Pace.start, 50);
     } else {

data/app/assets/stylesheets/pace/{big-counter.css → pace-theme-big-counter.css}

@@ -7,6 +7,10 @@
   user-select: none;
 }
 
+.pace.pace-inactive .pace-progress {
+  display: none;
+}
+
 .pace .pace-progress {
   position: fixed;
   z-index: 2000;
@@ -21,7 +25,7 @@
   position: absolute;
   top: 0;
   right: .5rem;
-  content: attr(data-progress);
+  content: attr(data-progress-text);
   font-family: "Helvetica Neue", sans-serif;
   font-weight: 100;
   font-size: 5rem;

data/lib/pace_rails/version.rb

@@ -1,3 +1,3 @@
 module PaceRails
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pace_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - arvind-naidu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,15 +79,15 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/pace/pace.js
-- app/assets/stylesheets/pace/barber-shop.css
-- app/assets/stylesheets/pace/big-counter.css
-- app/assets/stylesheets/pace/bounce.css
-- app/assets/stylesheets/pace/corner-indicator.css
-- app/assets/stylesheets/pace/fill-left.css
-- app/assets/stylesheets/pace/flash.css
-- app/assets/stylesheets/pace/flat-top.css
-- app/assets/stylesheets/pace/mac-osx.css
-- app/assets/stylesheets/pace/minimal.css
+- app/assets/stylesheets/pace/pace-theme-barber-shop.css
+- app/assets/stylesheets/pace/pace-theme-big-counter.css
+- app/assets/stylesheets/pace/pace-theme-bounce.css
+- app/assets/stylesheets/pace/pace-theme-corner-indicator.css
+- app/assets/stylesheets/pace/pace-theme-fill-left.css
+- app/assets/stylesheets/pace/pace-theme-flash.css
+- app/assets/stylesheets/pace/pace-theme-flat-top.css
+- app/assets/stylesheets/pace/pace-theme-mac-osx.css
+- app/assets/stylesheets/pace/pace-theme-minimal.css
 - lib/pace_rails.rb
 - lib/pace_rails/version.rb
 - pace_rails.gemspec
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Automatic page load progress bar