dassets 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 8dbe44e69f1cd555b3d4530bf6776c93ee6adc45
-  metadata.gz: 25630a550508870191515317a401c64a3afa28ac
+  data.tar.gz: 434e3a03c8c5bd4b34ae7bb48feb16cd98a6e2e0
+  metadata.gz: d6cc4fb4b577a182a90b73e1bfa682d231f11d9f
 SHA512: 
-  data.tar.gz: 42a5cb8ee86ff57a117107491c25d7fbc3d813978bb17d0ac67b15e61aa3ced203e6e9fe03b1b7d7d4c0c708f14011021b65401e27bdddf7156be32e7e6b2c48
-  metadata.gz: f11ead1c8a44cf0988602f2fb9ae08ca7c5cc2d7f587c679f504f68bf6f46f838395ce906b491b156565c5ac5c65067aaaa068f870a4228b53b150e741911857
+  data.tar.gz: ddd7939d9f0273ba6c74a86db795afee1910c0a4d6ae289bdaf7cc77500a65566b963fc0a12b217aa1a1c2756db7e668d2423782f13f7cc4d5598cdb507fed4f
+  metadata.gz: 8862732285c774b66b688524136f96964d92ad667aeabc263c08e7e142c2c1c8f8c20e02e31f5f0bd2ba01dce7067d394c728f1ce9acdcad22ad2a0b9c401bb1

data/lib/dassets.rb

@@ -21,13 +21,43 @@ module Dassets
   end
 
   def self.[](digest_path)
-    @asset_files[digest_path] ||= AssetFile.new(digest_path)
+    @asset_files[digest_path] ||= AssetFile.new(digest_path).tap do |af|
+      if af.fingerprint.nil?
+        msg = "error digesting `#{digest_path}`.\n\nMake sure Dassets has " \
+              "either a combination or source file for this digest path. If " \
+              "this path is for a combination, make sure Dassets has either " \
+              "a combination or source file for each digest path of the " \
+              "combination.\n\n"
+
+        msg << "\nCombination digest paths:"
+        msg << (Dassets.combinations.keys.empty? ? " (none)\n\n" : "\n\n")
+        Dassets.combinations.keys.sort.each do |key|
+          bullet = "#{key} => "
+          values = Dassets.combinations[key].sort
+          msg << (
+            ["#{bullet}#{values.first}"] +
+            values[1..-1].map{ |v| "#{' '*bullet.size}#{v}" }
+          ).join("\n")
+          msg << "\n\n"
+        end
+
+        msg << "\nSource file digest paths:"
+        msg << (Dassets.source_files.keys.empty? ? " (none)\n\n" : "\n\n")
+        msg << Dassets.source_files.keys.sort.join("\n")
+
+        raise AssetFileError, msg
+      end
+    end
   end
 
   def self.source_files
     @source_files
   end
 
+  def self.combinations
+    self.config.combinations
+  end
+
   module SourceFiles
 
     def self.new(sources)
@@ -45,6 +75,8 @@ module Dassets
 
   end
 
+  AssetFileError = Class.new(RuntimeError)
+
 end
 
 Dassets.init

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.14.3"
+  VERSION = "0.14.4"
 end

data/test/unit/dassets_tests.rb

@@ -11,7 +11,7 @@ module Dassets
     subject{ Dassets }
 
     should have_imeths :config, :configure, :init, :reset
-    should have_imeths :[], :source_files
+    should have_imeths :[], :source_files, :combinations
 
     should "return a `Config` instance with the `config` method" do
       assert_kind_of Config, subject.config
@@ -45,9 +45,10 @@ module Dassets
       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?
+    should "complain if digest path is not found using the index operator" do
+      assert_raises AssetFileError do
+        subject['path/not/found.txt']
+      end
     end
 
     should "know its list of configured source files" do
@@ -55,6 +56,11 @@ module Dassets
       assert_equal exp, subject.source_files
     end
 
+    should "know its configured combinations" do
+      exp = subject.config.combinations
+      assert_equal exp, subject.combinations
+    end
+
   end
 
 end

data/test/unit/server/request_tests.rb

@@ -1,6 +1,7 @@
 require 'assert'
 require 'dassets/server/request'
 
+require 'dassets'
 require 'dassets/asset_file'
 
 class Dassets::Server::Request
@@ -45,28 +46,28 @@ class Dassets::Server::Request
       req = file_request('GET', '/file1-d41d8cd98f00b204e9800998ecf8427e.txt')
       assert req.for_asset_file?
 
-      # no find on invalid fingerprint
-      req = file_request('GET', '/file1-daa05c683a4913b268653f7a7e36a.txt')
+      # not find an invalid fingerprint
+      req = file_request('GET', '/file1-abc123.txt')
       assert_not req.for_asset_file?
 
-      # no find on missing fingerprint
+      # not find a missing fingerprint
       req = file_request('HEAD', '/file1.txt')
       assert_not req.for_asset_file?
 
-      # no find on unknown file
+      # not find an unknown file with a missing fingerprint
       req = file_request('GET', '/some-file.txt')
       assert_not req.for_asset_file?
 
-      # no find on unknown file with an fingerprint
+      # complain with an unknown file with a valid fingerprint
       req = file_request('GET', '/some-file-daa05c683a4913b268653f7a7e36a5b4.txt')
-      assert_not req.for_asset_file?
+      assert_raises(Dassets::AssetFileError){ req.for_asset_file? }
     end
 
-    should "return an asset path and an empty asset file if request not for asset file" do
+    should "return an asset path and complain if request not for asset file" do
       req = file_request('GET', '/some-file.txt')
 
       assert_equal '', req.asset_path
-      assert_equal Dassets::AssetFile.new(''), req.asset_file
+      assert_raises(Dassets::AssetFileError){ req.asset_file }
     end
 
     protected

data/test/unit/server/response_tests.rb

@@ -2,6 +2,7 @@ require 'assert'
 require 'dassets/server/response'
 
 require 'rack/utils'
+require 'dassets'
 require 'dassets/asset_file'
 
 class Dassets::Server::Response
@@ -59,13 +60,9 @@ class Dassets::Server::Response
     end
 
     should "handle not found files" do
-      af   = Dassets['not-found-file.txt']
-      resp = Dassets::Server::Response.new(@env, af)
-
-      assert_equal 404,                         resp.status
-      assert_equal ['Not Found'],               resp.body
-      assert_equal Rack::Utils::HeaderHash.new, resp.headers
-      assert_equal [404, {}, ['Not Found']],    resp.to_rack
+      assert_raises(Dassets::AssetFileError) do
+        Dassets['not-found-file.txt']
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  version: 0.14.3
+  version: 0.14.4
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-07-26 00:00:00 Z
+date: 2017-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert