entityjs 0.3.1 → 0.3.2

data/lib/entityjs/config.rb

@@ -57,6 +57,14 @@ module Entityjs
       @yml['width']
     end
     
+    def canvas_border
+      if @yml.nil?
+        return true
+      end
+      
+      return @yml['canvas-border']
+    end
+    
     def height
       if @yml.nil?
         return 400

data/lib/entityjs/dirc.rb

@@ -29,11 +29,12 @@ module Entityjs
     end
     
     def self.find_tests_url(ignore=nil)
+      valids = Compile.valid_scripts.join(",")
       ignore ||= []
-      tests = Dir["#{Dirc.game_root}/#{Config.tests_folder}/**/*.js"]
+      tests = Dir["#{Dirc.game_root}/#{Config.tests_folder}/**/*.{#{valids}}"].sort
       
       tests = tests.collect do |i|
-        i[i.rindex('tests/')..-1]
+        i[i.rindex(Config.tests_folder+'/')..-1]
       end
       
       if ignore.any?
@@ -43,14 +44,45 @@ module Entityjs
       return tests
     end
     
+    #returns all game scripts with short paths
+    def self.find_scripts_short(ignore=nil, order=nil)
+      scripts = self.find_scripts_url(ignore, order)
+      
+      scripts.collect do |i|
+        
+        i.sub(Config.scripts_folder+'/', '')
+        
+      end
+    end
+    
     def self.find_scripts_url(ignore=nil, order=nil)
-      ignore ||= []
-      order ||= []
       
       scripts = self.find_scripts(ignore, order)
       
       #change filenames
-      scripts = scripts.collect{|k| k[k.rindex('scripts/')..-1] }
+      scripts = scripts.collect{|k| k[k.rindex(Config.scripts_folder+'/')..-1] }
+      
+      return scripts
+    end
+    
+    def self.find_entity_src_url(ignore=nil)
+      srcs = self.find_entity_src(ignore)
+      
+      #remove src directory and replace with entityjs
+      srcs = srcs.collect{|k| k[k.rindex('src/')..-1].gsub('src', 'entityjs') }
+      
+      return srcs
+    end
+    
+    def self.find_scripts(ignore=nil, order=nil)
+      ignore ||= []
+      order ||= []
+      valids = Compile.valid_scripts.join(",")
+      
+      scripts = Dir["#{Dirc.game_root}/#{Config.scripts_folder}/**/*.{#{valids}}"].sort
+      
+      #sort again by extension
+      scripts.sort! {|x,y| File.extname(x) <=> File.extname(y) }
       
       #ignore files
       if ignore.any?
@@ -74,29 +106,46 @@ module Entityjs
       return scripts
     end
     
-    def self.find_entity_src_url(ignore=nil)
-      ignore ||= []
-      srcs = self.find_entity_src(ignore)
+    def self.find_eunit_src_url(ignore=nil)
+      srcs = self.find_eunit_src(ignore)
       
       #remove src directory and replace with entityjs
-      srcs = srcs.collect{|k| k[k.rindex('src/')..-1].gsub('src', 'entityjs') }
-      
-      if ignore.any?
-        srcs.delete_if {|i| !i.match(/#{ignore.join('|')}/).nil? }
-      end
+      srcs = srcs.collect{|k| k[k.rindex('qunit/')..-1] }
       
       return srcs
+      
     end
     
-    def self.find_scripts(ignore=nil, order=nil)
+    def self.find_eunit_src(ignore=nil)
+      ignore ||= []
+      ents = Dir[Entityjs::eunit_folder+"/**/*.js"].sort
+      
+      #make sure qunit is at the top
+      
+      i = ents.index{|i| i.match(/qunit\.js$/) }
+      
+      if i.nil?
+        puts 'Error cannot find qunit.js!'
+        return ents
+      end
       
-      return Dir["#{Dirc.game_root}/#{Config.scripts_folder}/**/*.js"].sort
+      #remove
+      k = ents.delete_at(i)
       
+      #push at front
+      ents.unshift(k)
+      
+      if ignore.any?
+        ents.delete_if {|i| !i.match(/#{ignore.join('|')}/).nil? }
+      end
+      
+      return ents
     end
     
     def self.find_entity_src(ignore=nil)
+      ignore ||= []
 
-      ents = Dir[Entityjs::root+"/src/**/*.js"]
+      ents = Dir[Entityjs::source_folder+"/**/*.js"]
       
       #sort by name
       ents.sort!
@@ -114,6 +163,10 @@ module Entityjs
       
       ents.unshift(k)
       
+      if ignore.any?
+        ents.delete_if {|i| !i.match(/#{ignore.join('|')}/).nil? }
+      end
+      
       return ents
     end
     
@@ -133,7 +186,7 @@ module Entityjs
     
     def self.create_dir(name, move=false)
     
-      if !Dir.exists? name
+      if !File.directory? name
         Dir.mkdir(name)
       end
       

data/lib/entityjs/page.rb

@@ -0,0 +1,106 @@
+#The Page class renders html pages for the server
+module Entityjs
+  
+  class Page
+    
+    def self.processor_ext
+      return '.js'
+    end
+    
+    def self.render_play
+      self.set_vars("play.html")
+    end
+    
+    def self.render_tests
+      self.set_vars('tests.html', true)
+    end
+    
+    def self.render_entityjs_src(path)
+      path = Entityjs::root+'/src/'+path
+      
+      return IO.read(path)
+    end
+    
+    def self.render_test(path)
+      file = path.sub(/#{self.processor_ext}$/i, '');
+      
+      return Compile.test_to_js(file)
+    end
+    
+    def self.render_script(path)
+      file = path.sub(/#{self.processor_ext}$/i, '');
+      return Compile.script_to_js(file)
+    end
+    
+    def self.render_eunit(path)
+      IO.read(Entityjs::root+"/public/qunit/#{path}")
+    end
+    
+    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}")
+      
+      #reload config for changes
+      Config.instance.reload
+      
+      #set width, height and canvas id
+      contents = contents.sub("$WIDTH", Config.instance.width.to_s)
+      contents = contents.sub("$HEIGHT", Config.instance.height.to_s)
+      contents = contents.sub("$CANVAS_ID", Config.instance.canvas_id)
+      
+      if !Config.instance.canvas_border
+        contents = contents.sub('border:1px #333 solid;', '')
+      end
+      
+      #set javascript srcs
+      contents.sub("$JS", self.compile_js_html(tests))
+    end
+    
+    #compiles html js tags for render on webpage
+    def self.compile_js_html(tests=false)
+      js = %Q(
+      <script type=\"text/javascript\">
+      window.addEventListener\(\"load\", function(){
+          #{Build.js_config}
+          re.version = \"#{VERSION}\";
+        }\);
+      </script>
+)
+      ent = Dirc.find_entity_src_url(Config.instance.entity_ignore)
+      srcs = Dirc.find_scripts_url(Config.instance.scripts_ignore, Config.instance.scripts_order)
+      
+      if tests
+        tests_src = Dirc.find_tests_url(Config.instance.tests_ignore)
+        ent += Dirc.find_eunit_src_url
+      else
+        tests_src = []
+      end
+      
+      merg = ent | srcs | tests_src
+      
+      last = ''
+      
+      merg.each do |s|
+        
+        #output a divider for each js root
+        first_folder = s.split('/').shift
+        if last != first_folder
+          js += "\n\n\t<!-- #{first_folder} -->\n"
+          last = first_folder
+        end
+        
+        #add processor extension to non-js files so the server processes it into js
+        if s.match(/\.js$/).nil?
+          s += self.processor_ext
+        end
+        
+        js += "\t<script src=\"#{s}\" type=\"text/javascript\"></script>\n"
+      end
+      
+      return js
+    end
+    
+  end
+  
+end

data/lib/entityjs/parsers/parse_coffee.rb

@@ -0,0 +1,12 @@
+module Entityjs
+  
+  class ParseCoffee
+    
+    def self.parse(data, ops={})
+      ops[:no_wrap] ||= true
+      return CoffeeScript.compile(data, ops)
+    end
+    
+  end
+  
+end

data/lib/entityjs/version.rb

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

data/lib/entityjs.rb

@@ -14,6 +14,14 @@ rescue LoadError
   exit
 end
 
+begin
+  require "coffee-script" 
+rescue LoadError
+  puts "Could not load 'coffee-script'"
+  puts "run 'gem install coffee-script'"
+    exit
+end
+
 begin
   require "uglifier" 
 rescue LoadError
@@ -30,16 +38,22 @@ rescue LoadError
   exit
 end
 
-require "entityjs/version"
-
 module Entityjs
   
   def self.root
     @root = File.expand_path('../..',__FILE__)
   end
   
+  def self.source_folder
+    Entityjs::root+'/src'
+  end
+  
+  def self.eunit_folder
+    Entityjs::root+'/public/qunit'
+  end
+  
   def self.default_template
-    'blank'
+    'circle'
   end
   
   def self.template_path(name=nil)
@@ -47,7 +61,7 @@ module Entityjs
       name = self.default_template
     end
     path = "#{Entityjs::root}/templates/#{name}"
-    if Dir.exists? path
+    if File.directory? path
         return Dir.glob(path+'/*')
     else
         return nil

data/public/qunit/qunit.css

@@ -1,9 +1,9 @@
 /**
- * QUnit v1.3.0pre - A JavaScript Unit Testing Framework
+ * QUnit v1.5.0pre - A JavaScript Unit Testing Framework
  *
  * http://docs.jquery.com/QUnit
  *
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * or GPL (GPL-LICENSE.txt) licenses.
  */
@@ -54,6 +54,10 @@
 	color: #fff;
 }
 
+#qunit-header label {
+	display: inline-block;
+}
+
 #qunit-banner {
 	height: 5px;
 }
@@ -223,4 +227,6 @@
 	position: absolute;
 	top: -10000px;
 	left: -10000px;
-}
+	width: 1000px;
+	height: 1000px;
+}

data/public/qunit/qunit.entity.js

@@ -1,44 +1,108 @@
-EUnit = {
-  stack:[],
-  
-  runStack:function(){
-    for(var i in EUnit.stack){
-      var k = EUnit.stack[i];
-      
-      ok(k.called, k.message);
-    }
-  },
-  
-  push:function(obj){
-    this.stack.push(obj);
-    
-    return QUnit.config.queue.unshift(EUnit.runStack);
+ETest = function(){
+};
+
+ETest.prototype.push = function(){
+  var that = this;
+  if(QUnit.config.blocking){
+    that.run();
+  } else {
+    QUnit.config.queue.unshift(function(){
+      that.run();
+    });
   }
 };
+
+ETest.prototype.run = function(){
+  ok(this.check(), this.message);
+};
+
+/*
+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.
 
 var e = re.e('flicker');
 
-expectTrigger(e, 'flicker:end', function(){
+expectTrigger(e, 'flicker:finish', function(){
   //if triggered this will be called
 });
 
+var e = re.e('counter');
+
+//expect given arguments
+expectTrigger(e, 'maxed', [10]);
+
 */
 function expectTrigger(obj, trigger, func){
-  var trig = {
-    called:0,
-    message:"Expected "+trigger+" to be triggered"
+  var trig = new ETest();
+  trig.called = 0;
+  trig.message = "Expected "+trigger+" to be triggered";
+  
+  trig.check = function(){
+    return this.called;
   };
   
   trig.meth = function(){
     trig.called++;
-    if(func) func.apply(obj, arguments);
+    
+    if(typeof func == 'object'){
+      
+      var args = Array.prototype.slice.call(arguments, 0);
+      
+      ok(!(args>func || args<func), "trigger "+trigger+" should have same arguments");
+      
+    } else if(typeof func == 'function'){
+      func.apply(obj, arguments);
+    }
   };
   
   obj.on(trigger, trig.meth);
   
-  EUnit.push(trig);
+  trig.push();
+};
+
+function expectValueUp(obj, prop){
+  var trig = new ETest();
+  trig.message = "Expected "+prop+" to value up";
+  trig.old = obj[prop];
+  
+  trig.check = function(){
+    return this.old < obj[prop];
+  };
+  
+  trig.push();
+};
+
+function expectValueDown(obj, prop){
+  var trig = new ETest();
+  trig.message = "Expected "+prop+" to value down";
+  trig.old = obj[prop];
+  
+  trig.check = function(){
+    return this.old > obj[prop];
+  };
+  
+  trig.push();
+};
+
+/*
+
+re.e('circle')
+.attr('color', '#ff0000');
+
+pixelEqual(10, 10, 255, 0, 0, 0);
+
+*/
+function pixelEqual(x, y, r, g, b, a, message){
+  var actual = Array.prototype.slice.apply(re.sys.context.getImageData(x, y, 1, 1).data), expected = [r, g, b, a];
+	QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
 }
 
 /*
@@ -58,22 +122,22 @@ function expectFlicker(ent, flick){
 }
 
 /*
-Expects an entity or component to have a current listener attached.
+Expects an entity or component to have a current event attached.
 
 var e = re.e();
 
-expectListener(e, 'update'); //false
+expectEvent(e, 'update'); //false
 
 e.on('update', function(){
   
 });
 
-expectListener(e, 'update') //true
+expectEvent(e, 'update') //true
 
 */
-function expectListener(ent, trigger, func){
+function expectEvent(ent, trigger, func){
   if(arguments.length == 2){
-    ok(ent.has('^'+trigger), "Expected entity to have listener "+trigger);
+    ok(ent.has('^'+trigger), "Expected entity to have event "+trigger);
   } else {
     var fin = false;
     for(var i in ent._re_signals[trigger]){
@@ -81,7 +145,7 @@ function expectListener(ent, trigger, func){
       if(fin) break;
     }
     
-    ok(fin, "Expected entity to have listener "+trigger+" with function");
+    ok(fin, "Expected entity to have event "+trigger+" with function");
     
   }
 }
@@ -127,7 +191,7 @@ var f = factory;
 Generates a factory entity for easy use in the module()
 
 //light weight
-//a new coin in e will be created for every test()
+//a new coin in coin will be created for every test()
 module('coin', lazy('coin'));
 
 //do something after coin creation
@@ -146,17 +210,23 @@ teardown:function(e){
 }));
 
 test('coin should have valid of 10', function(){
-  equal(e.value, 10);
+  equal(coin.value, 10);
 })
 
 etc..
 
 */
-var e;
 function lazy(comps, obj){
+  var name;
+  if(typeof comps == 'string') comps = comps.split(' ');
+  name = comps[0];
+  var e;
+  
   return {
     setup:function(){
-      e = f(comps);
+      
+      window[name] = e = f(comps.join(' '));
+      
       if(typeof obj == 'function') obj(e);
       if(obj && obj.setup) obj.setup(e);
     },
@@ -167,6 +237,18 @@ function lazy(comps, obj){
   }
 }
 
+function lazyScene(scene, args){
+  return {
+    setup:function(){
+      var s = window[scene] = re.scene(scene);
+      s.enter.apply(s, args);
+    },
+    teardown:function(){
+      re.scene().exit();
+    }
+  };
+};
+
 /*
 Some super lazy evaluations
 */