dassets 0.3.0 → 0.4.0

data/test/unit/default_cache_tests.rb

@@ -0,0 +1,27 @@
+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

data/test/unit/{cmds/digest_cmd_tests.rb → digest_cmd_tests.rb}

@@ -1,13 +1,13 @@
 require 'assert'
 require 'dassets'
-require 'dassets/cmds/digest_cmd'
+require 'dassets/digest_cmd'
 
-class Dassets::Cmds::DigestCmd
+class Dassets::DigestCmd
 
   class BaseTests < Assert::Context
-    desc "Dassets::Cmds::DigestCmd"
+    desc "Dassets::DigestCmd"
     setup do
-      @cmd = Dassets::Cmds::DigestCmd.new(['a/path'])
+      @cmd = Dassets::DigestCmd.new(['a/path'])
     end
     subject{ @cmd }
 

data/test/unit/file_store_tests.rb

@@ -0,0 +1,30 @@
+require 'assert'
+require 'dassets/root_path'
+require 'dassets/file_store'
+
+class Dassets::FileStore
+
+  class BaseTests < Assert::Context
+    desc "Dassets::NullFileStore"
+    subject{ Dassets::NullFileStore.new }
+
+    should have_reader :root
+    should have_imeths :save, :store_path
+
+    should "be a kind of FileStore" do
+      assert_kind_of Dassets::FileStore, subject
+    end
+
+    should "build its root based on the config's root_path" do
+      assert_equal Dassets::RootPath.new(''), subject.root
+    end
+
+    should "build the store path based on a given url" do
+    end
+
+    should "return the store path on save" do
+    end
+
+  end
+
+end

data/test/unit/server/request_tests.rb

@@ -6,12 +6,8 @@ class Dassets::Server::Request
   class BaseTests < Assert::Context
     desc "Dassets::Server::Request"
     setup do
-      Dassets.init
       @req = file_request('GET', '/file1-daa05c683a4913b268653f7a7e36a5b4.txt')
     end
-    teardown do
-      Dassets.reset
-    end
     subject{ @req }
 
     should have_imeths :for_asset_file?, :asset_path, :asset_file
@@ -25,23 +21,23 @@ class Dassets::Server::Request
     end
 
     should "know if it is for an asset file" do
-      # find nested path with matching md5
+      # find nested path with matching fingerprint
       req = file_request('GET', '/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt')
       assert req.for_asset_file?
 
-      # find not nested path with matching md5
+      # find not nested path with matching fingerprint
       req = file_request('HEAD', '/file1-daa05c683a4913b268653f7a7e36a5b4.txt')
       assert req.for_asset_file?
 
-      # find even if md5 is *not* matching - just need to have any md5
+      # find even if fingerprint is *not* matching - just need to have any fingerprint
       req = file_request('GET', '/file1-d41d8cd98f00b204e9800998ecf8427e.txt')
       assert req.for_asset_file?
 
-      # no find on invalid md5
+      # no find on invalid fingerprint
       req = file_request('GET', '/file1-daa05c683a4913b268653f7a7e36a.txt')
       assert_not req.for_asset_file?
 
-      # no find on missing md5
+      # no find on missing fingerprint
       req = file_request('HEAD', '/file1.txt')
       assert_not req.for_asset_file?
 
@@ -49,7 +45,7 @@ class Dassets::Server::Request
       req = file_request('GET', '/some-file.txt')
       assert_not req.for_asset_file?
 
-      # no find on unknown file with an md5
+      # no find on unknown file with an fingerprint
       req = file_request('GET', '/some-file-daa05c683a4913b268653f7a7e36a5b4.txt')
       assert_not req.for_asset_file?
     end
@@ -58,7 +54,7 @@ class Dassets::Server::Request
       req = file_request('GET', '/some-file.txt')
 
       assert_equal '', req.asset_path
-      assert_equal Dassets::AssetFile.new('', ''), req.asset_file
+      assert_equal Dassets::AssetFile.new(''), req.asset_file
     end
 
     protected

data/test/unit/server/response_tests.rb

@@ -7,7 +7,7 @@ class Dassets::Server::Response
   class BaseTests < Assert::Context
     desc "Dassets::Server::Response"
     setup do
-      @resp = file_response(Dassets::AssetFile.new('', ''))
+      @resp = file_response(Dassets::AssetFile.new(''))
     end
     subject{ @resp }
 
@@ -16,8 +16,7 @@ class Dassets::Server::Response
 
     should "handle not modified files" do
       af = Dassets['file1.txt']
-      mtime = File.mtime(af.output_path).httpdate.to_s
-      resp = file_response(af, 'HTTP_IF_MODIFIED_SINCE' => mtime)
+      resp = file_response(af, 'HTTP_IF_MODIFIED_SINCE' => af.mtime)
 
       assert_equal 304, resp.status
       assert_equal [], resp.body
@@ -30,8 +29,8 @@ class Dassets::Server::Response
       resp = file_response(af)
       exp_headers = {
         'Content-Type'   => 'text/plain',
-        'Content-Length' => File.size?(af.output_path).to_s,
-        'Last-Modified'  => File.mtime(af.output_path).httpdate.to_s
+        'Content-Length' => Rack::Utils.bytesize(af.content).to_s,
+        'Last-Modified'  => af.mtime.to_s
       }
 
       assert_equal 200, resp.status

data/test/unit/source_cache_tests.rb

@@ -0,0 +1,50 @@
+require 'assert'
+require 'dassets/source_file'
+require 'dassets/source_cache'
+
+class Dassets::SourceCache
+
+  class BaseTests < Assert::Context
+    desc "Dassets::SourceCache"
+    setup do
+      @source_cache = Dassets::SourceCache.new('file1.txt')
+    end
+    subject{ @source_cache }
+
+    should have_readers :digest_path, :source_file
+    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
+      exp_source_file = Dassets::SourceFile.find_by_digest_path('file1.txt')
+      assert_equal exp_source_file, subject.source_file
+    end
+
+    should "exist if its source file exists" do
+      assert_equal subject.source_file.exists?, subject.exists?
+    end
+
+    should "use its source file's mtime as its mtime" do
+      assert_equal subject.source_file.mtime, subject.mtime
+    end
+
+    should "use its digest path and mtime as its key" do
+      exp_key = "#{subject.digest_path} -- #{subject.mtime}"
+      assert_equal exp_key, subject.key
+    end
+
+    should "get its fingerprint from the source file" do
+      assert_equal subject.source_file.fingerprint, subject.fingerprint
+    end
+
+    should "get its content from the source file" do
+      assert_equal subject.source_file.compiled, subject.content
+    end
+
+
+  end
+
+end

data/test/unit/source_file_tests.rb

@@ -1,5 +1,5 @@
 require 'assert'
-require 'dassets/engine'
+require 'dassets/asset_file'
 require 'dassets/source_file'
 
 class Dassets::SourceFile
@@ -13,7 +13,9 @@ class Dassets::SourceFile
     subject{ @source_file }
 
     should have_readers :file_path
-    should have_imeths :exists?, :digest_path, :compiled, :fingerprint
+    should have_imeths :asset_file, :digest_path
+    should have_imeths :compiled, :fingerprint, :exists?, :mtime
+    should have_cmeth :find_by_digest_path
 
     should "know its file path" do
       assert_equal @file_path, subject.file_path
@@ -23,14 +25,38 @@ class Dassets::SourceFile
       assert subject.exists?
     end
 
+    should "use the mtime of its file as its mtime" do
+      assert_equal File.mtime(subject.file_path).httpdate, subject.mtime
+    end
+
     should "know its digest path" do
       assert_equal 'file1.txt', subject.digest_path
     end
 
+    should "know its asset file" do
+      assert_kind_of Dassets::AssetFile, subject.asset_file
+      assert_equal Dassets::AssetFile.new(subject.digest_path), subject.asset_file
+    end
+
     should "know its compiled content fingerprint" do
       assert_equal 'daa05c683a4913b268653f7a7e36a5b4', subject.fingerprint
     end
 
+    should "be findable by its digest path" do
+      found = Dassets::SourceFile.find_by_digest_path(subject.digest_path)
+
+      assert_equal subject, found
+      assert_not_same subject, found
+    end
+
+    should "find a null src file if finding by an unknown digest path" do
+      null_src = Dassets::NullSourceFile.new('not/found/digest/path')
+      found = Dassets::SourceFile.find_by_digest_path('not/found/digest/path')
+
+      assert_equal null_src, found
+      assert_not_same null_src, found
+    end
+
   end
 
   class EngineTests < BaseTests
@@ -52,31 +78,4 @@ class Dassets::SourceFile
 
   end
 
-  class DigestTests < EngineTests
-    desc "being digested"
-    setup do
-      Dassets.init
-      @digested_asset_file = @source_file.digest
-    end
-    teardown do
-      Dassets.reset
-    end
-
-    should "return the digested asset file" do
-      assert_not_nil @digested_asset_file
-      assert_kind_of Dassets::AssetFile, @digested_asset_file
-    end
-
-    should "compile and write an asset file to the output path" do
-      assert_file_exists @digested_asset_file.output_path
-      assert_equal subject.compiled, File.read(@digested_asset_file.output_path)
-    end
-
-    should "add a digests entry for the asset file with its fingerprint" do
-      digests_on_disk = Dassets::Digests.new(Dassets.config.digests_path)
-      assert_equal subject.fingerprint, digests_on_disk[subject.digest_path]
-    end
-
-  end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dassets
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-25 00:00:00 Z
+date: 2013-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -114,34 +114,27 @@ files:
 - lib/dassets.rb
 - lib/dassets/asset_file.rb
 - lib/dassets/cli.rb
-- lib/dassets/cmds/cache_cmd.rb
-- lib/dassets/cmds/digest_cmd.rb
-- lib/dassets/digests.rb
+- lib/dassets/default_cache.rb
+- lib/dassets/digest_cmd.rb
 - lib/dassets/engine.rb
+- lib/dassets/file_store.rb
 - lib/dassets/root_path.rb
 - lib/dassets/runner.rb
 - lib/dassets/server.rb
 - lib/dassets/server/request.rb
 - lib/dassets/server/response.rb
+- lib/dassets/source_cache.rb
 - lib/dassets/source_file.rb
 - lib/dassets/version.rb
 - log/.gitkeep
 - test/helper.rb
 - test/support/app.rb
-- test/support/app/assets/.digests
 - test/support/app/assets/file1.txt
 - test/support/app/assets/file2.txt
 - 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/app/assets/public/file1.txt
-- test/support/app/assets/public/file2.txt
-- test/support/app/assets/public/grumpy_cat.jpg
-- test/support/app/assets/public/nested/a-thing.txt.no-use
-- test/support/app/assets/public/nested/file3.txt
-- test/support/app_public/.gitkeep
 - test/support/config/assets.rb
-- test/support/example.digests
 - test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt
 - test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
 - test/support/public/grumpy_cat-b0d1f399a916f7a25c4c0f693c619013.jpg
@@ -151,20 +144,20 @@ files:
 - test/support/source_files/nested/_nested_ignored.txt
 - test/support/source_files/nested/test2.txt
 - test/support/source_files/test1.txt
-- test/system/cache_cmd_run_tests.rb
 - test/system/digest_cmd_run_tests.rb
 - test/system/rack_tests.rb
 - test/unit/asset_file_tests.rb
-- test/unit/cmds/cache_cmd_tests.rb
-- test/unit/cmds/digest_cmd_tests.rb
 - test/unit/config_tests.rb
 - test/unit/dassets_tests.rb
-- test/unit/digests_tests.rb
+- test/unit/default_cache_tests.rb
+- test/unit/digest_cmd_tests.rb
 - test/unit/engine_tests.rb
+- test/unit/file_store_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/server/request_tests.rb
 - test/unit/server/response_tests.rb
 - test/unit/server_tests.rb
+- test/unit/source_cache_tests.rb
 - test/unit/source_file_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/dassets
@@ -203,20 +196,12 @@ summary: Digested asset files
 test_files: 
 - test/helper.rb
 - test/support/app.rb
-- test/support/app/assets/.digests
 - test/support/app/assets/file1.txt
 - test/support/app/assets/file2.txt
 - 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/app/assets/public/file1.txt
-- test/support/app/assets/public/file2.txt
-- test/support/app/assets/public/grumpy_cat.jpg
-- test/support/app/assets/public/nested/a-thing.txt.no-use
-- test/support/app/assets/public/nested/file3.txt
-- test/support/app_public/.gitkeep
 - test/support/config/assets.rb
-- test/support/example.digests
 - test/support/public/file1-daa05c683a4913b268653f7a7e36a5b4.txt
 - test/support/public/file2-9bbe1047cffbb590f59e0e5aeff46ae4.txt
 - test/support/public/grumpy_cat-b0d1f399a916f7a25c4c0f693c619013.jpg
@@ -226,18 +211,18 @@ test_files:
 - test/support/source_files/nested/_nested_ignored.txt
 - test/support/source_files/nested/test2.txt
 - test/support/source_files/test1.txt
-- test/system/cache_cmd_run_tests.rb
 - test/system/digest_cmd_run_tests.rb
 - test/system/rack_tests.rb
 - test/unit/asset_file_tests.rb
-- test/unit/cmds/cache_cmd_tests.rb
-- test/unit/cmds/digest_cmd_tests.rb
 - test/unit/config_tests.rb
 - test/unit/dassets_tests.rb
-- test/unit/digests_tests.rb
+- test/unit/default_cache_tests.rb
+- test/unit/digest_cmd_tests.rb
 - test/unit/engine_tests.rb
+- test/unit/file_store_tests.rb
 - test/unit/runner_tests.rb
 - test/unit/server/request_tests.rb
 - test/unit/server/response_tests.rb
 - test/unit/server_tests.rb
+- test/unit/source_cache_tests.rb
 - test/unit/source_file_tests.rb

data/lib/dassets/cmds/cache_cmd.rb

@@ -1,33 +0,0 @@
-require 'pathname'
-require 'fileutils'
-require 'dassets'
-require 'dassets/digests'
-
-module Dassets; end
-class Dassets::Cmds; end
-class Dassets::Cmds::CacheCmd
-
-  attr_reader :cache_root_path, :digests
-
-  def initialize(cache_root_path)
-    @cache_root_path = Pathname.new(cache_root_path)
-    @digests = Dassets::Digests.new(Dassets.config.digests_path)
-  end
-
-  def run(io=nil)
-    log io, "caching #{@digests.asset_files.count} asset file(s) to `#{@cache_root_path}` ..."
-    @digests.asset_files.each do |file|
-      cache_path = @cache_root_path.join(file.url).to_s
-
-      FileUtils.mkdir_p File.dirname(cache_path)
-      FileUtils.cp(file.output_path, cache_path)
-    end
-  end
-
-  private
-
-  def log(io, msg)
-    io.puts msg if io
-  end
-
-end