dassets 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: 434e3a03c8c5bd4b34ae7bb48feb16cd98a6e2e0
-  metadata.gz: d6cc4fb4b577a182a90b73e1bfa682d231f11d9f
 SHA512: 
-  data.tar.gz: ddd7939d9f0273ba6c74a86db795afee1910c0a4d6ae289bdaf7cc77500a65566b963fc0a12b217aa1a1c2756db7e668d2423782f13f7cc4d5598cdb507fed4f
-  metadata.gz: 8862732285c774b66b688524136f96964d92ad667aeabc263c08e7e142c2c1c8f8c20e02e31f5f0bd2ba01dce7067d394c728f1ce9acdcad22ad2a0b9c401bb1
+  metadata.gz: 6c67ff2dc34e83e2aad70042aa2c8cb97ab7fe0fc62999965795f993843c4ba7d600bf398edb2ff7dc5723047903b2053f42ed88c932588ea0a6da884225069d
+  data.tar.gz: 1eb545fcb9b88bfef7d310132b9488e5237fa6cd64ed16c51d3e57a55d2749ed98de18623eadbc6ad18de68a14c27584c5cb742ff46befce8c8df72c332ab0e1
+SHA1: 
+  metadata.gz: 283666dcd8471f7e2e66482e6777457894373451
+  data.tar.gz: 9c213ba859d5bd3b3bd0ba24f57c1f4d746284b0

data/lib/dassets.rb

@@ -20,8 +20,12 @@ module Dassets
     self.config.reset
   end
 
+  def self.asset_file(digest_path)
+    @asset_files[digest_path] ||= AssetFile.new(digest_path)
+  end
+
   def self.[](digest_path)
-    @asset_files[digest_path] ||= AssetFile.new(digest_path).tap do |af|
+    self.asset_file(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 " \
@@ -36,7 +40,7 @@ module Dassets
           values = Dassets.combinations[key].sort
           msg << (
             ["#{bullet}#{values.first}"] +
-            values[1..-1].map{ |v| "#{' '*bullet.size}#{v}" }
+            (values[1..-1] || []).map{ |v| "#{' '*bullet.size}#{v}" }
           ).join("\n")
           msg << "\n\n"
         end

data/lib/dassets/server/request.rb

@@ -33,7 +33,7 @@ class Dassets::Server
     end
 
     def asset_file
-      @asset_file ||= Dassets[asset_path]
+      @asset_file ||= Dassets.asset_file(asset_path)
     end
 
     private

data/lib/dassets/version.rb

@@ -1,3 +1,3 @@
 module Dassets
-  VERSION = "0.14.4"
+  VERSION = "0.14.5"
 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, :combinations
+    should have_imeths :asset_file, :[], :source_files, :combinations
 
     should "return a `Config` instance with the `config` method" do
       assert_kind_of Config, subject.config
@@ -30,15 +30,26 @@ module Dassets
       assert_true config_reset_called
     end
 
-    should "return asset files given a their digest path using the index operator" do
+    should "return asset files given their digest path " do
+      file = subject.asset_file('nested/file3.txt')
+
+      assert_kind_of subject::AssetFile, file
+      assert_equal 'nested/file3.txt',                 file.digest_path
+      assert_equal 'd41d8cd98f00b204e9800998ecf8427e', file.fingerprint
+
       file = subject['nested/file3.txt']
 
       assert_kind_of subject::AssetFile, file
-      assert_equal 'nested/file3.txt', file.digest_path
+      assert_equal 'nested/file3.txt',                 file.digest_path
       assert_equal 'd41d8cd98f00b204e9800998ecf8427e', file.fingerprint
     end
 
     should "cache asset files" do
+      file1 = subject.asset_file('nested/file3.txt')
+      file2 = subject.asset_file('nested/file3.txt')
+
+      assert_same file2, file1
+
       file1 = subject['nested/file3.txt']
       file2 = subject['nested/file3.txt']
 
@@ -46,6 +57,9 @@ module Dassets
     end
 
     should "complain if digest path is not found using the index operator" do
+      assert_nothing_raised do
+        subject.asset_file('path/not/found.txt')
+      end
       assert_raises AssetFileError do
         subject['path/not/found.txt']
       end

data/test/unit/server/request_tests.rb

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

data/test/unit/server/response_tests.rb

@@ -2,7 +2,6 @@ require 'assert'
 require 'dassets/server/response'
 
 require 'rack/utils'
-require 'dassets'
 require 'dassets/asset_file'
 
 class Dassets::Server::Response
@@ -60,9 +59,13 @@ class Dassets::Server::Response
     end
 
     should "handle not found files" do
-      assert_raises(Dassets::AssetFileError) do
-        Dassets['not-found-file.txt']
-      end
+      af   = Dassets.asset_file('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
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors: 
 - Kelly Redding