distil 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2009-12-22}
+  s.date = %q{2010-01-11}
   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"]
@@ -27,6 +27,11 @@ Gem::Specification.new do |s|
      "lib/file-types/javascript-file.rb",
      "lib/file-types/json-file.rb",
      "lib/file-types/nib-file.rb",
+     "lib/filter.rb",
+     "lib/filters/coherent-asset-filter.rb",
+     "lib/filters/css-filter.rb",
+     "lib/filters/file-reference-filter.rb",
+     "lib/filters/jsl-dependency-filter.rb",
      "lib/jsdoc.conf",
      "lib/jsl.conf",
      "lib/project.rb",
@@ -52,10 +57,13 @@ 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/coherent/all-classes.tmpl",
      "vendor/jsdoc-extras/templates/coherent/allclasses.tmpl",
      "vendor/jsdoc-extras/templates/coherent/allfiles.tmpl",
+     "vendor/jsdoc-extras/templates/coherent/class-json.tmpl",
      "vendor/jsdoc-extras/templates/coherent/class.tmpl",
      "vendor/jsdoc-extras/templates/coherent/index.tmpl",
+     "vendor/jsdoc-extras/templates/coherent/namespace-json.tmpl",
      "vendor/jsdoc-extras/templates/coherent/publish.js",
      "vendor/jsdoc-extras/templates/coherent/showdown.js",
      "vendor/jsdoc-extras/templates/coherent/static/code-footer.html",

data/lib/file-set.rb

@@ -26,7 +26,7 @@ class FileSet
       if (File.exists?(full_path))
         source_file= SourceFile.from_path(full_path)
       else
-        source_file= Target.current.find_file(file)
+        source_file= Project.current.find_file(file)
         return if (!source_file)
       end
       

data/lib/file-types/css-file.rb

@@ -4,71 +4,8 @@ class CssFile < SourceFile
     ".css"
   end
 
-  def can_embed_as_content
-    true
-  end
-
-  def minify_content_type
-    "css"
-  end
-  
-  def content
-    return @content if (@content && @root_folder==@@root_folder)
-
-    # Remember the value of the class root_folder variable, because it changes
-    # where files are generated relative to.
-    @root_folder= @@root_folder
-
-    buffer= File.read(@full_path)
-    # Replace all ' (single quotes) with " (double quotes) in
-    # order to fix a problem with the background url regexp
-    buffer.gsub!(/\'/,'"')
-    # Force a newline after a rule terminating ; (semi-colon) 
-    # in order to fix a problem with the background url regexp
-    buffer.gsub!(/;(\n|\r)*/, ";\n")
-
-    # Rewrites the 'url("...")' rules to a relative path 
-    # based on the location of the new concatenated CSS file.
-    line_num=0
-
-    lines= buffer.split("\n")
-    
-    lines.each { |line|
-    
-      line_num+=1
-
-      line.gsub!(/@import\s+url\("?(.*\.css)"?\)/) { |match|
-        css_file= File.join(@parent_folder, $1)
-        
-        if (!File.exists?(css_file))
-          error "imported CSS file not found: #{$1}", line_num
-          # leave the @import rule in place
-          match
-        else
-          dependency= SourceFile.from_path(css_file)
-          @dependencies << dependency
-        end
-      }
-      
-      line.gsub!(/url\("?(.*\.(jpg|png|gif))"?\)/) { |match|
-        image_file= File.join(@parent_folder, $1)
-
-        if (!File.exists?(image_file))
-          warning "resource not found: #{$1} (#{image_file})", line_num
-          "url(\"#{$1}\")"
-        else
-          asset= SourceFile.from_path(image_file)
-          @assets << asset
-          # dependency.dependencies
-          "url(\"{{FILEREF(#{asset})}}\")"
-        end
-      }
-    }
-
-    @content= lines.join("\n")
-  end
-
-  def debug_content_relative_to_destination(destination)
+  def debug_content(options)
+    destination= File.expand_path(options.remove_prefix||"")
     "@import url(\"#{self.relative_to_folder(destination)}\");\n"
   end
   

data/lib/file-types/html-file.rb

@@ -4,8 +4,8 @@ class HtmlFile < SourceFile
     ".html"
   end
 
-  def can_embed_as_content
-    true
+  def minify_content(source)
+    source.gsub(/>\s+</, "><")
   end
-
+  
 end

data/lib/file-types/javascript-file.rb

@@ -7,90 +7,16 @@ class JavascriptFile < SourceFile
     ".js"
   end
 
-  def can_embed_as_content
-    true
+  def can_embed_as_content(file)
+    [".css", ".html", ".json"].include?(file.extension)
   end
 
-  def minify_content_type
-    "js"
-  end
-
-  def content
-    return @content if (@content && @root_folder==@@root_folder)
-
-    # Remember the value of the class root_folder variable, because it changes
-    # where files are generated relative to.
-    @root_folder= @@root_folder
-
-    @dependencies= []
-    content= File.read(@full_path).split("\n")
-    
-    line_num=0
-    
-    content.each { |line|
-      
-      line_num+=1
-      
-      # handle dependencies
-      line.gsub!($jsl_import_regex) { |match|
-
-        import_file= File.expand_path(File.join(@parent_folder, $1))
-        
-        if (File.exists?(import_file))
-          dependency= SourceFile.from_path(import_file)
-          @dependencies << dependency
-        else
-          dependency= Target.current.find_file($1)
-          if (dependency)
-            @dependencies << dependency
-          else
-            error "Missing import file: #{$1}", line_num
-          end
-        end
-        
-        # replace jsl import with empty string
-        ""
-
-      }
-      
-      line.gsub!($include_regex) { |match|
-
-        import_file= File.expand_path(File.join(@parent_folder, $1))
-
-        if (!File.exists?(import_file))
-          error "Missing import file: #{$1}", line_num
-          "NIB.asset('#{$1}')"
-        else
-          asset= SourceFile.from_path(import_file)
-          @assets << asset
-          if (asset.can_embed_as_content)
-            "NIB.asset('{{FILEREF(#{asset})}}','{{CONTENTREF(#{asset})}}')"
-          else
-            "NIB.asset('{{FILEREF(#{asset})}}')"
-            # include_content= asset.content.gsub("\\", "\\\\").gsub(/>\s+</, "><").gsub("\n", "\\n").gsub("\"", "\\\"").gsub("'", "\\\\'")
-            # "INC('{{FILEREF(#{asset})}}','{{CONTENTREF(#{asset})}}')"
-          end
-        end
-        
-      }
-      
-    }
-
-    # return the array of dependencies
-    @content= content.join("\n") + "\n"
-  end
-
-  def content_relative_to_destination(destination)
-    relative= super(destination)
-    relative.gsub(/\{\{CONTENTREF\(([^)]*)\)\}\}/) { |match|
-      file= SourceFile.from_path($1)
-      included_content= file.content_relative_to_destination(destination)
-      included_content= file.minify_content(included_content)
-      included_content.gsub("\\", "\\\\").gsub(/>\s+</, "><").gsub("\n", "\\n").gsub("\"", "\\\"").gsub("'", "\\\\'")
-    }
+  def escape_embeded_content(content)
+    content.gsub("\\", "\\\\").gsub("\n", "\\n").gsub("\"", "\\\"").gsub("'", "\\\\'")
   end
   
-  def debug_content_relative_to_destination(destination)
+  def debug_content(options)
+    destination= File.expand_path(options.remove_prefix||"")
     path= @file_path ? @file_path : self.relative_to_folder(destination)
     "loadScript(\"#{path}\");\n"
   end

data/lib/file-types/json-file.rb

@@ -8,7 +8,6 @@ class JsonFile < JavascriptFile
 
   def minify_content(source)
     super("(#{source})")[1..-3]
-    
   end
   
 end

data/lib/file-types/nib-file.rb

@@ -6,4 +6,8 @@ class NibFile < JavascriptFile
     ".jsnib"
   end
 
+  def content_type
+    "js"
+  end
+
 end

data/lib/filter.rb

@@ -0,0 +1,41 @@
+# require "#{$script_dir}/configurable"
+
+class Filter
+  
+  @@filters= []
+  def self.inherited(subclass)
+    @@filters << subclass.new
+  end
+
+  def self.abstract
+    false
+  end
+  
+  def self.each
+    @@filters.each { |f|
+      yield f
+    }
+  end
+  
+  def self.defined
+    @@filters
+  end
+  
+  def handles_file(file)
+    false
+  end
+
+  def preprocess_content(file, content)
+    content
+  end
+  
+  def filter_content(file, content, options={})
+    content
+  end
+  
+end
+
+# load all the other file types
+Dir.glob("#{$script_dir}/filters/*-filter.rb") { |file|
+  require file
+}

data/lib/filters/coherent-asset-filter.rb

@@ -0,0 +1,65 @@
+require "#{$script_dir}/filters/file-reference-filter"
+
+$include_regex= /NIB\.asset\(['"]([^)]+)['"]\)/
+$include_regex_old= /INC\(['"]([^)]+)['"]\)/
+
+class CoherentAssetFilter < FileReferenceFilter
+  
+  def handles_file(file)
+    return [".js"].include?(file.extension)
+  end
+  
+  def preprocess_content(file, content)
+    content= content.split("\n")
+    
+    line_num=0
+    
+    content.each { |line|
+      
+      line_num+=1
+      
+      line.gsub!($include_regex) { |match|
+
+        import_file= File.expand_path(File.join(file.parent_folder, $1))
+
+        if (!File.exists?(import_file))
+          file.error "Missing import file: #{$1}", line_num
+          "NIB.asset('#{$1}')"
+        else
+          asset= SourceFile.from_path(import_file)
+          file.add_asset(asset);
+          if (file.can_embed_as_content(asset))
+            "NIB.asset('#{file_reference(asset)}','#{content_reference(asset)}')"
+          else
+            "NIB.asset('#{file_reference(asset)}')"
+          end
+        end
+        
+      }
+
+      line.gsub!($include_regex_old) { |match|
+
+        import_file= File.expand_path(File.join(file.parent_folder, $1))
+
+        if (!File.exists?(import_file))
+          file.error "Missing import file: #{$1}", line_num
+          "INC('#{$1}')"
+        else
+          asset= SourceFile.from_path(import_file)
+          file.add_asset(asset);
+          if (file.can_embed_as_content(asset))
+            "INC('#{file_reference(asset)}','#{content_reference(asset)}')"
+          else
+            "INC('#{file_reference(asset)}')"
+          end
+        end
+        
+      }
+      
+    }
+    
+    content.join("\n")
+  end
+
+end
+

data/lib/filters/css-filter.rb

@@ -0,0 +1,58 @@
+require "#{$script_dir}/filters/file-reference-filter"
+
+$jsl_import_regex= /\/\*jsl:import\s+([^\*]*)\*\//
+
+class CssDependencyFilter < FileReferenceFilter
+  
+  def handles_file(file)
+    return [".css"].include?(file.extension)
+  end
+  
+  def preprocess_content(file, content)
+    # Replace all ' (single quotes) with " (double quotes) in
+    # order to fix a problem with the background url regexp
+    content.gsub!(/\'/,'"')
+    # Force a newline after a rule terminating ; (semi-colon) 
+    # in order to fix a problem with the background url regexp
+    content.gsub!(/;(\n|\r)*/, ";\n")
+
+    # Rewrites the 'url("...")' rules to a relative path 
+    # based on the location of the new concatenated CSS file.
+    line_num=0
+
+    lines= content.split("\n")
+    
+    lines.each { |line|
+    
+      line_num+=1
+
+      line.gsub!(/@import\s+url\("?(.*\.css)"?\)/) { |match|
+        css_file= File.join(file.parent_folder, $1)
+        
+        if (!File.exists?(css_file))
+          file.error "imported CSS file not found: #{$1}", line_num
+          # leave the @import rule in place
+          match
+        else
+          file.add_dependency(SourceFile.from_path(css_file))
+        end
+      }
+      
+      line.gsub!(/url\("?(.*\.(jpg|png|gif))"?\)/) { |match|
+        image_file= File.join(file.parent_folder, $1)
+
+        if (!File.exists?(image_file))
+          file.warning "resource not found: #{$1} (#{image_file})", line_num
+          "url(\"#{$1}\")"
+        else
+          asset= SourceFile.from_path(image_file)
+          file.add_asset(asset)
+          "url(\"#{file_reference(asset)}\")"
+        end
+      }
+    }
+    
+    lines.join("\n")
+  end
+  
+end

data/lib/filters/file-reference-filter.rb

@@ -0,0 +1,30 @@
+class FileReferenceFilter < Filter
+
+  def file_reference(file)
+    "{{FILEREF(#{file})}}"
+  end
+  
+  def content_reference(file)
+    "{{CONTENTREF(#{file})}}"
+  end
+
+  def filter_content(file, content, options)
+    destination= File.expand_path(options.remove_prefix||"")
+    
+    content.gsub!(/\{\{FILEREF\(([^)]*)\)\}\}/) { |match|
+      include_file= SourceFile.from_path($1)
+      include_file.relative_to_folder(destination)
+    }
+
+    content.gsub!(/\{\{CONTENTREF\(([^)]*)\)\}\}/) { |match|
+      include_file= SourceFile.from_path($1)
+      included_content= include_file.filtered_content(options)
+      included_content= include_file.minify_content(included_content)
+      file.escape_embeded_content(included_content)
+    }
+
+    content
+  end
+
+  
+end

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

@@ -0,0 +1,44 @@
+$jsl_import_regex= /\/\*jsl:import\s+([^\*]*)\*\//
+
+class JslDependencyFilter < Filter
+  
+  def handles_file(file)
+    return [".js"].include?(file.extension)
+  end
+  
+  def preprocess_content(file, content)
+
+    content= content.split("\n")
+    
+    line_num=0
+    
+    content.each { |line|
+      
+      line_num+=1
+      
+      # handle dependencies
+      line.gsub!($jsl_import_regex) { |match|
+
+        import_file= File.expand_path(File.join(file.parent_folder, $1))
+        if (File.exists?(import_file))
+          file.add_dependency SourceFile.from_path(import_file)
+        else
+          dependency= Project.current.find_file($1)
+          if (dependency)
+            file.add_dependency SourceFile.from_path(import_file)
+          else
+            file.error "Missing import file: #{$1}", line_num
+          end
+        end
+        
+        # replace jsl import with empty string
+        ""
+
+      }
+      
+    }
+    
+    content.join("\n")
+  end
+  
+end

data/lib/project.rb

@@ -20,6 +20,7 @@ class Project < Configurable
   option :external_projects
 
   def initialize(project_file, settings)
+    @@current= self
     @project_file= File.expand_path(project_file)
     Dir.chdir(File.dirname(@project_file))
     
@@ -27,7 +28,26 @@ class Project < Configurable
     settings.merge!(project_info)    
     super(settings)
   end
-  
+
+  @@current=nil
+  def self.current
+    @@current
+  end
+
+  def find_file(file)
+    return nil if external_projects.nil?
+    
+    external_projects.each { |project|
+      path= File.expand_path(File.join(project["include"], file))
+      if (File.exists?(path))
+        source_file= SourceFile.from_path(path)
+        source_file.file_path= file
+        return source_file
+      end
+    }
+    nil
+  end
+
   def build_external_projects
     projects= external_projects
     if (projects.nil?)
@@ -94,8 +114,6 @@ class Project < Configurable
     }
     
     @options.external_projects= projects
-    
-    puts "external_projects=#{external_projects.inspect}"
   end
   
   def build_targets

data/lib/source-file.rb

@@ -9,8 +9,8 @@ class SourceFile
     @full_path= File.expand_path(filepath)
 
     @parent_folder= File.dirname(@full_path)
-    @dependencies= Array.new
-    @assets= Array.new
+    @dependencies= []
+    @assets= []
     
     @@file_cache[@full_path]= self
   end
@@ -31,11 +31,14 @@ class SourceFile
     self.class.extension
   end
   
-  def can_embed_as_content
+  def can_embed_as_content(file)
     false
   end
   
-  def minify_content_type
+  def content_type
+    ext= self.extension
+    return if !ext
+    ext[1..-1]
   end
   
   @@file_types= []
@@ -81,21 +84,39 @@ class SourceFile
   end
   
   def file_path
-    @file_path || self.relative_to_folder(@@root_folder)
+    @file_path
   end
 
   def file_path=(path)
     @file_path=path
   end
   
-  def has_file_path
-    @file_path
+  def load_content
+    content= File.read(@full_path)
+    Filter.each { |f|
+      next if !f.handles_file(self)
+      content= f.preprocess_content(self, content)
+    }
+    content
+  end
+
+  def escape_embeded_content(content)
+    content
   end
   
   def content
-    @content ||= File.read(@full_path)
+    @content ||= load_content
   end
 
+  def filtered_content(options)
+    c= content || ""
+    Filter.each { |f|
+      next if !f.handles_file(self)
+      c= f.filter_content(self, c, options)
+    }
+    "#{c}\n"
+  end
+    
   def content_relative_to_destination(destination)
     content.gsub(/\{\{FILEREF\(([^)]*)\)\}\}/) { |match|
       file= SourceFile.from_path($1)
@@ -103,23 +124,23 @@ class SourceFile
     }
   end
 
-  def debug_content_relative_to_destination(destination)
-    self.content_relative_to_destination(destination)
+  def debug_content(options)
+    self.filtered_content(options)
   end
   
   def minify_content(source)
   	# Run the Y!UI Compressor
-    return source if !minify_content_type
+    return source if !content_type
   	buffer= ""
     
-  	IO.popen("java -jar #{$compressor} --type #{minify_content_type}", "r+") { |pipe|
+  	IO.popen("java -jar #{$compressor} --type #{content_type}", "r+") { |pipe|
   	  pipe.puts(source)
   	  pipe.close_write
   	  buffer= pipe.read
 	  }
 	  
     # buffer = `java -jar #{$compressor} --type #{type} #{working_file}`
-  	if ('css'==minify_content_type)
+  	if ('css'==content_type)
   		# puts each rule on its own line, and deletes @import statements
   		return buffer.gsub(/\}/,"}\n").gsub(/.*@import url\(\".*\"\);/,'')
   	else
@@ -154,19 +175,26 @@ class SourceFile
   end
   
   def dependencies
-    # make certain the content is loaded
-    self.content
+    content
     @dependencies
   end
 
+  def add_dependency(file)
+    return if @dependencies.include?(file)
+    @dependencies << file
+  end
+  
   def assets
-    # make certain the content is loaded
-    self.content
+    content
     @assets
   end
   
-  def copy_to(folder)
-    file_path= self.file_path
+  def add_asset(file)
+    @assets << file
+  end
+  
+  def copy_to(folder, prefix)
+    file_path= self.file_path || relative_to_folder(prefix||"")
     final_target_folder= File.join(folder, File.dirname(file_path))
     FileUtils.mkdir_p final_target_folder
     FileUtils.cp self.full_path, final_target_folder

data/lib/target.rb

@@ -8,10 +8,10 @@ class Target < Configurable
   
   def initialize(name, settings, project)
     super(settings, project)
-    
+
+    @@current= self
     @project= project
     @target_name= name
-    @@current= self
     
     @tasks= []
 
@@ -25,6 +25,7 @@ class Target < Configurable
     @error_count=0
   end
 
+  @@current=nil
   def self.current
     @@current
   end
@@ -56,18 +57,6 @@ class Target < Configurable
     products
   end
   
-  def find_file(file)
-    external_projects.each { |project|
-      path= File.expand_path(File.join(project["include"], file))
-      if (File.exists?(path))
-        source_file= SourceFile.from_path(path)
-        source_file.file_path= file
-        return source_file
-      end
-    }
-    nil
-  end
-
   def process_files
     @tasks.each { |t|
       t.find_files

data/lib/task.rb

@@ -1,3 +1,4 @@
+require "#{$script_dir}/filter"
 require "#{$script_dir}/source-file"
 require "#{$script_dir}/file-set"
 require 'set'
@@ -96,6 +97,10 @@ class Task < Configurable
     @probed= Set.new
     @included_files= []
     @files_to_include.each { |i| include_file(i) }
+    
+    files= @included_files.map { |f|
+      f.to_s
+    }
   end
   
   def products
@@ -104,7 +109,7 @@ class Task < Configurable
   
   def need_to_build
     return @need_to_build if !@need_to_build.nil?
-    
+
     product_modification_times= products.map { |p|
       p=File.expand_path(p)
       return (@need_to_build=true) if !File.exists?(p)
@@ -138,13 +143,13 @@ class Task < Configurable
     folders= []
 
     assets.each { |a|
-      path= a.has_file_path ? a.file_path : a.relative_to_folder(full_root_path)
+      path= a.file_path || a.relative_to_folder(full_root_path)
 
       parts= File.dirname(path).split(File::SEPARATOR)
       if ('.'==parts[0])
         target_path= File.join(output_folder, path)
         FileUtils.rm target_path if File.exists? target_path
-        File.symlink a.full_path, target_path
+        File.symlink a.relative_to_folder(output_folder), target_path
         next
       end
 
@@ -161,9 +166,11 @@ class Task < Configurable
     folders.each { |f|
       # puts "#{File.join(remove_prefix, f)} => #{File.join(output_folder, f)}"
       src_folder= remove_prefix ? File.join(remove_prefix, f) : f
+      src_folder= SourceFile.path_relative_to_folder(File.expand_path(src_folder), output_folder)
+      
       target_folder= File.expand_path(File.join(output_folder, f))
       next if File.exists?(target_folder)
-      File.symlink File.expand_path(src_folder), target_folder
+      File.symlink src_folder, target_folder
     }
     
     # puts "#{task_name}: folder=#{folders.inspect}"
@@ -171,7 +178,7 @@ class Task < Configurable
   
   def copy_assets
     assets.each { |a|
-      a.copy_to(output_folder)
+      a.copy_to(output_folder, remove_prefix)
     }
   end
   

data/lib/tasks/javascript-task.rb

@@ -23,6 +23,14 @@ class JavascriptTask < SingleOutputTask
     "js"
   end
   
+  def initialize(target, options)
+    super(target, options)
+    
+    if (generate_docs)
+      @products << File.join(doc_folder, "index.html")
+    end
+  end
+  
   # JsTask handles files that end in .js
   def handles_file?(file_name)
     "#{file_name}"[/\.js$/]
@@ -82,7 +90,7 @@ class JavascriptTask < SingleOutputTask
 
   def document_files()
       
-    return if (!@options.generate_docs)
+    return if (!generate_docs)
     return if (!File.exists?($jsdoc_command))
     
     tmp= Tempfile.new("jsdoc.conf")
@@ -92,9 +100,9 @@ class JavascriptTask < SingleOutputTask
     
     conf= replace_tokens(template, {
                     "DOC_FILES"=>doc_files.join(",\n"),
-                    "DOC_OUTPUT_DIR"=>@options.doc_folder,
-                    "DOC_TEMPLATE_DIR"=>@options.jsdoc_template,
-                    "DOC_PLUGINS_DIR"=>@options.jsdoc_plugins
+                    "DOC_OUTPUT_DIR"=>doc_folder,
+                    "DOC_TEMPLATE_DIR"=>jsdoc_template,
+                    "DOC_PLUGINS_DIR"=>jsdoc_plugins
                 })
 
     tmp << conf

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

@@ -48,18 +48,16 @@ class MultipleOutputTask < OutputTask
     concat= ""
     debug= ""
 
-    destination= File.expand_path(remove_prefix||"")
-    
     file.dependencies.each { |depend|
       next if !@files_to_include.include?(depend)
       next if @files_to_exclude.include?(depend)
       
-      concat << depend.content_relative_to_destination(destination)
-      debug << depend.debug_content_relative_to_destination(destination)
+      concat << depend.filtered_content(options)
+      debug << depend.debug_content(options)
     }
     
-    concat << file.content_relative_to_destination(destination)
-    debug << file.debug_content_relative_to_destination(destination)
+    concat << file.filtered_content(options)
+    debug << file.debug_content(options)
     
     @concat[file]= concat
     @debug[file]= debug

data/lib/tasks/nib-task.rb

@@ -1,4 +1,4 @@
-require "#{$script_dir}/tasks/output-task.rb"
+require "#{$script_dir}/tasks/multiple-output-task.rb"
 require "#{$script_dir}/tasks/javascript-task.rb"
 
 class NibTask < MultipleOutputTask

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

@@ -29,10 +29,9 @@ class SingleOutputTask < OutputTask
   end
 
   def process_files
-    destination= File.expand_path(remove_prefix||"")
     @included_files.each { |f|
-      @concat << f.content_relative_to_destination(destination)
-      @debug << f.debug_content_relative_to_destination(destination)
+      @concat << f.filtered_content(options)
+      @debug << f.debug_content(options)
     }
   end
 
@@ -50,7 +49,7 @@ class SingleOutputTask < OutputTask
     params= {
       "VERSION"=>@options.version
     }
-    
+
     concat= replace_tokens(@concat, params)
     
     File.open(@name_concat, "w") { |f|

data/vendor/jsdoc-extras/plugins/distil-plugin.js

@@ -1,3 +1,4 @@
+/*jsl:declare JSDOC*/
 JSDOC.PluginManager.registerPlugin("DistilPlugin", {
 
     onFunctionCall: function (functionCall)
@@ -5,6 +6,7 @@ JSDOC.PluginManager.registerPlugin("DistilPlugin", {
         switch (functionCall.name)
         {
             case 'Class.create':
+            case 'Class._create':
                 this.onClassCreate(functionCall);
                 break;
 
@@ -136,6 +138,7 @@ JSDOC.PluginManager.registerPlugin("DistilPlugin", {
                 tag.desc= tag.nibbleType(tag.desc);
                 tag.desc= tag.nibbleName(tag.desc);
                 break;
+                
         }
     }
     

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

@@ -0,0 +1,16 @@
+{+data.node.link+}
+    <if test="data.node.namespaces && data.node.namespaces.length">
+    <ul class="namespaces">
+        <for each="namespace" in="data.node.namespaces">
+            <li>{+publishClassListNamespace(data, namespace)+}</li>
+        </for>
+    </ul>
+    </if>
+
+    <if test="data.node.symbols && data.node.symbols.length">
+    <ul class="classes">
+        <for each="symbol" in="data.node.symbols">
+            <li>{+symbol.link+}</li>
+        </for>
+    </ul>
+    </if>

data/vendor/jsdoc-extras/templates/coherent/class-json.tmpl

@@ -0,0 +1,4 @@
+{
+    name: "{+data.node.name+}",
+    link: "{+data.node.linkHref+}"
+}

data/vendor/jsdoc-extras/templates/coherent/namespace-json.tmpl

@@ -0,0 +1,20 @@
+<if test="data.node">
+{
+    name: "{+data.node.name+}",
+    link: "{+data.node.linkHref+}"
+    <if test="data.node.symbols && data.node.symbols.length">
+    symbols: [
+        <for each="symbol" in="data.node.symbols">
+            {+publishJsonSymbol(data, symbol)+},
+        </for>
+    ],
+    </if>
+    <if test="data.node.namespaces && data.node.namespaces.length">
+    namespaces: [
+        <for each="namespace" in="data.node.namespaces">
+            {+publishJsonSymbol(data, namespace)+},
+        </for>
+    ]
+    </if>
+}
+</if>

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

@@ -69,7 +69,14 @@ function publish(symbolSet) {
 	
 	// create a class index, displayed in the left-hand column of every class page
 	Link.base = "../";
- 	publish.classesIndex = classesTemplate.process(classes); // kept in memory
+
+	var summary= generateJsonSummary(symbols);
+	
+    // publish.classesIndex = classesTemplate.process(classes); // kept in memory
+ 	publish.classesIndex = publishClassListSummary(summary); // kept in memory
+	
+	var classesJson= publishJsonSummary(summary);
+	IO.saveFile(publish.conf.outDir, "all-classes.json", classesJson);
 	
 	// create each of the class pages
 	for (i = 0, l = classes.length; i < l; i++) {
@@ -240,3 +247,117 @@ function copyFile(file, destFolder)
     
     IO.copyFile(file, destFolder);
 }
+
+function generateJsonSummary(symbols)
+{
+    var namespaces= {};
+    
+    var global;
+    var hrefRegex= /href="([^"]*)"/;
+    
+    symbols.forEach(function(symbol) {
+        var parentNamespace= namespaces[symbol.memberOf || "_global_"];
+        if (!symbol.isNamespace && !symbol.is("CONSTRUCTOR"))
+            return;
+        var link= new Link().toClass(symbol.alias).withText(symbol.name).toString();
+        var linkHref= link.match(hrefRegex)[1];
+        
+        if (!symbol.isNamespace)
+        {
+            var classInfo= {
+                name: symbol.name,
+                isa: "CLASS",
+                linkHref: linkHref,
+                link: link
+            };
+            // if (!parentNamespace)
+            //     print("missing parent namespace: " + (symbol.memberOf || "_global_"));
+            if (parentNamespace)
+                parentNamespace.symbols.push(classInfo);
+            return;
+        }
+
+        var namespace=  namespaces[symbol.alias]= {
+            name: symbol.name,
+            isa: "NAMESPACE",
+            linkHref: linkHref,
+            link: link,
+            
+            // symbol: symbol,
+            namespaces: [],
+            symbols: []
+        };
+
+        if ('_global_'===symbol.name)
+            global= namespace;
+
+        //  Link to parent
+        // if (!parentNamespace)
+        //     print("missing parent namespace: " + (symbol.memberOf || "_global_"));
+        if (parentNamespace)
+            parentNamespace.namespaces.push(namespace);
+    });
+
+    //  sort the namespaces and symbols
+    var sorter=makeSortby("name");
+    
+    for (var name in namespaces)
+    {
+        namespace= namespaces[name];
+        namespace.symbols= namespace.symbols.sort(sorter);
+        namespace.namespaces= namespace.namespaces.sort(sorter);
+    }
+
+    return global;
+}
+
+function publishJsonSummary(summary)
+{
+	var namespaceTemplate= new JSDOC.JsPlate(publish.conf.templatesDir+"namespace-json.tmpl");
+    var classTemplate= new JSDOC.JsPlate(publish.conf.templatesDir+"class-json.tmpl");
+
+    var data= {
+        namespaceTemplate: namespaceTemplate,
+        classTemplate: classTemplate,
+        symbolTemplate: classTemplate,
+        node: summary
+    };
+    
+    return namespaceTemplate.process(data);
+}
+    
+function publishJsonSymbol(data, node)
+{
+    var newData= {};
+    for (var p in data)
+        newData[p]= data[p];
+    newData.node= node;
+    if ("NAMESPACE"===node.isa)
+        return data.namespaceTemplate.process(newData);
+    else
+        return data.symbolTemplate.process(newData);
+}
+
+function publishClassListSummary(summary)
+{
+	var namespaceTemplate= new JSDOC.JsPlate(publish.conf.templatesDir+"all-classes.tmpl");
+
+    var data= {
+        namespaceTemplate: namespaceTemplate,
+        node: summary
+    };
+    
+    return namespaceTemplate.process(data);
+}
+
+function publishClassListNamespace(data, node)
+{
+    var newData= {};
+    for (var p in data)
+        newData[p]= data[p];
+    newData.node= node;
+    if ("NAMESPACE"===node.isa)
+        return data.namespaceTemplate.process(newData);
+    else
+        return data.symbolTemplate.process(newData);
+}

data/vendor/jsdoc-extras/templates/coherent/static/default.css

@@ -131,6 +131,16 @@ pre.code
     margin: 20px 0 0 0;
 }
 
+#index ul
+{
+    margin-left: 10px;
+}
+
+#index ul.namespaces + ul.classes
+{
+    margin-top: 20px;
+}
+
 #content
 {
     margin-left: 300px;

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

@@ -94,6 +94,8 @@ 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/Walker.js

@@ -406,7 +406,7 @@ JSDOC.Walker.prototype.step = function() {
 				
 				name = "$anonymous";
 				name = this.namescope.last().alias+"-"+name
-				
+
 				params = JSDOC.Walker.onParamList(this.ts.balance("LEFT_PAREN"));
 				
 				symbol = new JSDOC.Symbol(name, params, "FUNCTION", doc);

data/vendor/jsdoc-toolkit/jsrun.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env sh
 
 # launcher script for jsdoc
 # Author: Avi Deitcher
@@ -48,6 +48,5 @@ else
 fi
 
 CMD="java $_DOCDIR $_TDIR -jar $_BASEDIR/jsrun.jar $_APPDIR/run.js $@"
-echo $CMD
 $CMD
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -08:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: distil
 dependencies: []
 
@@ -34,6 +34,11 @@ files:
 - lib/file-types/javascript-file.rb
 - lib/file-types/json-file.rb
 - lib/file-types/nib-file.rb
+- lib/filter.rb
+- lib/filters/coherent-asset-filter.rb
+- lib/filters/css-filter.rb
+- lib/filters/file-reference-filter.rb
+- lib/filters/jsl-dependency-filter.rb
 - lib/jsdoc.conf
 - lib/jsl.conf
 - lib/project.rb
@@ -59,10 +64,13 @@ files:
 - vendor/extconf.rb
 - vendor/jsdoc-extras/plugins/distil-plugin.js
 - vendor/jsdoc-extras/plugins/interface-plugin.js
+- vendor/jsdoc-extras/templates/coherent/all-classes.tmpl
 - vendor/jsdoc-extras/templates/coherent/allclasses.tmpl
 - vendor/jsdoc-extras/templates/coherent/allfiles.tmpl
+- vendor/jsdoc-extras/templates/coherent/class-json.tmpl
 - vendor/jsdoc-extras/templates/coherent/class.tmpl
 - vendor/jsdoc-extras/templates/coherent/index.tmpl
+- vendor/jsdoc-extras/templates/coherent/namespace-json.tmpl
 - vendor/jsdoc-extras/templates/coherent/publish.js
 - vendor/jsdoc-extras/templates/coherent/showdown.js
 - vendor/jsdoc-extras/templates/coherent/static/code-footer.html