js2 0.0.3 → 0.0.4

data/Changelog

@@ -1,5 +1,12 @@
-== 0.0.2 2009-11-25
-* Fixed sass templating so that there is no default namespacing 
+== 0.0.4 2009-12-02
+* Adding JS2.createClass() and JS2.getClass()
+* Deprecating classes.js file in favor of js2bootstrap.js
+* Adding super function
 
 == 0.0.3 2009-11-30
 * Selenium test bug fixes
+
+== 0.0.2 2009-11-25
+* Fixed sass templating so that there is no default namespacing 
+
+

data/bin/js2

@@ -7,42 +7,61 @@ require 'js2'
 
 options = Hash.new
 
-usage = "Usage: js2 [options] <dir-with-js2>"
-op = OptionParser.new do |opts|
-  opts.banner = usage
+dir = nil
 
-  opts.on("--js2-haml-dir DIR", "Directory with js2.haml files") do |haml|
-    options[:js2_haml_dir] = haml
-  end
+# assume rails
+if ARGV.empty? && File.directory?('public') && File.directory?('app') && File.directory?('vendor') && File.directory?('config')
 
-  opts.on("--out-dir DIR", "Directory of js2 -> js output") do |out|
-    options[:write_dir] = out
-  end
+  puts "Detected Rails setup: using auto config"
+
+  dir = File.directory?('app/js2') ? './app/js2' : './js2'
+  puts "Using js2 dir: #{dir}"
+
+  options[:write_dir] = './public/javascripts'
+  puts "Writing to: #{options[:write_dir]}"
+
+  options[:daemonize] = true
+
+  options[:js2_haml_dir] = dir
+  puts "HAML dir (optional): #{options[:js2_haml_dir]}"
+
+else
+
+  usage = "Usage: js2 [options] <dir-with-js2>"
+  op = OptionParser.new do |opts|
+    opts.banner = usage
 
-  opts.on("-d", "--daemonize") do |d|
-    options[:daemonize] = true
+    opts.on("--js2-haml-dir DIR", "Directory with js2.haml files") do |haml|
+      options[:js2_haml_dir] = haml
+    end
+
+    opts.on("--out-dir DIR", "Directory of js2 -> js output") do |out|
+      options[:write_dir] = out
+    end
+
+    opts.on("-d", "--daemonize") do |d|
+      options[:daemonize] = true
+    end
+
+    opts.on('-h', "--help", "Help Screen") do 
+      puts opts
+      exit
+    end
   end
 
-  opts.on('-h', "--help", "Help Screen") do 
-    puts opts
-    exit
+  begin
+    op.parse!(ARGV)
+  rescue OptionParser::ParseError => e
+    puts op
   end
-end
 
-begin
-  op.parse!(ARGV)
-rescue OptionParser::ParseError => e
-  puts op
+  dir = ARGV.pop
 end
 
-
-dir = ARGV.pop
-
 if !dir && File.directory?("./public/javascripts")
   dir = "./public/javascripts" 
 end
 
-
 unless dir
   puts op
   exit

data/lib/js2/decorator/standard.rb

@@ -14,29 +14,8 @@ class JS2::Decorator::Standard
     return str
   end
 
-  def draw_classes (nodes)
-    ret = []
-    visited = Hash.new
-    funct = "function () { if (this.initialize) this.initialize.apply(this, arguments); }"
-    nodes.select { |n| n.is_a? JS2::AST::ClassNode }.sort { |a,b| a.name <=> b.name }.each do |n|
-      splitted = n.name.split(/\./)
-      running_name = []
-
-      splitted.each_with_index do |sub_name, i|
-        running_name << sub_name
-        name = running_name.join('.')
-        next if visited[name]
-        visited[name] = true
-
-        if i == 0
-          ret << "var #{name}=#{funct};"
-        else
-          ret << "  #{name}=#{funct};"
-        end
-
-      end
-    end
-    return ret.join("\n")
+  def draw_bootstrap ()
+    return File.read(File.dirname(__FILE__) + '/../../javascript/bootstrap.js')
   end
 
   private
@@ -111,6 +90,7 @@ class JS2::Decorator::Standard
 
     return <<-END
 // #{node.filename}:#{node.line_number}
+JS2.createClass("#{node.name}");
 #{node.name}.prototype={#{meta}
 #{member_js.join(",\n") }
 };

data/lib/js2/process/file_handler.rb

@@ -8,10 +8,15 @@ class JS2::Process::FileHandler
     @mtimes = Hash.new
   end
 
+  # depricated
   def class_file 
     return @write_dir + '/classes.js'
   end
 
+  def bootstrap_file 
+    return @write_dir + '/js2bootstrap.js'
+  end
+
   def get_view_files
     return [] unless @view_dir
     return Dir.glob(@view_dir + '/**/*.haml')
@@ -37,10 +42,19 @@ class JS2::Process::FileHandler
   def write_class_file (str)
     FileUtils.mkpath(File.dirname(class_file))
     File.open(class_file, 'w') do |f|
+      f << "alert('classes.js is deprecated, please include js2bootstrap.js instead.');"
       f << str
     end
   end
 
+  def write_bootstrap_file (str)
+    FileUtils.mkpath(File.dirname(bootstrap_file))
+    File.open(bootstrap_file, 'w') do |f|
+      f << str
+    end
+  end
+
+
   def need_update!
     ret = false
     did = Hash.new

data/lib/js2/processor.rb

@@ -131,8 +131,10 @@ class JS2::Processor
       @fh.write_file(nc.filename, str)
     end
 
-    str = decorator.draw_classes(universe.node_containers.flatten)
+    str = decorator.draw_bootstrap()
+
     @fh.write_class_file(str)
+    @fh.write_bootstrap_file(str)
 
     if @test_mode
       decorator.write_references(@reference_dir)

data/lib/js2.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Js2
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 
 module JS2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jeff Su
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -08:00
+date: 2009-12-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency