distil 0.13.6 → 0.14.0.b

data/lib/distil/source-file/html-file.rb

@@ -1,14 +1,13 @@
 module Distil
-
+  
   class HtmlFile < SourceFile
-
     extension "html"
     content_type "html"
 
-    def minified_content(source)
+    def minified_content(source=content)
       source.gsub(/>\s+</, "><")
     end
-  
   end
-
-end
+  
+end
+    

data/lib/distil/source-file/javascript-file.rb

@@ -1,17 +1,105 @@
 module Distil
+
+  JSL_IMPORT_REGEX= /\/\*jsl:import\s+([^\*]*)\*\//
+  NIB_ASSET_REGEX= /(NIB\.asset(?:Url)?)\(['"]([^)]+)['"]\)/
+  NIB_DECLARATION_REGEX= /NIB\(\s*(["'])(\w(?:\w|-)*)\1\s*,/
   
   class JavascriptFile < SourceFile
-    extension 'js'
-    content_type 'js'
+    include YuiMinifiableFile
+
+    extension "js"
+    content_type "js"
+
+    def check_nib
+      nib_name= basename(".js")
+
+      Dir.glob("#{dirname}/**/*") { |asset|
+        next if File.directory?(asset) || asset.to_s==full_path
+        asset= project.file_from_path(asset)
+
+        case
+        when 'js'==asset.content_type || 'css'==asset.content_type
+          add_dependency(asset)
+        when 'html'==asset.content_type
+          add_asset(asset)
+          project.add_alias_for_asset("#{nib_name}##{asset.basename}", asset)
+        else
+          add_asset(asset)
+        end
+      }
+    end
     
-    def can_embed_as_content(file)
-      [".css", ".html", ".json"].include?(file.extension)
+    def rewrite_content_relative_to_path(path)
+      text= content.gsub(JSL_IMPORT_REGEX, '')
+      text.gsub(NIB_ASSET_REGEX) do |match|
+          asset= project.file_from_path(File.join(dirname, $2))
+          if asset
+            "#{$1}(\"#{asset.relative_path}\")"
+          else
+            match
+          end
+      end
     end
+    
+    def dependencies
+      @dependencies unless @dependencies.nil?
 
-    def escape_embeded_content(content)
-      content.gsub("\\", "\\\\").gsub("\n", "\\n").gsub("\"", "\\\"").gsub("'", "\\\\'")
-    end
+      @dependencies= []
+      is_nib_file= (full_path =~ /([^\.\/]+)\.jsnib\/\1\.js$/)
+      
+      content.each_with_index do |line, line_num|
+        line_num+=1
+      
+        if is_nib_file && match=line.match(NIB_DECLARATION_REGEX)
+          unless match[2]==basename(".*")
+            error "NIB name must match match filename, otherwise NIB will be unloadable.", line_num
+          end
+        end
+        
+        # handle dependencies
+        line.scan(JSL_IMPORT_REGEX) do |match|
+          import_file= File.join(dirname, $1)
+          if (File.exists?(import_file))
+            add_dependency project.file_from_path(import_file)
+          else
+            dependency= project.find_file($1, :js, :import)
+            if (dependency)
+              add_dependency project.file_from_path(dependency)
+              project.add_alias_for_file($1, dependency)
+            else
+              error "Missing import file: #{$1}", line_num
+            end
+          end
+        end
+        
+        line.scan(NIB_ASSET_REGEX) do |match|
+          asset= project.file_from_path(File.join(dirname, $1))
+          if asset
+            add_asset(asset)
+          else
+            error "Missing asset file: #{$1}", line_num
+          end
+        end
+      end
 
+      if is_nib_file
+        # Handle special asset requirements for NIB files
+        check_nib
+      else
+        html= "#{basename(".js")}.html"
+        html_path= File.join(dirname, html)
+        
+        # Add an alias for an HTML file with the same basename if it exists
+        if File.exists?(html_path)
+          asset= project.file_from_path(html_path)
+          add_asset(asset)
+          project.add_alias_for_asset(html, asset)
+        end
+      end
+      
+      @dependencies
+    end
+    
   end
-
+  
 end

data/lib/distil/source-file/json-file.rb

@@ -1,5 +1,3 @@
-require "distil/source-file/javascript-file"
-
 module Distil
   
   class JsonFile < JavascriptFile
@@ -7,10 +5,10 @@ module Distil
     extension 'json'
     content_type 'js'
     
-    def minified_content(source)
+    def minified_content(source=content)
       super("(#{source})")[1..-3]
     end
   
   end
   
-end
+end

data/lib/distil/source-file/yui-minifiable-file.rb

@@ -0,0 +1,19 @@
+module Distil
+  module YuiMinifiableFile
+    
+    def minified_content(source=content)
+    	# Run the Y!UI Compressor
+      return source if !content_type
+    	buffer= ""
+    
+    	IO.popen("java -jar #{COMPRESSOR} --type #{content_type}", "r+") { |pipe|
+    	  pipe.puts(source)
+    	  pipe.close_write
+    	  buffer= pipe.read
+  	  }
+	  
+      buffer
+    end
+
+  end
+end

data/lib/distil/source-file.rb

@@ -3,24 +3,18 @@ require 'fileutils'
 module Distil
 
   class SourceFile
-    attr_accessor :parent_folder, :full_path
+    attr_reader :full_path, :project
+    attr_accessor :language, :is_asset
+    
     class_attr :extension
     class_attr :content_type
-
+    
     include ErrorReporter
     
-    def initialize(filepath)
+    def initialize(filepath, project)
       @full_path= File.expand_path(filepath)
-
-      @parent_folder= File.dirname(@full_path)
-      @dependencies= []
-      @assets= []
-    
-      @@file_cache[@full_path]= self
-    end
-  
-    def can_embed_as_content(file)
-      false
+      @project= project
+      project.cache_file(self)
     end
 
     def warning(message, line=nil)
@@ -31,32 +25,25 @@ module Distil
       super(message, self, line)
     end
     
-    @@file_types= []
-    def self.inherited(subclass)
-      @@file_types << subclass
-    end
-
-    def self.file_types
-      @@file_types
+    def output_path
+      # SourceFiles get copied (or symlinked) into the output folder so that
+      # their path is the same as that relative to the source folder
+      @output_path||= File.join(project.output_path, relative_path)
     end
-
-    @@file_cache= Hash.new
-    def self.from_path(filepath)
-      full_path= File.expand_path(filepath)
-      file= @@file_cache[full_path]
-      return file if file
-    
-      extension= File.extname(filepath)[1..-1]
     
-      @@file_types.each { |handler|
-        next if (handler.extension != extension)
-
-        return handler.new(filepath)
-      }
+    def relative_path
+      return @relative_path if @relative_path
+      if full_path.starts_with?(project.output_path)
+        @relative_path= Project.path_relative_to_folder(full_path, project.output_path)
+      else
+        @relative_path=Project.path_relative_to_folder(full_path, project.source_folder)
+      end
+    end
     
-      return SourceFile.new(filepath)
+    def path_relative_to(path)
+      Project.path_relative_to_folder(full_path, path)
     end
-
+    
     def to_s
       @full_path
     end
@@ -65,76 +52,44 @@ module Distil
       @full_path
     end
 
-    def basename(suffix=extension)
-      File.basename(@full_path, suffix)
+    def dirname
+      File.dirname(@full_path)
     end
-  
-    def file_path
-      @file_path
+    
+    def basename(suffix="")
+      File.basename(@full_path, suffix)
     end
 
-    def file_path=(path)
-      @file_path=path
-    end
-  
-    def load_content
-      File.read(@full_path)
+    def extension
+      @extension || self.class.extension || File.extname(full_path)[1..-1]
     end
 
-    def escape_embeded_content(content)
-      content
+    def content_type
+      @content_type || self.class.content_type || File.extname(full_path)[1..-1]
     end
-  
+
     def content
-      @content ||= load_content
+      @content ||= File.read(full_path)
     end
 
+    def rewrite_content_relative_to_path(path)
+      content
+    end
+    
     def last_modified
       @last_modified ||= File.stat(@full_path).mtime
     end
     
-    def minified_content(source)
-    	# Run the Y!UI Compressor
-      return source if !content_type
-    	buffer= ""
-    
-    	IO.popen("java -jar #{COMPRESSOR} --type #{content_type}", "r+") { |pipe|
-    	  pipe.puts(source)
-    	  pipe.close_write
-    	  buffer= pipe.read
-  	  }
-	  
-      buffer
+    def minified_content(source=content)
+      return source
     end
   
-    def self.path_relative_to_folder(path, folder)
-      outputFolder= File.expand_path(folder).to_s
-  
-      # Remove leading slash and split into parts
-      file_parts= path.slice(1..-1).split('/');
-      output_parts= outputFolder.slice(1..-1).split('/');
-
-      common_prefix_length= 0
-
-      file_parts.each_index { |i|
-        common_prefix_length= i
-        break if file_parts[i]!=output_parts[i]
-      }
-
-      return '../'*(output_parts.length-common_prefix_length) + file_parts[common_prefix_length..-1].join('/')
-    end
-  
-    def relative_to_folder(output_folder)
-      self.class.path_relative_to_folder(@full_path, output_folder)
+    def path_relative_to_folder(folder)
+      Project.path_relative_to_folder(@full_path, folder)
     end
 
-    def relative_to_file(source_file)
-      folder= File.dirname(File.expand_path(source_file))
-      self.relative_to_folder(folder)
-    end
-  
     def dependencies
-      @dependencies
+      @dependencies||=[]
     end
 
     def add_dependency(file)
@@ -143,11 +98,12 @@ module Distil
     end
   
     def assets
-      @assets
+      @assets||=Set.new
     end
   
     def add_asset(file)
-      @assets << file
+      file.is_asset=true
+      assets << file
     end
   
     def copy_to(folder, prefix)
@@ -163,6 +119,8 @@ module Distil
 end
 
 # load all the other file types
-Dir.glob("#{Distil::LIB_DIR}/distil/source-file/*-file.rb") { |file|
-  require file
-}
+require 'distil/source-file/yui-minifiable-file'
+require 'distil/source-file/css-file'
+require 'distil/source-file/html-file'
+require 'distil/source-file/javascript-file'
+require 'distil/source-file/json-file'

data/lib/distil/subclass-tracker.rb

@@ -0,0 +1,13 @@
+class Class
+  def inherited(subclass) 
+    if superclass.respond_to? :inherited 
+      superclass.inherited(subclass) 
+    end 
+    @subclasses ||= [] 
+    @subclasses << subclass 
+  end
+
+  def subclasses 
+    @subclasses||[]
+  end 
+end

data/lib/distil.rb

@@ -1,3 +1,4 @@
+require "rubygems"
 require "set"
 require 'yaml'
 require 'tempfile'
@@ -5,7 +6,17 @@ require 'fileutils'
 require 'zlib'
 require "open3"
 require 'uri'
+require 'erb'
 require 'open-uri'
+require "json"
+
+module Distil
+  class ValidationError < StandardError
+  end
+
+  COMPRESSOR= File.expand_path("#{VENDOR_DIR}/yuicompressor-2.4.2.jar")
+  
+end
 
 def class_attr(*rest)
   rest.each { |name|
@@ -30,10 +41,6 @@ def class_attr(*rest)
   }
 end
 
-def exist?(path, file)
-  File.file?(File.join(path, file))
-end
-
 class String
   def as_identifier
     word= self.to_s.gsub(/(?:^|\W)(.)/) { $1.upcase }
@@ -45,40 +52,17 @@ class String
   end
 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|
-		key= $2
-		ws= $1
-		value= params[key]||m;
-		if (ws && ws.length)
-			ws + value.split("\n").join(ws);
-		else
-			value
-		end
-	}
-end
-
-module Distil
-
-  FRAMEWORK_TYPE = "framework"
-  APP_TYPE = "application"
-
-  WEAK_LINKAGE = 'weak'
-  STRONG_LINKAGE = 'strong'
-  LAZY_LINKAGE = 'lazy'
-
-  DEBUG_MODE = 'debug'
-  RELEASE_MODE = 'release'
-
-end
-
-require 'distil/browser'
+require 'distil/hash-additions'
+require 'distil/javascript-code'
 require 'distil/error-reporter'
+require 'distil/subclass-tracker'
 require 'distil/configurable'
 require 'distil/source-file'
-require 'distil/task'
+require 'distil/file-vendor'
 require 'distil/product'
-require 'distil/target'
-require 'distil/project'
+require 'distil/javascript-file-validator'
+require 'distil/project'
+require 'distil/recursive-http-fetcher'
+require 'distil/library'
+require 'distil/browser'
+require 'distil/server'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: distil
 version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: false
+  hash: 91
+  prerelease: true
   segments: 
   - 0
-  - 13
-  - 6
-  version: 0.13.6
+  - 14
+  - 0
+  - b
+  version: 0.14.0.b
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-05 00:00:00 -08:00
+date: 2010-12-21 00:00:00 -08:00
 default_executable: distil
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +67,22 @@ dependencies:
         version: 1.4.8
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: directory_watcher
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 1
+        - 1
+        version: 1.1.1
+  type: :runtime
+  version_requirements: *id004
 description: A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit
 email: 
 executables: 
@@ -79,7 +96,6 @@ files:
 - Rakefile
 - VERSION
 - assets/distil.js
-- assets/mime.types
 - bin/distil
 - bin/distil-old
 - distil.gemspec
@@ -87,45 +103,28 @@ files:
 - lib/distil.rb
 - lib/distil/browser.rb
 - lib/distil/configurable.rb
-- lib/distil/configurable/file-set.rb
-- lib/distil/configurable/interpolated.rb
-- lib/distil/configurable/output-path.rb
-- lib/distil/configurable/project-path.rb
 - lib/distil/error-reporter.rb
+- lib/distil/file-vendor.rb
+- lib/distil/hash-additions.rb
+- lib/distil/javascript-code.rb
+- lib/distil/javascript-file-validator.rb
+- lib/distil/library.rb
 - lib/distil/product.rb
-- lib/distil/product/concatenated.rb
+- lib/distil/product/cache-manifest-product.rb
 - lib/distil/product/css-product.rb
-- lib/distil/product/debug.rb
-- lib/distil/product/javascript-base-product.rb
-- lib/distil/product/javascript-doc-product.rb
+- lib/distil/product/html-product.rb
 - lib/distil/product/javascript-product.rb
-- lib/distil/product/minified.rb
-- lib/distil/product/page-product.rb
-- lib/distil/product/pdoc-product.rb
 - lib/distil/project.rb
-- lib/distil/project/distil-project.rb
-- lib/distil/project/external-project.rb
-- lib/distil/project/remote-project.rb
+- lib/distil/recursive-http-fetcher.rb
+- lib/distil/server.rb
 - lib/distil/source-file.rb
 - lib/distil/source-file/css-file.rb
 - lib/distil/source-file/html-file.rb
 - lib/distil/source-file/javascript-file.rb
 - lib/distil/source-file/json-file.rb
-- lib/distil/target.rb
-- lib/distil/task.rb
-- lib/distil/task/css-dependency-task.rb
-- lib/distil/task/jsl-dependency-task.rb
-- lib/distil/task/nib-task.rb
-- lib/distil/task/validate-js-task.rb
-- lib/jsdoc.conf
+- lib/distil/source-file/yui-minifiable-file.rb
+- lib/distil/subclass-tracker.rb
 - lib/jsl.conf
-- lib/test/HtmlTestReporter.js
-- lib/test/Test.js
-- lib/test/TestReporter.js
-- lib/test/TestRunner.js
-- lib/test/browser.rb
-- lib/test/scriptwrapper.html
-- lib/test/unittest.html
 - vendor/Makefile
 - vendor/extconf.rb
 - vendor/jsdoc-extras/plugins/distil-plugin.js
@@ -844,12 +843,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: