entityjs 0.4.1 → 0.4.2

data/spec/javascripts/src/cycle/update_spec.js

@@ -17,27 +17,27 @@ describe('update', function(){
     
     is(k.updateFirst())
     var l = 0;
-    eq(re._c.update.l[l], k)
+    eq(re.update.l[l], k)
   })
   
   it('update last', function(){
     is(k.updateLast())
-    var l = re._c.update.l.length-1;
-    eq(re._c.update.l[l], k)
+    var l = re.update.l.length-1;
+    eq(re.update.l[l], k)
   })
   
   it('update after', function(){
     is(k.updateAfter(last))
     
-    var him = re._c.update.l.indexOf(last)
-    eq(re._c.update.l[him+1], k)
+    var him = re.update.l.indexOf(last)
+    eq(re.update.l[him+1], k)
   })
   
   it('update before', function(){
     is(k.updateBefore(last))
     
-    var him = re._c.update.l.indexOf(last)
-    eq(re._c.update.l[him-1], k)
+    var him = re.update.l.indexOf(last)
+    eq(re.update.l[him-1], k)
     
   })
   
@@ -56,7 +56,7 @@ describe('update', function(){
       called2 = true
     })
     
-    re.c('update').update(10)
+    re.update.update(10)
     
     ok(called2)
     ok(called)

data/spec/javascripts/src/display/align_spec.js

@@ -8,12 +8,12 @@ describe('align', function(){
     
     it('align hor', function(){
         is(e.alignHor(10));
-        eq(e.posX, re.sys.sizeX * 0.5 - e.sizeX * 0.5 + 10)
+        eq(e.posX, re.sys.sizeX * 0.5 - e.sizeX * 0.5 + 10 |0)
     });
     
     it('align ver', function(){
         is(e.alignVer(1));
-        eq(e.posY, re.sys.sizeY * 0.5 - e.sizeY * 0.5 + 1)
+        eq(e.posY, re.sys.sizeY * 0.5 - e.sizeY * 0.5 + 1 |0)
     
     });
     

data/spec/javascripts/src/display/el_spec.js

@@ -0,0 +1,17 @@
+describe('displays/el', function(){
+  
+  var e;
+  
+  beforeEach(function(){
+    e = re.e('el:div');
+  })
+  
+  it('should define valid dom', function(){
+    is(e.el, 'htmldivelement');
+    eq(e.posX(), 0)
+    eq(e.posY(), 0)
+    eq(e.sizeX(), 0)
+    eq(e.sizeY(), 0)
+  })
+  
+});

data/spec/javascripts/src/input/keyboard_spec.js

@@ -21,12 +21,12 @@ describe('keyboard', function(){
     });
     
     //manually call
-    re.c('keyboard').event({type:type, keyCode:68})//d
+    re.keyboard.event({type:type, keyCode:68})//d
     
     eq(called, 'd')
     eq(called2, null)
     
-    re.c('keyboard').event({type:type, keyCode:82})//r
+    re.keyboard.event({type:type, keyCode:82})//r
     
     eq(called, 'r')
     eq(called2, 'r')
@@ -48,12 +48,12 @@ describe('keyboard', function(){
     });
     
     //manually call
-    re.c('keyboard').event({type:type, keyCode:68})//d
+    re.keyboard.event({type:type, keyCode:68})//d
     
     eq(called, 'd')
     eq(called2, null)
     
-    re.c('keyboard').event({type:type, keyCode:82})//r
+    re.keyboard.event({type:type, keyCode:82})//r
     
     eq(called, 'r')
     eq(called2, 'r')

data/spec/javascripts/src/input/mouse_spec.js

@@ -22,7 +22,7 @@ describe('mouse', function(){
         is(m)
       })
       
-      re.c('mouse').event({type:type, offsetX:0, offsetY:0}, 'middle')
+      re.mouse.event({type:type, offsetX:0, offsetY:0}, 'middle')
       
       ok(called2)
       ok(called)
@@ -44,7 +44,7 @@ describe('mouse', function(){
         is(m)
       })
       
-      re.c('mouse').event({type:type, offsetX:0, offsetY:0}, 'middle')
+      re.mouse.event({type:type, offsetX:0, offsetY:0}, 'middle')
       
       ok(called2)
       ok(called)
@@ -63,7 +63,7 @@ describe('mouse', function(){
         is(e)
       });
       
-      re.c('mouse').event({type:type, offsetX:0, offsetY:0})
+      re.mouse.event({type:type, offsetX:0, offsetY:0})
       
       ok(called)
   });
@@ -75,12 +75,12 @@ describe('mouse', function(){
       
       e.on(type, function(x,y, e){
         called = true
+        is(e)
         is(x)
         is(y)
-        is(e)
       });
       
-      re.c('mouse').event({type:type, offsetX:0, offsetY:0})
+      re.mouse.event({type:type, offsetX:50, offsetY:100})
       
       ok(called)
   })
@@ -97,7 +97,7 @@ describe('mouse', function(){
         is(e)
       });
       
-      re.c('mouse').event({type:type, offsetX:0, offsetY:0})
+      re.mouse.event({type:type, offsetX:0, offsetY:0})
       
       ok(called)
   })
@@ -114,8 +114,9 @@ describe('mouse', function(){
         is(e)
       });
       
-      re.c('mouse').event({type:type, offsetX:0, offsetY:0})
+      re.mouse.event({type:type, offsetX:0, offsetY:0})
       
       ok(called)
   })
+
 });

data/spec/javascripts/src/math/random_spec.js

@@ -46,5 +46,13 @@ describe('random', function(){
     }
     
 	});
+
+  it('random prop from object', function(){
+    var obj = {ok:10, blah:2, t:3};
+
+    var prop = re.random(obj);
+
+    ok(prop == 'ok' || prop == 'blah' || prop == 't')
+  })
   
 });

data/spec/javascripts/src/util/clone_spec.js

@@ -0,0 +1,20 @@
+describe('util/clone', function(){
+
+	it('should clone object', function(){
+		var k = {ok:10, blah:[]}
+
+		var b = re.clone(k);
+
+		eq(b.ok, k.ok)
+		eq(b.blah, k.blah)
+	})
+
+	it('should clone array', function(){
+		var k = [1,2];
+
+		var b = re.clone(k);
+
+		eq(b, k)
+	})
+
+});

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

@@ -10,17 +10,12 @@ describe 'build' do
     teardown_mygame
   end
   
-  it 'should run' do
-    #turn this off, too much garbage made
-    #Entityjs::Command.run('build', []).should == 0
-  end
-  
-  it 'should run release1' do
+  it 'should build' do
     
     name = "release#{rand(999)}"
     Entityjs::Command.run('b', [name]).should == 0
     
-    dir = Entityjs::Config.builds_folder+"/"+name
+    dir = Entityjs::Config.build_folder
     
     File.directory?(dir).should == true
     
@@ -44,7 +39,7 @@ describe 'build' do
   end
   
   
-  it 'should build a throwthegame' do
+  it 'should build' do
     #compile given source
     sounds = "[]"
     images = "['blah.png']"

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

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'Html' do
+
+	before(:all) do
+		setup_mygame
+	end
+
+	after(:all) do
+		teardown_mygame
+	end
+
+	it 'should generate html files' do
+		#remove files before hand
+		if File.exists?("play.html")
+			FileUtils.rm("play.html")
+		end
+
+		if File.exists?("test.html")
+			FileUtils.rm("test.html")
+		end
+		Entityjs::Html.generate().should == 0
+		File.exists?("play.html").should == true
+		File.exists?("test.html").should == true
+	end
+
+end

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

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe 'min' do
+  
+  before(:all) do
+    setup_mygame
+  end
+  
+  after(:all) do
+    teardown_mygame
+  end
+  
+  it 'should compile' do
+    
+    Entityjs::Command.run('min', []).should == 0
+    
+    Entityjs::Config.instance.stub(:build_path).and_return('build')
+
+    dir = Entityjs::Config.instance.build_path
+    
+    File.directory?(dir).should == true
+    
+    Dir.chdir(dir) do
+      File.file?('game.min.js').should == true
+      contents = IO.read('game.min.js')
+      contents.should match /re\.canvas/
+    end
+  end
+  
+end

data/spec/lib/entityjs/config_spec.rb

@@ -15,5 +15,11 @@ describe 'config' do
     @config = Entityjs::Config.instance
     
   end
+
+  it 'should rewrite vars' do
+  	data = 'var sdf = RE_WIDTH'
+
+  	Entityjs::Config.instance.preprocess(data).should_not match(/RE_WIDTH/)
+  end
   
 end

data/spec/lib/entityjs/page_spec.rb

@@ -11,14 +11,14 @@ describe 'Page' do
   end
   
   it 'should render play' do
-    html = Entityjs::Page.render_play
+    html = Entityjs::Page.render_play_page
     
     html.should be_instance_of String
   end
   
-  it 'should render tests' do
+  it 'should render test' do
     
-    test = Entityjs::Page.render_tests
+    test = Entityjs::Page.render_test_page
     
     test.should be_instance_of String
   end
@@ -37,7 +37,7 @@ describe 'Page' do
   
   it 'should be script' do
     js = 'var test = 10;'
-    IO.stub(:read).and_return(js)
+    Entityjs::Compile.stub(:script_to_js).and_return(js)
     
     script = Entityjs::Page.render_script('blah.js')
     

data/src/core/comp.js

@@ -1,22 +1,3 @@
-    /*
-    Quick way to convert sentences to arrays.
-    */
-    var __z = function(n, r){
-        this._checkFinal();
-        
-        if(!this[n]){
-            this[n] = [];
-        }
-        
-        if(re.is(r, 'string')){
-            this[n] = this[n].concat(r.split(' '));
-        } else {
-            this[n] = this[n].concat(r);
-        }
-        
-        return this;
-    };
-    
     /*
     If component exists, the component will NOT be overwritten.
     
@@ -34,11 +15,21 @@
     re.c.init = function(name){
         
         this.name = name;
-        this._re_signals = {};
-        this._re_inherits = {};
+        this._re_listens = {};
+        this._re_defaults = {};
         this._re_defines = {};
         this._re_events = {};
-        this._re_final = false;
+        this._re_final = 0;
+
+        //defines the special re.[comp]()
+        if(!re[this.name]){
+            var that = this;
+
+            re[this.name] = function(){
+                return that._re_method.apply(that, arguments);
+            };
+
+        }
     };
     
     /*
@@ -54,7 +45,25 @@
     */
     
 re.c.init.prototype = {
-    
+    /*
+    Quick way to convert sentences to arrays.
+    */
+    z:function(n, r){
+        this._checkFinal();
+        
+        if(!this[n]){
+            this[n] = [];
+        }
+        
+        if(re.is(r, 'string')){
+            this[n] = this[n].concat(r.split(' '));
+        } else {
+            this[n] = this[n].concat(r);
+        }
+        
+        return this;
+    },
+
     _checkFinal:function(){
         
         if(this._re_final){
@@ -68,11 +77,11 @@ re.c.init.prototype = {
         if(!re.is(value)){
             
             for(var type in obj){
-                this[type] = obj[type];    
+                re[this.name][type] = obj[type];    
             }
             
         } else {
-            this[obj] = value;    
+            re[this.name][obj] = value;    
         }
         
         return this;
@@ -94,8 +103,55 @@ re.c.init.prototype = {
       return this;
     },
     
+    /*
+    Defines a more formal constructor for when references are needed.
+
+    re.c('control')
+    .factory(function(ref, val){
+        this.ref = ref;
+        this.val = val;
+    });
+
+    //new control entity
+    re.control(val1, val2);
+    re.c('control').factory
+
+    */
+    factory:function(f){
+        this._checkFinal();
+
+        this._re_factory = f;
+
+        return this;
+    },
+
+    _re_method:function(){
+        var e = re.e(this.name);
+
+        if(this._re_factory)
+            this._re_factory.apply(e, arguments);
+
+        return e;
+    },
+
+    /*
+    Overwrites the factory method for a custom use.
+
+    re.c('monster')
+    .method(function(){
+        return re('monster');
+    });
+
+    re.monster(); //calls method
+    
+    */
+    method:function(f){
+        this._re_method = f;
+        return this;
+    },
+
     requires:function(r){
-        return __z.call(this, '_re_requires', r);
+        return this.z('_re_requires', r);
     },
     
     /*
@@ -105,7 +161,7 @@ re.c.init.prototype = {
     This prevents incompatible components from colliding.
     */
     asserts:function(r){
-        return __z.call(this, '_re_asserts', r);
+        return this.z('_re_asserts', r);
     },
     
     /*
@@ -123,7 +179,7 @@ re.c.init.prototype = {
     
     */
     interfaces:function(r){
-        return __z.call(this, '_re_implements', r);
+        return this.z('_re_interfaces', r);
     },
     
     /*
@@ -202,12 +258,12 @@ re.c.init.prototype = {
         if(arguments.length == 1){
             
             for(var k in d){
-                this._re_inherits[k] = d[k];    
+                this._re_defaults[k] = d[k];    
             }
             
         } else {
             
-            this._re_inherits[d] = value;
+            this._re_defaults[d] = value;
                 
         }
         
@@ -294,7 +350,7 @@ re.c.init.prototype = {
     lock:function(){
         this._checkFinal();
         
-        this._re_final = true;
+        this._re_final = 1;
         
         return this;
     },