dassets 0.7.0 → 0.8.0

data/README.md

@@ -20,7 +20,7 @@ Dassets.configure do |c|
   # (optional) tell Dassets where to store digested asset files
   # if none given, Dassets will not write any digested output
   # use this to "cache" digested assets to the public dir (for example)
-  c.file_store '/path/to/public' # default: `NullFileStore.new`
+  c.file_store '/path/to/public' # default: `FileStore::NullStore.new`
 
 end
 ```

data/dassets.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.0"])
+  gem.add_development_dependency("assert", ["~> 2.4"])
   gem.add_development_dependency('assert-rack-test', ["~> 1.0"])
   gem.add_development_dependency("sinatra", ["~> 1.4"])
 

data/lib/dassets/asset_file.rb

@@ -21,39 +21,37 @@ class Dassets::AssetFile
   end
 
   def url
-    @url ||= begin
-      url_basename = "#{@basename}-#{self.fingerprint}#{@extname}"
-      File.join(@dirname, url_basename).sub(/^\.\//, '').sub(/^\//, '')
-    end
+    url_basename = "#{@basename}-#{self.fingerprint}#{@extname}"
+    File.join(@dirname, url_basename).sub(/^\.\//, '').sub(/^\//, '')
   end
 
   def href
-    @href ||= "/#{self.url}"
+    "/#{self.url}"
   end
 
   def fingerprint
     return nil if !self.exists?
-    @fingerprint ||= @source_proxy.fingerprint
+    @source_proxy.fingerprint
   end
 
   def content
     return nil if !self.exists?
-    @content ||= @source_proxy.content
+    @source_proxy.content
   end
 
   def mtime
     return nil if !self.exists?
-    @mtime ||= @source_proxy.mtime.httpdate
+    @source_proxy.mtime.httpdate
   end
 
   def size
     return nil if !self.exists?
-    @size ||= Rack::Utils.bytesize(self.content)
+    Rack::Utils.bytesize(self.content)
   end
 
   def mime_type
     return nil if !self.exists?
-    @mime_type ||= Rack::Mime.mime_type(@extname)
+    Rack::Mime.mime_type(@extname)
   end
 
   def exists?

data/lib/dassets/cache.rb

@@ -0,0 +1,45 @@
+module Dassets; end
+module Dassets::Cache
+
+  class MemCache
+    require 'thread'
+
+    # this is a thread-safe in-memory cache for use with the `SourceCache`
+
+    def initialize
+      @hash = {}
+      @write_mutex = ::Mutex.new
+    end
+
+    def keys
+      @hash.keys
+    end
+
+    def [](key)
+      @hash[key]
+    end
+
+    def []=(key, value)
+      @write_mutex.synchronize{ @hash[key] = value }
+    end
+
+  end
+
+  class NoCache
+
+    # This is a no-op cache object.  This is the default cache in use and "turns
+    # off caching.
+
+    def keys
+      []
+    end
+
+    def [](key)
+    end
+
+    def []=(key, value)
+    end
+
+  end
+
+end

data/lib/dassets/config.rb

@@ -0,0 +1,39 @@
+require 'pathname'
+require 'ns-options'
+require 'dassets/cache'
+require 'dassets/file_store'
+require 'dassets/source'
+
+module Dassets
+
+  class Config
+    include NsOptions::Proxy
+
+    option :file_store, FileStore, :default => proc{ FileStore::NullStore.new }
+    option :cache, :default => proc{ Cache::NoCache.new }
+
+    attr_reader :sources, :combinations
+
+    def initialize
+      super
+      @sources = []
+      @combinations = Hash.new{ |h, k| [k] } # digest pass-thru if none defined
+    end
+
+    def source(path, &block)
+      @sources << Source.new(path).tap{ |s| block.call(s) if block }
+    end
+
+    def combination(key_digest_path, value_digest_paths)
+      @combinations[key_digest_path.to_s] = [*value_digest_paths]
+    end
+
+    def combination?(key_digest_path)
+      # a digest path is only considered a combination is it is not the default
+      # pass-thru above
+      @combinations[key_digest_path.to_s] != [key_digest_path]
+    end
+
+  end
+
+end

data/lib/dassets/file_store.rb

@@ -1,35 +1,38 @@
 require 'thread'
 
-module Dassets; end
-class Dassets::FileStore
-  attr_reader :root
+module Dassets
 
-  def initialize(root)
-    @root = root
-    @save_mutex = ::Mutex.new
-  end
+  class FileStore
+    attr_reader :root
+
+    def initialize(root)
+      @root = root
+      @save_mutex = ::Mutex.new
+    end
 
-  def save(url, &block)
-    @save_mutex.synchronize do
-      store_path(url).tap do |path|
-        FileUtils.mkdir_p(File.dirname(path))
-        File.open(path, "w"){ |f| f.write(block.call) }
+    def save(url, &block)
+      @save_mutex.synchronize do
+        store_path(url).tap do |path|
+          FileUtils.mkdir_p(File.dirname(path))
+          File.open(path, "w"){ |f| f.write(block.call) }
+        end
       end
     end
-  end
 
-  def store_path(url)
-    File.join(@root, url)
-  end
+    def store_path(url)
+      File.join(@root, url)
+    end
 
-end
+    class NullStore < FileStore
+      def initialize
+        super('')
+      end
 
-class Dassets::NullFileStore < Dassets::FileStore
-  def initialize
-    super('')
-  end
+      def save(url, &block)
+        store_path(url) # no-op, just return the store path like the base does
+      end
+    end
 
-  def save(url, &block)
-    store_path(url) # no-op, just return the store path like the base does
   end
+
 end

data/lib/dassets/source_file.rb

@@ -47,7 +47,7 @@ module Dassets
     end
 
     def compiled
-      @compiled ||= @ext_list.inject(read_file(@file_path)) do |content, ext|
+      @ext_list.inject(read_file(@file_path)) do |content, ext|
         self.source.engines[ext].compile(content)
       end
     end
@@ -89,26 +89,27 @@ module Dassets
     def initialize(digest_path, cache = nil)
       @file_path, @ext_list = '', []
       @digest_path = digest_path
-      @source_compiled, @source_exists, @source_mtime = nil, false, nil
-
-      # if the digest path is a combination, build its proxy and use relevent
-      # properties as the source file properties
-      if Dassets.config.combination?(@digest_path)
-        source_proxy = SourceProxy.new(@digest_path, cache)
-        @source_compiled = source_proxy.content
-        @source_exists   = source_proxy.exists?
-        @source_mtime    = source_proxy.mtime
+      @source_proxy = if Dassets.config.combination?(@digest_path)
+        SourceProxy.new(@digest_path, cache)
+      else
+        NullSourceProxy.new
       end
     end
 
-    def compiled; @source_compiled; end
-    def exists?;  @source_exists;   end
-    def mtime;    @source_mtime;    end
+    def compiled; @source_proxy.content; end
+    def exists?;  @source_proxy.exists?; end
+    def mtime;    @source_proxy.mtime;   end
 
     def ==(other_source_file)
       self.file_path == other_source_file.file_path
     end
 
+    class NullSourceProxy
+      def content; nil;   end
+      def exists?; false; end
+      def mtime;   nil;   end
+    end
+
   end
 
 end

data/lib/dassets/source_proxy.rb

@@ -1,4 +1,5 @@
 require 'digest/md5'
+require 'dassets/cache'
 require 'dassets/source_file'
 
 module Dassets; end
@@ -8,7 +9,7 @@ class Dassets::SourceProxy
 
   def initialize(digest_path, cache = nil)
     @digest_path  = digest_path
-    @cache = cache || NoCache.new
+    @cache = cache || Dassets::Cache::NoCache.new
     @source_files = get_source_files(@digest_path, @cache)
   end
 
@@ -35,11 +36,11 @@ class Dassets::SourceProxy
   private
 
   def source_content
-    @source_content ||= @source_files.map{ |f| f.compiled }.join("\n")
+    @source_files.map{ |f| f.compiled }.join("\n")
   end
 
   def source_fingerprint
-    @source_fingerprint ||= Digest::MD5.new.hexdigest(source_content)
+    Digest::MD5.new.hexdigest(source_content)
   end
 
   def get_source_files(digest_path, cache)
@@ -48,9 +49,4 @@ class Dassets::SourceProxy
     end
   end
 
-  class NoCache
-    def [](key); end
-    def []=(key, value); end
-  end
-
 end

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/dassets.rb

@@ -1,68 +1,26 @@
-require 'pathname'
-require 'set'
-require 'ns-options'
-
 require 'dassets/version'
-require 'dassets/file_store'
-require 'dassets/default_cache'
-require 'dassets/source'
 require 'dassets/asset_file'
-
-ENV['DASSETS_ASSETS_FILE'] ||= 'config/assets'
+require 'dassets/config'
 
 module Dassets
 
-  def self.config;  @config  ||= Config.new; end
+  def self.config; @config ||= Config.new; end
   def self.configure(&block)
     block.call(self.config)
   end
 
   def self.init
-    begin
-      require self.config.assets_file
-    rescue LoadError
-    end
+    @asset_files ||= {}
   end
 
   def self.[](digest_path)
-    AssetFile.new(digest_path)
+    @asset_files[digest_path] ||= AssetFile.new(digest_path)
   end
 
   def self.source_list
     SourceList.new(self.config.sources)
   end
 
-  class Config
-    include NsOptions::Proxy
-
-    option :assets_file,   Pathname,  :default => ENV['DASSETS_ASSETS_FILE']
-    option :file_store,    FileStore, :default => proc{ NullFileStore.new }
-
-    attr_reader :sources, :combinations
-    attr_accessor :cache
-
-    def initialize
-      super
-      @sources = []
-      @combinations = Hash.new{ |h, k| [k] } # digest pass-thru if none defined
-      @cache = DefaultCache.new
-    end
-
-    def source(path, &block)
-      @sources << Source.new(path).tap{ |s| block.call(s) if block }
-    end
-
-    def combination(key_digest_path, value_digest_paths)
-      @combinations[key_digest_path.to_s] = [*value_digest_paths]
-    end
-
-    def combination?(key_digest_path)
-      # a digest path is only considered a combination is it is not the default
-      # pass-thru above
-      @combinations[key_digest_path.to_s] != [key_digest_path]
-    end
-  end
-
   module SourceList
     def self.new(sources)
       sources.inject([]){ |list, source| list += source.files }

data/test/helper.rb

@@ -11,6 +11,23 @@ require 'pathname'
 TEST_SUPPORT_PATH = Pathname.new(File.expand_path('../support', __FILE__))
 
 ENV['DASSETS_TEST_MODE']   = 'yes'
-ENV['DASSETS_ASSETS_FILE'] = 'test/support/config/assets'
+
 require 'dassets'
+
+@dumb_engine = Class.new(Dassets::Engine) do
+  def ext(in_ext); ''; end
+  def compile(input); "#{input}\nDUMB"; end
+end
+@useless_engine = Class.new(Dassets::Engine) do
+  def ext(in_ext); 'no-use'; end
+  def compile(input); "#{input}\nUSELESS"; end
+end
+
+Dassets.configure do |c|
+  c.source TEST_SUPPORT_PATH.join("app/assets") do |s|
+    s.engine 'dumb', @dumb_engine
+    s.engine 'useless', @useless_engine
+  end
+end
+
 Dassets.init

data/test/system/rack_tests.rb

@@ -1,8 +1,10 @@
 require 'assert'
+require 'dassets'
+
 require 'assert-rack-test'
 require 'fileutils'
-require 'test/support/app'
 require 'dassets/server'
+require 'test/support/app'
 
 module Dassets
 
@@ -46,7 +48,7 @@ module Dassets
       FileUtils.rm(@url_file)
     end
     teardown do
-      Dassets.config.file_store = NullFileStore.new
+      Dassets.config.file_store = FileStore::NullStore.new
     end
 
     should "digest the asset" do

data/test/unit/asset_file_tests.rb

@@ -1,12 +1,13 @@
 require 'assert'
+require 'dassets/asset_file'
+
 require 'fileutils'
 require 'dassets/file_store'
 require 'dassets/source_proxy'
-require 'dassets/asset_file'
 
 class Dassets::AssetFile
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Dassets::AssetFile"
     setup do
       @asset_file = Dassets::AssetFile.new('file1.txt')
@@ -81,9 +82,31 @@ class Dassets::AssetFile
       assert_equal "/nested/file1-.txt", nested.href
     end
 
+    should "not memoize its attributes" do
+      url1 = subject.url
+      url2 = subject.url
+      assert_not_same url2, url1
+
+      href1 = subject.href
+      href2 = subject.href
+      assert_not_same href2, href1
+
+      fingerprint1 = subject.fingerprint
+      fingerprint2 = subject.fingerprint
+      assert_not_same fingerprint2, fingerprint1
+
+      content1 = subject.content
+      content2 = subject.content
+      assert_not_same content2, content1
+
+      mtime1 = subject.mtime
+      mtime2 = subject.mtime
+      assert_not_same mtime2, mtime1
+    end
+
   end
 
-  class DigestTests < BaseTests
+  class DigestTests < UnitTests
     desc "being digested with an output path configured"
     setup do
       Dassets.config.file_store = TEST_SUPPORT_PATH.join('public').to_s
@@ -91,7 +114,7 @@ class Dassets::AssetFile
       @outfile = Dassets.config.file_store.store_path(@asset_file.url)
     end
     teardown do
-      Dassets.config.file_store = Dassets::NullFileStore.new
+      Dassets.config.file_store = Dassets::FileStore::NullStore.new
     end
 
     should "return the asset file url" do

data/test/unit/cache_tests.rb

@@ -0,0 +1,53 @@
+require 'assert'
+require 'dassets/cache'
+
+module Dassets::Cache
+
+  class UnitTests < Assert::Context
+    desc "Dassets::Cache"
+
+    should "define an in-memory cache handler" do
+      assert MemCache
+    end
+
+    should "define a no-op cache handler" do
+      assert NoCache
+    end
+
+  end
+
+  class MemCacheTests < UnitTests
+    desc "MemCache"
+    setup do
+      @cache = MemCache.new
+    end
+    subject{ @cache }
+
+    should have_imeths :keys, :[], :[]=
+
+    should "cache given key/value pairs in memory" do
+      val = []
+      subject['something'] = val
+      assert_same val, subject['something']
+    end
+
+  end
+
+  class NoCacheTests < UnitTests
+    desc "NoCache"
+    setup do
+      @cache = NoCache.new
+    end
+    subject{ @cache }
+
+    should have_imeths :keys, :[], :[]=
+
+    should "not cache given key/value pairs in memory" do
+      val = []
+      subject['something'] = val
+      assert_not_same val, subject['something']
+    end
+
+  end
+
+end

data/test/unit/config_tests.rb

@@ -1,23 +1,33 @@
 require 'assert'
+require 'dassets/config'
+
 require 'ns-options/assert_macros'
-require 'dassets'
+require 'dassets/cache'
+require 'dassets/file_store'
 
 class Dassets::Config
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     include NsOptions::AssertMacros
+
     desc "Dassets::Config"
     setup do
       @config = Dassets::Config.new
     end
     subject{ @config }
 
-    should have_option :assets_file, Pathname,  :default => ENV['DASSETS_ASSETS_FILE']
-    should have_options :file_store
-
+    should have_options :file_store, :cache
     should have_reader :combinations
     should have_imeth :source, :combination, :combination?
 
+    should "default the file store option to a null file store" do
+      assert_kind_of Dassets::FileStore::NullStore, subject.file_store
+    end
+
+    should "default the cache option to no caching" do
+      assert_kind_of Dassets::Cache::NoCache, subject.cache
+    end
+
     should "register new sources with the `source` method" do
       path = '/path/to/app/assets'
       filter = proc{ |paths| [] }

data/test/unit/dassets_tests.rb

@@ -1,10 +1,12 @@
 require 'assert'
-require 'fileutils'
 require 'dassets'
 
+require 'fileutils'
+require 'dassets/asset_file'
+
 module Dassets
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Dassets"
     subject{ Dassets }
 
@@ -23,6 +25,13 @@ module Dassets
       assert_equal 'd41d8cd98f00b204e9800998ecf8427e', file.fingerprint
     end
 
+    should "cache asset files" do
+      file1 = subject['nested/file3.txt']
+      file2 = subject['nested/file3.txt']
+
+      assert_same file2, file1
+    end
+
     should "return an asset file that doesn't exist if digest path not found" do
       file = subject['path/not/found.txt']
       assert_not file.exists?

data/test/unit/engine_tests.rb

@@ -3,7 +3,7 @@ require 'dassets/engine'
 
 class Dassets::Engine
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "the base Dassets::Engine"
     setup do
       @engine = Dassets::Engine.new

data/test/unit/file_store_tests.rb

@@ -3,13 +3,48 @@ require 'dassets/file_store'
 
 class Dassets::FileStore
 
-  class NullTests < Assert::Context
-    desc "Dassets::NullFileStore"
-    subject{ Dassets::NullFileStore.new }
+  class UnitTests < Assert::Context
+    desc "Dassets::FileStore"
+    setup do
+      @root = TEST_SUPPORT_PATH.join('public')
+      @url = 'some/url'
+      @url_path = @root.join(@url).to_s
+      FileUtils.rm_f(@url_path)
+
+      @store = Dassets::FileStore.new(@root.to_s)
+    end
+    teardown do
+      FileUtils.rm_f(@url_path)
+    end
+    subject{ @store }
 
-    should have_reader :root
+    should have_readers :root
     should have_imeths :save, :store_path
 
+    should "know its root path" do
+      assert_equal @root.to_s, subject.root
+    end
+
+    should "build the store path based on a given url" do
+      assert_equal @url_path, subject.store_path(@url)
+    end
+
+    should "return write a file and return the store path on save" do
+      assert_not_file_exists @url_path
+      path = subject.save(@url){ 'some contents' }
+
+      assert_equal @url_path, path
+      assert_file_exists @url_path
+    end
+
+  end
+
+  class NullStoreTests < UnitTests
+    desc "NullStore"
+    setup do
+      @store = Dassets::FileStore::NullStore.new
+    end
+
     should "be a kind of FileStore" do
       assert_kind_of Dassets::FileStore, subject
     end
@@ -18,12 +53,8 @@ class Dassets::FileStore
       assert_equal '', subject.root
     end
 
-    should "build the store path based on a given url" do
-      assert_equal '/some/url', subject.store_path('some/url')
-    end
-
     should "return the store path on save" do
-      assert_equal '/some/url', subject.save('some/url')
+      assert_equal "/#{@url}", subject.save(@url)
     end
 
   end

data/test/unit/server/request_tests.rb

@@ -1,9 +1,11 @@
 require 'assert'
 require 'dassets/server/request'
 
+require 'dassets/asset_file'
+
 class Dassets::Server::Request
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Dassets::Server::Request"
     setup do
       @req = file_request('GET', '/file1-daa05c683a4913b268653f7a7e36a5b4.txt')

data/test/unit/server/response_tests.rb

@@ -1,10 +1,12 @@
 require 'assert'
-require 'rack/utils'
 require 'dassets/server/response'
 
+require 'rack/utils'
+require 'dassets/asset_file'
+
 class Dassets::Server::Response
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Dassets::Server::Response"
     setup do
       @resp = file_response(Dassets::AssetFile.new(''))

data/test/unit/source_file_tests.rb

@@ -2,6 +2,7 @@ require 'assert'
 require 'dassets/source_file'
 
 require 'dassets/asset_file'
+require 'dassets/source_proxy'
 
 class Dassets::SourceFile
 
@@ -51,6 +52,12 @@ class Dassets::SourceFile
       assert_not_same subject, found
     end
 
+    should "not memoize its compiled source" do
+      compiled1 = subject.compiled
+      compiled2 = subject.compiled
+      assert_not_same compiled2, compiled1
+    end
+
   end
 
   class NullSourceTests < UnitTests

data/test/unit/source_proxy_tests.rb

@@ -1,30 +1,37 @@
 require 'assert'
+require 'dassets/source_proxy'
+
 require 'digest/md5'
+require 'dassets/cache'
 require 'dassets/source_file'
 require 'dassets/source_proxy'
 
 class Dassets::SourceProxy
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "Dassets::SourceProxy"
     setup do
       @source_proxy = Dassets::SourceProxy.new('file1.txt')
     end
     subject{ @source_proxy }
 
-    should have_readers :digest_path, :source_files
+    should have_readers :digest_path, :source_files, :cache
     should have_imeths :content, :fingerprint, :key, :mtime, :exists?
 
     should "know its digest path" do
       assert_equal 'file1.txt', subject.digest_path
     end
 
-    should "know its source file" do
+    should "know its source files" do
       exp_source_file = Dassets::SourceFile.find_by_digest_path('file1.txt')
       assert_equal 1, subject.source_files.size
       assert_equal exp_source_file, subject.source_files.first
     end
 
+    should "use a `NoCache` cache handler by default" do
+      assert_kind_of Dassets::Cache::NoCache, subject.cache
+    end
+
     should "exist if its source file exists" do
       assert_equal subject.source_files.first.exists?, subject.exists?
     end
@@ -49,7 +56,7 @@ class Dassets::SourceProxy
 
   end
 
-  class CombinationTests < BaseTests
+  class CombinationTests < UnitTests
     desc "when the digest path is a combination to multiple source files"
     setup do
       Dassets.config.combination 'file3.txt', ['file1.txt', 'file2.txt']
@@ -89,4 +96,42 @@ class Dassets::SourceProxy
 
   end
 
+  class NoCacheTests < UnitTests
+    desc "with a `NoCache` cache handler"
+    setup do
+      @cache = Dassets::Cache::NoCache.new
+      @source_proxy = Dassets::SourceProxy.new('file1.txt', @cache)
+    end
+
+    should "not cache its source content/fingerprint" do
+      content1 = subject.content
+      content2 = subject.content
+      assert_not_same content2, content1
+
+      finger1 = subject.fingerprint
+      finger2 = subject.fingerprint
+      assert_not_same finger2, finger1
+    end
+
+  end
+
+  class MemCacheTests < UnitTests
+    desc "with a `MemCache` cache handler"
+    setup do
+      @cache = Dassets::Cache::MemCache.new
+      @source_proxy = Dassets::SourceProxy.new('file1.txt', @cache)
+    end
+
+    should "cache its source content/fingerprint in memory" do
+      content1 = subject.content
+      content2 = subject.content
+      assert_same content2, content1
+
+      finger1 = subject.fingerprint
+      finger2 = subject.fingerprint
+      assert_same finger2, finger1
+    end
+
+  end
+
 end

data/test/unit/source_tests.rb

@@ -1,6 +1,8 @@
 require 'assert'
 require 'dassets/source'
 
+require 'dassets/engine'
+
 class Dassets::Source
 
   class BaseTests < Assert::Context

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-07 00:00:00 Z
+date: 2013-12-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -26,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
         - 2
-        - 0
-        version: "2.0"
+        - 4
+        version: "2.4"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,8 @@ files:
 - dassets.gemspec
 - lib/dassets.rb
 - lib/dassets/asset_file.rb
-- lib/dassets/default_cache.rb
+- lib/dassets/cache.rb
+- lib/dassets/config.rb
 - lib/dassets/engine.rb
 - lib/dassets/file_store.rb
 - lib/dassets/server.rb
@@ -130,7 +131,6 @@ files:
 - test/support/app/assets/grumpy_cat.jpg
 - test/support/app/assets/nested/a-thing.txt.useless.dumb
 - test/support/app/assets/nested/file3.txt
-- test/support/config/assets.rb
 - test/support/empty/.gitkeep
 - test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt
 - test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
@@ -143,9 +143,9 @@ files:
 - test/support/source_files/test1.txt
 - test/system/rack_tests.rb
 - test/unit/asset_file_tests.rb
+- test/unit/cache_tests.rb
 - test/unit/config_tests.rb
 - test/unit/dassets_tests.rb
-- test/unit/default_cache_tests.rb
 - test/unit/engine_tests.rb
 - test/unit/file_store_tests.rb
 - test/unit/server/request_tests.rb
@@ -196,7 +196,6 @@ test_files:
 - test/support/app/assets/grumpy_cat.jpg
 - test/support/app/assets/nested/a-thing.txt.useless.dumb
 - test/support/app/assets/nested/file3.txt
-- test/support/config/assets.rb
 - test/support/empty/.gitkeep
 - test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt
 - test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
@@ -209,9 +208,9 @@ test_files:
 - test/support/source_files/test1.txt
 - test/system/rack_tests.rb
 - test/unit/asset_file_tests.rb
+- test/unit/cache_tests.rb
 - test/unit/config_tests.rb
 - test/unit/dassets_tests.rb
-- test/unit/default_cache_tests.rb
 - test/unit/engine_tests.rb
 - test/unit/file_store_tests.rb
 - test/unit/server/request_tests.rb

data/lib/dassets/default_cache.rb

@@ -1,29 +0,0 @@
-require 'thread'
-
-# this is a thread-safe in-memory cache for use with the `SourceCache` that
-# only caches source fingerprint keys.  there are a few reasons for using this
-# as the "default":
-# * source fingerprints are accessed more frequently than contents (ie hrefs,
-#   urls, etc) so caching them can have nice affects on performance.  Plus it
-#   seems silly to have to compile the source file everytime you want to get its
-#   href so you can link it in.
-# * fingerprints have a much smaller data size so won't overly bloat memory.
-
-class Dassets::DefaultCache
-
-  def initialize
-    @hash = {}
-    @write_mutex = ::Mutex.new
-  end
-
-  def keys;    @hash.keys; end
-  def [](key); @hash[key]; end
-
-  def []=(key, value)
-    @write_mutex.synchronize do
-      @hash[key] = value if key =~ /-- fingerprint$/ # only write fingerprint keys
-    end
-  end
-
-end
-

data/test/support/config/assets.rb

@@ -1,20 +0,0 @@
-require 'dassets'
-
-@dumb_engine = Class.new(Dassets::Engine) do
-  def ext(in_ext); ''; end
-  def compile(input); "#{input}\nDUMB"; end
-end
-@useless_engine = Class.new(Dassets::Engine) do
-  def ext(in_ext); 'no-use'; end
-  def compile(input); "#{input}\nUSELESS"; end
-end
-
-Dassets.configure do |c|
-  c.source TEST_SUPPORT_PATH.join("app/assets") do |s|
-    s.engine 'dumb', @dumb_engine
-    s.engine 'useless', @useless_engine
-  end
-
-  c.cache = nil # use no cache
-
-end

data/test/unit/default_cache_tests.rb

@@ -1,27 +0,0 @@
-require 'assert'
-require 'dassets/default_cache'
-
-class Dassets::DefaultCache
-
-  class BaseTests < Assert::Context
-    desc "Dassets::DefaultCache"
-    setup do
-      @cache = Dassets::DefaultCache.new
-    end
-    subject{ @cache }
-
-    should have_imeths :keys, :[], :[]=
-
-    should "only cache fingerprint keys" do
-      subject['some val'] = 'something'
-      assert_empty subject.keys
-      assert_nil subject['some val']
-
-      subject['a -- fingerprint'] = 'finger'
-      assert_includes 'a -- fingerprint', subject.keys
-      assert_equal 'finger', subject['a -- fingerprint']
-    end
-
-  end
-
-end