entityjs 0.3.2 → 0.4.0

data/.gitignore

@@ -6,4 +6,4 @@ pkg/*
 .redcar
 ._redcar
 mygame
-*.min.js
+*.min.js

data/lib/entityjs/config.rb

@@ -54,7 +54,7 @@ module Entityjs
       if @yml.nil?
         return 500
       end
-      @yml['width']
+      @yml['width'] || 500
     end
     
     def canvas_border
@@ -62,14 +62,14 @@ module Entityjs
         return true
       end
       
-      return @yml['canvas-border']
+      return @yml['canvas-border'] || true
     end
     
     def height
       if @yml.nil?
         return 400
       end
-      @yml['height']
+      @yml['height'] || 400
     end
     
     def scripts_ignore
@@ -121,7 +121,7 @@ module Entityjs
         return 'game-canvas'
       end
       
-      @yml['canvas-id']
+      @yml['canvas-id'] || 'game-canvas'
     end
     
     def license

data/lib/entityjs/dirc.rb

@@ -7,8 +7,8 @@ module Entityjs
     
     def self.game?
       
-      #check if config.yml exists
-      if File.file? Config.file_name
+      #check if scripts dir exists
+      if File.directory? Config.scripts_folder
       
         if @game_root.nil?
           @game_root = Dir.pwd

data/lib/entityjs/page.rb

@@ -39,7 +39,13 @@ module Entityjs
     protected
     #defines varaibles on the template htmls for view on webpage
     def self.set_vars(path, tests=false)
-      contents = IO.read("#{Entityjs::root}/public/#{path}")
+      #search locally first
+      local = Dirc.game_root+'/'+path
+      if File.file? local
+        contents = IO.read(local);
+      else
+        contents = IO.read("#{Entityjs::root}/public/#{path}")
+      end
       
       #reload config for changes
       Config.instance.reload

data/lib/entityjs/version.rb

@@ -1,3 +1,3 @@
 module Entityjs
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/public/qunit/qunit.entity.js

@@ -21,10 +21,6 @@ Disable re.ready for testing
 */
 re.ready = function(){};
 
-window.addEventListener('load', function(){
-  re.sys.init(re.canvas).start();
-}, true);
-
 /*
 Expects a trigger call from the given obj.
 
@@ -173,17 +169,36 @@ e.has('coin') //true
 var coin2 = f('coin');
 coin2.value //10
 
+//create coin with custom factory
+//still has other defines properties
+
+var customCoin = f('coin', function(){
+  this.getValue = function(){
+    return this.value;
+  };
+});
+
+customCoin.value //10
+customCoin.getValue(); //10
+
 */
 var _factories = {};
 function factory(comps, func){
-  var e = re.e(comps);
-  
-  //don't enter in arrays, strings only
-  if(func) _factories[comps] = func;
-  
-  if(_factories[comps]) _factories[comps].call(e);
-  
-  return e;
+  //define new factory
+  if(func && !_factories[comps]){
+    _factories[comps] = func;
+    
+  } else {
+    //create
+    var e = re.e(comps);
+    
+    //call defined factory
+    if(_factories[comps]) _factories[comps].call(e);
+    
+    //call custom method
+    if(func) func.call(e);
+    return e;
+  }
 }
 var f = factory;
 

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

@@ -20,6 +20,17 @@ describe('comp', function(){
     eq(k.yep, 'yep')
   })
   
+  it('should add events', function(){
+    k.events('mouseup', function(){})
+    k.events({
+      mousedown:function(){}
+    });
+    
+    is(k._re_events.mouseup)
+    is(k._re_events.mousedown)
+    
+  })
+  
   it('should requires', function(){
     k
     .requires('test test2');

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

@@ -29,6 +29,18 @@ describe('entity', function(){
     ok(e.has('yep45 ok12'))
   })
   
+  it('should add events from comp', function(){
+    var func = function(){
+      
+    }
+    c.events('mousedown', func);
+    
+    e.comp(c.name);
+    
+    ok(e.has('^mousedown'));
+    is(e.mousedown);
+  })
+  
   it('should define properly', function(){
     re.c('blah1')
     .defines({
@@ -140,7 +152,7 @@ describe('entity', function(){
       
       e.comp(c.name)
       
-      e.removeComp(c.name)
+      e.removeComp(['blah', c.name])
       not(e.has(c.name))
       ok(called)
       ok(called2)
@@ -159,6 +171,10 @@ describe('entity', function(){
     eq(e.clone(2).comps(), e.comps())
   })
   
+  it('should clone empty entity', function(){
+    is(re.e().clone())
+  })
+  
   it('parent', function(){
       c.defines('d', function(v){return v; })
       .defaults('y', function(v){return v;})
@@ -166,7 +182,45 @@ describe('entity', function(){
       eq(e.parent(c.name, 'd', 100), 100)
       eq(e.parent(c.name, 'y', 'bob'), 'bob')
       e.comp(c.name)
-      ok(e.parent('', 'has', c.name))
+      ok(e.parent('','has', c.name))
+  })
+  
+  it('attr overwrite method', function(){
+    
+    var called = false;
+    
+    e.attr({
+      blah:function(){}
+    });
+    
+    e.attr({
+      blah:function(){
+        called = true;
+      }
+    });
+    
+    e.blah();
+    
+    ok(called);
+  });
+  
+  it('should dispose of all components properly', function(){
+    var called = false, called2 = false;
+    
+    e.comp('image iso');
+    
+    re.c('draw').on('dispose', function(e){
+      called = true;
+    })
+    
+    re.c('draw').dispose(function(){
+      called2 = true;
+    })
+    
+    e.dispose();
+    ok(called);
+    ok(called2)
+    
   })
   
   it('should throw error on undefined parent method', function(){
@@ -224,8 +278,9 @@ describe('entity', function(){
           not(e.has('^yep'))
            
           ok(e.has('^ok'))
-              e.off({ok:func})
-              not(e.has('^ok'))
+            e.off({ok:func})
+              
+            not(e.has('^ok'))
               
               //remove all
        e.on('key', function(){});
@@ -233,7 +288,25 @@ describe('entity', function(){
       eq(e._re_signals, {});
   })
   
-  it('should add multiple bindings', function(){
+  it('should change context of event', function(){
+    
+    var obj = {};
+    
+    e.on({
+      blah:function(){
+        eq(obj, this);
+      }
+    }, obj);
+    
+    e.on('blah2', function(){
+      eq(obj, this);
+    }, obj);
+    
+    e.trigger('blah2').trigger('blah');
+    
+  });
+  
+  it('should add multiple events', function(){
     
     var called = false;
     var called2 = false;
@@ -298,22 +371,32 @@ describe('entity', function(){
   var co;
   var en;
   var called2 = false;
+  
+  //listen for dispose call on component
       c.dispose(function(comp){
           called = true
           co = comp
       })
+      
+      //component dispose trigger
           c.on('dispose', function(e){
           called2 = true
           en = e
           })
+      
+          //add comp to testing entity
       e.comp(c.name)
+      
       var called3 = false
+      //listen for dispose trigger on entity
           e.on('dispose', function(){
               called3 = true
           });
       
+          //call it
       e.dispose()
       
+      //asserts
       ok(called)
       eq(co, c)
       ok(called2)

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

@@ -1,5 +1,9 @@
 describe('query', function(){
   
+  beforeEach(function(){
+    query = re();
+  })
+  
     it('should query', function(){
         re.e('tesee');
         re.e('tesee bob99');
@@ -25,6 +29,10 @@ describe('query', function(){
     eq(re(g).length, 1)
   });
   
+  it('should return empty query', function(){
+    eq(re().length, 0);
+  })
+  
   it('should select *', function(){
       var c = re._e.length;
       eq(re('*').length, c);
@@ -38,13 +46,24 @@ describe('query', function(){
         }).length, 1)
     });
   
-    it('method', function(){
-        eq(re.e('ok', 3).method('comp', 'b').comps(), ['ok', 'b'])
+    it('should create query from array', function(){
+      var a = [1,2,3];
+      
+      var q = re(a);
+      
+      eq(q[0], a[0])
+      eq(q[1], a[1])
+      eq(q[2], a[2])
+      
+    })
+    
+    it('invoke', function(){
+        eq(re.e('ok', 3).invoke('comp', 'b').comps(), ['ok', 'b'])
     });
   
     it('each', function(){
       var i = 0;
-      is(re('dd', 3).each(function(c, l){
+      is(re('dd', 3).each(function(e, c, l){
         eq(i++, c);
         eq(l, 3)
       }))
@@ -52,10 +71,10 @@ describe('query', function(){
     
     it('tilemap', function(){
     
-      is(re.e('tile', 10).tilemap(5, function(x, y, i, l){
+      is(re.e('tile', 10).tilemap(5, function(e, x, y, i, l){
         ok(x < 5)
         ok(y < 2)
-        eq(l, 10)
+        is(l)
       }));
       
     });
@@ -75,29 +94,100 @@ describe('query', function(){
       eq(k[0].f, re('tile')[0].f);
       eq(k[0].y, re('tile')[0].y);
     });
-        
+    
+    it('e', function(){
+      
+      var q = re();
+      
+      q.e('blah');
+      
+      ok(q.last().has('blah'))
+      
+    })
+    
+    it('should last', function(){
+      var b = re.e();
+      query.last(b);
+      eq(query.last(), b)
+    })
+    
+    it('should first', function(){
+      var b = re.e();
+      query.first(b);
+      eq(query.first(), b)
+      
+    })
+    
+    it('insertAfter', function(){
+      var b = re.e();
+      
+      query.last(10, 6);
+      
+      query.insertAfter(10, b);
+      
+      eq(query.indexOf(b), 1);
+    })
+    
+    it('insertBefore', function(){
+      
+      var b = re.e();
+      
+      query.last(10, 6);
+      
+      query.insertBefore(6, b);
+      
+      eq(query.indexOf(b), 1);
+    })
+    
+    it('swap', function(){
+      query.last(10, 6);
+      
+      
+      query.swap(10, 6);
+      
+      eq(query[0], 6);
+      eq(query[1], 10);
+    })
+    
+    it('should erase', function(){
+      
+      var q = re();
+      
+      var e = re.e();
+      
+      q.push(e);
+      
+      //add in
+      var n = re.e();
+      
+      q.erase(e);
+      
+      not(q.include(e))
+      
+    })
+    
     it('attr', function(){
         re('tile').attr('first', 'asdf');
-        re('tile').each(function(){
-          eq(this.first, 'asdf')
+        re('tile').each(function(e){
+          eq(e.first, 'asdf')
         })
         
         re('tile').attr({yap:'1232'});
-        re('tile').each(function(){
-          eq(this.yap, '1232')
+        re('tile').each(function(e){
+          eq(e.yap, '1232')
         })
     });
     
     it('def', function(){
       re('tile').def('first', 'asdf');
-      re('tile').each(function(){
-        eq(this.first, 'asdf')
+      re('tile').each(function(e){
+        eq(e.first, 'asdf')
       })
       
       re('tile').def({yap:'1232', first:'d'});
-      re('tile').each(function(){
-        eq(this.yap, '1232')
-        eq(this.first, 'asdf')
+      re('tile').each(function(e){
+        eq(e.yap, '1232')
+        eq(e.first, 'asdf')
       })
     
     });
@@ -149,6 +239,97 @@ describe('query', function(){
         not(re.e('sdf',2).has('^wef'));
     });
     
+    it('include', function(){
+      
+      var en = re.e();
+      
+      var query = re();
+      
+      not(query.include(en));
+      
+      query.push(en);
+      
+      ok(query.include(en));
+      
+    })
+    
+    it('min', function(){
+      var query = re();
+      
+      query.push(0)
+      query.push(10)
+      query.push(2)
+      query.push(5)
+      
+      eq(query.min(function(e, i, l){
+        eq(this, 'ok')
+        is(i)
+        is(l)
+        
+        return e;
+        
+        }, 'ok'), 0)
+    })
+    
+    it('max', function(){
+      
+      var query = re();
+      
+      query.push(0)
+      query.push(10)
+      query.push(2)
+      query.push(5)
+      
+      eq(query.max(function(e, i, l){
+        eq(this, 'ok')
+        is(i)
+        is(l)
+        
+        return e;
+        
+        }, 'ok'), 10)
+    })
+    
+    it('find', function(){
+      var e = re();
+      e.push(1);
+      e.push(10);
+      
+      //find index with 10
+      eq(e.find(function(t){
+        eq(e, this)
+        return t == 10;
+        }), 10);
+    })
+    
+    it('isEmpty', function(){
+      ok(re().isEmpty())
+    })
+    
+    it('every', function(){
+      
+      //check if all entities in query have value blah
+      var e = re();
+      e.push(re.e());
+      e.push(re.e().attr('blah', true));
+      
+      not(e.every(function(e){
+        return e.blah;
+        }));
+      
+      e.attr('blah', true)
+        
+      //should now all have blah
+      ok(e.every(function(e){
+        return e.blah;
+        }));
+        
+      //length zero..
+      ok(re().every(function(){
+        return false;
+      }))
+    })
+    
     it('dispose', function(){
         is(re.e('rgfdvdvdfv', 2).dispose());
         eq(re('rgfdvdvdfv').length, 0);