jax 1.0.1 → 1.1.0.rc1

data/jax.gems

@@ -1 +1 @@
-bundler -v1.0.10
+bundler -v1.0.14

data/jax.gemspec

@@ -12,19 +12,21 @@ Gem::Specification.new do |s|
   s.summary     = %q{Framework for creating rich WebGL-enabled applications using JavaScript and Ruby}
   s.description = %q{Framework for creating rich WebGL-enabled applications using JavaScript and Ruby}
 
-  s.add_dependency 'rake',          '~> 0.8.7'
-  s.add_dependency 'bundler',       '~> 1.0.14'
+  s.add_dependency 'rake',          '~> 0.9.2'
+  s.add_dependency 'bundler',       '~> 1.0.15'
   s.add_dependency "thor",          '~> 0.14.6'
   s.add_dependency 'jasmine',       '~> 1.0.2.0'
-  s.add_dependency 'activesupport', '~> 3.0'
-  s.add_dependency "i18n",          '~> 0.5.0' # FIXME Jax doesn't really require this but ActiveSupport won't load without it!
+  s.add_dependency 'railties',      '~> 3.0.8'
   s.add_dependency 'sprockets',     '~> 1.0.2'
+  s.add_dependency 'rest-client',   '~> 1.6.3'
+  s.add_dependency 'minitar',       '~> 0.5.3'
   
-  s.add_development_dependency 'rspec',     '~> 2.0'
   s.add_development_dependency 'coderay',   '~> 0.9.7'
-  
+  s.add_development_dependency 'fakeweb',   '~> 1.3.0'
+  s.add_development_dependency 'ansi'
+  s.add_development_dependency 'turn'
+    
   # required by guides
-  s.add_development_dependency 'actionpack',     '~> 3.0'
   s.add_development_dependency 'RedCloth',       '~> 4.2'
   s.add_development_dependency 'w3c_validators', '~> 1.1.1'
 

data/lib/jax.rb

@@ -1,14 +1,23 @@
 require "active_support/core_ext"
+require "rails/railtie"
+require File.expand_path("jax/core_ext/kernel", File.dirname(__FILE__))
+
+# Don't raise an error when we extend Jax::Engine or Jax::Application
+Rails::Railtie::ABSTRACT_RAILTIES << "Jax::Engine" << "Jax::Application"
+
+JAX_FRAMEWORK_ROOT = File.expand_path('.', File.dirname(__FILE__)) unless defined?(JAX_FRAMEWORK_ROOT)
 
 module Jax
-  autoload :Generators,       File.join(File.dirname(__FILE__), "jax/generators/commands")
-  autoload :VERSION,          File.join(File.dirname(__FILE__), "jax/version")
-  autoload :Version,          File.join(File.dirname(__FILE__), "jax/version")
-  autoload :Application,      File.join(File.dirname(__FILE__), "jax/application")
-  autoload :Packager,         File.join(File.dirname(__FILE__), "jax/packager")
-  autoload :ResourceCompiler, File.join(File.dirname(__FILE__), "jax/resource_compiler")
-  autoload :Routes,           File.join(File.dirname(__FILE__), "jax/routes")
-  autoload :Shader,           File.join(File.dirname(__FILE__), "jax/shader")
+  autoload :Engine,           "jax/engine"
+  autoload :Generators,       "jax/generators/commands"
+  autoload :VERSION,          "jax/version"
+  autoload :Version,          "jax/version"
+  autoload :Application,      "jax/application"
+  autoload :Packager,         "jax/packager"
+  autoload :ResourceCompiler, "jax/resource_compiler"
+  autoload :Routes,           "jax/routes"
+  autoload :Shader,           "jax/shader"
+  autoload :Plugin,           "jax/plugin"
   
   class << self
     def application
@@ -23,7 +32,12 @@ module Jax
       application && application.root
     end
     
-    delegate :shader_load_paths, :to => :application
+    def framework_root
+      JAX_FRAMEWORK_ROOT
+    end
+    
+    delegate :shader_load_paths, :javascript_load_paths, :plugin_repository_url, :default_plugin_repository_url,
+             :plugin_repository_url=, :to => :application
   end
 end
 

data/lib/jax/application.rb

@@ -1,91 +1,149 @@
 module Jax
-  class Application
+  class Application < Jax::Engine
+    autoload :Configurable,  "jax/application/configurable"
     autoload :Configuration, "jax/application/configuration"
+    autoload :Railties,      "jax/application/railties"
 
     class << self
+      private :new
+
+      def configure(&block)
+        class_eval(&block)
+      end
+
       def inherited(base)
         raise "You cannot have more than one Jax::Application" if Jax.application
         super
-        
-        base.called_from = begin
-          # Remove the line number from backtraces making sure we don't leave anything behind
-          call_stack = caller.map { |p| p.sub(/:\d+.*/, '') }
-          File.dirname(call_stack.detect { |p| p !~ %r[jax[\w.-]*/lib/jax] })
-        end
-        
-        Jax.application = base.instance
-        Jax.application.config.root ||= Jax.application.find_root_with_flag("app")
-      end
 
-      def config
-        @config ||= Jax::Application::Configuration.new
+        Jax.application = base.instance
       end
-      
+    
       def instance
-        @instance ||= new
+        @@instance ||= new
       end
       
-      def called_from
-        @called_from ||= nil
+      def routes
+        Jax.application.config.routes
       end
-      
-      def called_from=(where)
-        @called_from = where
+
+      def respond_to?(*args)
+        super || instance.respond_to?(*args)
       end
       
-      def routes
-        Jax.application.config.routes
+      def initialize!
+        # return silently because we may have to call initialize automatically.
+        # Jax prior to v1.1.0 didn't call #initialize! during boot.
+        return self if @initialized
+        @initialized = true
+        run_initializers(self)
+        self
+      end
+
+    protected
+
+      def method_missing(*args, &block)
+        instance.send(*args, &block)
+      end
+    end
+    
+    delegate :plugins, :to => :railties
+    
+    def railties
+      @railties ||= Jax::Application::Railties.new(config)
+    end
+    
+    def detect_shaders(paths)
+      for path in paths
+        shader_paths = Dir[File.join(path, "*/{vertex,fragment}.ejs")].collect { |d| File.dirname(d) }.uniq
+        shader_paths.each do |shader_path|
+          shaders.push Jax::Shader.from(shader_path)
+        end
       end
     end
 
-    delegate :config, :to => "self.class"
     delegate :root, :to => :config
     delegate :routes, :to => :config
-    delegate :shader_load_paths, :to => :config
+    delegate :plugin_repository_url, :plugin_repository_url=, :default_plugin_repository_url, :to => :config
+    
+    def shader_load_paths
+      if !@shader_load_paths
+        @shader_load_paths = []
+        self.class.initialize!
+      end
+      @shader_load_paths
+    end
+    
+    def javascript_load_paths
+      if !@javascript_load_paths
+        @javascript_load_paths = []
+        @javascript_load_paths = javascript_source_roots + @javascript_load_paths
+      end
+      @javascript_load_paths
+    end
+    
+    def javascript_sources
+      if !@javascript_sources
+        @javascript_sources = []
+        self.class.initialize!
+      end
+      @javascript_sources
+    end
+    
+    def resource_paths
+      if !@resource_files
+        @resource_files = []
+        self.class.initialize!
+      end
+      @resource_files
+    end
+    
+    def resources
+      if !@resources
+        @resources = Jax::ResourceCompiler.new
+        self.class.initialize!
+      end
+      @resources
+    end
+    
+    def javascript_source_roots
+      if !@javascript_source_roots
+        @javascript_source_roots = []
+        self.class.initialize!
+      end
+      @javascript_source_roots
+    end
+    
+    def asset_paths
+      if !@asset_paths
+        @asset_paths = []
+        self.class.initialize!
+      end
+      @asset_paths
+    end
     
     def shaders
-#      @shaders ||= begin
-        shaders = []
-
-        shader_paths.each do |name, path|
-          shaders << Jax::Shader.from(path)
-        end
-        
+      if !@shaders
+        @shaders = []
         def shaders.find(name)
           select { |s| s.name == name }.first
         end
 
-        shaders
-#      end
-    end
-    
-    def shader_paths
-      shader_paths = {}
-      shader_load_paths.each do |path|
-        full_path = File.directory?(path) ? path : File.expand_path(path, config.root)
-        glob = File.join(full_path, "*/{fragment,vertex}.ejs")
-        Dir[glob].each do |dir|
-          shader_base = File.dirname(dir)
-          shader_name = File.basename(shader_base)
-          shader_paths[shader_name] = shader_base
-        end
+        self.class.initialize!
       end
-      shader_paths
+      @shaders
     end
     
-    def find_root_with_flag(flag, default=nil)
-      root_path = self.class.called_from
-  
-      while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/#{flag}")
-        parent = File.dirname(root_path)
-        root_path = parent != root_path && parent
-      end
-  
-      root = File.exist?("#{root_path}/#{flag}") ? root_path : default
-      raise "Could not find root path for #{self}" unless root
-  
-      RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ?
-        Pathname.new(root).expand_path : Pathname.new(root).realpath
+    def initializers
+      # jax doesn't have a bootstrapper or initializer yet, but I think these are good ideas
+      # so I'm leaving this here as a sort of reminder for how to do it.
+      # initializers = Bootstrap.initializers_for(self)
+      initializers = nil
+      railties.all { |r| initializers = initializers ? initializers + r.initializers : r.initializers }
+      initializers = initializers ? initializers + super : super
+      # initializers += Finisher.initializers_for(self)
+      initializers
     end
   end
-end
+end
+
+require File.expand_path("application/builtin", File.dirname(__FILE__))

data/lib/jax/application/builtin.rb

@@ -0,0 +1,12 @@
+class Jax::Application::Builtin < Jax::Engine
+  # Builtin is just an Engine whose Configuration is instantiated with a hardcoded
+  # path pointing to within the Jax framework (../../../builtin). Engine's initializers
+  # take care of everything else, hence the builtin path is structured the same as any
+  # Jax plugin.
+  
+  autoload :Configurable,  "jax/application/builtin/configurable"
+  autoload :Configuration, "jax/application/builtin/configuration"
+  
+  # not sure why this is necessary. self::Configurable must be resolving to something.
+  include Jax::Application::Builtin::Configurable
+end

data/lib/jax/application/builtin/configurable.rb

@@ -0,0 +1,5 @@
+module Jax::Application::Builtin::Configurable
+  def config
+    @config ||= Jax::Application::Builtin::Configuration.new(self.class.find_root_with_flag("app", Dir.pwd))
+  end
+end

data/lib/jax/application/builtin/configuration.rb

@@ -0,0 +1,5 @@
+class Jax::Application::Builtin::Configuration < Jax::Engine::Configuration
+  def initialize(*)
+    super(File.expand_path("../../../../builtin", File.dirname(__FILE__)))
+  end
+end

data/lib/jax/application/configurable.rb

@@ -0,0 +1,19 @@
+module Jax
+  class Application
+    module Configurable
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def inherited(base)
+          raise "You cannot inherit from a Jax::Application child"
+        end
+      end
+
+      def config
+        @config ||= Jax::Application::Configuration.new(self.class.find_root_with_flag("app", Dir.pwd))
+      end
+    end
+  end
+end

data/lib/jax/application/configuration.rb

@@ -1,13 +1,13 @@
-class Jax::Application::Configuration
-  attr_accessor :view_paths, :root
+require 'yaml'
+
+class Jax::Application::Configuration < Jax::Engine::Configuration
+  attr_accessor :view_paths
+  attr_writer :plugin_repository_url
   
-  def initialize
+  def initialize(*)
+    super
     @view_paths = ['app/views']
-    if defined?(JAX_ROOT)
-      @root = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? Pathname.new(JAX_ROOT).expand_path : Pathname.new(JAX_ROOT).realpath
-    else
-      @root = nil
-    end
+    read_config_files
   end
   
   def routes
@@ -18,10 +18,43 @@ class Jax::Application::Configuration
     @routes
   end
   
-  def shader_load_paths
-    @shader_load_paths ||= [
-      File.expand_path('../../../builtin/shaders', File.dirname(__FILE__)),
-      "app/shaders"
-    ]
+  def paths
+    @paths ||= begin
+      paths = super
+      paths.tmp                 "tmp"
+      paths.vendor              "vendor"
+      paths.vendor.plugins      "vendor/plugins"
+      paths
+    end
+  end
+  
+  def default_plugin_repository_url
+    "http://plugins.jaxgl.com/"
+  end
+  
+  def plugin_repository_url
+    @plugin_repository_url ||=
+      @config_file[:plugin_repository_url] ||
+      ENV['JAX_PLUGIN_REPOSITORY_URL'] ||
+      default_plugin_repository_url
+      
+    @plugin_repository_url.dup # so that it can't be edited in-place
+  end
+  
+  private
+  def read_config_files
+    @config_file = {}.with_indifferent_access
+    @config_file.merge! hash_from_config_file(File.expand_path("~/.jax", File.dirname(__FILE__)))
+    @config_file.merge! hash_from_config_file(File.expand_path(".jax", root))
+  end
+  
+  def hash_from_config_file(path)
+    if File.file? path
+      hash = YAML::load(File.read(path)) || {}
+      raise "Error: #{hash.inspect} is not a hash (read from #{path})" unless hash.kind_of?(Hash)
+      hash
+    else
+      {}
+    end
   end
 end