entityjs 0.4.3 → 0.4.4

data/bin/entityjs

@@ -20,5 +20,7 @@ case code
     puts "Move inside the root directory"
   when 3
     puts "File/Directory already exists"
+  when 4
+  	puts "Argument error"
     
 end

data/lib/entityjs/assets.rb

@@ -11,7 +11,7 @@ module Entityjs
       ['mp3', 'ogg', 'aac', 'wav']
     end
     
-    def self.search(type='*')
+    def self.search(type=nil)
       
       case type
         when 'images'
@@ -25,8 +25,7 @@ module Entityjs
           return self.find_files(sounds_folder+"/**/*.{#{valid_sounds}}")
           
         else
-          #TODO: fix up
-          return self.search_datas
+          return self.find_files(Config.assets_folder+'/**/*')
           
       end
       
@@ -34,14 +33,18 @@ module Entityjs
     
     def self.search_datas
       #TODO: find all other folders and generate a key in re.assets
+      #DEPRECATED
       return self.find_files("#{Config.assets_folder}/*/*").select{|i| i.match(/(images|sounds)\//i) == nil }
     end
     
     def self.find_files(search)
-      Dir[Dirc.game_root+'/'+search].collect do |i|
-        #remove long string
-        i = i.split("assets/").pop
-      end
+      Dir.glob(Dirc.game_root+'/'+search).collect do |i|
+        if File.file?(i)
+          #remove long string
+          i = i.split(Config.assets_folder+"/").pop
+        end
+      end.compact
+      #remove nils from array too
     end
     
   end

data/lib/entityjs/commands/build.rb

@@ -21,7 +21,7 @@ module Entityjs
       scripts_folder = Config.scripts_folder
       styles_folder = Config.instance.build_styles_path
       
-      final_name = Config.instance.build_name+'.js'
+      final_name = Config.instance.build_scripts_name
       html_name = 'play.html'
       
       puts "Building to #{build_folder}"
@@ -63,7 +63,7 @@ module Entityjs
       #save css
       Dirc.create_dir(styles_folder)
 
-      File.open(styles_folder+"/"+Config.instance.build_styles_name+'.css', 'w') do |f|
+      File.open(styles_folder+"/"+Config.instance.build_styles_name, 'w') do |f|
         f.write(css)
       end
       
@@ -181,7 +181,15 @@ module Entityjs
       entity_src = self.compile_entity(Config.instance.build_entity_ignore+Config.instance.entity_ignore)
       scripts = self.compile_scripts(Config.instance.build_scripts_ignore+Config.instance.scripts_ignore, Config.instance.scripts_order)
       
-      self.build_wrap(entity_src+scripts)
+      code = self.build_wrap(entity_src+scripts)
+
+      #build erase
+      Config.instance.build_erase.each do |i|
+        #replace all finds with comments in front
+        code = code.gsub(i, "//#{i}")
+      end
+      
+      return code
     end
 
     def self.build_wrap(code)
@@ -209,18 +217,21 @@ module Entityjs
       return code
     end
     
-    def self.js_config(path = nil, images = nil, sounds = nil, canvas = nil)
+    def self.js_config(path = nil, assets = nil, canvas = nil)
       path ||= Config.assets_folder+'/'
-      images ||= self.images_to_js
-      sounds ||= self.sounds_to_js
+
+      if assets.nil?
+        assets = self.assets_to_js
+      end
+      if assets.is_a? Hash
+        assets = assets.to_json
+      end
+
       canvas ||= Config.instance.canvas_id
       
       return %Q(
       re.load.path = \"#{path}\";
-      re.assets = {
-        images:#{images},
-        sounds:#{sounds}
-        };
+      re.assets = #{assets};
       re.canvas = \"##{canvas}\";
       )
     end
@@ -242,6 +253,43 @@ module Entityjs
       
       "[#{s}]"
     end
+
+    #returns all folders from assets array in a js object
+    #
+    #Input like this: 
+    # ["images/blah.png", "images/tree.png", "models/tree.xml"]
+    #
+    # Is returned like this:
+    # {
+    #  images:["blah.png", "tree.png"],
+    #  model:["tree.xml"]
+    # }
+    #
+    def self.assets_to_js(assets = nil, ignore=nil)
+      assets ||= Assets.search()
+      ignore ||= Config.instance.assets_ignore
+
+      tree = {}
+
+      assets.each do |i|
+
+        if ignore.any? && !i.match(/#{ignore.join('|')}/).nil?
+          #ignore assets
+          next
+        end
+
+        #folder
+        folder = i.split('/').first
+
+        if tree[folder].nil?
+          tree[folder] = []
+        end
+
+        tree[folder].push(i)
+      end
+
+      return tree.to_json
+    end
     
   end
   

data/lib/entityjs/commands/comp.rb

@@ -6,8 +6,12 @@ module Entityjs
       if !Dirc.game?
         return 2
       end
+
+      if name.nil?
+        return 4
+      end
       
-      if name.class == Array
+      if name.is_a? Array
         name = name.first
       end
       
@@ -17,6 +21,7 @@ module Entityjs
       end
       
       filename = name
+      
       if name.index('.').nil?
         filename += '.js'
       end
@@ -60,7 +65,7 @@ module Entityjs
         f.close
       end
       
-      puts "Created comp: #{dir}/#{filename}"
+      puts "Created comp: #{filename}"
       
       Dir.chdir(Dirc.game_root)
       

data/lib/entityjs/commands/min.rb

@@ -10,6 +10,11 @@ module Entityjs
 
     	Config.instance.reload
 
+      #make build dir if not found
+      if !File.directory?(Config.instance.build_path)
+        Dir.mkdir(Config.instance.build_path)
+      end
+
       final_name = Config.instance.build_name+'.js'
       path = Config.instance.build_path+'/'+final_name
 

data/lib/entityjs/commands/server.rb

@@ -31,6 +31,10 @@ module Entityjs
       Page.render_test_page()
       
     end
+
+    get '/tests' do
+      Page.render_test_page()
+    end
     
     get '/favicon.ico' do
       content_type 'image/ico'

data/lib/entityjs/commands/test.rb

@@ -8,8 +8,12 @@ module Entityjs
       end
       
       tests = []
+
+      if name.nil?
+        return 4
+      end
       
-      if name.class == Array
+      if name.is_a? Array
         tests = name[1..-1]
         
         name = name.first
@@ -44,7 +48,7 @@ module Entityjs
         return 3
       end
       
-      test_name = filename.split('_test.').shift
+      test_name = filename.split('_test.').first
       
       File.open(filename, 'w') do |f|
         
@@ -57,7 +61,7 @@ module Entityjs
         f.close
       end
       
-      puts "Created test: tests/#{filename}"
+      puts "Created test: #{filename}"
       
       Dir.chdir(Dirc.game_root)
       

data/lib/entityjs/config.rb

@@ -96,6 +96,10 @@ module Entityjs
     def scripts_order
       return split_attr('scripts-order')
     end
+
+    def assets_ignore
+      return split_attr('assets-ignore')
+    end
     
     def tests_ignore
       return split_attr('tests-ignore')
@@ -104,6 +108,18 @@ module Entityjs
     def entity_ignore
       return split_attr('entity-ignore')
     end
+
+    #erases found lines on compiling
+    #NOT implemented
+    def build_erase
+      return split_attr('build-erase')
+    end
+
+    #overwrites config vars during compiling
+    #NOT implemented
+    def build_vars
+
+    end
     
     def build_entity_ignore
       return split_attr('build-entity-ignore')
@@ -113,8 +129,12 @@ module Entityjs
       return get_attr('build-name', self.title_slug+'.min')
     end
 
+    def build_scripts_name
+      return get_attr('build-scripts-name', self.build_name+'.js')
+    end
+
     def build_styles_name
-      return get_attr('build_styles_name', self.build_name)
+      return get_attr('build-styles-name', self.build_name+'.css')
     end
 
     def build_styles_ignore
@@ -202,6 +222,8 @@ module Entityjs
         contents = contents.gsub("RE_#{val}", v.to_s)
       end
 
+      #build erase
+
       #set width, height and canvas id
       #contents = contents.sub("RE_WIDTH", Config.instance.width.to_s)
       #contents = contents.sub("RE_HEIGHT", Config.instance.height.to_s)

data/lib/entityjs/dirc.rb

@@ -5,6 +5,7 @@ module Entityjs
   
   class Dirc
     
+    #is the current directory an EntityJS game?
     def self.game?
       
       #check if scripts dir exists
@@ -19,17 +20,17 @@ module Entityjs
       return false
     end
     
-    #checks if a local file exists
+    #checks if file exists in the EntityJS game
     def self.exists?(file)
       return File.file? Dirc.game_root+'/'+file
     end
 
+    #path to EntityJS game
     def self.to_game_root
       Dir.chdir(@game_root)
     end
     
     def self.game_root
-      
       @game_root
     end
     

data/lib/entityjs/page.rb

@@ -130,7 +130,13 @@ module Entityjs
 
         first_folder = folders
         if last != first_folder
-          js += "\n\n\t<!-- #{first_folder} -->\n"
+          if first_folder.is_a? Array
+            line = first_folder.join('/')
+          else
+            line = first_folder
+          end
+          
+          js += "\n\n\t<!-- #{line} -->\n"
           last = first_folder
         end
         

data/lib/entityjs/version.rb

@@ -1,3 +1,3 @@
 module Entityjs
-  VERSION = "0.4.3" unless const_defined? :VERSION
+  VERSION = "0.4.4" unless const_defined? :VERSION
 end

data/public/qunit/qunit.entity.js

@@ -238,6 +238,7 @@ function lazy(comps, obj){
     teardown:function(){
       if(obj && obj.teardown) obj.teardown(e);
       e.dispose();
+      delete window[name];
     }
   }
 }
@@ -318,4 +319,4 @@ function match(test, reg, i){
   
   ok(test.match(reg) != null, "Expected to match "+reg)
   
-}
+}

data/public/qunit/qunit.mock.js

@@ -50,7 +50,9 @@ stub(re, 'pressed', 10);
       
       return expectation.callCount += 1;
     };
-    return mocking.expectations.push(expectation);
+    mocking.expectations.push(expectation);
+
+    return object[method];
   };
   stub = function(object, method, fn) {
     var stb;
@@ -70,6 +72,11 @@ stub(re, 'pressed', 10);
       original: object[method]
     };
     object[method] = fn;
+
+    if(!mocking || !mocking.stubs){
+      throw "Can only stub inside tests!";
+    }
+
     return mocking.stubs.push(stb);
   };
   mock = function(test) {

data/spec/javascripts/src/core/comp_spec.js

@@ -20,6 +20,42 @@ describe('comp', function(){
     eq(re[k.name].yep, 'yep')
   })
 
+  it('should create comp in new style', function(){
+    
+    re.c('jump12', {
+      requires:"sdf",
+
+      init:function(){
+
+      },
+
+      defines:{
+        ok:10
+      },
+
+      defaults:{
+        k:10
+      },
+
+      factory:function(){
+
+      }
+
+    });
+
+    eq(re.c('jump12')._re_requires, ['sdf']);
+    eq(re.c('jump12')._re_defines, {ok:10});
+    eq(re.c('jump12')._re_defaults, {k:10});
+
+  });
+
+  it('should use default factory', function(){
+    var a = 10;
+
+    eq(re[k.name]("blah", a).blah, a);
+
+  });
+
   it('should create a factory', function(){
     var val = 10;
 

data/spec/javascripts/src/core/entity_spec.js

@@ -30,6 +30,19 @@ describe('entity', function(){
     eq(e.get('bla'), 10);
   });
 
+  it('should trigger once', function(){
+    var count = 0;
+    e.once('blah', function(){
+      count++;
+    });
+
+    e.trigger('blah');
+    e.trigger('blah');
+    e.trigger('blah');
+
+    eq(count, 1);
+  });
+
   it('comp', function(){
     e.comp('qwdqwd wer')
     

data/spec/javascripts/src/core/load_spec.js

@@ -4,7 +4,7 @@ describe('load', function(){
         //add images
         re.load.path = '__spec__/'
         var img = '/__spec__/helpers/accept.png'
-        var sfx = 'helpers/alligator.mp3'
+        var sfx = 'http://localhost:8888/__spec__/helpers/alligator.mp3'
         var sfx2 = 'helpers/alligator.ogg'
         
         var called = false

data/spec/javascripts/src/core/query_spec.js

@@ -180,6 +180,7 @@ describe('query', function(){
       
       var e = re.e();
       
+      q.push(10);
       q.push(e);
       
       //add in

data/spec/javascripts/src/media/sound_spec.js

@@ -21,14 +21,6 @@ describe('sound', function(){
     })
 	});
   
-  it('resume', function(){
-    is(e.resume())
-  })
-  
-  it('pause', function(){
-    is(e.pause())
-  })
-  
   it('currenttime', function(){
     //is(e.currentTime())
   })

data/spec/lib/entityjs/assets_spec.rb

@@ -10,7 +10,7 @@ describe 'Assets' do
     @sounds_file = Entityjs::Config.sounds_folder+'/fold/secret1.mp3'
     files.push @sounds_file
     
-    Dir.stub(:'[]').and_return(files)
+    Dir.stub(:glob).and_return(files)
     IO.stub(:read).and_return('{"test":0, "array":[1,2,3]}')
   end
   
@@ -32,6 +32,10 @@ describe 'Assets' do
     
   end
   
-  it 'should return all datas'
+  it 'should return all assets' do
+    r = Entityjs::Assets.search()
+
+    r.should include(@sounds_file.gsub('assets/',''))
+  end
   
 end

data/spec/lib/entityjs/commands/build_spec.rb

@@ -46,12 +46,18 @@ describe 'build' do
     canvas = 'game-canvas'
     scripts = "re.ready(function(){});"
     
-    scripts += Entityjs::Build.js_config('', images, sounds, canvas)
+    scripts += Entityjs::Build.js_config('', {:images=>images, :sounds=>sounds}, canvas)
     
     #min
     min = Entityjs::Build.minify(scripts)
     
     min.should match /Entityjs/i
   end
+
+  it 'should build assets to js' do
+    data = ["images/blah.png", "models/tree.xml"]
+
+    Entityjs::Build.assets_to_js(data).should include("blah.png")
+  end
   
 end

data/spec/lib/entityjs/commands/templates_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe 'Templates' do
   
   it 'should display templates' do
+  	Dir.chdir("..")
     Entityjs::Command.run('templates', []).should == 0
   end
   

data/spec/support/mygame.rb

@@ -1,14 +1,22 @@
 
 def setup_mygame
+
   root = File.dirname(__FILE__)+'/../..'
   
   if !File.directory? root+'/mygame'
     Dir.mkdir(root+'/mygame')
   end
-  
+
+  if !File.directory? root+'/mygame/scripts'
+  	Dir.mkdir(root+'/mygame/scripts')
+  end
+
   Dir.chdir(root+'/mygame')
   
-  Entityjs::Dirc.game?
+  if !Entityjs::Dirc.game?
+  	raise "Error game folder not found"
+  end
+
 end
 
 def teardown_mygame

data/src/core/comp.js

@@ -3,11 +3,18 @@
     
     @return component reference
     */
-    re.comp = re.c = function(title){
+    re.comp = re.c = function(title, data){
         
         if(!re._c[title]){
             re._c[title] = new re.c.init(title);
         }
+
+        //set data
+        if(data){
+            for(var i in data){
+                re._c[title][i](data[i]);
+            }
+        }
         
         return re._c[title];
     };
@@ -74,7 +81,7 @@ re.c.init.prototype = {
     //turns global method into a singleton
     singleton:function(){
         this._re_method = function(){
-            return this._ || (this._ = re.e(this.name));
+            return this._singleton || (this._singleton = re.e(this.name));
         }
         return this;
     },
@@ -122,7 +129,6 @@ re.c.init.prototype = {
 
     //new control entity
     re.control(val1, val2);
-    re.c('control').factory
 
     */
     factory:function(f){
@@ -133,11 +139,23 @@ re.c.init.prototype = {
         return this;
     },
 
+    /*
+    Controls the factory method flow.
+
+    Will create a new entity and try to use the defined factory or else
+    uses the default:
+    
+    //default factory
+    re.circle({radius:10, color:"#ff0000"});
+
+    */ 
     _re_method:function(){
         var e = re.e(this.name), f = this._re_factory;
 
         if(f)
             f.apply(e, arguments);
+        else
+            e.attr.apply(e,arguments); //this is the default factory method
 
         return e;
     },

data/src/core/entity.js

@@ -329,12 +329,12 @@
         
     });
     */
-    p.on = function(type, method, context){
+    p.on = function(type, method, context, once){
         
         if(re.is(type, 'object')){
             
           for(var k in type){
-            this.on(k, type[k], method);
+            this.on(k, type[k], method, context);
           }
             
         } else {
@@ -344,12 +344,16 @@
             }
             if(!re.is(method)) throw 'Method is null'
             //save context
-            this._re_listens[type].push({c:context || this, f:method});
+            this._re_listens[type].push({c:context || this, f:method, o:once});
             
         }
         
         return this;
     };
+
+    p.once = function(type, method, context){
+        return this.on(type, method, context, 1);
+    };
     
     /*
     Added in V0.2.1
@@ -423,8 +427,8 @@
             if(!b) break;
             if(!b[i]) continue;
             
-            //return false remove
-            if(b[i].f.apply(b[i].c, Array.prototype.slice.call(arguments, 1)) === false){
+            //return false remove or if is once listen
+            if(b[i].f.apply(b[i].c, Array.prototype.slice.call(arguments, 1)) === false || (b[i] && b[i].o)){
                 b.splice(i, 1);
             }
             

data/src/core/load.js

@@ -78,7 +78,7 @@
             a = this.assets[i];
             
             //copy full source path
-            var s = (a.charAt(0)=='/')?a:re.load.path+a;
+            var s = (a.match(/^(\/|http:)/))?a:re.load.path+a;
 
             //remove directories
             a = re.load.file(a);
@@ -125,6 +125,9 @@
     p.current = 0;
     p.total = 0;
     
+    //src - full path to image
+    //a - image name
+    //n - image name without ext
     p._loadImg = function(src, a, n){
         var that = this;
         var img = new Image();
@@ -146,6 +149,7 @@
           
           that._loaded();
         };
+        img.crossOrigin = '';
         
         img.onerror = function(){
             
@@ -202,8 +206,7 @@
           });
         
         } else {
-          s = new Audio(src);
-          s.src = src;
+          s = new Audio();
           s.preload = "auto";
           s.load();
           
@@ -223,6 +226,8 @@
               }
           },false);
           
+          s.src = src;
+          
           this._def_sfx(s, a, n);
         
         }
@@ -232,7 +237,7 @@
     p._def_sfx = function(s, a, n){
       
       re.c(a)
-      //create statics codec for easy use
+      //create static codec for easy use
       .alias(n+re.load.soundExt)
       .defines({
           _sound:s

data/src/core/query.js

@@ -443,7 +443,7 @@
     
     */
     p.erase = function(ref){
-      for(var i=this.length; i--;){
+      for(var i=0; i<this.length; i++){
         if(this[i] == ref) this.splice(i, 1);
       }
       return this;

data/src/display/circle.js

@@ -13,7 +13,7 @@ re.c('circle')
         c.fillStyle = this.color;
         
         c.beginPath();
-            var r = this.radius;
+            var r = this.get('radius');
             
             c.arc(-this.regX + r , -this.regY + r , r, 0, Math.PI*2, true);
         
@@ -31,4 +31,4 @@ re.c('circle')
         return this.sizeX * 0.5;
     }
     
-});
+});

data/src/display/draw.js

@@ -133,7 +133,7 @@ re.c('draw')
     */
     visible:function(){
         
-        return this.drawable && re.screen.hit(this.posX - this.regX, this.posY - this.regY, this.sizeX, this.sizeY);
+        return this.drawable && re.screen.hit(this.posX, this.posY, this.sizeX, this.sizeY);
         
     }
     

data/src/display/text.js

@@ -64,7 +64,7 @@ re.c('text')
 		
 		c.font = this.font;
 		c.fillStyle = this.textColor;
-    c.textAlign = this.textAlgin;
+    c.textAlign = this.textAlign;
     c.textBaseline = this.textBaseline;
     
     //multi-line

data/src/input/keyboard.js

@@ -15,6 +15,7 @@ re.c('keyboard')
 .statics({
   //list of listing entities
 	l:[],
+    focusStop:true,
 	
 	keyCodes: { 
     /* start the a-z keys */
@@ -116,7 +117,7 @@ re.c('keyboard')
     var tagName = (e.target || e.srcElement || {}).tagName;
     
     //disable keyboard keys if focus lost
-		if(tagName == 'INPUT' || tagName == 'SELECT' || tagName == 'TEXTAREA'){
+		if(that.focusStop && tagName && tagName.match(/INPUT|SELECT|TEXTAREA/)){
 			return;
 		}
 		

data/src/math/bisect.js

@@ -28,13 +28,13 @@ re.c('bisect')
 		return this.toTileY(bi, width, sizeX) * sizeY;
 	},
 	
-	toTileX:function(bi, width, size){
+	toTileX:function(bi, width, sizeX){
 		
-		return bi % (width / size) | 0;
+		return bi % (width / sizeX) | 0;
 	},
 	
-	toTileY:function(bi, width, size){
-		return (bi * size) / (width - 0.1) | 0;
+	toTileY:function(bi, width, sizeX){
+		return (bi * sizeX) / (width - 0.1) | 0;
 	},
 	
   /*

data/src/math/clamp.js

@@ -0,0 +1,8 @@
+/*
+Similar to limit comp.
+*/
+re.clamp = function(value, min, max){
+	if(value < min) return min;
+	else if(max!=null && value > max) return max;
+	return value;
+};

data/src/math/hit.js

@@ -14,27 +14,20 @@ re.c('hit')
 	k.hit(entity);
   
 	*/
-	hit:function(x, y, w, h, rx, ry){
+	hit:function(x, y, w, h){
     if(re.is(x, 'object')){
       y = x.posY || x.y;
       w = x.sizeX || x.w;
       h = x.sizeY || x.h;
-      rx = x.regX || 0;
-      ry = x.regY || 0;
       x = x.posX || x.x;
     }
     
-    rx = rx || 0;
-    ry = ry || 0;
-    var regX = this.regX || 0;
-    var regY = this.regY || 0;
-    
 		return !
 		(
-		x - rx > this.posX + this.sizeX - regX ||
-		x + w - rx < this.posX - regX ||
-		y - ry > this.posY + this.sizeY - regY ||
-		y + h - ry < this.posY - regY
+		x > this.posX + this.sizeX ||
+		x + w < this.posX ||
+		y > this.posY + this.sizeY ||
+		y + h < this.posY
 		);
 	}
 	

data/src/math/iso.js

@@ -30,6 +30,9 @@ re.c('iso')
     return {posX:this.toPosX(x, y), posY:this.toPosY(x, y)};
   },
   
+  /*
+  Converts a position into the closest iso tile
+  */
   toIsoX:function(x, y){
     var ym = (2*y - x) * 0.5;
     var xm = x + ym;

data/src/math/tile.js

@@ -125,5 +125,4 @@ re.c('tile')
 .init(function(){
   this.sizeX = re.tile.sizeX;
   this.sizeY = re.tile.sizeY;
-  
-})
+});

data/src/media/sound.js

@@ -45,17 +45,18 @@ This will be fixed with the channel component.
 re.c('sound')
 .statics({
     
-    enabled:true
+    enabled:true,
+    volume:1
     
 })
 .defaults({
   playing:false
 })
 .namespaces({
-  e:false,
+  e:0,
   
   ended:function(){
-    
+    this.playing = 0;
     this.trigger('sound:finish');
     
   }
@@ -63,50 +64,60 @@ re.c('sound')
 })
 .defines({
 
-    play:function(){
+    /*
+    Plays the sound from the beginning.
+
+    onFinish is called when the sound has finished playing through all loops.
+    */
+    play:function(loops, volume, onFinish){
         if(!this._sound || !re.sound.enabled) return this;
         if(this.playing) this.stop();
         
         var c = this._sound;
         var that = this;
+        volume = volume || re.sound.volume;
         
-        if(window['soundManager']){
-          
-          c.play({onfinish:function(){
-            that.sound_ended();
-            }
+        if(window.soundManager){
+          //play sound with soundManager
+          c.play({
+            onfinish:function(){
+              that.sound_ended();
+              if(onFinish) onFinish(that);
+            },
+            position:0,
+            volume:volume,
+            loops:loops||1
           });
           
         } else {
+          //play with browser
           c.currentTime = 0;
+          c.volume = volume;
+          loops = loops||1;
           
-          if(!this.sound_e){
-            this.sound_e = true;
-            var f = function(){
-              that.sound_ended();
+          var f = function(){
+            if(--loops>0){
+              c.play();
+            } else {
               c.removeEventListener('ended', f);
-              that.sound_e = false;
-            };
-            
-            c.addEventListener('ended', f, false);
-            
-          }
+              that.sound_ended();
+              if(onFinish) onFinish(that);
+            }
+          };
+
+          c.addEventListener('ended', f);
+
           c.play();
         }
+        this.playing = 1;
       
         return this;
     },
     
-    resume:function(){
-        this._sound.play();
-        this.playing = true;
-        
-        return this;
-    },
-    
-    pause:function(){
+    //stops playing the sound
+    stop:function(){
         this._sound.pause();
-        this.playing = false;
+        this.playing = 0;
         
         return this;
     }

data/src/util/assert.js

@@ -0,0 +1,10 @@
+/*
+Throws an exception when false. This is useful for development.
+
+All asserts will be removed when compiled.
+*/
+re.assert = function(test, message){
+	message = message || '';
+	if(!test) throw "Assert Fail: "+message;
+	re.log("Assert Pass: "+message);
+};

data/src/util/extend.js

@@ -0,0 +1,9 @@
+re.extend = function(){
+	var out = {};
+	for(var i in arguments){
+		for(var b in arguments[i]){
+			out[b] = arguments[i][b];
+		}
+	}
+	return out;
+};

data/src/util/support.js

@@ -77,9 +77,10 @@ re.support = function(s){
 		if(c.audio = !!ele.canPlayType){
 			
 			c.ogg  = ele.canPlayType('audio/ogg; codecs="vorbis"');
-			c.mp3  = ele.canPlayType('audio/mpeg;');
 			c.wav  = ele.canPlayType('audio/wav; codecs="1"');
-			c.aac = ele.canPlayType('audio/x-m4a;') || ele.canPlayType('audio/aac;');
+			c.webma = ele.canPlayType('audio/webm; codecs="vorbis"');
+			c.mp3  = ele.canPlayType('audio/mpeg; codecs="mp3"');
+			c.m4a = ele.canPlayType('audio/mp4; codecs=mp4a.40.2');
 			
 			//switch unsupported codecs to false
 			for(var i in c){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entityjs
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23146660 !ruby/object:Gem::Requirement
+  requirement: &21132740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23146660
+  version_requirements: *21132740
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &23146240 !ruby/object:Gem::Requirement
+  requirement: &21113980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23146240
+  version_requirements: *21113980
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &23145740 !ruby/object:Gem::Requirement
+  requirement: &21112560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *23145740
+  version_requirements: *21112560
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &23145320 !ruby/object:Gem::Requirement
+  requirement: &21110820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23145320
+  version_requirements: *21110820
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &23144860 !ruby/object:Gem::Requirement
+  requirement: &21108600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23144860
+  version_requirements: *21108600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &23144440 !ruby/object:Gem::Requirement
+  requirement: &21106980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23144440
+  version_requirements: *21106980
 - !ruby/object:Gem::Dependency
   name: cobravsmongoose
-  requirement: &23144020 !ruby/object:Gem::Requirement
+  requirement: &21105280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23144020
+  version_requirements: *21105280
 - !ruby/object:Gem::Dependency
   name: cssmin
-  requirement: &23143600 !ruby/object:Gem::Requirement
+  requirement: &21102740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23143600
+  version_requirements: *21102740
 description: HTML5 Javascript game engine, quickly create robust, flexible and reusable
   games.
 email:
@@ -262,6 +262,7 @@ files:
 - src/input/touch.js
 - src/math/bisect.js
 - src/math/body.js
+- src/math/clamp.js
 - src/math/distance.js
 - src/math/drag.js
 - src/math/force.js
@@ -282,7 +283,9 @@ files:
 - src/pattern/timestep.js
 - src/save/database.js
 - src/save/storage.js
+- src/util/assert.js
 - src/util/clone.js
+- src/util/extend.js
 - src/util/log.js
 - src/util/polyfill.js
 - src/util/scene.js