Merge pull request #4 from ianmcgregor/develop

🐛 Fix group api issue and update tests - fixes #3

.travis.yml

@@ -1,10 +1,16 @@
+sudo: false
+dist: trusty
 language: node_js
 node_js:
-  - 0.10
+  - 6
 addons:
-  firefox: "30.0"
+  apt:
+    packages:
+      - google-chrome-stable
 before_install:
-  - 'npm install -g karma-cli'
-before_script:
+  - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+  - sleep 3
+before_script:
+  - npm i -g karma karma-cli

examples/index.html

@@ -56,7 +56,7 @@ <h2>video</h2>
   var loader = assetsLoader({ log: true })
       .add({
           id: 'video',
-          url: 'https://dl.dropboxusercontent.com/u/15470024/prototypes/video/counter.webm',
+          url: 'https://ianmcgregor.co/prototypes/video/counter.webm',
           blob: true
       })
       .on('error', function(error) {
@@ -109,7 +109,7 @@ <h2>group b</h2>
         })
         .add({
             id: 'groupB',
-            basePath: 'https://dl.dropboxusercontent.com/u/15470024/prototypes/audio/',
+            basePath: 'https://ianmcgregor.co/prototypes/audio/',
             assets: sounds
         })
         .on('error', function(error) {
@@ -200,7 +200,7 @@ <h2>group b</h2>
         var loader = assetsLoader({ log: true })
             .add({
                 id: 'video',
-                url: 'https://dl.dropboxusercontent.com/u/15470024/prototypes/video/counter.webm',
+                url: 'https://ianmcgregor.co/prototypes/video/counter.webm',
                 blob: true
             })
             .on('error', function(error) {
@@ -257,7 +257,7 @@ <h2>group b</h2>
             })
             .add({
                 id: 'groupB',
-                basePath: 'https://dl.dropboxusercontent.com/u/15470024/prototypes/audio/',
+                basePath: 'https://ianmcgregor.co/prototypes/audio/',
                 assets: [{
                     id: 'select',
                     url: 'select.ogg'

karma.conf.js

@@ -6,6 +6,12 @@ module.exports = function(config) {
     // base path, that will be used to resolve files and exclude
     basePath: '',
 
+    client: {
+        mocha: {
+            timeout: 20000
+        }
+    },
+
     plugins: [
       'karma-mocha',
       'karma-chai',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "assets-loader",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "A simple batch assets loader.",
   "keywords": [
     "loader",
@@ -16,7 +16,9 @@
   "license": "MIT",
   "main": "src/index.js",
   "scripts": {
-    "test": "./node_modules/.bin/karma start --single-run --browsers Firefox"
+    "start": "gulp",
+    "build": "gulp release",
+    "test": "karma start --single-run --browsers Chrome"
   },
   "readmeFilename": "README.md",
   "repository": {

src/group.js

@@ -37,22 +37,17 @@ module.exports = function createGroup(config) {
         if (!arguments.length) {
             return assets;
         }
-        return map[id];
+        if (map[id]) {
+            return map[id];
+        }
+        return loaders[id];
     };
 
     var find = function(id) {
         if (get(id)) {
             return get(id);
         }
         var found = null;
-        // assets.filter(function(asset) {
-        //     return asset.type === 'group';
-        // }).map(function(asset) {
-        //     return loaders[asset.id];
-        // }).some(function(loader) {
-        //     found = loader.find(id);
-        //     return !!found;
-        // });
         Object.keys(loaders).some(function(key) {
             found = loaders[key].find && loaders[key].find(id);
             return !!found;

test/assets.json

@@ -1,26 +1,26 @@
 {
   "image": [
-    "http://placekitten.com/g/200/300",
-    "http://placekitten.com/1000/1000",
-    "http://placekitten.com/g/400/200",
-    "http://placekitten.com/g/200/150"
+    "https://ianmcgregor.co/prototypes/images/cat_01.jpg",
+    "https://ianmcgregor.co/prototypes/images/cat_02.jpg",
+    "https://ianmcgregor.co/prototypes/images/cat_03.jpg",
+    "https://ianmcgregor.co/prototypes/images/cat_04.jpg"
   ],
   "audio": [
     {
-      "ogg": "https://dl.dropboxusercontent.com/u/15470024/prototypes/audio/music.ogg",
-      "mp3": "https://dl.dropboxusercontent.com/u/15470024/prototypes/audio/music.mp3"
+      "ogg": "https://ianmcgregor.co/prototypes/audio/music.ogg",
+      "mp3": "https://ianmcgregor.co/prototypes/audio/music.mp3"
     }
   ],
   "video": [
     {
-      "mp4": "https://dl.dropboxusercontent.com/u/15470024/prototypes/video/counter.mp4",
-      "webm": "https://dl.dropboxusercontent.com/u/15470024/prototypes/video/counter.webm"
+      "mp4": "https://ianmcgregor.co/prototypes/video/counter.mp4",
+      "webm": "https://ianmcgregor.co/prototypes/video/counter.webm"
     }
   ],
   "json": [
-    "https://dl.dropboxusercontent.com/u/15470024/prototypes/test/test.json"
+    "https://ianmcgregor.co/prototypes/test/test.json"
   ],
   "text": [
-    "https://dl.dropboxusercontent.com/u/15470024/prototypes/video/tracking/tracking_01.txt"
+    "https://ianmcgregor.co/prototypes/video/tracking/tracking_01.txt"
   ]
 }

test/group.spec.js

@@ -0,0 +1,61 @@
+const assetsLoader = require('../src/index.js');
+const files = require('./files.js');
+
+describe('asset loader', () => {
+
+    describe('group', () => {
+
+        let complete = false;
+        let loadProgress = 0;
+        let groupA = null;
+        let groupB = null;
+
+        const loader = assetsLoader()
+            .add({
+                id: 'groupA',
+                assets: files.images
+            })
+            .add({
+                id: 'groupB',
+                assets: [files.json]
+            });
+
+        beforeEach(function(done) {
+            if (complete) {
+                done();
+                return;
+            }
+            loader
+                .on('progress', function(progress) {
+                    loadProgress = progress;
+                })
+                .on('complete', () => {
+                    complete = true;
+                    groupA = loader.get('groupA');
+                    groupB = loader.get('groupB');
+                    done();
+                })
+                .on('error', function(error) {
+                    console.log(error);
+                })
+                .start();
+        });
+
+        it('should have finished loading', () => {
+            expect(complete).equals(true);
+            expect(loadProgress).to.eql(1);
+        });
+
+        it('should have groupA', () => {
+            expect(groupA).to.exist;
+            expect(groupA.get()).to.have.lengthOf(2);
+            expect(groupA.get()[0]).to.have.property('type', 'jpg');
+        });
+
+        it('should have groupB', () => {
+            expect(groupB).to.exist;
+            expect(groupB.get()).to.have.lengthOf(1);
+            expect(groupB.get()[0]).to.have.property('type', 'json');
+        });
+    });
+});