jax 1.0.1 → 1.1.0.rc1

data/lib/jax/generators/app/templates/public/stylesheets/%file_name%.css.tt

@@ -0,0 +1,11 @@
+#nav {
+  position:absolute;
+  top: 0px;
+  left: 0px;
+  background-color: #fff;
+  z-index:100; /* for chrome */
+}
+
+body {
+  margin: 0;
+}

data/lib/jax/generators/app/templates/public/webgl_not_supported.html

@@ -7,7 +7,7 @@
     
     <p>
       Unfortunately, WebGL appears to be unavailable! Please verify that you have the latest release of a WebGL-compatible
-      browser such as <a href="http://www.firefox.com">FireFox 4.0</a> or <a href="http://chrome.google.com">Chrome 11</a>.
+      browser such as <a href="http://www.firefox.com">FireFox</a> or <a href="http://chrome.google.com">Chrome</a>.
     </p>
   
     <p>

data/lib/jax/generators/app/templates/spec/javascripts/support/jasmine.yml

@@ -17,6 +17,7 @@ src_files:
     - app/**/*.js
     - tmp/**/*.js
     - public/javascripts/**/*.js
+    - lib/**/*.js
 
 # stylesheets
 #

data/lib/jax/generators/app/templates/spec/javascripts/support/spec_helpers/jax_spec_environment_helper.js

@@ -11,23 +11,31 @@ function setupJaxTestEnvironment() {
     return trivialReporter.specFilter(spec);
   };
 
+  setupJaxSpecContext();
+
+  jasmineEnv.execute();
+}
+
+function setupJaxSpecContext() {
   /*
     Create a canvas element and add it to the document. 
     There's nothing special about this element.
    */
   var canvas = document.createElement("canvas");
+  canvas.setAttribute("width", 600);
+  canvas.setAttribute("height", 400);
   canvas.setAttribute("id", "spec-canvas");
   canvas.style.display = "none";
   document.body.appendChild(canvas);
   
   beforeEach(function() {
-    window.SPEC_CONTEXT = new Jax.Context(canvas);
+    Jax.getGlobal().SPEC_CONTEXT = new Jax.Context(canvas);
   });
   
   afterEach(function() {
-    SPEC_CONTEXT.dispose();
+    Jax.getGlobal().SPEC_CONTEXT.dispose();
   })
-
-
-  jasmineEnv.execute();
 }
+
+if (typeof(global) != 'undefined')
+  global.setupJaxSpecContext = setupJaxSpecContext;

data/lib/jax/generators/app/templates/spec/javascripts/support/spec_helpers/jax_spec_helper.js

@@ -157,39 +157,35 @@ beforeEach(function() {
       this.actual = "model";
       var original_render = model.render;
       
-      var context = new Jax.Context('canvas-element');
-      context.world.addObject(model);
-      context.world.addLightSource(new Jax.Scene.LightSource({type:Jax.DIRECTIONAL_LIGHT}));
+      SPEC_CONTEXT.world.addObject(model);
+      SPEC_CONTEXT.world.addLightSource(new Jax.Scene.LightSource({type:Jax.DIRECTIONAL_LIGHT}));
 
       var illuminated = false;
       model.render = function() {
-        if (context.current_pass == Jax.Scene.ILLUMINATION_PASS)
+        if (SPEC_CONTEXT.current_pass == Jax.Scene.ILLUMINATION_PASS)
           illuminated = true;
       };
 
       spyOn(model, 'render').andCallThrough();
-      context.world.render();
+      SPEC_CONTEXT.world.render();
       
       var called = model.render.callCount;
       if (!model.render.callCount) result = false; // fail-safe
-      context.dispose();
       
       model.render = original_render;
       return called && illuminated;
     },
     
     toBeRendered: function() {
-      var context = new Jax.Context('canvas-element');
       var model = this.actual;
       var original_render = model.render;
-      context.world.addObject(model);
+      SPEC_CONTEXT.world.addObject(model);
       
       this.actual = 'model';
       spyOn(model, 'render');
-      context.world.render();
+      SPEC_CONTEXT.world.render();
       expect(model.render).toHaveBeenCalled();
       
-      context.dispose();
       model.render = original_render;
     },
     

data/lib/jax/generators/commands.rb

@@ -3,92 +3,218 @@
 require 'thor'
 require 'thor/group'
 require File.expand_path('../../jax', File.dirname(__FILE__))
+require File.expand_path('interactions', File.dirname(__FILE__))
 
 module Jax
   module Generators
-    class Command < Thor::Group
-      class << self
-        def inherited(base)
-          base.base_path = File.dirname(caller.first.gsub(/:.*$/, ''))
+    class Error < Thor::Error
+    end
+    
+    module Usage
+      module ClassMethods
+        def start(given_args=ARGV, config={})
+          if (given_args.length == 0)
+            puts usage
+          else
+            super
+          end
         end
-        
+
+        def usage
+          usage = ERB.new(File.read(File.expand_path("USAGE", base_path)), nil, '-')
+          usage.result(binding)
+        end
+
         def base_path
           @base_path || raise("Jax Command base path was not found")
         end
-        
+
         def base_path=(path)
           @base_path = path
         end
-
-        def usage
-          usage = ERB.new(File.read(File.expand_path("USAGE", base_path)), nil, '-')
-          usage.result(binding)
+      end
+      
+      class << self
+        def extended(base)
+          base.send :extend, ClassMethods
+          base.base_path = File.dirname(caller.first.gsub(/:.*$/, ''))
         end
-        
-        def start(given_args=ARGV, config={})
-          if (given_args.length == 0)
-            puts usage
-          else
-            super
+      
+        def included(base)
+          base.send :extend, ClassMethods
+          base.base_path = File.dirname(caller.first.gsub(/:.*$/, ''))
+        end
+      end
+    end
+    
+    class Command < Thor::Group
+      include Thor::Actions
+      include Jax::Generators::Usage
+      
+      no_tasks do
+        def exit(message = "")
+          raise Jax::Generators::Error, message
+        end
+      end
+      
+      def self.inherited(base)
+        base.base_path = File.dirname(caller.first.gsub(/:.*$/, ''))
+        base.instance_eval do
+          def self.source_root
+            File.join(base_path, "templates")
           end
         end
       end
     end
     
-    autoload :Controller, File.join(File.dirname(__FILE__), "controller/controller_generator")
-    autoload :Model,      File.join(File.dirname(__FILE__), "model/model_generator")
-    autoload :LightSource,File.join(File.dirname(__FILE__), "light_source/light_source_generator")
-    autoload :Material,   File.join(File.dirname(__FILE__), "material/material_generator")
-    autoload :Shader,     File.join(File.dirname(__FILE__), "shader/shader_generator")
+    # Generators extending PluggableCommand will produce code in either a Jax
+    # application proper, or in a plugin within the app.
+    class PluggableCommand < Command
+      def check_plugin_destination
+        if ENV['JAX_CWD'] && cwd = File.expand_path('.', ENV['JAX_CWD'])
+          if cwd =~ /^#{Regexp::escape File.join(Jax.root, "vendor/plugins/", "")}(.*?)(\/|$)/
+            self.destination_root = Jax.root.join("vendor", "plugins", $1)
+          end
+        end
+      end
+    end
+    
+    autoload :Controller,  "jax/generators/controller/controller_generator"
+    autoload :Model,       "jax/generators/model/model_generator"
+    autoload :LightSource, "jax/generators/light_source/light_source_generator"
+    autoload :Material,    "jax/generators/material/material_generator"
+    autoload :Shader,      "jax/generators/shader/shader_generator"
+    autoload :Plugin,      "jax/generators/plugin/all"
+    autoload :Packager,    "jax/generators/packager/package_generator"
   end
 end
 
 class JaxGeneratorInvoker < Thor
+  include Thor::Actions
+  
   def self.basename
     "jax generate"
   end
 
-  desc "controller", "generates a new controller"
+  desc "controller NAME", "generates a new controller"
   def controller(*args)
-    Jax::Generators::Controller::ControllerGenerator.start(args)
+    Jax::Generators::Controller::ControllerGenerator.start(ARGV[1..-1])
   end
   
-  desc "model", "generates a new model"
+  desc "model NAME", "generates a new model"
   def model(*args)
-    Jax::Generators::Model::ModelGenerator.start(args)
+    Jax::Generators::Model::ModelGenerator.start(args, :behavior => behavior)
   end
   
-  desc "light", "generates a new light source"
+  desc "light NAME TYPE", "generates a new light source"
   def light(*args)
-    Jax::Generators::LightSource::LightSourceGenerator.start(args)
+    Jax::Generators::LightSource::LightSourceGenerator.start(args, :behavior => behavior)
   end
   
-  desc "material", "generates a new material"
+  desc "material NAME", "generates a new material"
   def material(*args)
     args = ARGV.dup
-    2.times { args.shift }
-    Jax::Generators::Material::MaterialGenerator.start(args)
+    args.shift
+    Jax::Generators::Material::MaterialGenerator.start(args, :behavior => behavior)
   end
 
-  desc "scaffold", "generates a controller, model and material, all with the same name"
-  def scaffold(*name)
-    name = name.shift || []
-    Jax::Generators::Controller::ControllerGenerator.start([name, 'index'])
-    Jax::Generators::Model::ModelGenerator.start([name])
-    Jax::Generators::Material::MaterialGenerator.start([name])
+  desc "scaffold NAME", "generates a controller, model and material, all with the same name"
+  def scaffold(name)
+    Jax::Generators::Controller::ControllerGenerator.start([name, 'index'], :behavior => behavior)
+    Jax::Generators::Model::ModelGenerator.start([name], :behavior => behavior)
+    Jax::Generators::Material::MaterialGenerator.start([name], :behavior => behavior)
   end
 
-  desc "shader", "generates a new custom shader"
+  desc "shader NAME", "generates a new custom shader"
   def shader(*name)
-    Jax::Generators::Shader::ShaderGenerator.start(name)
+    Jax::Generators::Shader::ShaderGenerator.start(name, :behavior => behavior)
+  end
+  
+  desc "plugin NAME", "generates a new plugin"
+  def plugin(*args)
+    Jax::Generators::Plugin::PluginGenerator.start(ARGV[1..-1], :behavior => behavior)
   end
 end
 
-class JaxGenerator < Thor
-  desc "generate", "generates a controller, model, light source, material or shader"
-  def generate(*args)
-    JaxGeneratorInvoker.start(args)
+class JaxGenerator
+  attr_reader :args
+  
+  COMMANDS = {
+    "generate" => "Generate new code",
+    "destroy"  => "Undo code generated with \"generate\"",
+    "plugin"   => "Install a plugin",
+    "package"  => "Package the app for production"
+  } unless defined?(COMMANDS)
+  ALIASES = { "g" => "generate" } unless defined?(ALIASES)
+  
+  def initialize(args)
+    @args = args
+    
+    show_usage and return unless command
+    if respond_to? command then send command
+    else invalid command
+    end
   rescue ArgumentError
     puts $!.message
   end
+  
+  def package
+    Jax::Generators::Packager::PackageGenerator.start
+  end
+  
+  def generate
+    JaxGeneratorInvoker.start
+  end
+  
+  def destroy
+    JaxGeneratorInvoker.start(ARGV, :behavior => :revoke)
+  end
+  
+  def plugin
+    Jax::Generators::Plugin::PluginManager.start
+  end
+  
+  def command
+    @command ||= begin
+      command = args.shift
+      command = ALIASES[command] || command
+    end
+  end
+  
+  def invalid(command)
+    puts "Invalid command."
+    puts
+    show_usage
+  end
+  
+  def show_usage
+    puts <<-end_banner
+Usage: jax COMMAND [ARGS]
+
+The following commands are available:
+  #{command_list.join("\n  ")}
+  
+All commands can be run with -h for more information.
+    end_banner
+  end
+  
+  def command_list
+    COMMANDS.keys.collect { |command| "#{command.ljust(13)}#{description_for command}"}
+  end
+  
+  def description_for(command)
+    if i = ALIASES.values.index(command)
+      COMMANDS[command] + " (shortcut alias: \"#{ALIASES.keys[i]}\")"
+    else
+      COMMANDS[command]
+    end
+  end
+  
+  class << self
+    # this gets called by script/jax from within a jax app
+    def start
+      new ARGV
+    end
+  end
 end
+

data/lib/jax/generators/controller/controller_generator.rb

@@ -3,10 +3,10 @@ require 'active_support/core_ext'
 module Jax
   module Generators
     module Controller
-      class ControllerGenerator < Jax::Generators::Command
-        include Thor::Actions
+      class ControllerGenerator < Jax::Generators::PluggableCommand
         argument :controller_name
         attr_reader :actions, :action_name
+        class_option :root, :default => false, :type => :boolean
 
         def self.source_root
           File.expand_path("templates", File.dirname(__FILE__))
@@ -15,6 +15,7 @@ module Jax
         def initialize(args=[], options={}, config={})
           super
           @actions = args[1..-1].collect { |c| c.underscore }
+          @actions = ['index'] if @actions.empty?
           @controller_name = controller_name.underscore
         end
         
@@ -44,6 +45,12 @@ module Jax
                              :after => /\.routes\.map do$/
           end
         end
+        
+        def root_route
+          if options[:root]
+            insert_into_file "config/routes.rb", "  root '#{controller_name}'\n", :before => /^end\s*\Z/
+          end
+        end
 
         protected
         def file_name

data/lib/jax/generators/interactions.rb

@@ -0,0 +1,56 @@
+module Jax
+  module Generators
+    module Interactions
+      def prompt_yn(message, options = {})
+        yn = ask(message).downcase[0]
+        throw :aborted, "Aborted by user." if yn != ?y
+      end
+      
+      def menu(items, options = {})
+        min = 1
+        if options[:allow_all]
+          say_option 0, "All candidates"
+          min = 0
+        end
+        
+        items.each_with_index do |item, index|
+          say_option index+1, item
+        end
+        which = menu_choice(:min => min, :max => items.length)
+                        
+        if which == -1
+          items.each_with_index { |item, index| yield item, index }
+        else
+          yield items[which], which
+        end
+      end
+      
+      def menu_choice(*args)
+        options = args.extract_options!
+        caption, addl_caption = *args
+        caption = "Please select an option, or press ctrl+c to cancel >" unless caption
+        
+        which = ask("#{addl_caption}#{caption}")
+        sel = which.to_i
+        # if sel.to_s != which then which is non-numeric
+        if sel.to_s != which || options[:min] && sel < options[:min] || options[:max] && sel > options[:max]
+          menu_choice(caption, "Invalid choice. ")
+        else
+          sel - 1
+        end
+      end
+      
+      def say_option(which, caption)
+        say "\t#{which}\t: #{caption}"
+      end
+      
+      def overwrite(path)
+        path = path.to_s
+        if File.exist? path
+          prompt_yn "Path '#{path}' already exists! Delete it?"
+          FileUtils.rm_rf path
+        end
+      end
+    end
+  end
+end