entityjs 0.4.1 → 0.4.2

data/templates/circle/scripts/scenes/home.js

@@ -4,26 +4,17 @@ re.scene('home')
   //stop the browser from moving around
   re.preventDefault('left right up down');
   
+  var radius = 10;
+  var color = '#FF0000';
+
   //create new circle on canvas
-  re.e('circle align update')
-  .attr({
-    radius:10,
-    speed:15,
-    color:'#ff0000'
-  })
+  re.circle(radius, color)
   //from align component
   .alignHor()
-  .alignVer()
-  .on('update', function(){
-    
-    //move on keypressed
-    if(re.pressed('a', 'left')) this.posX -= this.speed;
-    if(re.pressed('d', 'right')) this.posX += this.speed;
-    
-    if(re.pressed('w', 'up')) this.posY -= this.speed;
-    if(re.pressed('s', 'down')) this.posY += this.speed;
-    
-  });
+  .alignVer();
+
+  //find circle and change speed
+  re('circle').first().attr('speed', 15);
   
   //add help text
   re.e('text align')

data/templates/circle/tests/scenes/home_test.js

@@ -1,8 +1,4 @@
-module('scenes/home', {
-  setup:function(){
-    re.scene('home').enter();
-  }
-});
+module('scenes/home', lazyScene('home'));
 
 test('entities should exist', function(){
   
@@ -12,18 +8,14 @@ test('entities should exist', function(){
   
   //has update listener
   expectEvent(circle, 'update');
-  
-  var xBefore = circle.posX;
-  
+  expectValueDown(circle, 'posX');
+
   //moves upon keypress
   keypress('a', function(){
     //key is currently down, so call update method
     circle.trigger('update');
   });
   
-  //check if the circle moved
-  ok(xBefore != circle.posX);
-  
   //text exists
   is(re('text')[0]);
 });

data/templates/dom/game.json

@@ -0,0 +1,6 @@
+{
+	"build-scripts-ignore":"plugins/*",
+	"title":"DOM Elements",
+	"ver":"1.0",
+	"order":"plugins/*"
+}

data/templates/dom/scripts/els/btn.js

@@ -0,0 +1,5 @@
+re.c('btn')
+.requires('el:button')
+.factory(function(text, click){
+	this.click(click).text(text);
+})

data/templates/dom/scripts/els/contain.js

@@ -0,0 +1,5 @@
+//Adds el to root container automatically
+re.c('contain')
+.init(function(){
+	$(".RE_CANVAS-CONTAINER").append(this.el);
+});

data/templates/dom/scripts/els/header.js

@@ -0,0 +1,5 @@
+re.c('header')
+.factory(function(type, text){
+	this.comp('el:h'+type+' contain');
+	this.$el.text(text);
+});

data/templates/dom/scripts/scenes/home.js

@@ -0,0 +1,22 @@
+re.scene('home')
+.enter(function(){
+  
+  re.header(1, "Some Header")
+  .alignLeft(10).alignTop(10);
+  
+  //some text..
+  re.e('el:span contain')
+  .text("RE_VER")
+  .alignBottom(-10)
+  .alignRight(-10);
+
+  re.btn('Click Me', function(){
+    alert('Clicked!');
+  }).align(0,0);
+
+})
+.exit(function(){
+
+  //built in to remove everything
+  this.clear();
+});

data/templates/dom/tests/scenes/home_test.js

@@ -0,0 +1,9 @@
+module('home');
+
+test('enter home', function(){
+
+	re.scene('home').enter();
+
+	//check if one button exists
+	eq(re("btn").length, 1);
+});

data/templates/isometric/game.json

@@ -0,0 +1,16 @@
+{
+	//configure game settings
+  "width": 500,
+  "height": 400,
+  "canvas-id": "game-canvas",
+
+  //ignore entity scripts
+  "entity-ignore": "socket wait group",
+  
+  "tests-ignore": null,
+  "scripts-ignore": null,
+  "tests-scripts-ignore":"init.js",
+
+  //order scripts
+  "order": null
+}

data/templates/platform/game.json

@@ -0,0 +1,18 @@
+{
+	//configure game settings
+  "width": 500,
+  "height": 400,
+  "canvas-id": "game-canvas",
+
+  //ignore entity scripts
+  "entity-ignore": "wait group",
+  
+  "tests-ignore": null,
+  "scripts-ignore": null,
+
+  //ignores scripts on the test page
+  "tests-scripts-ignore":"init.js",
+
+  //this makes all .tmx files last
+  "order":".*/.js"
+}

data/templates/platform/scripts/displays/hero.js

@@ -62,7 +62,7 @@ re.c('hero')
 .init(function(){
   
   //add animations
-  this.anis = {
+  this.animates = {
 	  idle:[800, [0, 1], -1],
 	  run:[800, [2, 3], 1],
 	  jump:[500, [4, 5, 4], 1],

data/templates/platform/scripts/items/coin.js

@@ -21,7 +21,7 @@ re.c('coin')
   this.sfx = re.e('sound coin.sfx');
   
   //setup animations to play
-	this.anis = {
+	this.animates = {
     glow:[1800, [14, 15, 15], -1]
   };
   

data/templates/platform/scripts/items/spring.js

@@ -14,7 +14,7 @@ re.c('spring')
 })
 .init(function(){
   //add animation, can also send a string instead of an array
-  this.anis = {
+  this.animates = {
     bounce:[300, [13, 12], 1]
   };
 	

data/templates/platform/tests/displays/hero_test.js

@@ -3,10 +3,10 @@ module('hero', lazy('hero'));
 test('has animations', function(){
   
   //these where manually put in
-  is(hero.anis.idle);
-  is(hero.anis.run);
-  is(hero.anis.jump);
-  is(hero.anis.ladder);
+  is(hero.animates.idle);
+  is(hero.animates.run);
+  is(hero.animates.jump);
+  is(hero.animates.ladder);
   
 });
 

data/templates/platform/tests/factories.js

@@ -30,6 +30,6 @@ hero.health = 100;
 */
 
 //re.ready() is DISABLED during testing
-addEventListener('load', function(){
+re.listener('load', function(){
 	re.sys.init(re.canvas).start();
 });

data/templates/platform/tests/items/coin_test.js

@@ -4,7 +4,7 @@ test('valid', function(){
   
   expectEvent(coin, 'update');
   
-  is(coin.anis.glow);
+  is(coin.animates.glow);
   
 });
 

data/templates/pong/game.json

@@ -0,0 +1,16 @@
+{
+	//configure game settings
+  "width": 400,
+  "height": 300,
+  "canvas-id": "game-canvas",
+
+  //ignore entity scripts
+  "entity-ignore": "socket wait group",
+  
+  "tests-ignore": null,
+  "scripts-ignore": null,
+  "tests-scripts-ignore":"init.js",
+
+  //order scripts
+  "order": null
+}

data/templates/tiltmaze/game.json

@@ -0,0 +1,16 @@
+{
+	//configure game settings
+  "width": 180,
+  "height": 180,
+  "canvas-id": "game-canvas",
+
+  //ignore entity scripts
+  "entity-ignore": "socket wait group",
+  
+  "tests-ignore": null,
+  "scripts-ignore": null,
+  "tests-scripts-ignore":"init.js",
+
+  //order scripts
+  "order": "/tile.js$"
+}

data/templates/tiltmaze/scripts/structs/level.js

@@ -1,4 +1,4 @@
-re.level = re.c('level')
+re.c('level')
 .requires('automap')
 .statics({
   get:function(num){

data/templates/tiltmaze/scripts/tiles/walltile.js

@@ -1,4 +1,4 @@
-re.walltile = re.c('walltile')
+re.c('walltile')
 .statics({
   factory:function(num){
     var e = re.e('walltile');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entityjs
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cssmin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HTML5 Javascript game engine, quickly create robust, flexible and reusable
   games.
 email:
@@ -133,7 +149,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
 - Gemfile
 - README.md
 - Rakefile
@@ -146,6 +161,8 @@ files:
 - lib/entityjs/commands/comp.rb
 - lib/entityjs/commands/eunit.rb
 - lib/entityjs/commands/font.rb
+- lib/entityjs/commands/html.rb
+- lib/entityjs/commands/min.rb
 - lib/entityjs/commands/new.rb
 - lib/entityjs/commands/release.rb
 - lib/entityjs/commands/server.rb
@@ -160,13 +177,14 @@ files:
 - lib/entityjs/parsers/parse_xml.rb
 - lib/entityjs/version.rb
 - license.txt
+- public/favicon.ico
 - public/play.html
 - public/qunit/qunit.css
 - public/qunit/qunit.entity.js
 - public/qunit/qunit.input.js
 - public/qunit/qunit.js
 - public/qunit/qunit.mock.js
-- public/tests.html
+- public/test.html
 - spec/javascripts/helpers/accept.png
 - spec/javascripts/helpers/alligator.mp3
 - spec/javascripts/helpers/alligator.ogg
@@ -194,6 +212,7 @@ files:
 - spec/javascripts/src/display/animate_spec.js
 - spec/javascripts/src/display/circle_spec.js
 - spec/javascripts/src/display/draw_spec.js
+- spec/javascripts/src/display/el_spec.js
 - spec/javascripts/src/display/group_spec.js
 - spec/javascripts/src/display/image_spec.js
 - spec/javascripts/src/display/imgtext_spec.js
@@ -224,6 +243,7 @@ files:
 - spec/javascripts/src/pattern/pathfind_spec.js
 - spec/javascripts/src/pattern/timestep_spec.js
 - spec/javascripts/src/save/storage_spec.js
+- spec/javascripts/src/util/clone_spec.js
 - spec/javascripts/src/util/log_spec.js
 - spec/javascripts/src/util/polyfill_spec.js
 - spec/javascripts/src/util/scene_spec.js
@@ -238,6 +258,8 @@ files:
 - spec/lib/entityjs/commands/comp_spec.rb
 - spec/lib/entityjs/commands/eunit_spec.rb
 - spec/lib/entityjs/commands/font_spec.rb
+- spec/lib/entityjs/commands/html_spec.rb
+- spec/lib/entityjs/commands/min_spec.rb
 - spec/lib/entityjs/commands/new_spec.rb
 - spec/lib/entityjs/commands/release_spec.rb
 - spec/lib/entityjs/commands/templates_spec.rb
@@ -261,11 +283,11 @@ files:
 - src/cycle/tween.js
 - src/cycle/update.js
 - src/cycle/wait.js
-- src/cycle/worker.js
 - src/display/align.js
 - src/display/animate.js
 - src/display/circle.js
 - src/display/draw.js
+- src/display/el.js
 - src/display/group.js
 - src/display/image.js
 - src/display/imgtext.js
@@ -300,40 +322,31 @@ files:
 - src/pattern/timestep.js
 - src/save/database.js
 - src/save/storage.js
+- src/util/clone.js
 - src/util/log.js
 - src/util/polyfill.js
 - src/util/scene.js
 - src/util/sheet.js
 - src/util/support.js
-- templates/animation/assets/images/hero.png
-- templates/animation/scripts/init.js
-- templates/animation/scripts/scenes/home.js
-- templates/animation/scripts/scenes/load.js
-- templates/animation/tests/init_test.js
-- templates/animation/tests/scenes/home_test.js
-- templates/animation/tests/scenes/load_test.js
-- templates/arrow_keys/assets/images/arrow.png
-- templates/arrow_keys/config.yml
-- templates/arrow_keys/readme.txt
-- templates/arrow_keys/scripts/displays/arrow.js
-- templates/arrow_keys/scripts/init.js
-- templates/arrow_keys/scripts/inputs/controls.js
-- templates/arrow_keys/scripts/scenes/home.js
-- templates/arrow_keys/scripts/scenes/load.js
-- templates/arrow_keys/tests/displays/arrow_test.js
-- templates/arrow_keys/tests/init_test.js
-- templates/arrow_keys/tests/inputs/controls_test.js
-- templates/arrow_keys/tests/scenes/home_test.js
-- templates/arrow_keys/tests/scenes/load_test.js
-- templates/circle/config.yml
+- templates/circle/game.json
 - templates/circle/readme.txt
+- templates/circle/scripts/displays/circle.js
 - templates/circle/scripts/init.js
 - templates/circle/scripts/scenes/home.js
 - templates/circle/scripts/scenes/load.js
 - templates/circle/tests/scenes/home_test.js
 - templates/circle/tests/scenes/load_test.js
+- templates/dom/game.json
+- templates/dom/scripts/els/btn.js
+- templates/dom/scripts/els/contain.js
+- templates/dom/scripts/els/header.js
+- templates/dom/scripts/init.js
+- templates/dom/scripts/scenes/home.js
+- templates/dom/scripts/scenes/load.js
+- templates/dom/tests/scenes/home_test.js
+- templates/dom/tests/scenes/load_test.js
 - templates/isometric/assets/images/isotiles.png
-- templates/isometric/config.yml
+- templates/isometric/game.json
 - templates/isometric/readme.txt
 - templates/isometric/scripts/displays/cursor.js
 - templates/isometric/scripts/displays/isoimage.js
@@ -349,7 +362,7 @@ files:
 - templates/platform/assets/images/tiles.png
 - templates/platform/assets/sounds/coin.mp3
 - templates/platform/assets/sounds/coin.ogg
-- templates/platform/config.yml
+- templates/platform/game.json
 - templates/platform/readme.txt
 - templates/platform/scripts/displays/bit.js
 - templates/platform/scripts/displays/hero.js
@@ -378,7 +391,7 @@ files:
 - templates/platform/tests/scenes/play_test.js
 - templates/platform/tests/utils/counter_test.js
 - templates/platform/tests/utils/level_test.js
-- templates/pong/config.yml
+- templates/pong/game.json
 - templates/pong/readme.txt
 - templates/pong/scripts/controls/ai.js
 - templates/pong/scripts/controls/arena.js
@@ -403,7 +416,7 @@ files:
 - templates/pong/tests/scenes/game_test.js
 - templates/pong/tests/scenes/home_test.js
 - templates/pong/tests/scenes/over_test.js
-- templates/tiltmaze/config.yml
+- templates/tiltmaze/game.json
 - templates/tiltmaze/readme.txt
 - templates/tiltmaze/scripts/displays/ball.js
 - templates/tiltmaze/scripts/displays/target.js