source-file.rb in distil-0.14.0.b

- old
+ new

@@ -1,155 +1,111 @@
 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
+      @project= project
+      project.cache_file(self)
     end
-  
-    def can_embed_as_content(file)
-      false
-    end
 
     def warning(message, line=nil)
       super(message, self, line)
     end
     
     def error(message, line=nil)
       super(message, self, line)
     end
     
-    @@file_types= []
-    def self.inherited(subclass)
-      @@file_types << subclass
+    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
-
-    def self.file_types
-      @@file_types
+    
+    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
-
-    @@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)
-      }
-    
-      return SourceFile.new(filepath)
+    def path_relative_to(path)
+      Project.path_relative_to_folder(full_path, path)
     end
-
+    
     def to_s
       @full_path
     end
   
     def to_str
       @full_path
     end
 
-    def basename(suffix=extension)
+    def dirname
+      File.dirname(@full_path)
+    end
+    
+    def basename(suffix="")
       File.basename(@full_path, suffix)
     end
-  
-    def file_path
-      @file_path
-    end
 
-    def file_path=(path)
-      @file_path=path
+    def extension
+      @extension || self.class.extension || File.extname(full_path)[1..-1]
     end
-  
-    def load_content
-      File.read(@full_path)
-    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('/')
+    def path_relative_to_folder(folder)
+      Project.path_relative_to_folder(@full_path, folder)
     end
-  
-    def relative_to_folder(output_folder)
-      self.class.path_relative_to_folder(@full_path, output_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)
       return if @dependencies.include?(file)
       @dependencies << file
     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)
       file_path= self.file_path || relative_to_folder(prefix||"")
       final_target_folder= File.join(folder, File.dirname(file_path))
@@ -161,8 +117,10 @@
   end
 
 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'