pacejs_rails 0.4.17 → 0.5.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTgzMTc1MmRjODIxN2I5NTM1NDgyZTZiZWJhYWUxNTBhNjJiMDk3Yw==
-  data.tar.gz: !binary |-
-    ZmQ4MTI3YjUyNTRkZjk0ZGQxMGRkNGY5YzYzMGEzMGVmN2I3MTA0Yw==
+SHA1:
+  metadata.gz: 76e6f715ea28b0b876c4d0502680525a0038a681
+  data.tar.gz: e00dd64e3bdba73f2b6fbcb03fbd158f7306a178
 SHA512:
-  metadata.gz: !binary |-
-    ODc2MzQ0NDNmNmRmMGZmNjE0MjUwNGJmZjAwMDU3MzBhMDg4YmJlOTlmYTNm
-    NDVkNjAzZTBmOTYxMjliNjQ0M2QxNDE3YTdhNjNhM2FkOTdmNzY1NzAyNDZj
-    MmQzNzBjNjhiMjZkZGRiMDgxNzg5YWIwMGVjMzVkZDBhMmIwM2Y=
-  data.tar.gz: !binary |-
-    ZTQ0M2EzYWY0NWM3ZjhjNjRiYmY2ZmQ3Y2FhYzFlNDg1ZDU1MTIzYTk3ZWI1
-    ZDEyYThkNWVmYzY4YTI3OGQxMGYwODRhZmY5NDMxYTJlOGE1MzZjNjVhMDIy
-    YjkwMDg2OGE5NGRiNzVjY2U0ZmZhY2Y5ODFjNGU3MDcxZGYzMjA=
+  metadata.gz: a339aa7da95af6aa968462042ecbee5d590ff54381d15d02d82c292e3a01c9da7ab9ee8e5fe8acca33719e573d6f1fcaa37e76996da9062385eef5e958c76e0e
+  data.tar.gz: 905b328e6cb2bf90a6ab47b6096a82da184b82a05706bccf26a417fd4ba9c3674e3872e014273d7ffa39930bb74ec42772fb0e90e3ba072bfdc75fec45b52034

data/app/assets/javascripts/pace.js

@@ -1,8 +1,8 @@
-// v 0.4.16
+// v 0.5.1
 // Pace.js
 // https://github.com/HubSpot/pace
 (function() {
-  var AjaxMonitor, Bar, DocumentMonitor, ElementMonitor, ElementTracker, EventLagMonitor, Evented, Events, NoTargetError, RequestIntercept, SOURCE_KEYS, Scaler, SocketRequestTracker, XHRRequestTracker, animation, avgAmplitude, bar, cancelAnimation, cancelAnimationFrame, defaultOptions, extend, extendNative, getFromDOM, getIntercept, handlePushState, ignoreStack, init, now, options, requestAnimationFrame, result, runAnimation, scalers, shouldTrack, source, sources, uniScaler, _WebSocket, _XDomainRequest, _XMLHttpRequest, _i, _intercept, _len, _pushState, _ref, _ref1, _replaceState,
+  var AjaxMonitor, Bar, DocumentMonitor, ElementMonitor, ElementTracker, EventLagMonitor, Evented, Events, NoTargetError, RequestIntercept, SOURCE_KEYS, Scaler, SocketRequestTracker, XHRRequestTracker, animation, avgAmplitude, bar, cancelAnimation, cancelAnimationFrame, defaultOptions, extend, extendNative, getFromDOM, getIntercept, handlePushState, ignoreStack, init, now, options, requestAnimationFrame, result, runAnimation, scalers, shouldIgnoreURL, shouldTrack, source, sources, uniScaler, _WebSocket, _XDomainRequest, _XMLHttpRequest, _i, _intercept, _len, _pushState, _ref, _ref1, _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; },
@@ -30,7 +30,8 @@
     },
     ajax: {
       trackMethods: ['GET'],
-      trackWebSockets: false
+      trackWebSockets: true,
+      ignoreURLs: []
     }
   };
 
@@ -246,7 +247,7 @@
         }
         this.el = document.createElement('div');
         this.el.className = "pace pace-active";
-        document.body.className = document.body.className.replace('pace-done', '');
+        document.body.className = document.body.className.replace(/pace-done/g, '');
         document.body.className += ' pace-running';
         this.el.innerHTML = '<div class="pace-progress">\n  <div class="pace-progress-inner"></div>\n</div>\n<div class="pace-activity"></div>';
         if (targetElement.firstChild != null) {
@@ -441,7 +442,11 @@
       if ((_WebSocket != null) && options.ajax.trackWebSockets) {
         window.WebSocket = function(url, protocols) {
           var req;
-          req = new _WebSocket(url, protocols);
+          if (protocols != null) {
+            req = new _WebSocket(url, protocols);
+          } else {
+            req = new _WebSocket(url);
+          }
           if (shouldTrack('socket')) {
             _this.trigger('request', {
               type: 'socket',
@@ -469,9 +474,30 @@
     return _intercept;
   };
 
+  shouldIgnoreURL = function(url) {
+    var pattern, _j, _len1, _ref2;
+    _ref2 = options.ajax.ignoreURLs;
+    for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
+      pattern = _ref2[_j];
+      if (typeof pattern === 'string') {
+        if (url.indexOf(pattern) !== -1) {
+          return true;
+        }
+      } else {
+        if (pattern.test(url)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  };
+
   getIntercept().on('request', function(_arg) {
-    var after, args, request, type;
-    type = _arg.type, request = _arg.request;
+    var after, args, request, type, url;
+    type = _arg.type, request = _arg.request, url = _arg.url;
+    if (shouldIgnoreURL(url)) {
+      return;
+    }
     if (!Pace.running && (options.restartOnRequestAfter !== false || shouldTrack(type) === 'force')) {
       args = arguments;
       after = options.restartOnRequestAfter || 0;
@@ -514,8 +540,11 @@
     }
 
     AjaxMonitor.prototype.watch = function(_arg) {
-      var request, tracker, type;
-      type = _arg.type, request = _arg.request;
+      var request, tracker, type, url;
+      type = _arg.type, request = _arg.request, url = _arg.url;
+      if (shouldIgnoreURL(url)) {
+        return;
+      }
       if (type === 'socket') {
         tracker = new SocketRequestTracker(request);
       } else {
@@ -817,11 +846,13 @@
   };
 
   Pace.go = function() {
+    var start;
     Pace.running = true;
     bar.render();
+    start = now();
     cancelAnimation = false;
     return animation = runAnimation(function(frameTime, enqueueNextFrame) {
-      var avg, count, done, element, elements, i, j, remaining, scaler, scalerList, start, sum, _j, _k, _len1, _len2, _ref2;
+      var avg, count, done, element, elements, i, j, remaining, scaler, scalerList, sum, _j, _k, _len1, _len2, _ref2;
       remaining = 100 - bar.progress;
       count = sum = 0;
       done = true;
@@ -842,7 +873,6 @@
       }
       avg = sum / count;
       bar.update(uniScaler.tick(frameTime, avg));
-      start = now();
       if (bar.done() || done || cancelAnimation) {
         bar.update(100);
         Pace.trigger('done');
@@ -850,7 +880,7 @@
           bar.finish();
           Pace.running = false;
           return Pace.trigger('hide');
-        }, Math.max(options.ghostTime, Math.min(options.minTime, now() - start)));
+        }, Math.max(options.ghostTime, Math.max(options.minTime - (now() - start), 0)));
       } else {
         return enqueueNextFrame();
       }

data/lib/pacejs_rails/version.rb

@@ -1,3 +1,3 @@
 module PacejsRails
-  VERSION = "0.4.17"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,65 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: pacejs_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.5.1
 platform: ruby
 authors:
 - Guy Israeli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-description: ! 'pace.js for Rails 3.1 and above - Automatic web page progress bar '
+description: 'pace.js for Rails 3.1 and above - Automatic web page progress bar '
 email:
 - guy.israeli@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -88,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: pace.js for Rails with versions! horray!