dassets 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb00e1656956e770b1e509f47389da503b40842
-  data.tar.gz: f32473d4d3bc21276cc9e09dd8a0ad3ab8677614
+  metadata.gz: 6276fedfd2895a526ed5a1593dae1a3a1d0ae726
+  data.tar.gz: 248ce8d0a5548d7454fb5675296df73e52c0ad3f
 SHA512:
-  metadata.gz: 8293311bd021e41fc50a334f38d3c8ac1a93b07147660faa0b23df81fe64299411c5b6f6e56f6ca22cacf7a4a77c5f275534c591dd11116d45961ffae5a5c75c
-  data.tar.gz: b3b9914524b148a2809b1596c3f5c229b3ccd5a027bccc220c0629f15aebcf98b22f2b754e5a4b20a14064b97eb2e1c17003d2ec2170dad728945e7e44e65389
+  metadata.gz: 9428c6ed5707756a0bd9e3e81197548394d1da94735d1ccd66d4cf837a024de745bd94db73e0452fd4fdc41053aca798177bc0692cb8cc569da4e9786ed0fc95
+  data.tar.gz: dfa8a1d4831ba49d293650a363ac71020bb6d62cf9d54e09d3c6c9791b2b5acdb9ec9c4f7b9d4c61b85fff82b39840a35c1e838ba58bcc052af31239cc9f4a0e

data/lib/dassets/source_proxy.rb

@@ -5,11 +5,11 @@ require 'dassets/source_file'
 module Dassets; end
 class Dassets::SourceProxy
 
-  attr_reader :digest_path, :source_files, :cache
+  attr_reader :digest_path, :cache, :source_files
 
   def initialize(digest_path, cache = nil)
     @digest_path  = digest_path
-    @cache = cache || Dassets::Cache::NoCache.new
+    @cache        = cache || Dassets::Cache::NoCache.new
     @source_files = get_source_files(@digest_path, @cache)
   end
 
@@ -26,7 +26,7 @@ class Dassets::SourceProxy
   end
 
   def mtime
-    @source_files.map{ |f| f.mtime }.max
+    @source_files.map{ |f| f.mtime }.compact.max
   end
 
   def exists?

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/test/unit/source_proxy_tests.rb

@@ -11,33 +11,33 @@ class Dassets::SourceProxy
   class UnitTests < Assert::Context
     desc "Dassets::SourceProxy"
     setup do
-      @source_proxy = Dassets::SourceProxy.new('file1.txt')
+      @source_proxy = Dassets::SourceProxy.new(Factory.string)
     end
     subject{ @source_proxy }
 
-    should have_readers :digest_path, :source_files, :cache
-    should have_imeths :content, :fingerprint, :key, :mtime, :exists?
+    should have_readers :digest_path, :cache, :source_files
+    should have_imeths :key, :content, :fingerprint, :mtime, :exists?
 
-    should "know its digest path" do
-      assert_equal 'file1.txt', subject.digest_path
+  end
+
+  class NotComboTests < UnitTests
+    desc "when the digest path is not a combination"
+    setup do
+      @source_proxy = Dassets::SourceProxy.new('file1.txt')
     end
 
-    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
+    should "know its digest path" do
+      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
     end
 
-    should "exist if its source file exists" do
-      assert_equal subject.source_files.first.exists?, subject.exists?
-    end
-
-    should "use its source file's mtime as its mtime" do
-      assert_equal subject.source_files.first.mtime, subject.mtime
+    should "have a single source file" do
+      assert_equal 1, subject.source_files.size
+      exp_source_file = Dassets::SourceFile.find_by_digest_path('file1.txt')
+      assert_equal exp_source_file, subject.source_files.first
     end
 
     should "use its digest path and mtime as its key" do
@@ -45,53 +45,108 @@ class Dassets::SourceProxy
       assert_equal exp_key, subject.key
     end
 
-    should "get its fingerprint by MD5 hashing the compiled source" do
+    should "get its content from the compiled source of the single source file" do
+      assert_equal subject.source_files.first.compiled, subject.content
+    end
+
+    should "get its fingerprint by MD5 hashing the content" do
       exp_fp = Digest::MD5.new.hexdigest(subject.content)
       assert_equal exp_fp, subject.fingerprint
     end
 
-    should "get its content from the compiled source" do
-      assert_equal subject.source_files.first.compiled, subject.content
+    should "use its single source file's max mtime as its mtime" do
+      assert_equal subject.source_files.first.mtime, subject.mtime
+    end
+
+    should "exist if its single source file exists" do
+      assert_equal subject.source_files.first.exists?, subject.exists?
     end
 
   end
 
-  class CombinationTests < UnitTests
-    desc "when the digest path is a combination to multiple source files"
+  class ComboSetupTests < UnitTests
     setup do
       Dassets.config.combination 'file3.txt', ['file1.txt', 'file2.txt']
-      @source_proxy = Dassets::SourceProxy.new('file3.txt')
+      Dassets.config.combination 'file4.txt', []
+      Dassets.config.combination 'file5.txt', ['file3.txt', 'file4.txt']
+    end
+    teardown do
+      Dassets.config.combinations.delete('file5.txt')
+      Dassets.config.combinations.delete('file4.txt')
+      Dassets.config.combinations.delete('file3.txt')
+    end
+
+  end
+
+  class ComboTests < ComboSetupTests
+    desc "when the digest path is a combination to multiple source files"
+    setup do
       @exp_source_files = [
         Dassets::SourceFile.find_by_digest_path('file1.txt'),
         Dassets::SourceFile.find_by_digest_path('file2.txt')
       ]
-    end
-    teardown do
-      Dassets.config.combinations.delete('file3.txt')
+      @source_proxy = Dassets::SourceProxy.new('file3.txt')
     end
 
     should "know its digest path" do
       assert_equal 'file3.txt', subject.digest_path
     end
 
-    should "know its source file" do
+    should "know its source files" do
       assert_equal 2, subject.source_files.size
       assert_equal @exp_source_files, subject.source_files
     end
 
-    should "exist if its source file exists" do
-      exp_exists = @exp_source_files.inject(true){ |res, f| res && f.exists? }
-      assert_equal exp_exists, subject.exists?
+    should "get its content from the compiled source of its source files" do
+      exp_content = subject.source_files.map{ |f| f.compiled }.join("\n")
+      assert_equal exp_content, subject.content
     end
 
-    should "use its source file's mtime as its mtime" do
-      exp_mtime = @exp_source_files.map{ |f| f.mtime }.max
+    should "use its source files' max mtime as its mtime" do
+      exp_mtime = subject.source_files.map{ |f| f.mtime }.max
       assert_equal exp_mtime, subject.mtime
     end
 
-    should "get its content from the compiled source" do
-      exp_content = @exp_source_files.map{ |f| f.compiled }.join("\n")
-      assert_equal exp_content, subject.content
+    should "exist if its all its source files exist" do
+      exp_exists = subject.source_files.inject(true){ |res, f| res && f.exists? }
+      assert_equal exp_exists, subject.exists?
+    end
+
+  end
+
+  class EmptyComboTests < ComboSetupTests
+    desc "when the digest path is an empty combination"
+    setup do
+      @source_proxy = Dassets::SourceProxy.new('file4.txt')
+    end
+
+    should "not have any source files" do
+      assert_equal 0, subject.source_files.size
+    end
+
+    should "have empty content" do
+      assert_equal '', subject.content
+    end
+
+    should "have no mtime" do
+      assert_nil subject.mtime
+    end
+
+    should "exist" do
+      assert_true subject.exists?
+    end
+
+  end
+
+  class ComboWithEmptyComboTests < ComboSetupTests
+    desc "when the digest path is a combination that includes an empty combination"
+    setup do
+      @source_proxy = Dassets::SourceProxy.new('file5.txt')
+    end
+
+    should "ignore the mtime of the empty combination" do
+      exp_mtime = subject.source_files.map{ |f| f.mtime }.compact.max
+      assert_equal exp_mtime, subject.mtime
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dassets
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: assert