source_file.rb in dassets-0.6.0

- old
+ new

@@ -1,74 +1,75 @@
-require 'digest/md5'
 require 'fileutils'
 require 'dassets'
 require 'dassets/asset_file'
 
 module Dassets
 
   class SourceFile
 
     def self.find_by_digest_path(path)
-      # always look at the freshest source list to make sure you get all sources
-      # not just the ones Dassets has cached
-      sources = Dassets::SourceList.new(Dassets.config).map{ |p| self.new(p) }
+      # look in the configured source list
+      source_files = Dassets.source_list.map{ |p| self.new(p) }
 
-      # get the last matching one in case two sources have the same digest path
-      # the last one *should* be correct since it was last to be digested
-      sources.select{ |s| s.digest_path == path }.last || NullSourceFile.new(path)
+      # get the last matching one (in case two source files have the same digest
+      # path the last one *should* be correct since it was last to be configured)
+      source_files.select{ |s| s.digest_path == path }.last || NullSourceFile.new(path)
     end
 
     attr_reader :file_path
 
     def initialize(file_path)
-      @file_path = file_path
+      @file_path = file_path.to_s
       @ext_list = File.basename(@file_path).split('.').reverse
     end
 
+    # get the last matching one (in the case two sources with the same path are
+    # configured) since we select the last matching source file (from the last
+    # configured source) in `find_by_digest_path` above.
+    def source
+      @source ||= Dassets.config.sources.select do |source|
+        @file_path =~ /^#{slash_path(source.path)}/
+      end.last
+    end
+
     def asset_file
       @asset_file ||= Dassets::AssetFile.new(self.digest_path)
     end
 
     def digest_path
       @digest_path ||= begin
         digest_basename = @ext_list.inject([]) do |digest_ext_list, ext|
-          digest_ext_list << Dassets.config.engines[ext].ext(ext)
-        end.reject{ |e| e.empty? }.reverse.join('.')
+          digest_ext_list << self.source.engines[ext].ext(ext)
+        end.reject(&:empty?).reverse.join('.')
 
-        File.join([
-          digest_dirname(@file_path, Dassets.config.source_path),
-          digest_basename
-        ].reject{ |p| p.empty? })
+        File.join([digest_dirname(@file_path), digest_basename].reject(&:empty?))
       end
     end
 
     def compiled
       @compiled ||= @ext_list.inject(read_file(@file_path)) do |content, ext|
-        Dassets.config.engines[ext].compile(content)
+        self.source.engines[ext].compile(content)
       end
     end
 
-    def fingerprint
-      @fingerprint ||= Digest::MD5.new.hexdigest(self.compiled)
-    end
-
     def exists?
       File.file?(@file_path)
     end
 
     def mtime
-      File.mtime(@file_path).httpdate
+      File.mtime(@file_path)
     end
 
     def ==(other_source_file)
       self.file_path == other_source_file.file_path
     end
 
     private
 
-    def digest_dirname(file_path, source_path)
-      slash_path(File.dirname(file_path)).sub(slash_path(source_path), '')
+    # remove the source path from the dirname (if it exists)
+    def digest_dirname(file_path)
+      slash_path(File.dirname(file_path)).sub(slash_path(self.source.path), '')
     end
 
     def slash_path(path)
       File.join(path, '')
     end
@@ -84,10 +85,9 @@
     def initialize(digest_path)
       @file_path = ''
       @ext_list = []
       @digest_path = digest_path
     end
-    def digest; end
     def ==(other_source_file)
       self.file_path == other_source_file.file_path
     end
   end
 