jax 2.0.6 → 2.0.7

data/CHANGELOG

@@ -1,3 +1,11 @@
+* 2.0.7 *
+
+* Resolved issue #48: Unable to reliably pick any object not explicitly added to World
+
+* Resolved issue #54: Default views can't be overridden
+
+
+
 * 2.0.6 *
 
 * Resolved issue #30: `Jax.Framebuffer#getTexture(context, index)` now returns texture

data/Rakefile

@@ -21,7 +21,7 @@ end
 
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.cucumber_opts = ["-f", "pretty", "-f", "rerun", "-o", "features/rerun.txt", "-t", "~@wip"]
+  t.cucumber_opts = ["-f", "pretty", "-f", "rerun", "-r", "features", "-o", "features/rerun.txt", "-t", "~@wip"]
   unless ENV['FEATURE']
     if !ENV['ALL'] &&
       File.file?(rerun = File.expand_path("features/rerun.txt", File.dirname(__FILE__))) &&
@@ -177,7 +177,7 @@ namespace :doc do
         "https://github.com/sinisterchipmunk/jax/tree/master/#{obj.file}#L#{obj.line_number}"
       },
       :pretty_urls => false,
-      :bust_cache  => false,
+      :bust_cache  => true,
       :name => 'Jax WebGL Framework',
       :short_name => 'Jax',
       :home_url => 'http://jaxgl.com',
@@ -339,3 +339,4 @@ task :guides => 'guides:generate'
 
 # disabled node tests for now, since Jax.DataRegion and friends break it. Rake jasmine instead.
 task :default => ['spec', 'cucumber', 'travis', 'guides']
+task :release => 'guides:publish'

data/features/support/env.rb

@@ -8,8 +8,7 @@ Jax::Rails::Application.config.cache_classes = false
 
 # IMPORTANT: it is necessary to set this _prior_ to app initialization in order to pick up asset dirs
 ::Rails.application.config.root = File.expand_path("../../tmp/rails-cukes", File.dirname(__FILE__))
-
-Jax::Rails::Application.initialize!
+::Rails.application.config.reload_plugins = true
 
 require 'cucumber/rails/action_controller'
 

data/features/support/setup.rb

@@ -6,9 +6,22 @@ Before do
 end
 
 Before("@rails") do
+  FileUtils.rm_rf File.join($cucumber_root, "tmp/rails-cukes").to_s
   setup_rails_environment
   create_directory "app/assets/jax/shaders"
+  create_directory "vendor/plugins/mine/app/assets/jax"
   route "mount Jax::Engine => '/'"
+
+  # boot the app, failing silently if it's already booted
+  # silent failure is necessary because we can't boot for
+  # each feature in isolation
+  begin
+    Jax::Rails::Application.initialize!
+  rescue
+    if $!.message != "Application has been already initialized."
+      raise
+    end
+  end
 end
 
 After do

data/lib/assets/javascripts/jax/mvc/model.js

@@ -89,6 +89,7 @@
        *
        **/
       initialize: function(data) {
+        this.__unique_id = Jax.Model.__unique_id_tracker++;
         this.camera = new Jax.Camera();
         
         initProperties(this, Jax.Model.default_properties);
@@ -137,6 +138,9 @@
         if (this.mesh)
         {
           var self = this;
+          if (!Jax.Model.__instances[this.__unique_id])
+            Jax.Model.__instances[this.__unique_id] = this;
+          options = Jax.Util.normalizeOptions(options, { model_index: this.__unique_id });
           context.pushMatrix(function() {
             context.multModelMatrix(self.camera.getTransformationMatrix());
             self.mesh.render(context, options);
@@ -201,6 +205,8 @@
       dispose: function() {
         if (this.mesh)
           this.mesh.dispose();
+        if (Jax.Model.__instances[this.__unique_id])
+          delete Jax.Model.__instances[this.__unique_id];
       },
       
       /**
@@ -330,4 +336,16 @@
     Object.extend(klass, model_class_methods);
     return klass;
   };
+  
+  /*
+  This is touchy. Jax.World needs to be able to look up models
+  that aren't necessarily in the world (using its unique ID).
+  However, we want to be careful not to leave references to
+  models strewn about; the user may need to garbage-collect
+  them. So, we'll track them using this variable; they only
+  get added to the variable upon render, and the reference
+  gets deleted whenever the model is disposed.
+  */
+  Jax.Model.__unique_id_tracker = 1;
+  Jax.Model.__instances = {};
 })();

data/lib/assets/javascripts/jax/mvc/route_set.js

@@ -64,9 +64,9 @@ Jax.RouteSet = (function() {
     map: function(path, controller) {
       if (!path) throw new Error("path is required");
       var parts = path.split(/\//);
-      var controller_name = parts[0];
+      var controller_name = Jax.Util.underscore(parts[0]);
 
-      this._map[Jax.Util.underscore(controller_name)] = controller;
+      this._map[controller_name] = controller;
 
       if (!Jax.views.exists(controller_name+"/index"))
         Jax.views.push(controller_name+"/index", function() {
@@ -104,7 +104,7 @@ Jax.RouteSet = (function() {
       var parts = path.split(/\//);
       if (parts.length > 2 || parts.length == 0)
         throw new Error("Invalid path format. String should look like 'controller/action'.");
-      var controller_name = parts[0];
+      var controller_name = Jax.Util.underscore(parts[0]);
       var action_name = parts[1] || "index";
       
       var controller_class = this._map[Jax.Util.underscore(controller_name)];

data/lib/assets/javascripts/jax/mvc/view_manager.js

@@ -17,7 +17,7 @@ Jax.ViewManager = (function() {
      * If the path is already stored, the current one will be replaced.
      **/
     push: function(path, view) {
-      this.views[path.toLowerCase()] = view;
+      this.views[Jax.Util.underscore(path)] = view;
     },
     
     /**
@@ -29,8 +29,8 @@ Jax.ViewManager = (function() {
      * if not handled appropriately.
      **/
     get: function(path) {
-      if (this.views[path.toLowerCase()])
-        return new Jax.View(this.views[path.toLowerCase()]);
+      if (this.views[Jax.Util.underscore(path)])
+        return new Jax.View(this.views[Jax.Util.underscore(path)]);
       else throw new Error("Could not find view at '"+path+"'!");
     },
 
@@ -51,7 +51,11 @@ Jax.ViewManager = (function() {
      * Removes the specified view path and, if it existed to begin with, returns it.
      * Otherwise undefined is returned.
      **/
-    remove: function(path) { var result = this.views[path]; delete this.views[path]; return result; },
+    remove: function(path) {
+      var result = this.views[Jax.Util.underscore(path)];
+      delete this.views[Jax.Util.underscore(path)];
+      return result;
+    },
     
     /**
      * Jax.ViewManager#exists(path) -> Boolean
@@ -59,7 +63,7 @@ Jax.ViewManager = (function() {
      * Returns true if a view exists for the specified view path, false otherwise.
      **/
     exists: function(path) {
-      return !!this.views[path];
+      return !!this.views[Jax.Util.underscore(path)];
     }
   });
 })();

data/lib/assets/javascripts/jax/webgl/world.js

@@ -22,7 +22,7 @@ Jax.World = (function() {
     initialize: function(context) {
       this.context  = context;
       this.lighting = new Jax.Scene.LightManager(context);
-      this.objects  = [];
+      this.objects = {};
     },
     
     /**
@@ -41,42 +41,40 @@ Jax.World = (function() {
      *
      **/
     addObject: function(object) {
-      this.objects.push(object);
+      this.objects[object.__unique_id] = object;
+      // this.objects.push(object);
       if (object.isLit() || object.isShadowCaster())
         this.lighting.addObject(object);
       return object;
     },
     
     /**
-     * Jax.World#getObject(index) -> Jax.Model
-     * - index (Number): the world index of this object
+     * Jax.World#getObject(unique_id) -> Jax.Model
+     * - unique_id (Number): the unique ID associated with this model instance
      *
-     * Returns the object with the specified world index, or undefined.
+     * Returns the object with the specified unique ID if it has been
+     * added to this World, or undefined if it has not.
      **/
-    getObject: function(index) { return this.objects[index]; },
+    getObject: function(unique_id) { return this.objects[unique_id]; },
     
     /**
-     * Jax.World#removeObject(object_or_index) -> Jax.Model
-     * - object_or_index (Number|Jax.Model): the model instance to remove, or its world index
+     * Jax.World#removeObject(object_or_unique_id) -> Jax.Model
+     * - object_or_unique_id (Number|Jax.Model): the model instance to remove,
+     *                                           or its unique ID
      *
-     * If the model or its index cannot be found, nothing happens and the return value is undefined.
-     * Otherwise, the object is removed from this World and then returned.
+     * If the model or its ID has not been added to this World, nothing happens
+     * and the return value is undefined. Otherwise, the object is removed from
+     * this World and then returned.
      **/
-    removeObject: function(object_or_index) {
-      if (this.objects[object_or_index]) {
-        var obj = this.objects[object_or_index];
-        this.objects.splice(object_or_index, 1);
+    removeObject: function(object_or_id) {
+      if (typeof(object_or_id) == 'number') {
+        var obj = this.objects[object_or_id];
+        delete this.objects[object_or_id];
         this.lighting.removeObject(obj);
         return obj;
+      } else {
+        this.removeObject(object_or_id.__unique_id);
       }
-      else
-        for (var i = 0; i < this.objects.length; i++)
-          if (this.objects[i] == object_or_index)
-          {
-            this.objects.splice(i, 1);
-            this.lighting.removeObject(this.objects[i]);
-            return this.objects[i];
-          }
     },
     
     /**
@@ -88,13 +86,13 @@ Jax.World = (function() {
      * - ary (Array): an optional array to populate. A new one will be created if this is not specified.
      *                (Note: the array's contents will be cleared.)
      * 
-     * Picks all visible object indices within the specified rectangular regions and returns them as elements in
+     * Picks all visible object IDs within the specified rectangular regions and returns them as elements in
      * an array.
      *
-     * An object's index matches its position in the world's object list. That is, the following code is
-     * valid:
+     * An object's ID matches is unique throughout Jax, even across multiple contexts.
      *
-     *     this.world.getObjects(this.world.pickRegionalIDs(0,0, 100,100));
+     * If you want references to the actual objects, instead of just their unique IDs, consider using
+     * the #pickRegion() method instead.
      *
      **/
     pickRegionalIndices: function(x1, y1, x2, y2, ary) {
@@ -103,6 +101,8 @@ Jax.World = (function() {
       else ary = new Array();
       var world = this, pickBuffer = getPickBuffer(this), context = this.context;
       var data = new Uint8Array(w*h*4);
+      x1 = Math.min(x1, x2);
+      y1 = Math.min(y1, y2);
 
       pickBuffer.bind(context, function() {
         pickBuffer.viewport(context);
@@ -122,7 +122,7 @@ Jax.World = (function() {
       for (var i = 2; i < data.length; i += 4) {
         if (data[i] > 0) { // blue key exists, we've found an object
           index = Jax.Util.decodePickingColor(data[i-2], data[i-1], data[i], data[i+1]);
-          if (index != undefined) {
+          if (index != undefined && ary.indexOf(index) == -1) {
             ary.push(index);
           }
         }
@@ -132,7 +132,7 @@ Jax.World = (function() {
     },
     
     /**
-     * Jax.World#pickRegion(x1, y1, x2, y2) -> Array
+     * Jax.World#pickRegion(x1, y1, x2, y2[, ary]) -> Array
      * - x1 (Number): the screen X coordinate of the first corner of the 2D rectangle within which to pick
      * - y1 (Number): the screen Y coordinate of the first corner of the 2D rectangle within which to pick
      * - x2 (Number): the screen X coordinate of the second corner of the 2D rectangle within which to pick
@@ -144,9 +144,9 @@ Jax.World = (function() {
      * an array.
      **/
     pickRegion: function(x1, y1, x2, y2, ary) {
-      var result = this.pickRegionalIndices(x1, y1, x2, y2);
+      var result = this.pickRegionalIndices(x1, y1, x2, y2, ary);
       for (var i = 0; i < result.length; i++)
-        result[i] = this.getObject(i);
+        result[i] = Jax.Model.__instances[result[i]];
       return result;
     },
     
@@ -176,7 +176,7 @@ Jax.World = (function() {
     pick: function(x, y) {
       var index = this.pickIndex(x, y);
       if (index != undefined) {
-        return this.getObject(index);
+        return Jax.Model.__instances[index];
       }
       return index;
     },
@@ -186,7 +186,9 @@ Jax.World = (function() {
      * Returns the number of objects currently registered with this World.
      **/
     countObjects: function() {
-      return this.objects.length;
+      var count = 0;
+      for (var i in this.objects) count++;
+      return count;
     },
     
     /**
@@ -216,26 +218,22 @@ Jax.World = (function() {
       /* this.current_pass is used by the material */
 
       this.context.glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-      var unlit = Jax.Util.normalizeOptions(options, {unlit:true});
+      var _options = Jax.Util.normalizeOptions(options, {unlit:true});
       
-      if (this.lighting.isEnabled() && (!unlit.material || (unlit.material.supportsLighting && unlit.material.supportsLighting()))) {
+      if (this.lighting.isEnabled() && (!_options.material || (_options.material.supportsLighting && _options.material.supportsLighting()))) {
         /* illumination pass */
         this.context.current_pass = Jax.Scene.ILLUMINATION_PASS;
         this.lighting.illuminate(this.context, options);
 
         /* ambient pass - unlit objects only because lit objects get ambient+diffuse+specular in one pass */
         this.context.current_pass = Jax.Scene.AMBIENT_PASS;
-        for (i = 0; i < this.objects.length; i++)
-          if (!this.objects[i].isLit()) {
-            unlit.model_index = i;
-            this.objects[i].render(this.context, unlit);
-          }
+        for (i in this.objects)
+          if (!this.objects[i].isLit())
+            this.objects[i].render(this.context, _options);
       } else {
         this.context.current_pass = Jax.Scene.AMBIENT_PASS;
-        for (i = 0; i < this.objects.length; i++) {
-          unlit.model_index = i;
-          this.objects[i].render(this.context, unlit);
-        }
+        for (i in this.objects)
+          this.objects[i].render(this.context, _options);
       }
       
       return this;
@@ -250,27 +248,34 @@ Jax.World = (function() {
      * the objects' respective +update+ functions (if they have one).
      **/
     update: function(timechange) {
-      for (var i = this.objects.length-1; i >= 0; i--)
+      for (var i in this.objects) {
         if (this.objects[i].update)
           this.objects[i].update(timechange);
+      }
       return this;
     },
     
     /**
-     * Jax.World#dispose() -> Jax.World
+     * Jax.World#dispose([include_objects=true]) -> Jax.World
      *
      * Disposes of this world by removing all references to its objects and
-     * reinitializing its +Jax.Scene.LightManager+ instance. Note that the
-     * individual objects are not disposed; this is left as a task for either
-     * the developer or the JavaScript garbage collector. The reason for this
-     * is because it is impossible for Jax.World to know whether the objects
-     * in question are in use by other Worlds.
+     * reinitializing its +Jax.Scene.LightManager+ instance. Note that by
+     * default, objects within this world will also be disposed. Pass
+     * `false` as an argument if you do not want the objects to be disposed.
+     *
+     * Note that both models and meshes _can_ be reused after disposal; they'll just
+     * be silently re-initialized. This means it is safe to dispose of models while
+     * they are still being used (although this is slow and not recommended if at all
+     * avoidable).
+     *
      **/
-    dispose: function() {
+    dispose: function(include_objects) {
       var i, o;
       
-      for (i = this.objects.length-1; i >= 0; i--)
-        (o = this.objects.pop());// && o.dispose();
+      for (i in this.objects) {
+        if (include_objects !== false)
+          delete this.objects[i];
+      }
       
       this.lighting = new Jax.Scene.LightManager(this.context);
     }

data/lib/jax/version.rb

@@ -2,7 +2,7 @@ module Jax
   module Version
     MAJOR = 2
     MINOR = 0
-    PATCH = 6
+    PATCH = 7
     BUILD = nil
     STRING = BUILD ? [MAJOR, MINOR, PATCH, BUILD].join(".") : [MAJOR, MINOR, PATCH].join(".")
   end

data/spec/javascripts/jax/mvc/controller_spec.js

@@ -8,6 +8,28 @@ describe("Jax.Controller", function() {
     expect(Jax.views.find("welcome/index")).not.toBeUndefined();
   });
   
+  describe("with a view defined", function() {
+    var view;
+    beforeEach(function() {
+      view = function() { };
+      Jax.views.push("FooBars/index", view);
+    });
+    
+    it("should indicate the view exists", function() {
+      expect(Jax.views.exists("foo_bars/index")).toBeTruthy();
+    });
+    
+    it("should indicate CamelCased variants of the view exist", function() {
+      expect(Jax.views.exists("Foo_bars/index")).toBeTruthy();
+      expect(Jax.views.exists("FooBars/index")).toBeTruthy();
+    });
+    
+    it("should override the default view", function() {
+      Jax.Controller.create("FooBars", {});
+      expect(Jax.views.find("foo_bars/index").view_func).toBe(view);
+    });
+  });
+  
   describe("with an update method", function() {
     var context;
     

data/spec/javascripts/jax/mvc/route_set_spec.js

@@ -3,7 +3,10 @@ describe("Jax.RouteSet", function() {
   var controller_class = Jax.Controller.create({index: function() { }});
   Jax.views.push("generic/index", function() { });
   
-  beforeEach(function() { map = Jax.routes; map.clear(); });
+  beforeEach(function() {
+    map = Jax.routes;
+    map.clear();
+  });
   
   describe("when a CamelCase controller name is given", function() {
     beforeEach(function() {

data/spec/javascripts/jax/world_spec.js

@@ -44,64 +44,81 @@ describe("Jax.World", function() {
       obottomright = world.addObject(new Jax.Model({position:[ 2.5,-2.5, -5],mesh:mesh}));
     });
     
-    it("center",       function() { expect(world.pick(at.center_x, at.center_y)).toEqual(ofront); });
-    it("top left",     function() { expect(world.pick(at.left, at.top)).toEqual(otopleft); });
-    it("top right",    function() { expect(world.pick(at.right,at.top)).toEqual(otopright); });
-    it("bottom left",  function() { expect(world.pick(at.left, at.bottom)).toEqual(obottomleft); });
-    it("bottom right", function() { expect(world.pick(at.right,at.bottom)).toEqual(obottomright); });
-    /*
+    it("center",       function() { expect(world.pick(at.center_x, at.center_y) === ofront).toBeTruthy(); });
+    it("top left",     function() { expect(world.pick(at.left, at.top)          === otopleft).toBeTruthy(); });
+    it("top right",    function() { expect(world.pick(at.right,at.top)          === otopright).toBeTruthy(); });
+    it("bottom left",  function() { expect(world.pick(at.left, at.bottom)       === obottomleft).toBeTruthy(); });
+    it("bottom right", function() { expect(world.pick(at.right,at.bottom)       === obottomright).toBeTruthy(); });
+    
     it("region: everything", function() {
       var objects = world.pickRegion(at.left, at.top, at.right, at.bottom);
-      expect(objects).toContain(ofront);
-      expect(objects).toContain(otopleft);
-      expect(objects).toContain(otopright);
-      expect(objects).toContain(obottomleft);
-      expect(objects).toContain(obottomright);
+      expect(objects.indexOf(ofront)).not.toEqual(-1);
+      expect(objects.indexOf(otopleft)).not.toEqual(-1);
+      expect(objects.indexOf(otopright)).not.toEqual(-1);
+      expect(objects.indexOf(obottomleft)).not.toEqual(-1);
+      expect(objects.indexOf(obottomright)).not.toEqual(-1);
     });
     
     it("region: top-left quadrant", function() {
       var objects = world.pickRegion(at.left, at.top, at.center_x, at.center_y);
-      expect(objects).toContain(ofront);
-      expect(objects).toContain(otopleft);
-      expect(objects).not.toContain(otopright);
-      expect(objects).not.toContain(obottomleft);
-      expect(objects).not.toContain(obottomright);
+      expect(objects.indexOf(ofront)).not.toEqual(-1);
+      expect(objects.indexOf(otopleft)).not.toEqual(-1);
+      expect(objects.indexOf(otopright)).toEqual(-1);
+      expect(objects.indexOf(obottomleft)).toEqual(-1);
+      expect(objects.indexOf(obottomright)).toEqual(-1);
     });
-
+    
     it("region: top-right quadrant", function() {
       var objects = world.pickRegion(at.right, at.top, at.center_x, at.center_y);
-      expect(objects).toContain(ofront);
-      expect(objects).not.toContain(otopleft);
-      expect(objects).toContain(otopright);
-      expect(objects).not.toContain(obottomleft);
-      expect(objects).not.toContain(obottomright);
+      expect(objects.indexOf(ofront)).not.toEqual(-1);
+      expect(objects.indexOf(otopleft)).toEqual(-1);
+      expect(objects.indexOf(otopright)).not.toEqual(-1);
+      expect(objects.indexOf(obottomleft)).toEqual(-1);
+      expect(objects.indexOf(obottomright)).toEqual(-1);
     });
-
+    
     it("region: bottom-left quadrant", function() {
       var objects = world.pickRegion(at.left, at.bottom, at.center_x, at.center_y);
-      expect(objects).toContain(ofront);
-      expect(objects).not.toContain(otopleft);
-      expect(objects).not.toContain(otopright);
-      expect(objects).toContain(obottomleft);
-      expect(objects).not.toContain(obottomright);
+      expect(objects.indexOf(ofront)).not.toEqual(-1);
+      expect(objects.indexOf(otopleft)).toEqual(-1);
+      expect(objects.indexOf(otopright)).toEqual(-1);
+      expect(objects.indexOf(obottomleft)).not.toEqual(-1);
+      expect(objects.indexOf(obottomright)).toEqual(-1);
     });
     
     it("region: bottom-right quadrant", function() {
       var objects = world.pickRegion(at.right, at.bottom, at.center_x, at.center_y);
-      expect(objects).toContain(ofront);
-      expect(objects).not.toContain(otopleft);
-      expect(objects).not.toContain(otopright);
-      expect(objects).not.toContain(obottomleft);
-      expect(objects).toContain(obottomright);
+      expect(objects.indexOf(ofront)).not.toEqual(-1);
+      expect(objects.indexOf(otopleft)).toEqual(-1);
+      expect(objects.indexOf(otopright)).toEqual(-1);
+      expect(objects.indexOf(obottomleft)).toEqual(-1);
+      expect(objects.indexOf(obottomright)).not.toEqual(-1);
+    });
+    
+    it("should be able to pick objects not explicitly added to the world", function() {
+      var onested = new Jax.Model({position: [0.0, 0.0, -5], mesh: mesh});
+      ofront.render = function(context, options) { onested.render(context, options); };
+      expect(world.pick(at.center_x, at.center_y) === onested).toBeTruthy();
+    });
+
+    it("should be able to regionally pick objects not explicitly added to the world", function() {
+      var onested = new Jax.Model({position: [0.0, 0.0, -5], mesh: mesh});
+      ofront.render = function(context, options) { onested.render(context, options); };
+      expect(world.pickRegion(at.center_x-1, at.center_y-1, at.center_x+1, at.center_y+1)[0] === onested).toBeTruthy();
     });
-    */
   });
   
   describe("with an object", function() {
-    beforeEach(function() { world.addObject(new Jax.Model()); });
+    var model;
+    beforeEach(function() { world.addObject(model = new Jax.Model()); });
     
-    it("should remove the object", function() {
-      world.removeObject(world.getObject(0));
+    it("should remove objects by reference", function() {
+      world.removeObject(model);
+      expect(world.countObjects()).toEqual(0);
+    });
+
+    it("should remove objects by ID", function() {
+      world.removeObject(model.__unique_id);
       expect(world.countObjects()).toEqual(0);
     });
   });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jax
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-17 00:00:00.000000000Z
+date: 2012-01-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153610220 !ruby/object:Gem::Requirement
+  requirement: &2153840660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153610220
+  version_requirements: *2153840660
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2153609620 !ruby/object:Gem::Requirement
+  requirement: &2153840160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *2153609620
+  version_requirements: *2153840160
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2153609040 !ruby/object:Gem::Requirement
+  requirement: &2153839600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153609040
+  version_requirements: *2153839600
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153608480 !ruby/object:Gem::Requirement
+  requirement: &2153839120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153608480
+  version_requirements: *2153839120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153593920 !ruby/object:Gem::Requirement
+  requirement: &2153838620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153593920
+  version_requirements: *2153838620
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &2153593380 !ruby/object:Gem::Requirement
+  requirement: &2153837980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153593380
+  version_requirements: *2153837980
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &2153592720 !ruby/object:Gem::Requirement
+  requirement: &2153837480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.7
   type: :development
   prerelease: false
-  version_requirements: *2153592720
+  version_requirements: *2153837480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153592180 !ruby/object:Gem::Requirement
+  requirement: &2153837020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2153592180
+  version_requirements: *2153837020
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2153591580 !ruby/object:Gem::Requirement
+  requirement: &2153836420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153591580
+  version_requirements: *2153836420
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2153591000 !ruby/object:Gem::Requirement
+  requirement: &2153835940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153591000
+  version_requirements: *2153835940
 - !ruby/object:Gem::Dependency
   name: genspec
-  requirement: &2153590400 !ruby/object:Gem::Requirement
+  requirement: &2153835460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.3
   type: :development
   prerelease: false
-  version_requirements: *2153590400
+  version_requirements: *2153835460
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &2153589820 !ruby/object:Gem::Requirement
+  requirement: &2153834860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.9.1
   type: :development
   prerelease: false
-  version_requirements: *2153589820
+  version_requirements: *2153834860
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153589220 !ruby/object:Gem::Requirement
+  requirement: &2153834380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153589220
+  version_requirements: *2153834380
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &2153588720 !ruby/object:Gem::Requirement
+  requirement: &2153834000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153588720
+  version_requirements: *2153834000
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &2153588060 !ruby/object:Gem::Requirement
+  requirement: &2153833460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *2153588060
+  version_requirements: *2153833460
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2153587440 !ruby/object:Gem::Requirement
+  requirement: &2153832860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: *2153587440
+  version_requirements: *2153832860
 - !ruby/object:Gem::Dependency
   name: w3c_validators
-  requirement: &2153586860 !ruby/object:Gem::Requirement
+  requirement: &2153832400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *2153586860
+  version_requirements: *2153832400
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &2153586280 !ruby/object:Gem::Requirement
+  requirement: &2153831940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 1.4.9
   type: :development
   prerelease: false
-  version_requirements: *2153586280
+  version_requirements: *2153831940
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &2153584940 !ruby/object:Gem::Requirement
+  requirement: &2153831320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,7 +219,7 @@ dependencies:
         version: 2.0.11
   type: :development
   prerelease: false
-  version_requirements: *2153584940
+  version_requirements: *2153831320
 description: ! "\n    Framework for creating rich WebGL-enabled applications using
   JavaScript and Ruby.\n    Can be used stand-alone to create static JavaScript documents,
   or integrated\n    seamlessly with Ruby on Rails to build dynamic WebGL applications.\n
@@ -648,7 +648,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1570841926271225879
+      hash: -1809678549776687615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -657,7 +657,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1570841926271225879
+      hash: -1809678549776687615
 requirements: []
 rubyforge_project: jax
 rubygems_version: 1.8.10