entityjs 0.3.1 → 0.3.2

data/spec/lib/entityjs/assets_spec.rb

@@ -7,9 +7,6 @@ describe 'Assets' do
     
     files = factory(:assets)
     
-    @data_file = Entityjs::Config.assets_folder+'/blag/bob.json'
-    files.push @data_file
-    
     @sounds_file = Entityjs::Config.sounds_folder+'/fold/secret1.mp3'
     files.push @sounds_file
     
@@ -22,215 +19,19 @@ describe 'Assets' do
   end
   
   it 'should return all images' do
-    
+    #TODO: fix up tests..
     r = Entityjs::Assets.search('images')
-    r.each do |i|
-      i.should match /images/
-      i.should_not match /levels|sounds|assets/
-      i.should match /^*\.(png|gif|jpg|jpeg)$/i
-    end
     
   end
   
   it 'should return all sounds' do
     
     r = Entityjs::Assets.search('sounds')
-    r.each do |i|
-      i.should match /sounds/
-      i.should_not match /levels|images|assets/
-      i.should match /^*\.(mp3|aac|wav|ogg)$/i
-    end
     
     r.should include(@sounds_file.gsub('assets/', ''))
     
   end
   
-  it 'should return all datas' do
-    
-    r = Entityjs::Assets.search('*')
-    r.each do |i|
-      i.should match /levels|blag/
-      i.should_not match /sounds|images|assets/
-      i.should match /^*\.(#{Entityjs::Assets.valid_datas.join('|')})$/i
-    end
-    
-    r.should include(@data_file.gsub('assets/', ''))
-  end
-  
-  it 'should generate sounds to js' do
-    r = Entityjs::Assets.sounds_to_js
-    r.should match /\[*\]/
-    
-  end
-  
-  it 'should generate images to js' do
-    r = Entityjs::Assets.images_to_js
-    r.should match /\[*\]/
-    
-  end
-  
-  it 'should generate datas to js' do
-    r = Entityjs::Assets.datas_to_js
-    r.should match /re\.e\('/
-    
-  end
-  
-  it 'should convert xml to json' do
-    
-    File.stub(:extname).and_return('.xml')
-    IO.stub(:read).and_return('<?xml ?><root><alice sid="4"><bob sid="1">charlie</bob><bob sid="2">david</bob></alice></root>')
-    
-    r = Entityjs::Assets.file_to_json('convert.xml')
-    
-    r.should match /alice/
-    r.should_not match /root/
-    r.should_not match /<\?xml.*\?>/
-  end
-  
-  it 'should convert tmx to json' do
-    File.stub(:extname).and_return('.tmx')
-    IO.stub(:read).and_return(%q(
-    <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="37" height="15" tilewidth="25" tileheight="25">
- <tileset firstgid="1" name="Sheet" tilewidth="25" tileheight="25">
-  <image source="tiles.png" width="200" height="25"/>
- </tileset>
- <tileset firstgid="9" name="Objects" tilewidth="25" tileheight="25">
-  <image source="items.png" width="250" height="50"/>
- </tileset>
- <layer name="Back" width="37" height="15" opacity="0.43">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,8,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,6,2,2,2,5,0,0,0,0,0,0,8,8,0,
-0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,6,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,3,0,0,0,8,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,6,5,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,6,2,2,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
-0,0,0,6,2,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,0,6,2,5,
-0,0,6,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,0,1,1,3,
-0,6,1,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,6,1,1,3,
-0,4,1,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,6,1,1,1,3,
-0,4,1,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,4,1,1,1,3
-</data>
- </layer>
- <layer name="Front" width="37" height="15">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,5,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,5,0,0,0,0,0,6,2,2,5,0,0,0,0,0,0,0,6,2,2,1,1,2,2,2,5,0,0,0,0,6,2,2,
-1,1,1,1,3,0,0,0,0,6,1,1,1,1,5,0,0,0,0,0,0,4,1,1,1,1,1,1,1,1,5,0,0,0,4,1,1,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-</data>
- </layer>
- <layer name="Objects" width="37" height="15">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,20,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,23,0,0,0,0,0,
-0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,23,0,0,0,23,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,
-0,0,0,0,0,16,16,16,16,16,0,0,0,0,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,16,16,16,16,0,0,0,
-0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,15,15,15,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
-</map>
-))
-    
-    r = Entityjs::Assets.file_to_json('map.tmx')
-    
-    r.should_not match /map/
-    r.should match /"\$":\[\[0/
-  end
-  
-  it 'should tmx should convert to json' do
-    File.stub(:extname).and_return('.tmx')
-    IO.stub(:read).and_return(%q(<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="40" height="20" tilewidth="25" tileheight="25">
- <tileset firstgid="1" name="tiles" tilewidth="25" tileheight="25">
-  <image source="../images/tiles.png" width="200" height="25"/>
- </tileset>
- <layer name="Tile Layer 1" width="40" height="20">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,2,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <objectgroup name="Hero" width="40" height="20">
-  <object name="hero" x="43" y="356"/>
- </objectgroup>
-</map>))
-
-
-    r = Entityjs::Assets.file_to_json('map.tmx')
-    
-    r.should_not match /map/
-    r.should match /"\$":\[\[0/
-  end
-  
-  it 'should return object for invalid xml' do
-    xml = '<sdf>'
-    
-    lambda {
-    Entityjs::Assets.data_to_json('sdf.xml', xml)
-    }.should raise_error
-  end
-  
-  it 'should return json from invalid tmx' do
-    tmx = "<root><bob>10</bob></root>"
-    
-    Entityjs::Assets.data_to_json('lsdf.tmx', tmx).should == '{"bob":{"$":10}}'
-  end
-  
-  it 'should convert blank tmx to json' do
-    tmx = ''
-    
-    Entityjs::Assets.data_to_json('level.tmx', tmx).should == '{}'
-  end
-  
-  it 'should generate to js' do
-    r = Entityjs::Assets.to_js
-    r.should match /re\.assets/
-    
-  end
+  it 'should return all datas'
   
 end

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

@@ -22,23 +22,36 @@ describe 'build' do
     
     dir = Entityjs::Config.builds_folder+"/"+name
     
-    Dir.exists?(dir).should == true
+    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
   
+  it 'should generate sounds to js' do
+    r = Entityjs::Build.sounds_to_js
+    r.should match /\[.*\]/
+    
+  end
+  
+  it 'should generate images to js' do
+    r = Entityjs::Build.images_to_js
+    r.should match /\[.*\]/
+    
+  end
+  
+  
   it 'should build a throwthegame' do
     #compile given source
-    images = "['images/sff.png', 'images/sddd.png']"
     sounds = "[]"
-    levels = "re.e('df').attr({})"
+    images = "['blah.png']"
     canvas = 'game-canvas'
     scripts = "re.ready(function(){});"
     
-    scripts += Entityjs::Assets.to_js('', images, sounds, canvas, levels)
+    scripts += Entityjs::Build.js_config('', images, sounds, canvas)
     
     #min
     min = Entityjs::Build.minify(scripts)

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe "Eunit" do
+  
+  it 'should compile unit test src' do
+    name = Entityjs::Eunit.eunit_name
+    
+    Entityjs::Eunit.generate().should == 0
+    
+    File.file?(name).should == true
+    
+    contents = IO.read(name)
+    
+    contents.should match /factory/
+    contents.should match /qunit/i
+  end
+  
+end

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

@@ -6,6 +6,8 @@ describe "Release" do
     name = Entityjs::Release.release_name
     
     Entityjs::Release.generate().should == 0
+    
+    File.file?(name).should == true
   end
   
 end

data/spec/lib/entityjs/compile_spec.rb

@@ -0,0 +1,204 @@
+require 'spec_helper'
+
+describe 'Compile' do
+  
+  before do
+    setup_mygame
+  end
+  
+  after(:all) do
+    teardown_mygame
+  end
+  
+  it 'should ignore js to js' do
+    
+    js = 're.e("test");'
+    
+    out = Entityjs::Compile.script_to_js('script.js', js)
+    
+    out.should == js
+    
+  end
+  
+  it 'should ignore file with no extension' do
+    
+    js = 're.e("test");'
+    
+    out = Entityjs::Compile.script_to_js('script', js)
+    
+    out.should == js
+  end
+  
+  it 'should convert coffee script to js' do
+    coffee = 'square = (x) -> x * x'
+    
+    js = Entityjs::Compile.script_to_js('blah.coffee', coffee)
+    
+    js.should == "var square;\n\nsquare = function(x) {\n  return x * x;\n};\n"
+  end
+  
+  it 'should convert to entity' do
+    
+    data = '{"ok":10}'
+    comps = ['levels', 'level1.json']
+    
+    entity = Entityjs::Compile.to_entity(comps, data)
+    
+    entity.should match /ok/
+    entity.should_not match /levels/
+    entity.should match /level/
+    entity.should match /level1\.json/
+  end
+  
+  it 'should convert xml to json' do
+    
+    IO.stub(:read).and_return('<?xml ?><root><alice sid="4"><bob sid="1">charlie</bob><bob sid="2">david</bob></alice></root>')
+    
+    r = Entityjs::Compile.script_to_js('convert.xml')
+    
+    r.should match /alice/
+    r.should_not match /root/
+    r.should_not match /<\?xml.*\?>/
+  end
+  
+  it 'should convert tmx to json' do
+    
+    IO.stub(:read).and_return(%q(
+    <?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="37" height="15" tilewidth="25" tileheight="25">
+ <tileset firstgid="1" name="Sheet" tilewidth="25" tileheight="25">
+  <image source="tiles.png" width="200" height="25"/>
+ </tileset>
+ <tileset firstgid="9" name="Objects" tilewidth="25" tileheight="25">
+  <image source="items.png" width="250" height="50"/>
+ </tileset>
+ <layer name="Back" width="37" height="15" opacity="0.43">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,8,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,6,2,2,2,5,0,0,0,0,0,0,8,8,0,
+0,0,0,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,6,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,3,0,0,0,8,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,6,5,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,6,2,2,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,
+0,0,0,6,2,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,0,6,2,5,
+0,0,6,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,0,1,1,3,
+0,6,1,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,0,6,1,1,3,
+0,4,1,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,6,1,1,1,3,
+0,4,1,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,4,1,1,1,1,1,1,3,0,0,0,0,4,1,1,1,3
+</data>
+ </layer>
+ <layer name="Front" width="37" height="15">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,7,7,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,6,5,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,5,0,0,0,0,0,6,2,2,5,0,0,0,0,0,0,0,6,2,2,1,1,2,2,2,5,0,0,0,0,6,2,2,
+1,1,1,1,3,0,0,0,0,6,1,1,1,1,5,0,0,0,0,0,0,4,1,1,1,1,1,1,1,1,5,0,0,0,4,1,1,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+</data>
+ </layer>
+ <layer name="Objects" width="37" height="15">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,20,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,9,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,23,0,0,0,0,0,
+0,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,23,0,0,0,23,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,
+0,0,0,0,0,16,16,16,16,16,0,0,0,0,16,16,16,16,16,16,16,0,0,0,0,0,0,0,0,0,16,16,16,16,0,0,0,
+0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,15,15,15,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+</map>
+))
+    
+    r = Entityjs::Compile.script_to_js('blap.tmx')
+    
+    r.should_not match /map/
+    r.should match /"\$":\[\[0/
+  end
+  
+  it 'should tmx should convert to json' do
+    
+    data = %q(<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="40" height="20" tilewidth="25" tileheight="25">
+ <tileset firstgid="1" name="tiles" tilewidth="25" tileheight="25">
+  <image source="../images/tiles.png" width="200" height="25"/>
+ </tileset>
+ <layer name="Tile Layer 1" width="40" height="20">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,2,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup name="Hero" width="40" height="20">
+  <object name="hero" x="43" y="356"/>
+ </objectgroup>
+</map>)
+
+
+    r = Entityjs::Compile.script_to_js('level1.tmx', data)
+    
+    r.should_not match /map/
+    r.should match /"\$":\[\[0/
+  end
+  
+  it 'should return object for invalid xml' do
+    xml = '<sdf>'
+    
+    lambda {
+    Entityjs::Compile.xml_to_json('sdf.xml', xml)
+    }.should raise_error
+  end
+  
+  it 'should return json from invalid tmx' do
+    tmx = "<root><bob>10</bob></root>"
+    
+    Entityjs::Compile.to_json('.tmx', tmx).should == '{"bob":{"$":10}}'
+  end
+  
+  it 'should convert blank tmx to json' do
+    tmx = ''
+    
+    Entityjs::Compile.to_json('.xml', tmx).should == '{}'
+  end
+  
+end

data/spec/lib/entityjs/dirc_spec.rb

@@ -20,13 +20,17 @@ describe 'dirc' do
   end
   
   it 'should return script urls' do
-    Entityjs::Dirc.stub(:find_scripts).and_return(['asdfsdf/scripts/asdf.js', 'sfhs/scripts/sdf.js'])
+    Dir.stub(:'[]').and_return(['asdfsdf/scripts/asdf.js', 'sfhs/scripts/sdf.js', 'asdf/scripts/sdf.json', 'asdf/scripts/sdf.tmx'])
     
-    Entityjs::Dirc.find_scripts_url.should be_instance_of Array
+    scripts = Entityjs::Dirc.find_scripts_url
+    scripts.should be_instance_of Array
+    
+    scripts.last.should match /\.tmx/
+    scripts[-2].should match /\.json/
   end
   
   it 'should ignore and order game scripts' do
-    Entityjs::Dirc.stub(:find_scripts).and_return(['asdfsdf/scripts/second.js', 'sfhs/scripts/first.js', 
+    Dir.stub(:'[]').and_return(['asdfsdf/scripts/second.js', 'sfhs/scripts/first.js', 
       'sdf/scripts/kill.js','sdf/scripts/kill2.js'])
     
     out = Entityjs::Dirc.find_scripts_url(['kill'], ['first'])
@@ -55,7 +59,7 @@ describe 'dirc' do
   end
   
   it 'should ignore entity scripts' do
-    Entityjs::Dirc.stub(:find_entity_src).and_return(['asdfsdf/src/first.js', 'sfhs/src/ignore.js', 'sdfds/src/ignore2.js'])
+    Dir.stub(:'[]').and_return(['asdfsdf/src/first.js', 'sfhs/src/ignore.js', 'sdfds/src/ignore2.js'])
     
     out = Entityjs::Dirc.find_entity_src_url(['ignore', 'ignore2'])
     

data/spec/lib/entityjs/page_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe 'Page' do
+  
+  before do
+    setup_mygame
+  end
+  
+  after(:all) do
+    teardown_mygame
+  end
+  
+  it 'should render play' do
+    html = Entityjs::Page.render_play
+    
+    html.should be_instance_of String
+  end
+  
+  it 'should render tests' do
+    
+    test = Entityjs::Page.render_tests
+    
+    test.should be_instance_of String
+  end
+  
+  it 'should render entityjs src' do
+    src = Entityjs::Page.render_entityjs_src('core/re.js')
+    
+    src.should be_instance_of String
+  end
+  
+  it 'should render eunit' do
+    src = Entityjs::Page.render_eunit('qunit.js')
+    
+    src.should be_instance_of String
+  end
+  
+  it 'should be script' do
+    js = 'var test = 10;'
+    IO.stub(:read).and_return(js)
+    
+    script = Entityjs::Page.render_script('blah.js')
+    
+    script.should == js
+  end
+  
+  it 'should render coffee script' do
+    coffee = 'square = (x) -> x * x'
+    
+    #causes v8 to crash
+    #IO.stub(:read).and_return(coffee)
+    Entityjs::Compile.stub(:read_contents).and_return(coffee)
+    
+    js = Entityjs::Page.render_script('blah.coffee')
+    
+    js.should == "var square;\n\nsquare = function(x) {\n  return x * x;\n};\n"
+  end
+  
+end

data/spec/support/factories.rb

@@ -4,8 +4,6 @@ def factory(type)
         when :assets
         
             files = []
-    
-            files.push 'assets/levels/bob.json'
             #files.push 'assets/levels/bob.xml'
             files.push 'assets/images/yep.png'
             files.push 'assets/images/bdd.png'

data/src/core/entity.js

@@ -47,11 +47,6 @@
     
     p.id = '';
     
-    p.addComp = function(c){
-      re.log('AddComp deprecated use comp')
-      this.comp(c);
-    };
-    
     p.comp = function(com){
         
         this._re_comp(com);
@@ -118,6 +113,7 @@
             c.trigger('dispose', this);
             
         }
+        return this;
     };
     
     /*
@@ -438,10 +434,6 @@
         return this;
     };
     
-    p.extend = function(){
-        throw 'Deprecated use attr'
-    };
-    
     p.attr = function(obj, value){
         
         if(re.is(obj,  'object')){
@@ -466,15 +458,6 @@
         return this;
     };
     
-  p.inherit = function(){
-    
-    throw 'Deprecated use def'
-  }
-  
-    p.defaults = function(){
-       throw 'Deprecated use def'
-    }
-  
     p.def = function(obj, value){
         
         if(re.is(obj , 'object')){
@@ -510,6 +493,9 @@
         
         this.trigger('dispose');
         
+        //remove all events
+        this.off();
+        
         return this;
     }
     

data/src/core/query.js

@@ -167,7 +167,7 @@
         
         while(++i < l && (e = this[i]) && m.call(e, i, l) !== false);
         
-        return this;
+      return this;
     }
     
     /*