Game loader

config/webpack.js

@@ -7,6 +7,12 @@ import ProgressPlugin from '../src/webpack-progress'
 let config = {
   context: path('src'),
   resolve: {
+    alias: {
+      bemuse: path('src'),
+      assets: path('assets'),
+    },
+  },
+  resolveLoader: {
     alias: {
       bemuse: path('src'),
     },
@@ -29,11 +35,8 @@ let config = {
   module: {
     loaders: [
       {
-        test: /[\\\/]src[\\\/].*\.js$/,
-        loader: '6to5?modules=common&experimental=true',
-      },
-      {
-        test: /[\\\/]spec[\\\/].*\.js$/,
+        test: /\.js$/,
+        include: [path('src'), path('spec')],
         loader: '6to5?modules=common&experimental=true',
       },
       {
@@ -53,6 +56,14 @@ let config = {
         test: /\.jade/,
         loader: 'jade',
       },
+      {
+        test: /\.png$/,
+        loader: 'url-loader?limit=100000&mimetype=image/png',
+      },
+      {
+        test: /\.jpg$/,
+        loader: 'file-loader',
+      },
     ],
     postLoaders: [],
   },
@@ -63,8 +74,13 @@ let config = {
 
 if (NODE_ENV === 'test' || process.env.COV === 'true') {
   config.module.postLoaders.push({
-    test: /\/src\/.*\.js$/,
-    exclude: /\/src\/test\/.*\.js$|\/src\/boot\/loader\.js$/,
+    test: /\.js$/,
+    include: [path('src')],
+    exclude: [
+      path('src', 'test'),
+      path('src', 'polyfill'),
+      path('src', 'boot', 'loader.js'),
+    ],
     loader: 'istanbul-instrumenter',
   })
 }

package.json

@@ -43,45 +43,56 @@
     "css-loader": "^0.9.0",
     "exports-loader": "^0.6.2",
     "express": "^4.10.6",
+    "file-loader": "^0.8.1",
     "glob": "^4.3.2",
     "gulp": "^3.8.10",
     "gulp-gh-pages": "git://github.com/dtinth/gulp-gh-pages",
     "gulp-jshint": "^1.9.0",
     "gulp-util": "^3.0.1",
     "istanbul": "^0.3.5",
     "istanbul-instrumenter-loader": "^0.1.2",
-    "jade": "^1.8.2",
+    "jade": "^1.9.2",
     "jade-loader": "^0.7.0",
     "jasmine": "^2.1.1",
     "js-yaml": "^3.2.5",
     "jscs": "^1.9.0",
-    "jshint": "^2.5.11",
+    "jshint": "^2.6.0",
     "jshint-stylish": "^1.0.0",
     "merge-stream": "^0.1.6",
     "mocha": "^2.1.0",
     "node-env": "^0.1.6",
     "node-notifier": "^4.0.3",
     "pegjs-loader": "^0.1.1",
+    "ractive-loader": "^0.5.6",
     "sass-loader": "^0.3.1",
     "script-loader": "^0.6.1",
+    "sinon": "git://github.com/cjohansen/Sinon.JS#sinon-2.0",
+    "sinon-chai": "^2.7.0",
     "style-loader": "^0.8.2",
     "through2": "^0.6.3",
+    "url-loader": "^0.5.5",
     "val-loader": "^0.5.0",
+    "web-audio-test-api": "^0.2.1",
     "webpack": "^1.4.13",
     "webpack-dev-server": "^1.6.6"
   },
   "dependencies": {
     "audio-context": "^0.1.0",
-    "bluebird": "^2.9.6",
-    "bms": "^0.2.0",
+    "bluebird": "^2.9.10",
+    "bms": "^0.6.0",
+    "bytes": "^1.0.0",
     "chance": "^0.7.3",
     "co": "^4.3.1",
+    "data-structure": "^1.2.0",
     "debug": "^2.1.1",
     "jquery": "^2.1.3",
     "keytime": "^0.1.0",
+    "lazy-property": "^1.0.0",
     "once": "^1.3.1",
     "pixi.js": "^2.2.3",
+    "ractive": "^0.6.1",
     "ramda": "^0.9.1",
+    "throat": "^2.0.2",
     "vue": "^0.11.4"
   }
 }

spec/download/download_spec.js

@@ -0,0 +1,19 @@
+
+import download from 'bemuse/download'
+
+describe('download', function() {
+
+  it('resolves with correct type', function() {
+    return expect(download('/spec/download/fixtures/hello.txt').as('text'))
+      .to.eventually.match(/hello world/)
+  })
+
+  it('rejects for 404', function() {
+    return expect(download('/nonexistant').as('blob')).to.be.rejected
+  })
+
+  it('rejects for bad url', function() {
+    return expect(download('file:///nonexistant').as('blob')).to.be.rejected
+  })
+
+})

spec/download/fixtures/hello.txt

@@ -0,0 +1 @@
+hello world

spec/game/audio-loader_spec.js

@@ -0,0 +1,52 @@
+
+import AudioLoader from 'bemuse/game/audio-loader'
+
+describe('AudioLoader', function() {
+
+  describe('load', function() {
+
+    var assets
+    var keysounds
+    var master
+    var loader
+
+    beforeEach(function() {
+      assets    = { file: sinon.stub() }
+      keysounds = { files: sinon.stub() }
+      master    = { sample: sinon.stub() }
+      loader = new AudioLoader(assets, master)
+    })
+
+    it('should load file when matches', function() {
+      keysounds.files.returns(['a.wav'])
+      assets.file.withArgs('a.wav').returns(Promise.resolve({
+        read: () => Promise.resolve('ok1')
+      }))
+      master.sample.withArgs('ok1').returns(Promise.resolve('ok2'))
+      return expect(loader.loadFrom(keysounds)).to.eventually.deep.eq({
+        'a.wav': 'ok2'
+      })
+    })
+
+    it('should try mp3', function() {
+      keysounds.files.returns(['a.wav'])
+      assets.file.withArgs('a.wav').returns(Promise.reject())
+      assets.file.withArgs('a.mp3').returns(Promise.resolve({
+        read: () => Promise.resolve('ok1')
+      }))
+      master.sample.withArgs('ok1').returns(Promise.resolve('ok2'))
+      return expect(loader.loadFrom(keysounds)).to.eventually.deep.eq({
+        'a.wav': 'ok2'
+      })
+    })
+
+    it('should not include failed matches', function() {
+      keysounds.files.returns(['a.wav'])
+      assets.file.withArgs('a.wav').returns(Promise.reject())
+      assets.file.withArgs('a.mp3').returns(Promise.reject())
+      return expect(loader.loadFrom(keysounds)).to.eventually.deep.eq({ })
+    })
+
+  })
+
+})

spec/progress/progress_spec.js

@@ -0,0 +1,53 @@
+
+import Progress from 'bemuse/progress'
+
+describe('Progress', function() {
+
+  describe('#watch', function() {
+    it('should report current progress when watched', function() {
+      let progress = new Progress()
+      let spy = sinon.spy()
+      progress.report(1, 10)
+      progress.watch(spy)
+      expect(spy).to.have.callCount(1)
+      expect(spy).to.have.been.calledWith(progress)
+    })
+  })
+
+  describe('#report', function() {
+    it('should fire to all watchers', function() {
+      let progress = new Progress()
+      let spy = sinon.spy()
+      progress.report(1, 10)
+      progress.report(2, 10)
+      progress.watch(spy)
+      progress.report(3, 10)
+      progress.report(4, 10)
+      expect(spy).to.have.callCount(3)
+    })
+    it('should return a function to unsubscribe', function() {
+      let progress = new Progress()
+      let spy = sinon.spy()
+      progress.report(1, 10)
+      progress.report(2, 10)
+      let unsubscribe = progress.watch(spy)
+      progress.report(3, 10)
+      unsubscribe()
+      progress.report(4, 10)
+      expect(spy).to.have.callCount(2)
+    })
+  })
+
+  describe('#progress', function() {
+    it('returns progress in fraction', function() {
+      let progress = new Progress()
+      progress.report(1, 10)
+      expect(progress.progress).to.equal(1 / 10)
+    })
+    it('returns null in unavailable', function() {
+      let progress = new Progress()
+      expect(progress.progress).to.equal(null)
+    })
+  })
+
+})

spec/progress/utils_spec.js

@@ -0,0 +1,51 @@
+
+import Progress from 'bemuse/progress'
+import * as ProgressUtils from 'bemuse/progress/utils'
+
+describe('ProgressUtils', function() {
+
+  describe('.fixed', function() {
+    it('should report for fixed number of items', function() {
+      let progress = new Progress()
+      let advance = ProgressUtils.fixed(10, progress)
+      expect(progress.current).to.equal(0)
+      expect(progress.total).to.equal(10)
+      advance('wow')
+      expect(progress.current).to.equal(1)
+      expect(progress.total).to.equal(10)
+      expect(progress.extra).to.equal('wow')
+    })
+  })
+
+  describe('.wrapPromise', function() {
+    it('should report number of fulfilled promises', function() {
+      let progress = new Progress()
+      let f = ProgressUtils.wrapPromise(progress, promise => promise)
+      let a = f(new Promise(() => {}))
+      let b = f(Promise.resolve(1))
+      let c = f(Promise.reject(new Error('no')))
+      let d = f(Promise.resolve(3))
+      void a
+      void c
+      return Promise.all([b, d]).then(() => {
+        expect(progress.current).to.equal(2)
+        expect(progress.total).to.equal(4)
+      })
+    })
+  })
+
+  describe('.bind', function() {
+    it('should bind from one progress to another', function() {
+      let a = new Progress()
+      let b = new Progress()
+      a.report(10, 20)
+      ProgressUtils.bind(a, b)
+      expect(b.current).to.equal(10)
+      expect(b.total).to.equal(20)
+      a.report(15, 25)
+      expect(b.current).to.equal(15)
+      expect(b.total).to.equal(25)
+    })
+  })
+
+})

spec/resources/fixtures/a/metadata.json

@@ -0,0 +1 @@
+{"files":[{"name":"do.mp3","ref":[0,0,30093]},{"name":"mi.mp3","ref":[0,30093,60186]},{"name":"sol.mp3","ref":[0,60186,90279]}],"refs":[{"path":"mp3.0.ea6087c3.bemuse","hash":"ea6087c3379bce007e50c3100b99b83c"}]}

spec/resources/fixtures/b/metadata.json

@@ -0,0 +1 @@
+{"files":[{"name":"do.mp3","ref":[0,0,30093]},{"name":"mi.mp3","ref":[0,30093,60186]},{"name":"sol.mp3","ref":[0,60186,90279]}],"refs":[{"path":"mp3.0.ea6087c3.bemuse","hash":"ea6087c3379bce007e50c3100b99b83c"}]}