loada 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930b1abd61336921ae85869405c33ad95b350909
-  data.tar.gz: 6eac1a436bf9df8bf817edc24151544ffd423029
+  metadata.gz: e46e048066887349e82593374bd8e01be9939074
+  data.tar.gz: c2e315a44219740081edad7d28b5527454638597
 SHA512:
-  metadata.gz: 4d3ba4805f0b6359fd8bd9a612d7c2b1b33121b879c4bcb26d78b913637cf759939a9c92276ebf285d3f9619e8949d8ff71b0437ef6d1263f422417292af77f9
-  data.tar.gz: 2e7814bb23ec815245a9251cfddac17795a39f66688a5be87c37ced3b4b380b49a8c52c54c8894134d53ab45640d327f567bda6efaf01dfbc5ce7dc17f9f99ce
+  metadata.gz: d80029578b98744380e519d132ad776c5a458dc70fe7db6630d735d5aee1ea9eaabebc837fcc42d1c0141ac4e73a4dc44326c14915afa588dda0b12d28ddca48
+  data.tar.gz: 41c455b41631f59aa046009ef4eccef8a19f8443551324618f73212b02ba40a27bb19efd6452f819bc5cbd23bbea6665cac9334fe0b8a6a734551586cd5aebae

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "loada",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "main": "lib/loada.min.js",
   "ignore": [
     "Gruntfile.coffee",

data/lib/loada.js

@@ -71,15 +71,49 @@
         if (typeof this.storage === 'string') {
           return this.storage = JSON.parse(localStorage[this.key]);
         }
+      } else {
+        return this.storage = {};
+      }
+    };
+
+    Loada.prototype.expire = function() {
+      var byDate, byExistance, byRevision, key, library, now, _ref, _results,
+        _this = this;
+      if (this.options.localStorage) {
+        now = new Date;
+        byDate = function(library) {
+          return library.expirationDate && new Date(library.expirationDate) <= now;
+        };
+        byExistance = function(library) {
+          return !_this.requires.set[key];
+        };
+        byRevision = function(library) {
+          return _this.requires.set[key].revision !== library.revision;
+        };
+        _ref = this.storage;
+        _results = [];
+        for (key in _ref) {
+          library = _ref[key];
+          if (byDate(library) || byExistance(library) || byRevision(library)) {
+            _results.push(delete this.storage[key]);
+          } else {
+            _results.push(void 0);
+          }
+        }
+        return _results;
       }
     };
 
     Loada.prototype.save = function() {
-      return localStorage[this.key] = JSON.stringify(this.storage);
+      if (this.options.localStorage) {
+        return localStorage[this.key] = JSON.stringify(this.storage);
+      }
     };
 
     Loada.prototype.clear = function() {
-      return delete localStorage[this.key];
+      if (this.options.localStorage) {
+        return delete localStorage[this.key];
+      }
     };
 
     Loada.prototype.get = function(key) {
@@ -87,32 +121,6 @@
       return (_ref = this.storage[key]) != null ? _ref.source : void 0;
     };
 
-    Loada.prototype.expire = function() {
-      var byDate, byExistance, byRevision, key, library, now, _ref, _results,
-        _this = this;
-      now = new Date;
-      byDate = function(library) {
-        return library.expirationDate && new Date(library.expirationDate) <= now;
-      };
-      byExistance = function(library) {
-        return !_this.requires.set[key];
-      };
-      byRevision = function(library) {
-        return _this.requires.set[key].revision !== library.revision;
-      };
-      _ref = this.storage;
-      _results = [];
-      for (key in _ref) {
-        library = _ref[key];
-        if (byDate(library) || byExistance(library) || byRevision(library)) {
-          _results.push(delete this.storage[key]);
-        } else {
-          _results.push(void 0);
-        }
-      }
-      return _results;
-    };
-
     Loada.prototype.require = function() {
       var libraries, library, now, _i, _len, _ref;
       libraries = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
@@ -120,8 +128,8 @@
         library = libraries[_i];
         library.key || (library.key = library.url);
         library.type || (library.type = (_ref = library.url) != null ? _ref.split('.').pop() : void 0);
-        if (library.localStorage == null) {
-          library.localStorage = true;
+        if (library.cache == null) {
+          library.cache = true;
         }
         if (library.require == null) {
           library.require = true;
@@ -144,9 +152,7 @@
       var loaders, progress,
         _this = this;
       callbacks || (callbacks = {});
-      if (this.options.localStorage) {
-        this.expire();
-      }
+      this.expire();
       progress = new this.Progress(this.requires.length, callbacks.progress);
       loaders = 0;
       return this._ensureSizes(callbacks.progress != null, function() {
@@ -206,31 +212,30 @@
     };
 
     Loada.prototype._loadGroup = function(group, progress, callback) {
-      var library, method,
+      var library, method, results, _i, _len,
         _this = this;
-      library = group.shift();
-      if (!library) {
-        return callback();
-      }
-      if (this.options.localStorage && this.storage[library.key] && library.localStorage) {
-        if (progress != null) {
-          progress.set(library.key, 100);
-        }
-        if (this.storage[library.key].require) {
-          this._inject(this.storage[library.key]);
-        }
-        return this._loadGroup(group, progress, callback);
-      } else {
-        method = this.options.localStorage ? "_loadAJAX" : "_loadInline";
-        return this[method](library, progress, function() {
-          if (_this.options.localStorage) {
-            _this.storage[library.key] = library;
-          }
-          if (library.require) {
-            _this._inject(library);
+      results = [];
+      for (_i = 0, _len = group.length; _i < _len; _i++) {
+        library = group[_i];
+        if (this.storage[library.key] && library.cache) {
+          if (progress != null) {
+            progress.set(library.key, 100);
           }
-          return _this._loadGroup(group, progress, callback);
-        });
+          results.push(this.storage[library.key]);
+        } else {
+          method = this.options.localStorage || !library.require ? "_loadAJAX" : "_loadInline";
+          this[method](library, progress, function() {
+            results.push(library);
+            if (results.length === group.length) {
+              _this._inject(results);
+              return callback();
+            }
+          });
+        }
+      }
+      if (results.length === group.length) {
+        this._inject(results);
+        return callback();
       }
     };
 
@@ -238,6 +243,9 @@
       var poller, xhr,
         _this = this;
       xhr = this._ajax('GET', library.url, function(xhr) {
+        if (library.cache) {
+          _this.storage[library.key] = library;
+        }
         library.source = xhr.responseText;
         clearInterval(poller);
         if (progress != null) {
@@ -283,18 +291,28 @@
       return $head.appendChild(script);
     };
 
-    Loada.prototype._inject = function(library) {
-      var script, style;
-      if (library.type === 'js') {
-        script = document.createElement("script");
-        script.defer = true;
-        script.text = library.source;
-        return $head.appendChild(script);
-      } else if (library.type === 'css') {
-        style = document.createElement("style");
-        style.innerHTML = library.source;
-        return $head.appendChild(style);
+    Loada.prototype._inject = function(libraries) {
+      var library, script, style, _i, _len, _results;
+      libraries = [].concat(libraries);
+      _results = [];
+      for (_i = 0, _len = libraries.length; _i < _len; _i++) {
+        library = libraries[_i];
+        if (library.require && library.source) {
+          if (library.type === 'js') {
+            script = document.createElement("script");
+            script.defer = true;
+            script.text = library.source;
+            _results.push($head.appendChild(script));
+          } else if (library.type === 'css') {
+            style = document.createElement("style");
+            style.innerHTML = library.source;
+            _results.push($head.appendChild(style));
+          } else {
+            _results.push(void 0);
+          }
+        }
       }
+      return _results;
     };
 
     Loada.prototype._ajax = function(method, url, callback) {
@@ -304,12 +322,12 @@
       } else {
         xhr = new ActiveXObject('Microsoft.XMLHTTP');
       }
-      xhr.open(method, url, 1);
       xhr.onreadystatechange = function() {
         if (xhr.readyState > 3) {
           return typeof callback === "function" ? callback(xhr) : void 0;
         }
       };
+      xhr.open(method, url, 1);
       xhr.send();
       return xhr;
     };

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loada",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "Browser assets preloader with the support of localStorage-based caching and progress tracking",
   "repository": "",
   "keywords": [

data/spec/loada_spec.coffee

@@ -1,10 +1,17 @@
 describe "Loada", ->
 
+  beforeEach ->
+    Loada.debug = false
+    window.sandbox = {}
+
+  afterEach ->
+    delete window.sandbox
+
   it "initializes properly", ->
     set = Loada.set(undefined, localStorage: false)
     expect(set.set).toEqual '*'
     expect(set.options.localStorage).toBeFalsy()
-    expect(set.storage).toBeUndefined()
+    expect(set.storage).toEqual {}
 
     localStorage['loada.foo'] = JSON.stringify('foo': 'bar')
 
@@ -74,6 +81,10 @@ describe "Loada", ->
       @set.require url: 'foo.js', size: 100
       @set.require url: 'bar.js'
       @set.require url: 'baz.js'
+      @server = sinon.fakeServer.create()
+
+    afterEach ->
+      @server.restore()
 
     it "zerofills with no progress tracking", ->
       callback = sinon.spy()
@@ -83,18 +94,16 @@ describe "Loada", ->
 
     it "gets sizes with progress tracking", ->
       callback = sinon.spy()
-      server   = sinon.fakeServer.create()
       @set._ensureSizes true, callback
 
       waits 0
 
       runs ->
-        expect(server.requests[0].url).toEqual 'bar.js'
-        expect(server.requests[1].url).toEqual 'baz.js'
+        expect(@server.requests[0].url).toEqual 'bar.js'
+        expect(@server.requests[1].url).toEqual 'baz.js'
 
-        server.requests[0].respond 200, {'Content-Length': '100'}, ''
-        server.requests[1].respond 200, {}, ''
-        server.restore()
+        @server.requests[0].respond 200, {'Content-Length': '100'}, ''
+        @server.requests[1].respond 200, {}, ''
 
       waits 0
 
@@ -111,7 +120,6 @@ describe "Loada", ->
       sinon.stub @set, '_inject'
 
     afterEach ->
-      @set._inject.restore()
       @server.restore()
 
     it "gets single from cache", ->
@@ -130,7 +138,7 @@ describe "Loada", ->
         expect(@server.requests.length).toEqual 0
         expect(callback.callCount).toEqual 1
         expect(@set._inject.callCount).toEqual 1
-        expect(@set._inject.args[0][0]).toEqual {require: true}
+        expect(@set._inject.args[0][0]).toEqual [{require: true}]
 
     it "gets single from net", ->
       callback = sinon.spy()
@@ -151,14 +159,14 @@ describe "Loada", ->
           key: 'foo.js'
           type: 'js'
           source: 'foobar'
-          localStorage: true
+          cache: true
           require: true
 
         expect(@server.requests.length).toEqual 1
         expect(@set.storage['foo.js']).toEqual library
         expect(callback.callCount).toEqual 1
         expect(@set._inject.callCount).toEqual 1
-        expect(@set._inject.args[0][0]).toEqual library
+        expect(@set._inject.args[0][0]).toEqual [library]
 
     it "orders properly", ->
       @set.require(
@@ -166,23 +174,32 @@ describe "Loada", ->
         { url: 'bar.js' }
       )
       @set.require url: 'baz.js'
+      @set._inject.restore()
 
-      @set._loadGroup @set.requires.input[0], null, ->
-      @set._loadGroup @set.requires.input[1], null, ->
+      @set._loadGroup @set.requires.input[0], null, firstGroup = sinon.spy()
+      @set._loadGroup @set.requires.input[1], null, secondGroup = sinon.spy()
 
       waits 0
 
       runs ->
-        @server.requests[0].respond 200, {}, 'foobar'
-        @server.requests[1].respond 200, {}, 'foobar'
-        @server.requests[2].respond 200, {}, 'foobar'
+        @server.requests[0].respond 200, {}, 'window.sandbox.TEST1 = 1'
+        @server.requests[2].respond 200, {}, 'window.sandbox.TEST2 = 1'
 
       waits 0
 
       runs ->
-        expect(@server.requests[0].url).toEqual 'foo.js'
-        expect(@server.requests[1].url).toEqual 'baz.js'
-        expect(@server.requests[2].url).toEqual 'bar.js'
+        expect(firstGroup.callCount).toEqual 0
+        expect(secondGroup.callCount).toEqual 1
+        expect(window.sandbox.TEST1).toBeUndefined()
+        expect(window.sandbox.TEST2).toEqual 1
+        @server.requests[1].respond 200, {}, 'window.sandbox.TEST1 = 2'
+
+      waits 0
+
+      runs ->
+        expect(firstGroup.callCount).toEqual 1
+        expect(secondGroup.callCount).toEqual 1
+        expect(window.sandbox.TEST1).toEqual 2
 
     describe "progress", ->
       it "tracks with cache", ->
@@ -227,30 +244,23 @@ describe "Loada", ->
           expect(progress.set.args[0]).toEqual ['foo.js', 100]
           expect(progress.set.args[1]).toEqual ['bar.js', 100]
 
-  it "loads through inlining", ->
-    window.TEST = 0
-
+  it "inlines", ->
     set = Loada.set()
-    server = sinon.fakeServer.create()
     callback = sinon.spy()
 
-    set._loadInline {url: 'spec/support/test.js', key: 'test.js', type: 'js'}, null, callback
+    set._loadInline {url: 'spec/support/test1_1.js', key: 'test.js', type: 'js'}, null, callback
 
     waits 100
 
     runs ->
       expect(callback.callCount).toEqual 1
-      expect(window.TEST).toEqual 1
-      delete window.TEST
+      expect(window.sandbox.TEST).toEqual 1
 
   it "injects", ->
-    window.TEST = 0
-
     set = Loada.set()
-    set._inject source: 'window.TEST = 1', type: 'js'
+    set._inject source: 'window.sandbox.TEST = 1', type: 'js', require: true
 
-    expect(window.TEST).toEqual 1
-    delete window.TEST
+    expect(window.sandbox.TEST).toEqual 1
 
   it "caches", ->
     set = Loada.set()
@@ -281,13 +291,11 @@ describe "Loada", ->
       set._inject.restore()
 
   it "loads", ->
-    window.TEST = 0
-
     progress = sinon.spy()
     success = sinon.spy()
 
     set = Loada.set()
-    set.require url: 'spec/support/test.js'
+    set.require url: 'spec/support/test1_1.js'
     set.load
       progress: progress
       success: success
@@ -298,21 +306,73 @@ describe "Loada", ->
       expect(progress.callCount).toEqual 1
       expect(progress.args[0][0]).toEqual 100
       expect(success.callCount).toEqual 1
-      expect(window.TEST).toEqual 1
-
-      delete window.TEST
+      expect(window.sandbox.TEST).toEqual 1
 
   it "loads text", ->
     set = Loada.set()
-    server = sinon.fakeServer.create()
-    set.require url: 'foo', type: 'text'
-
+    set.require url: 'spec/support/text', key: 'foo', type: 'text'
     set.load()
 
-    waits 0
+    waits 100
 
     runs ->
-      expect(server.requests.length).toEqual 1
-      server.requests[0].respond 200, {}, 'foobar'
+      expect(set.get 'foo').toEqual 'foobar'
+
+  describe "collisions", ->
+
+    it "loads in correct order with localStorage", ->
+      progress = sinon.spy()
+      success = sinon.spy()
+
+      set = Loada.set()
+      set.require {url: 'spec/support/test1_1.js'}, {url: 'spec/support/test1_2.js'}
+      set.load
+        progress: progress
+        success: success
+
+      waits 100
+
+      runs ->
+        expect(progress.callCount).toEqual 2
+        expect(progress.args[0][0]).toEqual 50
+        expect(progress.args[1][0]).toEqual 100
+        expect(success.callCount).toEqual 1
+        expect(window.sandbox.TEST).toEqual 2
+
+    it "loads in correct order with inlining", ->
+      progress = sinon.spy()
+      success = sinon.spy()
+
+      set = Loada.set('*', localStorage: false)
+      set.require {url: 'spec/support/test1_1.js'}, {url: 'spec/support/test1_2.js'}
+      set.load
+        progress: progress
+        success: success
+
+      waits 100
+
+      runs ->
+        expect(progress.callCount).toEqual 2
+        expect(progress.args[0][0]).toEqual 50
+        expect(progress.args[1][0]).toEqual 100
+        expect(success.callCount).toEqual 1
+        expect(window.sandbox.TEST).toEqual 2
+
+    it "loads in correct order when mixed", ->
+      progress = sinon.spy()
+      success = sinon.spy()
+
+      set = Loada.set('*')
+      set.require {url: 'spec/support/test1_1.js'}, {url: 'spec/support/test1_2.js', cache: false}
+      set.load
+        progress: progress
+        success: success
 
-      expect(set.get 'foo').toEqual 'foobar'
+      waits 100
+
+      runs ->
+        expect(progress.callCount).toEqual 2
+        expect(progress.args[0][0]).toEqual 50
+        expect(progress.args[1][0]).toEqual 100
+        expect(success.callCount).toEqual 1
+        expect(window.sandbox.TEST).toEqual 2

data/spec/support/test1_1.js

@@ -0,0 +1 @@
+window.sandbox.TEST = 1

data/spec/support/test1_2.js

@@ -0,0 +1 @@
+window.sandbox.TEST = 2

data/spec/support/test2_1.js

@@ -0,0 +1 @@
+window.sandbox.TEST2 = 1

data/spec/support/text

@@ -0,0 +1 @@
+foobar

data/src/loada.coffee

@@ -55,17 +55,48 @@ class @Loada
 
       if typeof(@storage) == 'string'
         @storage = JSON.parse(localStorage[@key])
+    else
+      @storage = {}
+
+  #
+  # Cleans up current state
+  #
+  # Removes entries that are:
+  #   * expired by date (`expires` option)
+  #   * got new revision (`revision` option)
+  #   * not found in the current requires list
+  #
+  expire: ->
+    if @options.localStorage
+      now = new Date
+
+      byDate = (library) =>
+        library.expirationDate && new Date(library.expirationDate) <= now
+
+      byExistance = (library) =>
+        !@requires.set[key]
+
+      byRevision = (library) =>
+        @requires.set[key].revision != library.revision
+
+      for key, library of @storage
+
+        if byDate(library) || byExistance(library) || byRevision(library)
+          delete @storage[key]
 
   #
   # Saves current set state to localStorage
   #
   save: ->
-    localStorage[@key] = JSON.stringify @storage
+    if @options.localStorage
+      localStorage[@key] = JSON.stringify @storage
 
   #
   # Removes localStorage entry bound to current set
   #
-  clear: -> delete localStorage[@key]
+  clear: ->
+    if @options.localStorage
+      delete localStorage[@key]
 
   #
   # Gets raw source of an asset
@@ -75,30 +106,7 @@ class @Loada
   get: (key) ->
     @storage[key]?.source
 
-  #
-  # Cleans up current state
-  #
-  # Removes entries that are:
-  #   * expired by date (`expires` option)
-  #   * got new revision (`revision` option)
-  #   * not found in the current requires list
-  #
-  expire: ->
-    now = new Date
-
-    byDate = (library) =>
-      library.expirationDate && new Date(library.expirationDate) <= now
-
-    byExistance = (library) =>
-      !@requires.set[key]
-
-    byRevision = (library) =>
-      @requires.set[key].revision != library.revision
 
-    for key, library of @storage
-
-      if byDate(library) || byExistance(library) || byRevision(library)
-        delete @storage[key]
 
   #
   # Adds library that should be loaded
@@ -121,7 +129,7 @@ class @Loada
     for library in libraries
       library.key  ||= library.url
       library.type ||= library.url?.split('.').pop()
-      library.localStorage = true unless library.localStorage?
+      library.cache = true unless library.cache?
       library.require = true unless library.require?
 
       if library.expires
@@ -147,7 +155,7 @@ class @Loada
   #
   load: (callbacks) ->
     callbacks ||= {}
-    @expire() if @options.localStorage
+    @expire()
 
     progress = new @Progress(@requires.length, callbacks.progress)
     loaders  = 0
@@ -195,24 +203,27 @@ class @Loada
   # @private
   #
   _loadGroup: (group, progress, callback) =>
-    library = group.shift()
-
-    return callback() unless library
+    results = []
 
-    if @options.localStorage && @storage[library.key] && library.localStorage
-      progress?.set library.key, 100
-      @_inject @storage[library.key] if @storage[library.key].require
-      @_loadGroup group, progress, callback
-    else
-      method = if @options.localStorage
-        "_loadAJAX"
+    for library in group
+      if @storage[library.key] && library.cache
+        progress?.set library.key, 100
+        results.push @storage[library.key]
       else
-        "_loadInline"
-
-      @[method] library, progress, =>
-        @storage[library.key] = library if @options.localStorage
-        @_inject library if library.require
-        @_loadGroup group, progress, callback
+        method = if @options.localStorage || !library.require
+          "_loadAJAX"
+        else
+          "_loadInline"
+
+        @[method] library, progress, =>
+          results.push library
+          if results.length == group.length
+            @_inject results
+            callback()
+
+    if results.length == group.length
+      @_inject results
+      callback()
 
   #
   # Loads one asset by AJAX query and stores it into instance
@@ -221,6 +232,7 @@ class @Loada
   #
   _loadAJAX: (library, progress, callback) ->
     xhr = @_ajax 'GET', library.url, (xhr) =>
+      @storage[library.key] = library if library.cache
       library.source = xhr.responseText
       clearInterval poller
       progress?.set library.key, 100
@@ -265,16 +277,19 @@ class @Loada
   #
   # @private
   #
-  _inject: (library) ->
-    if library.type == 'js'
-      script = document.createElement "script"
-      script.defer = true
-      script.text = library.source
-      $head.appendChild script
-    else if library.type == 'css'
-      style = document.createElement "style"
-      style.innerHTML = library.source
-      $head.appendChild style
+  _inject: (libraries) ->
+    libraries = [].concat(libraries)
+
+    for library in libraries when library.require && library.source
+      if library.type == 'js'
+        script = document.createElement "script"
+        script.defer = true
+        script.text = library.source
+        $head.appendChild script
+      else if library.type == 'css'
+        style = document.createElement "style"
+        style.innerHTML = library.source
+        $head.appendChild style
 
   #
   # Starring custom XHR wrapper!
@@ -287,8 +302,8 @@ class @Loada
     else
       xhr = new ActiveXObject 'Microsoft.XMLHTTP'
 
-    xhr.open method, url, 1
     xhr.onreadystatechange = -> callback?(xhr) if xhr.readyState > 3
+    xhr.open method, url, 1
     xhr.send()
 
     xhr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loada
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Boris Staal
@@ -29,7 +29,10 @@ files:
 - package.json
 - spec/helpers/spec_helper.coffee
 - spec/loada_spec.coffee
-- spec/support/test.js
+- spec/support/test1_1.js
+- spec/support/test1_2.js
+- spec/support/test2_1.js
+- spec/support/text
 - src/loada.coffee
 homepage: http://github.com/joosy/loada
 licenses: []

data/spec/support/test.js

@@ -1 +0,0 @@
-window.TEST = 1