dassets 0.12.0 → 0.13.0

data/Gemfile

@@ -2,5 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake'
-gem 'pry', "~> 0.9.0"
+gem 'rake', "~> 10.4.0"
+gem 'pry',  "~> 0.9.0"

data/README.md

@@ -19,7 +19,8 @@ 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)
+  # use this to "cache" digested assets to the public dir so that
+  # your web server can serve them directly
   c.file_store '/path/to/public' # default: `FileStore::NullStore.new`
 
 end

data/lib/dassets/asset_file.rb

@@ -12,21 +12,21 @@ class Dassets::AssetFile
     @dirname  = File.dirname(@digest_path)
     @extname  = File.extname(@digest_path)
     @basename = File.basename(@digest_path, @extname)
-    @source_proxy = Dassets::SourceProxy.new(@digest_path, Dassets.config.cache)
+    @source_proxy = Dassets::SourceProxy.new(@digest_path, {
+      :content_cache     => Dassets.config.content_cache,
+      :fingerprint_cache => Dassets.config.fingerprint_cache
+    })
   end
 
   def digest!
     return if !self.exists?
-    Dassets.config.file_store.save(self.path){ self.content }
-  end
-
-  def path
-    path_basename = "#{@basename}-#{self.fingerprint}#{@extname}"
-    File.join(@dirname, path_basename).sub(/^\.\//, '').sub(/^\//, '')
+    Dassets.config.file_store.save(self.url){ self.content }
   end
 
   def url
-    "#{dassets_base_url}/#{self.path}"
+    path_basename = "#{@basename}-#{self.fingerprint}#{@extname}"
+    path = File.join(@dirname, path_basename).sub(/^\.\//, '').sub(/^\//, '')
+    "#{dassets_base_url}/#{path}"
   end
 
   alias_method :href, :url

data/lib/dassets/cache.rb

@@ -4,7 +4,7 @@ module Dassets::Cache
   class MemCache
     require 'thread'
 
-    # this is a thread-safe in-memory cache for use with the `SourceCache`
+    # this is a thread-safe in-memory cache
 
     def initialize
       @hash = {}

data/lib/dassets/config.rb

@@ -10,14 +10,15 @@ module Dassets
     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
+      @sources           = []
+      @combinations      = Hash.new{ |h, k| [k] } # digest pass-thru if none defined
+      @content_cache     = Dassets::Cache::NoCache.new
+      @fingerprint_cache = Dassets::Cache::NoCache.new
     end
 
     def base_url(value = nil)
@@ -29,6 +30,16 @@ module Dassets
       @base_url = value
     end
 
+    def content_cache(cache = nil)
+      @content_cache = cache if !cache.nil?
+      @content_cache
+    end
+
+    def fingerprint_cache(cache = nil)
+      @fingerprint_cache = cache if !cache.nil?
+      @fingerprint_cache
+    end
+
     def source(path, &block)
       @sources << Source.new(path).tap{ |s| block.call(s) if block }
     end

data/lib/dassets/server/request.rb

@@ -1,4 +1,4 @@
-require 'rack/request'
+require 'rack'
 
 module Dassets; end
 class Dassets::Server

data/lib/dassets/source_file.rb

@@ -7,13 +7,13 @@ module Dassets
 
   class SourceFile
 
-    def self.find_by_digest_path(path, cache = nil)
+    def self.find_by_digest_path(path, options = nil)
       # look in the configured source list
       source_files = Dassets.source_list.map{ |p| self.new(p) }
 
       # 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, cache)
+      source_files.select{ |s| s.digest_path == path }.last || NullSourceFile.new(path, options)
     end
 
     attr_reader :file_path
@@ -86,11 +86,11 @@ module Dassets
 
   class NullSourceFile < SourceFile
 
-    def initialize(digest_path, cache = nil)
+    def initialize(digest_path, options = nil)
       @file_path, @ext_list = '', []
       @digest_path = digest_path
       @source_proxy = if Dassets.config.combination?(@digest_path)
-        SourceProxy.new(@digest_path, cache)
+        SourceProxy.new(@digest_path, options)
       else
         NullSourceProxy.new
       end

data/lib/dassets/source_proxy.rb

@@ -5,12 +5,18 @@ require 'dassets/source_file'
 module Dassets; end
 class Dassets::SourceProxy
 
-  attr_reader :digest_path, :cache, :source_files
+  attr_reader :digest_path, :content_cache, :fingerprint_cache
+  attr_reader :source_files
 
-  def initialize(digest_path, cache = nil)
-    @digest_path  = digest_path
-    @cache        = cache || Dassets::Cache::NoCache.new
-    @source_files = get_source_files(@digest_path, @cache)
+  def initialize(digest_path, options = nil)
+    options ||= {}
+    @digest_path       = digest_path
+    @content_cache     = options[:content_cache]     || Dassets::Cache::NoCache.new
+    @fingerprint_cache = options[:fingerprint_cache] || Dassets::Cache::NoCache.new
+    @source_files      = get_source_files(@digest_path, {
+      :content_cache     => @content_cache,
+      :fingerprint_cache => @fingerprint_cache
+    })
   end
 
   def key
@@ -18,11 +24,11 @@ class Dassets::SourceProxy
   end
 
   def content
-    @cache["#{self.key} -- content"] ||= source_content
+    @content_cache[self.key] ||= source_content
   end
 
   def fingerprint
-    @cache["#{self.key} -- fingerprint"] ||= source_fingerprint
+    @fingerprint_cache[self.key] ||= source_fingerprint
   end
 
   def mtime
@@ -43,9 +49,9 @@ class Dassets::SourceProxy
     Digest::MD5.new.hexdigest(source_content)
   end
 
-  def get_source_files(digest_path, cache)
+  def get_source_files(digest_path, options)
     Dassets.config.combinations[digest_path.to_s].map do |source_digest_path|
-      Dassets::SourceFile.find_by_digest_path(source_digest_path, cache)
+      Dassets::SourceFile.find_by_digest_path(source_digest_path, options)
     end
   end
 

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

data/test/support/factory.rb

@@ -3,4 +3,8 @@ require 'assert/factory'
 module Factory
   extend Assert::Factory
 
+  def self.base_url
+    Factory.boolean ? Factory.url : nil
+  end
+
 end

data/test/system/rack_tests.rb

@@ -81,19 +81,21 @@ module Dassets
 
   class DigestTests < SuccessTests
     setup do
+      base_url = Factory.base_url
+      Assert.stub(Dassets.config, :base_url){ base_url }
       Dassets.config.file_store = TEST_SUPPORT_PATH.join('public').to_s
-      @url = 'file1-daa05c683a4913b268653f7a7e36a5b4.txt'
+      @url = Dassets['file1.txt'].url
       @url_file = Dassets.config.file_store.store_path(@url)
-      FileUtils.rm(@url_file)
     end
     teardown do
+      FileUtils.rm(@url_file)
       Dassets.config.file_store = FileStore::NullStore.new
     end
 
     should "digest the asset" do
       assert_not_file_exists @url_file
 
-      resp = get "/#{@url}"
+      resp = get @url
       assert_equal 200, resp.status
       assert_file_exists @url_file
     end

data/test/unit/asset_file_tests.rb

@@ -15,7 +15,7 @@ class Dassets::AssetFile
     subject{ @asset_file }
 
     should have_readers :digest_path, :dirname, :extname, :basename, :source_proxy
-    should have_imeths  :digest!, :path, :url, :href, :fingerprint, :content
+    should have_imeths  :digest!, :url, :href, :fingerprint, :content
     should have_imeths  :mtime, :size, :mime_type, :exists?, :==
 
     should "know its digest path, dirname, extname, and basename" do
@@ -39,9 +39,12 @@ class Dassets::AssetFile
     end
 
     should "know its source proxy" do
-      assert_not_nil subject.source_proxy
-      assert_kind_of Dassets::SourceProxy, subject.source_proxy
-      assert_equal subject.digest_path, subject.source_proxy.digest_path
+      source_proxy = subject.source_proxy
+      assert_not_nil source_proxy
+      assert_kind_of Dassets::SourceProxy, source_proxy
+      assert_equal subject.digest_path, source_proxy.digest_path
+      assert_equal Dassets.config.content_cache, source_proxy.content_cache
+      assert_equal Dassets.config.fingerprint_cache, source_proxy.fingerprint_cache
     end
 
     should "have a fingerprint" do
@@ -68,14 +71,7 @@ class Dassets::AssetFile
       assert_equal exp_content, without_output.content
     end
 
-    should "build it's path from the file and the fingerprint" do
-      assert_match /^file1-[a-f0-9]{32}\.txt$/, subject.path
-
-      nested = Dassets::AssetFile.new('nested/file1.txt')
-      assert_equal "nested/file1-.txt", nested.path
-    end
-
-    should "build it's url/href from the path and any configured base url" do
+    should "build it's url/href from the file, fingerpint and any configured base url" do
       assert_match /^\/file1-[a-f0-9]{32}\.txt$/, subject.url
       assert_match subject.url, subject.href
 
@@ -84,7 +80,7 @@ class Dassets::AssetFile
       assert_equal nested.url, nested.href
 
       base_url = Factory.url
-      Dassets.config.base_url base_url
+      Assert.stub(Dassets.config, :base_url){ base_url }
 
       assert_match /^#{base_url}\/file1-[a-f0-9]{32}\.txt$/, subject.url
       assert_match subject.url, subject.href
@@ -94,10 +90,6 @@ class Dassets::AssetFile
     end
 
     should "not memoize its attributes" do
-      path1 = subject.path
-      path2 = subject.path
-      assert_not_same path2, path1
-
       url1 = subject.url
       url2 = subject.url
       assert_not_same url2, url1
@@ -120,11 +112,15 @@ class Dassets::AssetFile
   class DigestTests < UnitTests
     desc "being digested with an output path configured"
     setup do
+      base_url = Factory.base_url
+      Assert.stub(Dassets.config, :base_url){ base_url }
       Dassets.config.file_store = TEST_SUPPORT_PATH.join('public').to_s
+
       @save_path = @asset_file.digest!
-      @outfile = Dassets.config.file_store.store_path(@asset_file.path)
+      @outfile = Dassets.config.file_store.store_path(@asset_file.url)
     end
     teardown do
+      FileUtils.rm(@outfile)
       Dassets.config.file_store = Dassets::FileStore::NullStore.new
     end
 

data/test/unit/config_tests.rb

@@ -16,9 +16,10 @@ class Dassets::Config
     end
     subject{ @config }
 
-    should have_options :file_store, :cache
+    should have_options :file_store
     should have_readers :combinations
     should have_imeths :base_url, :set_base_url
+    should have_imeths :content_cache, :fingerprint_cache
     should have_imeths :source, :combination, :combination?
 
     should "have no base url by default" do
@@ -47,8 +48,30 @@ class Dassets::Config
       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
+    should "default its content cache" do
+      assert_instance_of Dassets::Cache::NoCache, subject.content_cache
+    end
+
+    should "allow configuring non-nil content caches" do
+      cache = Dassets::Cache::MemCache.new
+      subject.content_cache(cache)
+      assert_equal cache, subject.content_cache
+
+      subject.content_cache(nil)
+      assert_equal cache, subject.content_cache
+    end
+
+    should "default its fingerprint cache" do
+      assert_instance_of Dassets::Cache::NoCache, subject.fingerprint_cache
+    end
+
+    should "allow configuring non-nil fingerprint caches" do
+      cache = Dassets::Cache::MemCache.new
+      subject.fingerprint_cache(cache)
+      assert_equal cache, subject.fingerprint_cache
+
+      subject.fingerprint_cache(nil)
+      assert_equal cache, subject.fingerprint_cache
     end
 
     should "register new sources with the `source` method" do

data/test/unit/source_file_tests.rb

@@ -2,6 +2,7 @@ require 'assert'
 require 'dassets/source_file'
 
 require 'dassets/asset_file'
+require 'dassets/cache'
 require 'dassets/source_proxy'
 
 class Dassets::SourceFile
@@ -61,6 +62,12 @@ class Dassets::SourceFile
   end
 
   class NullSourceTests < UnitTests
+    setup do
+      Dassets.config.combination 'file3.txt', ['file1.txt', 'file2.txt']
+    end
+    teardown do
+      Dassets.config.combinations.delete('file3.txt')
+    end
 
     should "find a null src file if finding by an unknown digest path" do
       null_src = Dassets::NullSourceFile.new('not/found/digest/path')
@@ -75,16 +82,49 @@ class Dassets::SourceFile
       assert_nil null_src.mtime
     end
 
+    should "pass options to a null src when finding by an unknown digest path" do
+      null_src = Dassets::NullSourceFile.new('not/found/digest/path')
+      null_src_new_called_with = []
+      Assert.stub(Dassets::NullSourceFile, :new) do |*args|
+        null_src_new_called_with = args
+        null_src
+      end
+
+      options = {
+        :content_cache     => Dassets::Cache::NoCache.new,
+        :fingerprint_cache => Dassets::Cache::NoCache.new
+      }
+      Dassets::SourceFile.find_by_digest_path('not/found/digest/path', options)
+
+      exp = ['not/found/digest/path', options]
+      assert_equal exp, null_src_new_called_with
+    end
+
     should "'proxy' the digest path if the path is a combination" do
-      Dassets.config.combination 'file3.txt', ['file1.txt', 'file2.txt']
       src_proxy      = Dassets::SourceProxy.new('file3.txt')
       null_combo_src = Dassets::NullSourceFile.new('file3.txt')
 
       assert_equal src_proxy.exists?, null_combo_src.exists?
       assert_equal src_proxy.content, null_combo_src.compiled
       assert_equal src_proxy.mtime,   null_combo_src.mtime
+    end
 
-      Dassets.config.combinations.delete('file3.txt')
+    should "pass options to its source proxy when the path is a combination" do
+      src_proxy = Dassets::SourceProxy.new('file3.txt')
+      src_proxy_new_called_with = []
+      Assert.stub(Dassets::SourceProxy, :new) do |*args|
+        src_proxy_new_called_with = args
+        src_proxy
+      end
+
+      options = {
+        :content_cache     => Dassets::Cache::NoCache.new,
+        :fingerprint_cache => Dassets::Cache::NoCache.new
+      }
+      Dassets::NullSourceFile.new('file3.txt', options)
+
+      exp = ['file3.txt', options]
+      assert_equal exp, src_proxy_new_called_with
     end
 
   end

data/test/unit/source_proxy_tests.rb

@@ -15,7 +15,8 @@ class Dassets::SourceProxy
     end
     subject{ @source_proxy }
 
-    should have_readers :digest_path, :cache, :source_files
+    should have_readers :digest_path, :content_cache, :fingerprint_cache
+    should have_readers :source_files
     should have_imeths :key, :content, :fingerprint, :mtime, :exists?
 
   end
@@ -30,8 +31,9 @@ class Dassets::SourceProxy
       assert_equal 'file1.txt', subject.digest_path
     end
 
-    should "use a `NoCache` cache handler by default" do
-      assert_kind_of Dassets::Cache::NoCache, subject.cache
+    should "use no cache by default" do
+      assert_kind_of Dassets::Cache::NoCache, subject.content_cache
+      assert_kind_of Dassets::Cache::NoCache, subject.fingerprint_cache
     end
 
     should "have a single source file" do
@@ -155,7 +157,10 @@ class Dassets::SourceProxy
     desc "with a `NoCache` cache handler"
     setup do
       @cache = Dassets::Cache::NoCache.new
-      @source_proxy = Dassets::SourceProxy.new('file1.txt', @cache)
+      @source_proxy = Dassets::SourceProxy.new('file1.txt', {
+        :content_cache     => @cache,
+        :fingerprint_cache => @cache
+      })
     end
 
     should "not cache its source content/fingerprint" do
@@ -173,8 +178,12 @@ class Dassets::SourceProxy
   class MemCacheTests < UnitTests
     desc "with a `MemCache` cache handler"
     setup do
-      @cache = Dassets::Cache::MemCache.new
-      @source_proxy = Dassets::SourceProxy.new('file1.txt', @cache)
+      @content_cache     = Dassets::Cache::MemCache.new
+      @fingerprint_cache = Dassets::Cache::MemCache.new
+      @source_proxy = Dassets::SourceProxy.new('file1.txt', {
+        :content_cache     => @content_cache,
+        :fingerprint_cache => @fingerprint_cache
+      })
     end
 
     should "cache its source content/fingerprint in memory" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 43
   prerelease: 
   segments: 
   - 0
-  - 12
+  - 13
   - 0
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-11-24 00:00:00 Z
+date: 2015-12-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -106,7 +106,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - dassets.gemspec
@@ -133,7 +133,6 @@ files:
 - test/support/app/assets/nested/file3.txt
 - test/support/empty/.gitkeep
 - test/support/factory.rb
-- test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt
 - test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
 - test/support/public/grumpy_cat-b0d1f399a916f7a25c4c0f693c619013.jpg
 - test/support/public/nested/a-thing.txt-7413d18f2eba9c695a880aff67fde135.no-use
@@ -185,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Digested asset files
@@ -199,7 +198,6 @@ test_files:
 - test/support/app/assets/nested/file3.txt
 - test/support/empty/.gitkeep
 - test/support/factory.rb
-- test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt
 - test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
 - test/support/public/grumpy_cat-b0d1f399a916f7a25c4c0f693c619013.jpg
 - test/support/public/nested/a-thing.txt-7413d18f2eba9c695a880aff67fde135.no-use

data/test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt

@@ -1 +0,0 @@
-file1.txt