dassets 0.2.0 → 0.3.0

data/test/unit/engine_tests.rb

@@ -0,0 +1,59 @@
+require 'assert'
+require 'dassets/engine'
+
+class Dassets::Engine
+
+  class BaseTests < Assert::Context
+    desc "the base Dassets::Engine"
+    setup do
+      @engine = Dassets::Engine.new
+    end
+    subject{ @engine }
+
+    should have_reader :opts
+    should have_imeths :ext, :compile
+
+    should "default the opts if none given" do
+      exp_opts = {}
+      assert_equal exp_opts, subject.opts
+    end
+
+    should "raise NotImplementedError on `ext` and `compile`" do
+      assert_raises NotImplementedError do
+        subject.ext('foo')
+      end
+
+      assert_raises NotImplementedError do
+        subject.compile('some content')
+      end
+    end
+
+  end
+
+  class NullEngineTests < Assert::Context
+    desc "the NullEngine"
+    setup do
+      @engine = Dassets::NullEngine.new('some' => 'opts')
+    end
+    subject{ @engine }
+
+    should "be a Engine" do
+      assert_kind_of Dassets::Engine, subject
+    end
+
+    should "know its opts" do
+      exp_opts = {'some' => 'opts'}
+      assert_equal exp_opts, subject.opts
+    end
+
+    should "return the given extension on `ext`" do
+      assert_equal 'foo', subject.ext('foo')
+    end
+
+    should "return the given input on `compile" do
+      assert_equal 'some content', subject.compile('some content')
+    end
+
+  end
+
+end

data/test/unit/server/response_tests.rb

@@ -16,7 +16,7 @@ class Dassets::Server::Response
 
     should "handle not modified files" do
       af = Dassets['file1.txt']
-      mtime = File.mtime(af.files_path).httpdate.to_s
+      mtime = File.mtime(af.output_path).httpdate.to_s
       resp = file_response(af, 'HTTP_IF_MODIFIED_SINCE' => mtime)
 
       assert_equal 304, resp.status
@@ -30,8 +30,8 @@ class Dassets::Server::Response
       resp = file_response(af)
       exp_headers = {
         'Content-Type'   => 'text/plain',
-        'Content-Length' => File.size?(af.files_path).to_s,
-        'Last-Modified'  => File.mtime(af.files_path).httpdate.to_s
+        'Content-Length' => File.size?(af.output_path).to_s,
+        'Last-Modified'  => File.mtime(af.output_path).httpdate.to_s
       }
 
       assert_equal 200, resp.status
@@ -53,9 +53,9 @@ class Dassets::Server::Response
       resp = file_response(af)
 
       assert_equal 404, resp.status
-      assert_equal [], resp.body
+      assert_equal ['Not Found'], resp.body
       assert_equal Rack::Utils::HeaderHash.new, resp.headers
-      assert_equal [ 404, {}, [] ], resp.to_rack
+      assert_equal [ 404, {}, ['Not Found'] ], resp.to_rack
     end
 
     protected

data/test/unit/source_file_tests.rb

@@ -0,0 +1,82 @@
+require 'assert'
+require 'dassets/engine'
+require 'dassets/source_file'
+
+class Dassets::SourceFile
+
+  class BaseTests < Assert::Context
+    desc "Dassets::SourceFile"
+    setup do
+      @file_path = File.join(Dassets.config.source_path, 'file1.txt')
+      @source_file = Dassets::SourceFile.new(@file_path)
+    end
+    subject{ @source_file }
+
+    should have_readers :file_path
+    should have_imeths :exists?, :digest_path, :compiled, :fingerprint
+
+    should "know its file path" do
+      assert_equal @file_path, subject.file_path
+    end
+
+    should "know if it exists" do
+      assert subject.exists?
+    end
+
+    should "know its digest path" do
+      assert_equal 'file1.txt', subject.digest_path
+    end
+
+    should "know its compiled content fingerprint" do
+      assert_equal 'daa05c683a4913b268653f7a7e36a5b4', subject.fingerprint
+    end
+
+  end
+
+  class EngineTests < BaseTests
+    desc "compiled against engines"
+    setup do
+      @file_path = File.join(Dassets.config.source_path, 'nested/a-thing.txt.useless.dumb')
+      @source_file = Dassets::SourceFile.new(@file_path)
+    end
+
+    should "build the digest path appropriately" do
+      assert_equal 'nested/a-thing.txt.no-use', subject.digest_path
+    end
+
+    should "compile the source content appropriately" do
+      file_content = File.read(@file_path)
+      exp_compiled_content = [ file_content, 'DUMB', 'USELESS' ].join("\n")
+      assert_equal exp_compiled_content, subject.compiled
+    end
+
+  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: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-18 00:00:00 Z
+date: 2013-04-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -114,22 +114,30 @@ files:
 - lib/dassets.rb
 - lib/dassets/asset_file.rb
 - lib/dassets/cli.rb
-- lib/dassets/digests_file.rb
+- lib/dassets/cmds/cache_cmd.rb
+- lib/dassets/cmds/digest_cmd.rb
+- lib/dassets/digests.rb
+- lib/dassets/engine.rb
 - lib/dassets/root_path.rb
 - lib/dassets/runner.rb
-- lib/dassets/runner/cache_command.rb
-- lib/dassets/runner/digest_command.rb
 - lib/dassets/server.rb
 - lib/dassets/server/request.rb
 - lib/dassets/server/response.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
@@ -137,18 +145,27 @@ files:
 - 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
 - test/support/public/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt
+- test/support/source_files/_ignored.txt
+- 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_file_tests.rb
-- test/unit/runner/cache_command_tests.rb
-- test/unit/runner/digest_command_tests.rb
+- test/unit/digests_tests.rb
+- test/unit/engine_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_file_tests.rb
 - tmp/.gitkeep
 homepage: http://github.com/redding/dassets
 licenses: []
@@ -187,9 +204,15 @@ 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
@@ -197,15 +220,24 @@ test_files:
 - 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
 - test/support/public/nested/file3-d41d8cd98f00b204e9800998ecf8427e.txt
+- test/support/source_files/_ignored.txt
+- 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_file_tests.rb
-- test/unit/runner/cache_command_tests.rb
-- test/unit/runner/digest_command_tests.rb
+- test/unit/digests_tests.rb
+- test/unit/engine_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_file_tests.rb

data/lib/dassets/runner/cache_command.rb

@@ -1,46 +0,0 @@
-require 'pathname'
-require 'fileutils'
-require 'dassets/asset_file'
-require 'dassets/digests_file'
-
-module Dassets; end
-class Dassets::Runner; end
-class Dassets::Runner::CacheCommand
-
-  attr_reader :files_root_path, :cache_root_path, :digests_file, :asset_files
-
-  def initialize(cache_root_path)
-    unless cache_root_path && File.directory?(cache_root_path)
-      raise Dassets::Runner::CmdError, "specify an existing cache directory"
-    end
-
-    @files_root_path = Pathname.new(Dassets.config.files_path)
-    @cache_root_path = Pathname.new(cache_root_path)
-    @digests_file = Dassets::DigestsFile.new(Dassets.config.digests_file_path)
-    @asset_files = @digests_file.asset_files
-  end
-
-  def run(write_files=true)
-    begin
-      @asset_files.each do |file|
-        files_path = @files_root_path.join(file.path).to_s
-        cache_path = @cache_root_path.join(file.cache_path).to_s
-
-        if write_files
-          FileUtils.mkdir_p File.dirname(cache_path)
-          FileUtils.cp(files_path, cache_path)
-        end
-      end
-      unless ENV['DASSETS_TEST_MODE']
-        $stdout.puts "#{@asset_files.size} files written to #{@cache_root_path}"
-      end
-      return write_files
-    rescue Exception => e
-      unless ENV['DASSETS_TEST_MODE']
-        $stderr.puts e, *e.backtrace; $stderr.puts ""
-      end
-      raise Dassets::Runner::CmdFail
-    end
-  end
-
-end

data/lib/dassets/runner/digest_command.rb

@@ -1,65 +0,0 @@
-require 'set'
-require 'dassets/asset_file'
-require 'dassets/digests_file'
-
-module Dassets; end
-class Dassets::Runner; end
-class Dassets::Runner::DigestCommand
-
-  attr_reader :asset_files, :digests_file
-
-  def initialize(file_paths)
-    @pwd = ENV['PWD']
-    @asset_files = if (file_paths || []).empty?
-      get_asset_files([*Dassets.config.files_path])
-    else
-      get_asset_files(file_paths)
-    end
-    @digests_file = Dassets::DigestsFile.new(Dassets.config.digests_file_path)
-  end
-
-  def run(save=true)
-    begin
-      digest_paths = @digests_file.keys
-      asset_paths  = @asset_files.map{ |f| f.path }
-
-      (digest_paths - asset_paths).each{ |file| @digests_file.delete(file) }
-      @asset_files.each{ |f| @digests_file[f.path] = f.md5 }
-
-      @digests_file.save! if save
-      unless ENV['DASSETS_TEST_MODE']
-        $stdout.puts "digested #{@asset_files.size} assets, saved to #{@digests_file.path}"
-      end
-      return save
-    rescue Exception => e
-      unless ENV['DASSETS_TEST_MODE']
-        $stderr.puts e, *e.backtrace; $stderr.puts ""
-      end
-      raise Dassets::Runner::CmdFail
-    end
-  end
-
-  private
-
-  # Get all file paths fuzzy-matching the given paths.  Each path must be a
-  # file that exists and is in the `config.files_path` tree.  Return them
-  # as sorted AssetFile objects.
-  def get_asset_files(paths)
-    fuzzy_paths(paths).
-      select{ |p| is_asset_file?(p) }.
-      sort.
-      map{ |p| Dassets::AssetFile.from_abs_path(p) }
-  end
-
-  def fuzzy_paths(paths)
-    paths.inject(Set.new) do |paths, path|
-      p = File.expand_path(path, @pwd)
-      paths += Dir.glob("#{p}*") + Dir.glob("#{p}*/**/*")
-    end
-  end
-
-  def is_asset_file?(path)
-    File.file?(path) && path.include?("#{Dassets.config.files_path}/")
-  end
-
-end

data/test/unit/digests_file_tests.rb

@@ -1,90 +0,0 @@
-require 'assert'
-require 'fileutils'
-require 'dassets/digests_file'
-require 'dassets/asset_file'
-
-class Dassets::DigestsFile
-
-  class BaseTests < Assert::Context
-    desc "Dassets::DigestsFile"
-    setup do
-      @file_path = File.join(Dassets.config.root_path, 'example.digests')
-      @digests = Dassets::DigestsFile.new(@file_path)
-    end
-    subject{ @digests }
-
-    should have_reader :path
-    should have_imeths :asset_files, :asset_file, :to_hash, :save!
-    should have_imeths :[], :[]=, :delete, :each, :keys, :values, :empty?
-
-    should "know its path" do
-      assert_equal @file_path, subject.path
-    end
-
-    should "know its asset files" do
-      assert_equal subject.keys.size, subject.asset_files.size
-      assert_kind_of Dassets::AssetFile, subject.asset_files.first
-    end
-
-    should "get a specific asset file from its data" do
-      file = subject.asset_file('/path/to/file1')
-
-      assert_kind_of Dassets::AssetFile, file
-      assert_equal '/path/to/file1', file.path
-      assert_equal subject['/path/to/file1'], file.md5
-    end
-
-    should "know whether it is empty or not" do
-      assert_not_empty subject
-    end
-
-    should "read values with the index operator" do
-      assert_equal 'abc123', subject['/path/to/file1']
-    end
-
-    should "write values with the index operator" do
-      subject['/path/to/test'] = 'testytest'
-      assert_equal 'testytest', subject['/path/to/test']
-    end
-
-    should "remove values with the delete method" do
-      assert_includes '/path/to/file1', subject.keys
-
-      subject.delete '/path/to/file1'
-      assert_not_includes '/path/to/file1', subject.keys
-    end
-
-    should "know its hash representation" do
-      exp_hash = {
-        "/path/to/file1" => "abc123",
-        "/path/to/file2" => "123abc",
-        "/path/to/file3" => "a1b2c3"
-      }
-      subject_to_hash = subject.to_hash
-      subject_internal_hash = subject.instance_variable_get("@hash")
-
-      assert_equal exp_hash, subject_to_hash
-      assert_not_equal subject_internal_hash.object_id, subject_to_hash.object_id
-    end
-
-  end
-
-  class SaveTests < BaseTests
-    desc "on save"
-    setup do
-      FileUtils.mv(@file_path, "#{@file_path}.bak")
-    end
-    teardown do
-      FileUtils.mv("#{@file_path}.bak", @file_path)
-    end
-
-    should "write out the digests to the path" do
-      assert_not_file_exists subject.path
-      subject.save!
-
-      assert_file_exists subject.path
-    end
-
-  end
-
-end