distil 0.8.4 → 0.10.0

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.10.0

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.8.4"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-01-17}
+  s.date = %q{2010-03-26}
   s.default_executable = %q{distil}
   s.description = %q{A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit}
   s.executables = ["distil"]
@@ -54,6 +54,8 @@ Gem::Specification.new do |s|
      "vendor/extconf.rb",
      "vendor/jsdoc-extras/plugins/distil-plugin.js",
      "vendor/jsdoc-extras/plugins/interface-plugin.js",
+     "vendor/jsdoc-extras/templates/classlist/all-classes.tmpl",
+     "vendor/jsdoc-extras/templates/classlist/publish.js",
      "vendor/jsdoc-extras/templates/coherent/all-classes.tmpl",
      "vendor/jsdoc-extras/templates/coherent/allclasses.tmpl",
      "vendor/jsdoc-extras/templates/coherent/allfiles.tmpl",
@@ -138,6 +140,7 @@ Gem::Specification.new do |s|
      "vendor/jsdoc-toolkit/app/test/memberof3.js",
      "vendor/jsdoc-toolkit/app/test/memberof_constructor.js",
      "vendor/jsdoc-toolkit/app/test/module.js",
+     "vendor/jsdoc-toolkit/app/test/multi_methods.js",
      "vendor/jsdoc-toolkit/app/test/name.js",
      "vendor/jsdoc-toolkit/app/test/namespace_nested.js",
      "vendor/jsdoc-toolkit/app/test/nocode.js",

data/lib/configurable.rb

@@ -66,6 +66,42 @@ class Configurable
     s
   end
 
+  def self.class_attr(name)
+    if (@class_attributes.nil?)
+      @class_attributes=[name]
+    else
+      @class_attributes<<name
+    end
+    
+    class_eval %(
+          def self.#{name}(*rest)
+            if (rest.length>0)
+              @#{name}= rest[0]
+            else
+              @#{name}
+            end
+          end
+          def self.#{name}=(value)
+            @#{name}= value
+          end
+          def #{name}
+            @#{name} || self.class.#{name}
+          end
+          def #{name}=(value)
+            @#{name}=value
+          end
+        )
+        
+  end
+  
+  def self.inherited(subclass)
+    super(subclass)
+    (@class_attributes||[]).each { |a|
+        instance_var = "@#{a}"
+        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+      }
+  end
+  
   # option name, [type], [default], [options]
   def self.option(name, *rest)
   

data/lib/file-set.rb

@@ -22,17 +22,24 @@ class FileSet
           next if ('.'==f[/^\./])
           include_file(File.join(full_path, f))
       }
-    else
-      if (File.exists?(full_path))
-        source_file= SourceFile.from_path(full_path)
-      else
-        source_file= Project.current.find_file(file)
-        return if (!source_file)
-      end
-      
-      return if (@files.include?(source_file))
-      @files << source_file
+      return
     end
+
+    files= Dir.glob(full_path)
+    if (files.length>0)
+      files.each { |f|
+        source_file= SourceFile.from_path(f)
+        next if (@files.include?(source_file))
+        @files << source_file
+      }
+      return
+    end
+    
+    # file not found by globbing (would also find explicit reference)
+    source_file= Project.current.find_file(file)
+    return if (!source_file)
+    return if (@files.include?(source_file))
+    @files << source_file
   end
   
   def each

data/lib/filters/css-filter.rb

@@ -5,7 +5,7 @@ $jsl_import_regex= /\/\*jsl:import\s+([^\*]*)\*\//
 class CssDependencyFilter < FileReferenceFilter
   
   def handles_file(file)
-    return [".css"].include?(file.extension)
+    return ["css"].include?(file.content_type)
   end
   
   def preprocess_content(file, content)

data/lib/filters/jsl-dependency-filter.rb

@@ -3,7 +3,7 @@ $jsl_import_regex= /\/\*jsl:import\s+([^\*]*)\*\//
 class JslDependencyFilter < Filter
   
   def handles_file(file)
-    return [".js"].include?(file.extension)
+    return ["js"].include?(file.content_type)
   end
   
   def preprocess_content(file, content)
@@ -25,7 +25,7 @@ class JslDependencyFilter < Filter
         else
           dependency= Project.current.find_file($1)
           if (dependency)
-            file.add_dependency SourceFile.from_path(import_file)
+            file.add_dependency dependency
           else
             file.error "Missing import file: #{$1}", line_num
           end

data/lib/project.rb

@@ -118,7 +118,7 @@ class Project < Configurable
     # build or get each project
     projects.each { |project|
       
-      if (project.key?("folder") && !File.directory?(project["folder"]))
+      if (project.key?("folder") && !File.directory?(project["folder"]) && !File.symlink?(project["folder"]))
         if (project["url"])
           url= project["url"]
           system "svn co #{url} #{project["folder"]}"
@@ -155,10 +155,10 @@ class Project < Configurable
            value.is_a?(Hash) && value.has_key?("enabled") && !value["enabled"])
 
       puts
-      puts "#{project_name}-#{section}:"
+      puts "#{project_name} #{section}:"
       puts
 
-      task= Task.by_name(section)
+      task= Task.by_name(section) || Task.by_product_name(section)
       if (task)
         new_value= Hash.new
         new_value[section]= value

data/lib/source-file.rb

@@ -15,15 +15,6 @@ class SourceFile
     @@file_cache[@full_path]= self
   end
 
-  @@root_folder= FileUtils.pwd
-  def self.root_folder
-    @@root_folder
-  end
-  
-  def self.root_folder=(new_root_folder)
-    @@root_folder= File.expand_path(new_root_folder)
-  end
-  
   def self.extension
   end
   
@@ -46,6 +37,10 @@ class SourceFile
     @@file_types << subclass
   end
 
+  def self.file_types
+    @@file_types
+  end
+
   @@file_cache= Hash.new
   def self.from_path(filepath)
     full_path= File.expand_path(filepath)

data/lib/target.rb

@@ -12,21 +12,34 @@ class Target < Configurable
     @@current= self
     @project= project
     @target_name= name
+
+    @warning_count=0
+    @error_count=0
     
     @tasks= []
 
     @extras.each { |task_name, task_settings|
       next if (tasks && !tasks.include?(task_name))
+
+      if (task_settings.is_a?(Array) || task_settings.is_a?(String))
+        task_settings= { "include"=>task_settings }
+      end
+      
       t= Task.by_name(task_name)
-      if (t.nil?)
-        error("Unknown task: #{task_name}")
+      if (!t.nil?)
+        @tasks << t.new(self, task_settings)
+        next
+      end
+      
+      t= Task.by_product_name(task_name)
+      if (!t.nil?)
+        task_settings["output_name"]= task_name[/(.*)\.#{t.output_type}$/,1]
+        @tasks << t.new(self, task_settings)
         next
       end
-      @tasks << t.new(self, task_settings)
-    }
 
-    @warning_count=0
-    @error_count=0
+      error("Unknown task: #{task_name}")
+    }
   end
 
   @@current=nil

data/lib/task.rb

@@ -8,11 +8,9 @@ class Task < Configurable
   attr_reader :included_files, :assets
 
   option :remove_prefix
-
+  option_alias :remove_prefix, :source_folder
+  
   def initialize(target, settings)
-    if (settings.is_a?(Array) || settings.is_a?(String))
-      settings= { "include"=>settings }
-    end
     super(settings, target)
     
     @target= target
@@ -22,10 +20,6 @@ class Task < Configurable
     @files_to_exclude= []
     @assets= Set.new
     @probed= Set.new
-    
-    if (remove_prefix)
-      SourceFile.root_folder= remove_prefix
-    end
   end
 
   @@tasks= []
@@ -37,6 +31,11 @@ class Task < Configurable
     @@tasks
   end
 
+  @@task_aliases= Hash.new
+  def self.task_name_alias(name)
+    @@task_aliases[name]= self
+  end
+  
   @@task_index= nil
   def self.task_index
     return @@task_index if @@task_index
@@ -49,21 +48,30 @@ class Task < Configurable
   end
   
   def self.by_name(taskname)
-    self.task_index[taskname]
+    self.task_index[taskname] || @@task_aliases[taskname]
   end
   
-  def self.task_name
+  def self.by_product_name(productname)
+    @@tasks.select { |t|
+      next if !t.respond_to?(:output_type)
+      return t if productname[/\.#{t.output_type}$/]
+    }
     nil
   end
   
+  def self.task_name
+    s= (self.to_s)[/(.*)Task/,1]
+    s && !s.empty? ?  s.downcase : nil
+  end
+
   def task_name
     self.class.task_name
   end
-    
+
   def handles_file?(file)
     false
   end
-
+  
   #  Do a simple token substitution. Tokens begin and end with @.
   def replace_tokens(string, params)
   	return string.gsub(/(\n[\t ]*)?@([^@ \t\r\n]*)@/) { |m|
@@ -96,11 +104,10 @@ class Task < Configurable
   def find_files
     @probed= Set.new
     @included_files= []
+    
     @files_to_include.each { |i| include_file(i) }
     
-    files= @included_files.map { |f|
-      f.to_s
-    }
+    # files= @included_files.map { |f| f.to_s }
   end
   
   def products
@@ -183,6 +190,8 @@ class Task < Configurable
   end
   
   def build_assets
+    FileUtils.mkdir_p(output_folder)
+
     if ("release"==mode)
       copy_assets
     else

data/lib/tasks/copy-task.rb

@@ -1,9 +1,5 @@
 class CopyTask < Task
   
-  def self.task_name
-    "copy"
-  end
-  
   def initialize(target, options)
     super(target, options)
     @files_to_exclude= @options.exclude.to_a

data/lib/tasks/css-task.rb

@@ -2,13 +2,7 @@ require "#{$script_dir}/tasks/single-output-task.rb"
 
 class CssTask < SingleOutputTask
   
-  def self.task_name
-    "css"
-  end
-  
-  def output_type
-    "css"
-  end
+  output_type "css"
   
   # CssTask handles files that end in .css
   def handles_file?(file_name)

data/lib/tasks/javascript-task.rb

@@ -14,22 +14,46 @@ class JavascriptTask < SingleOutputTask
   option :jsdoc_plugins, "#{$vendor_dir}/jsdoc-extras/plugins"
   option :doc_folder, "doc"
   option :generate_docs, false
+  option :generate_import, false
+  option :class_list, ""
+  option :class_list_template, "#{$vendor_dir}/jsdoc-extras/templates/classlist"
+
+  output_type "js"
   
-  def self.task_name
-    "js"
-  end
-  
-  def output_type
-    "js"
-  end
+  task_name_alias "js"
   
   def initialize(target, options)
     super(target, options)
     @concatenation_join_string = "\n/*jsl:ignore*/;/*jsl:end*/\n"
     
+    if (!class_list.empty?)
+      @products << File.join(output_folder, class_list)
+    end
+    
     if (generate_docs)
       @products << File.join(doc_folder, "index.html")
     end
+    
+    type= output_extension
+    return if (!type)
+
+    if (!output_name.empty?)
+      target_name= "#{output_name}"
+      prefix= "#{output_folder}/"
+    else
+      target_name= "#{target.target_name}".downcase
+      prefix= "#{output_folder}/#{project_name}"
+      if ("all"==target_name)
+        target_name= ""
+      else
+        prefix= "#{prefix}-"
+      end
+    end
+
+    if (generate_import)
+      @name_import= "#{prefix}#{target_name}-import#{type}"
+      @products << @name_import
+    end
   end
   
   # JsTask handles files that end in .js
@@ -58,6 +82,7 @@ class JavascriptTask < SingleOutputTask
     }
     
     @included_files.each { |f|
+      next if "js"!=f.content_type
       tmp << "+process #{f}\n"
     }
 
@@ -89,8 +114,44 @@ class JavascriptTask < SingleOutputTask
       
   end
 
+  def generate_class_list()
+    tmp= Tempfile.new("jsdoc.conf")
+    
+    template= File.read(@options.jsdoc_conf)
+    doc_files= @included_files.map { |f|
+      p= f.file_path || f.relative_to_folder(options.remove_prefix||"")
+      "\"#{p}\""
+    }
+    
+    class_list_output= File.join(output_folder, class_list)
+    
+    conf= replace_tokens(template, {
+                    "DOC_FILES"=>doc_files.join(",\n"),
+                    "DOC_OUTPUT_DIR"=>output_folder,
+                    "DOC_TEMPLATE_DIR"=>class_list_template,
+                    "DOC_PLUGINS_DIR"=>jsdoc_plugins
+                })
+
+    tmp << conf
+    tmp.close()
+    
+    command= "#{$jsdoc_command} -c=#{tmp.path}"
+    
+    stdin, stdout, stderr= Open3.popen3(command)
+    stdin.close
+    output= stdout.read
+    errors= stderr.read
+
+    tmp.delete
+    
+    puts errors
+    puts output
+  end
+  
   def document_files()
-      
+
+    generate_class_list() if (!class_list.empty?)
+    
     return if (!generate_docs)
     return if (!File.exists?($jsdoc_command))
     
@@ -133,5 +194,20 @@ class JavascriptTask < SingleOutputTask
               "LOAD_SCRIPTS" => @debug
             })
   end
+
+  def finish
+    super
+    return if (!generate_import)
+
+    File.delete(@name_import) if (File.exists?(@name_import))
+    
+    File.open(@name_import, "w") { |f|
+      f.write(notice_text)
+      
+      @included_files.each { |inc|
+        f.puts "/*jsl:import #{inc.relative_to_folder(output_folder)}*/"
+      }
+    }
+  end
   
 end

data/lib/tasks/multiple-output-task.rb

@@ -36,11 +36,11 @@ class MultipleOutputTask < OutputTask
     
     type= output_extension
     @included_files.each { |file|
-      basename= file.basename(".#{type}")
-      name_concat= "#{@prefix}#{basename}-uncompressed.#{type}"
-      name_min= "#{@prefix}#{basename}.#{type}"
-      name_gz= "#{@prefix}#{basename}.#{type}.gz"
-      name_debug= "#{@prefix}#{basename}-debug.#{type}"
+      basename= file.basename("#{type}")
+      name_concat= "#{@prefix}#{basename}-uncompressed#{type}"
+      name_min= "#{@prefix}#{basename}#{type}"
+      name_gz= "#{@prefix}#{basename}#{type}.gz"
+      name_debug= "#{@prefix}#{basename}-debug#{type}"
       @products.concat([name_concat, name_min, name_gz, name_debug])
     }
     @products
@@ -81,11 +81,11 @@ class MultipleOutputTask < OutputTask
     type= output_extension
     return if (!type)
 
-    basename= file.basename(".#{type}")
-    name_concat= "#{@prefix}#{basename}-uncompressed.#{type}"
-    name_min= "#{@prefix}#{basename}.#{type}"
-    name_gz= "#{@prefix}#{basename}.#{type}.gz"
-    name_debug= "#{@prefix}#{basename}-debug.#{type}"
+    basename= file.basename("#{type}")
+    name_concat= "#{@prefix}#{basename}-uncompressed#{type}"
+    name_min= "#{@prefix}#{basename}#{type}"
+    name_gz= "#{@prefix}#{basename}#{type}.gz"
+    name_debug= "#{@prefix}#{basename}-debug#{type}"
     
     # puts "Finish: #{file}"
     # puts "  #{name_concat}"

data/lib/tasks/output-task.rb

@@ -16,16 +16,19 @@ class OutputTask < Task
     FileUtils.mkdir_p(output_folder)
   end
 
-  def output_type
-    nil
-  end
+  class_attr :output_type
+  class_attr :content_type
   
-  def source_type
-    output_type
+  def self.content_type(*rest)
+    if (rest.length>0)
+      @content_type= rest[0]
+    else
+      @content_type || output_type
+    end
   end
   
   def output_extension
-    output_type
+    output_type && ".#{output_type}"
   end
 
   def products
@@ -36,7 +39,7 @@ class OutputTask < Task
   	# Run the Y!UI Compressor
   	buffer= ""
   	
-  	IO.popen("java -jar #{$compressor} --type #{source_type}", "r+") { |pipe|
+  	IO.popen("java -jar #{$compressor} --type #{content_type}", "r+") { |pipe|
   	  pipe.puts(source)
   	  pipe.close_write
   	  buffer= pipe.read

data/lib/tasks/single-output-task.rb

@@ -2,25 +2,31 @@ require "#{$script_dir}/tasks/output-task.rb"
 
 class SingleOutputTask < OutputTask
 
+  option :output_name, ""
+  
   def initialize(target, options)
     super(target, options)
 
     type= output_extension
     return if (!type)
-    
-    target_name= "#{target.target_name}".downcase
-    prefix= "#{output_folder}/#{project_name}"
-    
-    if ("all"==target_name)
-      target_name= ""
+
+    if (!output_name.empty?)
+      target_name= "#{output_name}"
+      prefix= "#{output_folder}/"
     else
-      prefix= "#{prefix}-"
+      target_name= "#{target.target_name}".downcase
+      prefix= "#{output_folder}/#{project_name}"
+      if ("all"==target_name)
+        target_name= ""
+      else
+        prefix= "#{prefix}-"
+      end
     end
 
-    @name_concat= "#{prefix}#{target_name}-uncompressed.#{type}"
-    @name_min= "#{prefix}#{target_name}.#{type}"
-    @name_gz= "#{prefix}#{target_name}.#{type}.gz"
-    @name_debug= "#{prefix}#{target_name}-debug.#{type}"
+    @name_concat= "#{prefix}#{target_name}-uncompressed#{type}"
+    @name_min= "#{prefix}#{target_name}#{type}"
+    @name_gz= "#{prefix}#{target_name}#{type}.gz"
+    @name_debug= "#{prefix}#{target_name}-debug#{type}"
 
     @concatenation_join_string= ""
     @products= [@name_concat, @name_min, @name_gz, @name_debug]
@@ -29,14 +35,16 @@ class SingleOutputTask < OutputTask
     @debug = ""
   end
 
+  def process_file(file)
+    if (!@concat.empty?)
+      @concat << @concatenation_join_string||""
+    end
+    @concat << file.filtered_content(options)
+    @debug << file.debug_content(options)
+  end
+  
   def process_files
-    @included_files.each { |f|
-      if (!@concat.empty?)
-        @concat << @concatenation_join_string||""
-      end
-      @concat << f.filtered_content(options)
-      @debug << f.debug_content(options)
-    }
+    @included_files.each { |f| process_file(f) }
   end
 
   def finish

data/lib/tasks/test-task.rb

@@ -189,10 +189,6 @@ class TestTask < Task
     @skipped= 0
   end
 
-  def self.task_name
-    "test"
-  end
-
   def handles_file?(file_name)
     "#{file_name}"[/\.js$/] || "#{file_name}"[/\.html$/]
   end

data/vendor/jsdoc-extras/templates/classlist/all-classes.tmpl

@@ -0,0 +1,7 @@
+function classIndex()
+{
+    {!
+        var aliases= data.map(function(c) { return '"' + c.alias + '"'; });
+    !}
+    return [{+aliases.join(',')+}];
+}

data/vendor/jsdoc-extras/templates/classlist/publish.js

@@ -0,0 +1,43 @@
+/** Called automatically by JsDoc Toolkit. */
+function publish(symbolSet) {
+	publish.conf = {  // trailing slash expected for dirs
+		ext:         ".html",
+		outDir:      JSDOC.opt.d || SYS.pwd+"../out/jsdoc/",
+		templatesDir: JSDOC.opt.t || SYS.pwd+"../templates/jsdoc/",
+		symbolsDir:  "symbols/",
+		srcDir:      "symbols/src/"
+	};
+	
+	// is source output is suppressed, just display the links to the source file
+	if (JSDOC.opt.s && defined(Link) && Link.prototype._makeSrcLink) {
+		Link.prototype._makeSrcLink = function(srcFilePath) {
+			return "<"+srcFilePath+">";
+		}
+	}
+	
+	// used to allow Link to check the details of things being linked to
+	Link.symbolSet = symbolSet;
+
+	// create the required templates
+	try {
+		var classesTemplate = new JSDOC.JsPlate(publish.conf.templatesDir+"all-classes.tmpl");
+	}
+	catch(e) {
+		print("Couldn't create the required templates: "+e);
+		quit();
+	}
+	
+	// some ustility filters
+	function hasNoParent($) {return (!$.memberOf);}
+	function isaFile($) {return ($.is("FILE"));}
+	function isaClass($) {return ($.is("CONSTRUCTOR") || $.isNamespace) && '_global_'!=$.alias;}
+	
+	// get an array version of the symbolset, useful for filtering
+	var symbols = symbolSet.toArray();
+	
+ 	// get a list of all the classes in the symbolset
+ 	var classes = symbols.filter(isaClass);
+	var classesIndex = classesTemplate.process(classes);
+	
+	IO.saveFile(publish.conf.outDir, 'classes.js', classesIndex);
+}

data/vendor/jsdoc-toolkit/app/lib/JSDOC/JsPlate.js

@@ -94,8 +94,6 @@ JSDOC.JsPlate.prototype.process = function(data, compact) {
 		if (e.lineNumber-2 >= 0) print("line "+(e.lineNumber-1)+": "+lines[e.lineNumber-2]);
 		print("line "+e.lineNumber+": "+lines[e.lineNumber-1]);
 		print("");
-		
-		print(this.code);
 	}
 	
 	if (compact) { // patch by mcbain.asm

data/vendor/jsdoc-toolkit/app/lib/JSDOC/Parser.js

@@ -52,12 +52,14 @@ if (JSDOC.opt.S) {
 		}
 	}
 
-		// if a symbol alias is documented more than once the last one with the user docs wins
+		// if a symbol alias is documented more than once the first one with the user docs wins
 		if (JSDOC.Parser.symbols.hasSymbol(symbol.alias)) {
  			var oldSymbol = JSDOC.Parser.symbols.getSymbol(symbol.alias);
 			if (oldSymbol.comment.isUserComment) {
+				if (JSDOC.opt.m) return;
 				if (symbol.comment.isUserComment) { // old and new are both documented
 					LOG.warn("The symbol '"+symbol.alias+"' is documented more than once.");
+					return;
 				}
 				else { // old is documented but new isn't
 					return;

data/vendor/jsdoc-toolkit/app/lib/JSDOC/SymbolSet.js

@@ -16,8 +16,9 @@ JSDOC.SymbolSet.prototype.hasSymbol = function(alias) {
 }
 
 JSDOC.SymbolSet.prototype.addSymbol = function(symbol) {
-	if (this.hasSymbol(symbol.alias)) {
+	if (JSDOC.opt.a && this.hasSymbol(symbol.alias)) {
 		LOG.warn("Overwriting symbol documentation for: "+symbol.alias + ".");
+		this.deleteSymbol(symbol.alias);
 	}
 	this._index.set(symbol.alias, symbol);
 }
@@ -111,11 +112,11 @@ if (/#$/.test(borrows[i].alias)) {
 JSDOC.SymbolSet.prototype.resolveMemberOf = function() {
 	for (var p = this._index.first(); p; p = this._index.next()) {
 		var symbol = p.value;
+
 		if (symbol.is("FILE") || symbol.is("GLOBAL")) continue;
 		
 		// the memberOf value was provided in the @memberOf tag
 		else if (symbol.memberOf) {
-			
 			// like foo.bar is a memberOf foo
 			if (symbol.alias.indexOf(symbol.memberOf) == 0) {
 				var memberMatch = new RegExp("^("+symbol.memberOf+")[.#-]?(.+)$");
@@ -142,6 +143,7 @@ JSDOC.SymbolSet.prototype.resolveMemberOf = function() {
 		// the memberOf must be calculated
 		else {
 			var parts = symbol.alias.match(/^(.*[.#-])([^.#-]+)$/);
+
 			if (parts) {
 				symbol.memberOf = parts[1];
 				symbol.name = parts[2];				

data/vendor/jsdoc-toolkit/app/lib/JSDOC/Walker.js

@@ -182,6 +182,15 @@ JSDOC.Walker.prototype.step = function() {
 			}
 			// foo = function() {}
 			else if (this.ts.look(1).is("ASSIGN") && this.ts.look(2).is("FUNCTION")) {
+				var constructs;
+				var isConstructor = false;
+				if (doc && (constructs = doc.getTag("constructs")) && constructs.length) {
+					if (constructs[0].desc) {
+						name = constructs[0].desc;
+						isConstructor = true;
+					}
+				}
+					
 				var isInner;
 				if (this.ts.look(-1).is("VAR") || this.isInner) {
 					if (doc && doc.getTag("memberOf").length > 0) {
@@ -204,6 +213,7 @@ JSDOC.Walker.prototype.step = function() {
 				symbol = new JSDOC.Symbol(name, params, "FUNCTION", doc);
 
 				if (isInner) symbol.isInner = true;
+				if (isConstructor) symbol.isa = "CONSTRUCTOR";
 				
 				if (this.ts.look(1).is("JSDOC")) {
 					var inlineReturn = ""+this.ts.look(1).data;
@@ -260,8 +270,6 @@ JSDOC.Walker.prototype.step = function() {
 				if (this.lastDoc) doc = this.lastDoc;
 				params = JSDOC.Walker.onParamList(this.ts.balance("LEFT_PAREN"));
 				
-				if (/(^|#)constructor$/.test(name)) JSDOC.PluginManager.run("onConstructorDefined", doc);
-				                   
 				if (doc && doc.getTag("constructs").length) {
 					name = name.replace(/\.prototype(\.|$)/, "#");
 					

data/vendor/jsdoc-toolkit/app/lib/JSDOC.js

@@ -1,7 +1,7 @@
 /**
 	@overview
-	@date $Date: 2009-10-28 16:25:32 -0700 (Wed, 28 Oct 2009) $
-	@version $Revision: 816 $ 
+	@date $Date: 2010-01-10 10:49:48 -0800 (Sun, 10 Jan 2010) $
+	@version $Revision: 829 $ 
 	@location $HeadURL: http://jsdoc-toolkit.googlecode.com/svn/trunk/jsdoc-toolkit/app/lib/JSDOC.js $
 	@name JSDOC.js
  */
@@ -27,6 +27,7 @@ JSDOC.opt = Opt.get(
 		e: "encoding",
 		"E[]": "exclude",
 		h: "help",
+		m: "multiple",
 		n: "nocode",
 		o: "out",
 		p: "private",
@@ -58,6 +59,7 @@ JSDOC.usage = function() {
 	print("  -e=<ENCODING> or --encoding=<ENCODING>\n          Use this encoding to read and write files.\n");
 	print("  -E=\"REGEX\" or --exclude=\"REGEX\"\n          Multiple. Exclude files based on the supplied regex.\n");
 	print("  -h or --help\n          Show this message and exit.\n");
+	print("  -m or --multiples\n          Don't warn about symbols being documented more than once.\n");
 	print("  -n or --nocode\n          Ignore all code, only document comments with @name tags.\n");
 	print("  -o=<PATH> or --out=<PATH>\n          Print log messages to a file (defaults to stdout).\n");
 	print("  -p or --private\n          Include symbols tagged as private, underscored and inner symbols.\n");

data/vendor/jsdoc-toolkit/app/test/multi_methods.js

@@ -0,0 +1,25 @@
+
+/**
+	Get the entire flavor.
+	@name flavor^3
+	@function
+	@returns {Object} The entire flavor hash.
+*/
+/**
+	Get a named flavor.
+	@name flavor^2
+	@function
+	@param {String} name The name of the flavor to get.
+	@returns {String} The value of that flavor.
+*/
+/**
+	Set the flavor.
+	@param {String} name The name of the flavor to set.
+	@param {String} value The value of the flavor.
+	@returns {String} The value of that flavor.
+*/
+function flavor(name, value) {
+	if (arguments.length > 1) flavor[name] = value;
+	else if (arguments.length == 1) return flavor[name];
+	else return flavor;
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  version: 0.8.4
+  version: 0.10.0
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 -08:00
+date: 2010-03-26 00:00:00 -07:00
 default_executable: distil
 dependencies: []
 
@@ -61,6 +61,8 @@ files:
 - vendor/extconf.rb
 - vendor/jsdoc-extras/plugins/distil-plugin.js
 - vendor/jsdoc-extras/plugins/interface-plugin.js
+- vendor/jsdoc-extras/templates/classlist/all-classes.tmpl
+- vendor/jsdoc-extras/templates/classlist/publish.js
 - vendor/jsdoc-extras/templates/coherent/all-classes.tmpl
 - vendor/jsdoc-extras/templates/coherent/allclasses.tmpl
 - vendor/jsdoc-extras/templates/coherent/allfiles.tmpl
@@ -145,6 +147,7 @@ files:
 - vendor/jsdoc-toolkit/app/test/memberof3.js
 - vendor/jsdoc-toolkit/app/test/memberof_constructor.js
 - vendor/jsdoc-toolkit/app/test/module.js
+- vendor/jsdoc-toolkit/app/test/multi_methods.js
 - vendor/jsdoc-toolkit/app/test/name.js
 - vendor/jsdoc-toolkit/app/test/namespace_nested.js
 - vendor/jsdoc-toolkit/app/test/nocode.js