dassets 0.3.0 → 0.4.0

data/lib/dassets/source_file.rb

@@ -7,6 +7,16 @@ 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) }
+
+      # 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)
+    end
+
     attr_reader :file_path
 
     def initialize(file_path)
@@ -14,19 +24,8 @@ module Dassets
       @ext_list = File.basename(@file_path).split('.').reverse
     end
 
-    def exists?
-      File.file?(@file_path)
-    end
-
-    def digest
-      return if !self.exists?
-
-      Dassets::AssetFile.new(self.digest_path, self.fingerprint).tap do |asset_file|
-        FileUtils.mkdir_p(File.dirname(asset_file.output_path))
-        File.open(asset_file.output_path, "w"){ |f| f.write(self.compiled) }
-        Dassets.digests[self.digest_path] = self.fingerprint
-        Dassets.digests.save!
-      end
+    def asset_file
+      @asset_file ||= Dassets::AssetFile.new(self.digest_path)
     end
 
     def digest_path
@@ -52,6 +51,18 @@ module Dassets
       @fingerprint ||= Digest::MD5.new.hexdigest(self.compiled)
     end
 
+    def exists?
+      File.file?(@file_path)
+    end
+
+    def mtime
+      File.mtime(@file_path).httpdate
+    end
+
+    def ==(other_source_file)
+      self.file_path == other_source_file.file_path
+    end
+
     private
 
     def digest_dirname(file_path, source_path)
@@ -68,4 +79,17 @@ module Dassets
 
   end
 
+  class NullSourceFile < SourceFile
+    attr_reader :file_path, :digest_path, :compiled, :fingerprint
+    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
+
 end

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/support/config/assets.rb

@@ -14,5 +14,6 @@ Dassets.configure do |c|
 
   c.engine 'dumb', @dumb_engine
   c.engine 'useless', @useless_engine
+  c.cache = nil # use no cache
 
 end

data/test/system/digest_cmd_run_tests.rb

@@ -7,62 +7,60 @@ module Dassets
   class DigestCmdRunTests < Assert::Context
     desc "the DigestCmd"
     setup do
-      Dassets.reset
-      Dassets.init
+      Dassets.config.file_store = 'public'
+      clear_store_path(Dassets.config.file_store.root)
       Dassets.digest_source_files
 
       @addfile = 'addfile.txt'
-      @rmfile  = 'file1.txt'
-      @updfile = 'file2.txt'
-      @addfile_path = File.join(File.join(Dassets.config.source_path, @addfile))
-      @rmfile_path  = File.join(File.join(Dassets.config.source_path, @rmfile))
-      @updfile_path = File.join(File.join(Dassets.config.source_path, @updfile))
-
-      @rmfilecontents   = File.read(@rmfile_path)
-      @updfilecontents  = File.read(@updfile_path)
-      @orig_updfile_md5 = Dassets.digests[@updfile]
-
-      FileUtils.touch @addfile_path
-      FileUtils.rm @rmfile_path
-      File.open(@updfile_path, "w+"){ |f| f.write('an update') }
+      @addfile_src = source_path(@addfile)
+
+      @rmfile = 'file1.txt'
+      @rmfile_src = source_path(@rmfile)
+      @rmfile_contents = File.read(@rmfile_src)
+
+      FileUtils.touch @addfile_src
+      @addfile_out = store_path(@addfile)
+
+      @rmfile_out = store_path(@rmfile)
+      FileUtils.rm @rmfile_src
     end
     teardown do
-      File.open(@updfile_path, "w"){ |f| f.write @updfilecontents }
-      File.open(@rmfile_path,  "w"){ |f| f.write @rmfilecontents }
-      FileUtils.rm @addfile_path
+      File.open(@rmfile_src,  "w"){ |f| f.write @rmfile_contents }
+      FileUtils.rm @addfile_src
 
-      Dassets.reset
-      Dassets.init
       Dassets.digest_source_files
+      clear_store_path(Dassets.config.file_store.root)
+      Dassets.digest_source_files
+      Dassets.config.file_store = NullFileStore.new
     end
 
     should "update the digests on all source files when run with no given paths" do
-      # check before state
-      assert_equal 5, Dassets.digests.paths.size
-      assert_not_includes @addfile, Dassets.digests.paths
-      assert_includes @rmfile, Dassets.digests.paths
-      assert_equal @orig_updfile_md5, Dassets.digests[@updfile]
-
+      clear_store_path(Dassets.config.file_store.root)
       Dassets.digest_source_files
 
-      # see the add, update and removal
-      assert_equal 5, Dassets.digests.paths.size
-      assert_includes @addfile, Dassets.digests.paths
-      assert_not_includes @rmfile, Dassets.digests.paths
-      assert_not_equal @orig_updfile_md5, Dassets.digests[@updfile]
+      assert_file_exists @addfile_out
+      assert_not_file_exists @rmfile_out
     end
 
     should "update the digests on a single source file when given its path" do
-      assert_equal 5, Dassets.digests.paths.size
-      assert_not_includes @addfile, Dassets.digests.paths
+      clear_store_path(Dassets.config.file_store.root)
+      Dassets.digest_source_files([@addfile_src])
 
-      Dassets.digest_source_files([@addfile_path])
+      assert_file_exists @addfile_out
+    end
+
+    private
+
+    def source_path(file)
+      File.join(File.join(Dassets.config.source_path, file))
+    end
+
+    def store_path(file)
+      Dassets.config.file_store.store_path(Dassets::AssetFile.new(file).url)
+    end
 
-      # see the add, don't change anything else
-      assert_equal 6, Dassets.digests.paths.size
-      assert_includes @addfile, Dassets.digests.paths
-      assert_includes @rmfile, Dassets.digests.paths
-      assert_equal    @orig_updfile_md5, Dassets.digests[@updfile]
+    def clear_store_path(path)
+      Dir.glob(File.join(path, '*')).each{ |p| FileUtils.rm_r(p) } if path
     end
 
   end

data/test/system/rack_tests.rb

@@ -10,12 +10,8 @@ module Dassets
 
     desc "the middleware in a rack app"
     setup do
-      Dassets.init
       app.use Dassets::Server
     end
-    teardown do
-      Dassets.reset
-    end
 
     def app
       @app ||= SinatraApp
@@ -29,13 +25,13 @@ module Dassets
     should "return a successful response" do
       resp = get '/file1-daa05c683a4913b268653f7a7e36a5b4.txt'
       assert_equal 200, resp.status
-      assert_equal Dassets['/file1.txt'].content, resp.body
+      assert_equal Dassets['file1.txt'].content, resp.body
     end
 
     should "return a successful response with no body on HEAD requests" do
       resp = head '/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt'
       assert_equal 200, resp.status
-      assert_equal Dassets['/file2.txt'].size.to_s, resp.headers['Content-Length']
+      assert_equal Dassets['file2.txt'].size.to_s, resp.headers['Content-Length']
       assert_empty resp.body
     end
 
@@ -45,7 +41,7 @@ module Dassets
     desc "requesting an existing asset file that has not been modified"
     setup do
       @resp = get('/file1-daa05c683a4913b268653f7a7e36a5b4.txt', {}, {
-        'HTTP_IF_MODIFIED_SINCE' => Dassets['/file1.txt'].mtime.to_s
+        'HTTP_IF_MODIFIED_SINCE' => Dassets['file1.txt'].mtime.to_s
       })
     end
 

data/test/unit/asset_file_tests.rb

@@ -1,4 +1,7 @@
 require 'assert'
+require 'fileutils'
+require 'dassets/file_store'
+require 'dassets/source_cache'
 require 'dassets/asset_file'
 
 class Dassets::AssetFile
@@ -6,69 +9,98 @@ class Dassets::AssetFile
   class BaseTests < Assert::Context
     desc "Dassets::AssetFile"
     setup do
-      @asset_file = Dassets::AssetFile.new('file1.txt', 'abc123')
+      @asset_file = Dassets::AssetFile.new('file1.txt')
     end
     subject{ @asset_file }
 
-    should have_cmeths :from_abs_path
-    should have_readers :path, :md5, :dirname, :extname, :basename
-    should have_readers :output_path, :url, :href
-    should have_imeth :content, :mtime, :size, :mime_type, :exists?, :==
+    should have_readers :digest_path, :dirname, :extname, :basename, :source_cache
+    should have_imeths  :digest!, :url, :fingerprint, :content
+    should have_imeths  :href, :mtime, :size, :mime_type, :exists?, :==
 
-    should "know its given path and md5" do
-      assert_equal 'file1.txt', subject.path
-      assert_equal 'abc123', subject.md5
-    end
-
-    should "know its dirname, extname, and basename" do
+    should "know its digest path, dirname, extname, and basename" do
+      assert_equal 'file1.txt', subject.digest_path
       assert_equal '.',     subject.dirname
       assert_equal '.txt',  subject.extname
       assert_equal 'file1', subject.basename
     end
 
-    should "build it's output_path from the path" do
-      assert_equal "#{Dassets.config.output_path}/file1.txt", subject.output_path
+    should "use its source file attrs as its own" do
+      assert_equal subject.source_cache.mtime, subject.mtime
+      assert_equal Rack::Utils.bytesize(subject.content), subject.size
+      assert_equal "text/plain", subject.mime_type
+      assert subject.exists?
+
+      null_file = Dassets::AssetFile.new('')
+      assert_nil null_file.mtime
+      assert_nil null_file.size
+      assert_nil null_file.mime_type
+      assert_not null_file.exists?
+    end
+
+    should "know its source cache" do
+      assert_not_nil subject.source_cache
+      assert_kind_of Dassets::SourceCache, subject.source_cache
+      assert_equal subject.digest_path, subject.source_cache.digest_path
+    end
+
+    should "have a fingerprint" do
+      assert_not_nil subject.fingerprint
+    end
+
+    should "get its fingerprint from its source cache if none is given" do
+      af = Dassets::AssetFile.new('file1.txt')
+      assert_equal af.source_cache.fingerprint, af.fingerprint
+    end
+
+    should "know it's content" do
+      assert_equal "file1.txt\n", subject.content
+
+      null_file = Dassets::AssetFile.new('')
+      assert_nil null_file.content
+    end
+
+    should "get its content from its source cache if no output file" do
+      digest_path = 'nested/a-thing.txt.no-use'
+      exp_content = "thing\n\nDUMB\nUSELESS"
 
-      nested = Dassets::AssetFile.new('nested/file1.txt', 'abc123')
-      assert_equal "#{Dassets.config.output_path}/nested/file1.txt", nested.output_path
+      without_output = Dassets::AssetFile.new(digest_path)
+      assert_equal exp_content, without_output.content
     end
 
-    should "build it's url from the path and the md5" do
-      assert_equal "file1-abc123.txt", subject.url
+    should "build it's url from the path and the fingerprint" do
+      assert_match /^file1-[a-f0-9]{32}\.txt$/, subject.url
 
-      nested = Dassets::AssetFile.new('nested/file1.txt', 'abc123')
-      assert_equal "nested/file1-abc123.txt", nested.url
+      nested = Dassets::AssetFile.new('nested/file1.txt')
+      assert_equal "nested/file1-.txt", nested.url
     end
 
     should "build it's href from the url" do
-      assert_equal "/file1-abc123.txt", subject.href
+      assert_match /^\/file1-[a-f0-9]{32}\.txt$/, subject.href
 
-      nested = Dassets::AssetFile.new('nested/file1.txt', 'abc123')
-      assert_equal "/nested/file1-abc123.txt", nested.href
+      nested = Dassets::AssetFile.new('nested/file1.txt')
+      assert_equal "/nested/file1-.txt", nested.href
     end
 
-    should "be created from absolute file paths and have md5 computed" do
-      abs_file_path = File.join(Dassets.config.output_path, 'file1.txt')
-      exp_md5 = 'daa05c683a4913b268653f7a7e36a5b4'
-      file = Dassets::AssetFile.from_abs_path(abs_file_path)
+  end
 
-      assert_equal 'file1.txt', file.path
-      assert_equal exp_md5, file.md5
+  class DigestTests < BaseTests
+    desc "being digested with an output path configured"
+    setup do
+      Dassets.config.file_store = 'public'
+      @save_path = @asset_file.digest!
+      @outfile = Dassets.config.file_store.store_path(@asset_file.url)
+    end
+    teardown do
+      Dassets.config.file_store = Dassets::NullFileStore.new
     end
 
-    should "know it's content, mtime, size, mime_type, and if it exists" do
-      assert_equal "file1.txt\n", subject.content
-      assert_equal File.mtime(subject.output_path).httpdate, subject.mtime
-      assert_equal File.size?(subject.output_path), subject.size
-      assert_equal "text/plain", subject.mime_type
-      assert subject.exists?
+    should "return the asset file url" do
+      assert_equal @outfile, @save_path
+    end
 
-      null_file = Dassets::AssetFile.new('', '')
-      assert_nil null_file.content
-      assert_nil null_file.mtime
-      assert_nil null_file.size
-      assert_nil null_file.mime_type
-      assert_not null_file.exists?
+    should "compile and write an asset file to the output path" do
+      assert_file_exists @outfile
+      assert_equal subject.content, File.read(@outfile)
     end
 
   end

data/test/unit/config_tests.rb

@@ -12,9 +12,10 @@ class Dassets::Config
     end
     subject{ @config }
 
-    should have_option :root_path,   Pathname, :required => true
+    should have_option :root_path, Pathname, :required => true
     should have_option :assets_file, Pathname, :default => ENV['DASSETS_ASSETS_FILE']
-    should have_options :source_path, :output_path, :digests_path
+    should have_options :source_path, :source_filter, :file_store
+
     should have_reader :engines
     should have_imeth :source, :engine
 
@@ -23,16 +24,6 @@ class Dassets::Config
       assert_equal exp_path, subject.source_path
     end
 
-    should "should use `apps/assets/public` as the default output path" do
-      exp_path = Dassets.config.root_path.join("app/assets/public").to_s
-      assert_equal exp_path, subject.output_path
-    end
-
-    should "should use `app/assets/.digests` as the default digests file path" do
-      exp_path = Dassets.config.root_path.join("app/assets/.digests").to_s
-      assert_equal exp_path, subject.digests_path.to_s
-    end
-
     should "set the source path and filter proc with the `sources` method" do
       path = Dassets::RootPath.new 'app/asset_files'
       filter = proc{ |paths| [] }
@@ -63,11 +54,6 @@ class Dassets::Config
       assert_equal '', subject.engines['empty'].compile('some content')
     end
 
-    should "should use `apps/assets/public` as the default files path" do
-      exp_path = Dassets.config.root_path.join("app/assets/public").to_s
-      assert_equal exp_path, subject.output_path
-    end
-
   end
 
 end

data/test/unit/dassets_tests.rb

@@ -8,50 +8,27 @@ module Dassets
     desc "Dassets"
     subject{ Dassets }
 
-    should have_imeths :config, :sources, :digests
-    should have_imeths :configure, :reset, :init, :[]
+    should have_imeths :config, :configure, :init, :[]
     should have_imeths :digest_source_files
 
     should "return a `Config` instance with the `config` method" do
       assert_kind_of Config, subject.config
     end
 
-    should "read the source list on init" do
-      subject.reset
-      assert_empty subject.sources
-
-      subject.init
-      assert_not_empty subject.sources
-    end
-
-    should "read/parse the digests on init" do
-      subject.reset
-      assert_empty subject.digests.paths
-
-      subject.init
-      assert_not_empty subject.digests.paths
-    end
-
-    should "return asset files given a their path using the index operator" do
-      subject.init
+    should "return asset files given a their digest path using the index operator" do
       file = subject['nested/file3.txt']
 
       assert_kind_of Dassets::AssetFile, file
-      assert_equal 'nested/file3.txt', file.path
-      assert_equal 'd41d8cd98f00b204e9800998ecf8427e', file.md5
-
-      subject.reset
+      assert_equal 'nested/file3.txt', file.digest_path
+      assert_equal 'd41d8cd98f00b204e9800998ecf8427e', file.fingerprint
     end
 
-    should "return an asset file with no fingerprint if path not in digests" do
-      file = subject['path/not/found.txt']
-      assert_equal '', file.md5
-
-      subject.init
+    should "return an asset file with unknown source if digest path not found" do
       file = subject['path/not/found.txt']
-      assert_equal '', file.md5
 
-      subject.reset
+      assert_kind_of Dassets::SourceCache, file.source_cache
+      assert_kind_of Dassets::NullSourceFile, file.source_cache.source_file
+      assert_not file.source_cache.exists?
     end
 
   end
@@ -69,17 +46,6 @@ module Dassets
       assert_equal exp_list, Dassets::SourceList.new(config)
     end
 
-    should "filter out any paths in the output path" do
-      config = Dassets::Config.new
-      config.source_path = "source_files" # test/support/source_files
-      config.output_path = "source_files/nested"
-      exp_list = [
-        'test1.txt', '_ignored.txt'
-      ].map{ |p| File.expand_path(p, config.source_path) }.sort
-
-      assert_equal exp_list, Dassets::SourceList.new(config)
-    end
-
     should "run the supplied source filter on the paths" do
       config = Dassets::Config.new
       config.source_path = "source_files" # test/support/source_files