psyho_juicer 1.0.0 → 1.0.7

data/test/unit/juicer/cache_buster_test.rb

@@ -26,10 +26,17 @@ class CacheBusterTest < Test::Unit::TestCase
       assert_equal @filename, Juicer::CacheBuster.clean("#@filename?1234567890", nil)
     end
 
+    should "not destroy numeric file names with no cache buster name" do
+      @numeric_filename = "815.gif"
+      File.open(@numeric_filename, "w") { |f| f.puts "Testing" }
+      assert_equal @numeric_filename, Juicer::CacheBuster.clean("#@numeric_filename?1234567890", nil)
+      File.delete(@numeric_filename)
+    end
+
     should "remove cache buster query parameters with custom name" do
       assert_equal @filename, Juicer::CacheBuster.clean("#@filename?cb=1234567890", :cb)
     end
-
+    
     should "remove hard cache buster" do
       assert_equal @filename, Juicer::CacheBuster.clean(@filename.sub(/(\.txt)/, '-jcb1234567890\1'))
     end
@@ -63,12 +70,47 @@ class CacheBusterTest < Test::Unit::TestCase
 
     should "include only mtime when parameter name is nil" do
       mtime = File.mtime(@filename).to_i
-      assert_equal "#@filename?#{mtime}", Juicer::CacheBuster.soft(@filename, nil)
+      assert_equal "#@filename?#{mtime}", Juicer::CacheBuster.soft(@filename, :parameter => nil)
     end
 
     should "include custom parameter name" do
       mtime = File.mtime(@filename).to_i
-      assert_equal "#@filename?juicer=#{mtime}", Juicer::CacheBuster.soft(@filename, :juicer)
+      assert_equal "#@filename?juicer=#{mtime}", Juicer::CacheBuster.soft(@filename, :parameter => :juicer)
+    end
+
+    should "use git cache buster if passed as a parameter" do
+      revision = revision_of_tracked_file
+      file_name = git_tracked_file
+      assert_equal "#{file_name}?jcb=#{revision}", Juicer::CacheBuster.soft(file_name, :revision_type => :git)
+    end
+
+    should "use mtime cache buster if passed as a parameter" do
+      file_name = git_tracked_file
+      revision = File.mtime(file_name).to_i
+      assert_equal "#{file_name}?jcb=#{revision}", Juicer::CacheBuster.soft(file_name, :revision_type => :mtime)
+    end
+  end
+
+  context "creating rails-style cache busters" do
+    should "clean file before adding new cache buster" do
+      cache_buster = "1234567890"
+      assert_no_match /#{cache_buster}/, Juicer::CacheBuster.rails("#@filename?#{cache_buster}")
+    end
+
+    should "append no cache buster when parameters exist" do
+      parameters = "id=1"
+      assert_match /#{parameters}/, Juicer::CacheBuster.rails("#@filename?#{parameters}")
+    end
+
+    should "include only mtime as query parameter" do
+      mtime = File.mtime(@filename).to_i
+      assert_equal "#@filename?#{mtime}", Juicer::CacheBuster.rails(@filename)
+    end
+
+    should "always use mtime cache busters" do
+      file_name = git_tracked_file
+      revision = Juicer::CacheBuster::Revision.mtime(file_name)
+      assert_equal "#{file_name}?#{revision}", Juicer::CacheBuster.rails(file_name, :revision_type => :git)
     end
   end
 
@@ -93,12 +135,60 @@ class CacheBusterTest < Test::Unit::TestCase
 
     should "include only mtime when parameter name is nil" do
       mtime = File.mtime("#@filename.txt").to_i
-      assert_equal "#@filename-#{mtime}.txt", Juicer::CacheBuster.hard("#@filename.txt", nil)
+      assert_equal "#@filename-#{mtime}.txt", Juicer::CacheBuster.hard("#@filename.txt", :parameter => nil)
     end
 
     should "include custom parameter name" do
       mtime = File.mtime("#@filename.txt").to_i
-      assert_equal "#@filename-juicer#{mtime}.txt", Juicer::CacheBuster.hard("#@filename.txt", :juicer)
+      assert_equal "#@filename-juicer#{mtime}.txt", Juicer::CacheBuster.hard("#@filename.txt", :parameter => :juicer)
+    end
+
+    should "use git cache buster if passed as a paramater" do
+      revision = revision_of_tracked_file
+      file_name = git_tracked_file
+      assert_equal "#{file_name.gsub('.txt', '')}-jcb#{revision}.txt", Juicer::CacheBuster.hard(file_name, :revision_type => :git)
+    end
+
+    should "use mtime cache buster if passed as a parameter" do
+      file_name = git_tracked_file
+      revision = File.mtime(file_name).to_i
+      assert_equal "#{file_name.gsub('.txt', '')}-jcb#{revision}.txt", Juicer::CacheBuster.hard(file_name, :revision_type => :mtime)
     end
   end
+
+  context "Revision" do
+    context "mtime" do
+      should "return the file modification time" do
+        assert_equal File.mtime(@filename).to_i, Juicer::CacheBuster::Revision.mtime(@filename)
+      end
+    end
+
+    context "git" do
+      should "return the last commit that modified the file if file is tracked by git" do
+        # given
+        expected_hash = revision_of_tracked_file
+        file_name = git_tracked_file
+
+        # then
+        assert_equal expected_hash, Juicer::CacheBuster::Revision.git(file_name)
+      end
+
+      should "return the last commit of the repository if file is not tracked by git" do
+        # given
+        last_commit = %x[git log -1 --pretty=oneline].split.first
+
+        # then
+        assert_equal last_commit, Juicer::CacheBuster::Revision.git(@filename)
+      end
+    end
+  end
+
+  def git_tracked_file
+    File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'git-tracked-file.txt'))
+  end
+
+  def revision_of_tracked_file
+    '98477054651e764b4ece65f417df3eb17eb5de83'
+  end
+
 end

data/test/unit/juicer/command/util_test.rb

@@ -6,7 +6,7 @@ end
 
 class TestCommandUtil < Test::Unit::TestCase
 
-  CSS_FILES = %w{a.css a1.css b.css b1.css c1.css d1.css path_test.css path_test2.css}
+  CSS_FILES = %w{a.css a1.css b.css b1.css b2.css c1.css d1.css path_test.css path_test2.css}
   JS_FILES = %w{a.js}
   ALL_FILES = (CSS_FILES + JS_FILES).sort
 

data/test/unit/juicer/css_cache_buster_test.rb

@@ -11,61 +11,156 @@ class TestCssCacheBuster < Test::Unit::TestCase
     Juicer::Test::FileSetup.new.create
   end
 
-  def test_find_urls
-    urls = @buster.urls(path("css/test.css"))
-    assert_equal 3, urls.length
-    assert_equal "../a1.css../images/1.png2.gif", urls.collect { |a| a.path }.sort.join.gsub(path("/"), "")
+  context "finding urls" do
+    should "find all urls" do
+      urls = @buster.urls(path("css/test.css"))
+      assert_equal 4, urls.length
+      assert_equal "../a1.css../images/1.png2.gif2.gif", urls.collect { |a| a.path }.sort.join.gsub(path("/"), "")
+    end
   end
 
-  def test_image_references_should_be_updated
-    file = path("css/test.css")
-    buster = Juicer::CssCacheBuster.new
-    buster.save file
+  context "image references" do
+    should "update image urls" do
+      file = path("css/test.css")
+      buster = Juicer::CssCacheBuster.new
+      buster.save file
 
-    File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
-      assert_match(/[^\?]*\?jcb=\d+/, path.first)
+      File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
+        assert_match(/[^\?]*\?jcb=\d+/, path.first)
+      end
     end
-  end
 
-  def test_absolute_path_without_document_root_should_fail
-    file = path("css/test2.css")
-    buster = Juicer::CssCacheBuster.new
+    should "not add multiple cache busters" do
+      file = path("css/test.css")
+      buster = Juicer::CssCacheBuster.new
+      buster.save file
+
+      assert_no_match /2\.gif\?jcb=\d+\?jcb=/, File.read(file)
+    end
 
-    assert_raise FileNotFoundError do
+    should "not add multiple cache busters when asset host cycling is used" do
+      file = path("css/test3.css")
+      buster = Juicer::CssCacheBuster.new( { :hosts => [ 'http://assets1', 'http://assets2', 'http://assets3' ], :document_root => './test/data' } )
       buster.save file
+
+      assert_no_match /2\.gif\?jcb=\d+\?jcb=/, File.read(file)
     end
+
   end
 
-  def test_absolute_path_should_be_resolved_when_document_root_known
-    file = path("css/test.css")
-    buster = Juicer::CssCacheBuster.new :document_root => path("")
+  context "absolute paths" do
+    # should "fail without document root" do
+    #   file = path("css/test2.css")
+    #   buster = Juicer::CssCacheBuster.new
 
-    assert_nothing_raised do
-      buster.save file
+    #   assert_raise FileNotFoundError do
+    #     buster.save file
+    #   end
+    # end
+
+    should "resolve with document root" do
+      file = path("css/test.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path("")
+
+      assert_nothing_raised do
+        buster.save file
+      end
+
+      File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
+        assert_match(/[^\?]*\?jcb=\d+/, path.first)
+      end
     end
+  end
 
-    File.read(file).scan(/url\(([^\)]*)\)/m).each do |path|
-      assert_match(/[^\?]*\?jcb=\d+/, path.first)
+  context "cache busters" do
+    should "add mtime to urls" do
+      File.open(path("a2.css"), "w") { |f| f.puts "" }
+      file = path("path_test2.css")
+      output = path("path_test3.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path("")
+      buster.save file, output
+
+      buster.urls(output).each { |url| assert url !~ /(jcb=\d+).*(jcb=\d+)/, url }
     end
   end
 
-  def test_urls_should_only_have_mtime_appended_once
-    File.open(path("a2.css"), "w") { |f| f.puts "" }
-    file = path("path_test2.css")
-    output = path("path_test3.css")
-    buster = Juicer::CssCacheBuster.new :document_root => path("")
-    buster.save file, output
+  context "rails cache busters" do
+    should "should append mtime to urls" do
+      File.open(path("a2.css"), "w") { |f| f.puts "" }
+      file = path("path_test2.css")
+      output = path("path_test3.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path(""), :type => :rails
+      buster.save file, output
 
-    buster.urls(output).each { |url| assert url !~ /(jcb=\d+).*(jcb=\d+)/, url }
+      buster.urls(output).each { |asset| assert_match /\?\d+$/, asset.path }
+    end
   end
+  
+  context "hard cache busters" do
+    should "should alter file name" do
+      File.open(path("a2.css"), "w") { |f| f.puts "" }
+      file = path("path_test2.css")
+      output = path("path_test3.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path(""), :type => :hard
+      buster.save file, output
 
-  def test_type_hard_should_produce_hard_buster_urls
+      buster.urls(output).each { |asset| assert_match /-jcb\d+\.[a-z]{3}$/, asset.path }
+    end
+  end
+
+  def given_a_buster_with_type_hard_and_format(format)
     File.open(path("a2.css"), "w") { |f| f.puts "" }
+    return Juicer::CssCacheBuster.new :document_root => path(""), :type => :hard, :format => format
+  end
+
+  def when_buster_saves_file(buster)
     file = path("path_test2.css")
     output = path("path_test3.css")
-    buster = Juicer::CssCacheBuster.new :document_root => path(""), :type => :hard
     buster.save file, output
+    return output
+  end
 
-    buster.urls(output).each { |asset| assert_match /-jcb\d+\.[a-z]{3}$/, asset.path }
+  def assert_all_urls_match(buster, output, pattern)
+    buster.urls(output).each { |asset| assert_match pattern, asset.path }
+  end
+
+  context "cache busters with git format" do
+    should "include last git commit touching that file in file name" do
+      # given
+      Juicer::CacheBuster::Revision.stubs(:git => 'GIT_LAST_COMMIT')
+      buster = given_a_buster_with_type_hard_and_format(:git)
+
+      # when
+      output = when_buster_saves_file(buster)
+
+      # then
+      assert_all_urls_match(buster, output, /-jcbGIT_LAST_COMMIT\.[a-z]{3}$/)
+    end
+  end
+
+  context "cache busters with mtime format" do
+    should "include file modification time in file name" do
+      # given
+      File.stubs(:mtime => 123)
+      buster = given_a_buster_with_type_hard_and_format(:mtime)
+
+      # when
+      output = when_buster_saves_file(buster)
+
+      # then
+      assert_all_urls_match(buster, output, /-jcb123\.[a-z]{3}$/)
+    end
+  end
+
+  context "non-existent urls" do
+    should "not raise" do
+      File.open(path("a2.css"), "w") { |f| f.puts "a { background: url(i/dont/exist.fck); }" }
+      file = path("a2.css")
+      buster = Juicer::CssCacheBuster.new :document_root => path("")
+
+      assert_nothing_raised do
+        buster.save file        
+      end
+    end
   end
 end

data/test/unit/juicer/image_embed_test.rb

@@ -73,6 +73,41 @@ class TestImageEmbed < Test::Unit::TestCase
         end
       end
 
+      context "non empty document root" do
+        setup do
+          @document_root = '/path/to/public/dir'
+          @another_embedder = Juicer::ImageEmbed.new(:type => :data_uri, :document_root => @document_root)
+          @files = [{ :path => "#{@document_root}/images/custom-file.png", :filename => '/images/custom-file.png', :content => "hello png!" }]
+          create_files(@files)
+        end
+        
+        should "embed urls with embedder" do
+          stylesheets = [{ :path => "#{@document_root}/stylesheets/test_absolute_path.css", :content => "body: { background: url(#{@files.first[:filename]}?embed=true); }" }]
+          create_files(stylesheets)
+          
+          @another_embedder.save stylesheets.first[:path]
+          css_contents = File.read(stylesheets.first[:path])
+
+          # encode the image
+          image_contents = File.read(@files.first[:path])
+          data_uri = Datafy::make_data_uri(image_contents, 'image/png')
+
+          # make sure the encoded data_uri is present in the stylesheet
+          assert css_contents.include?(data_uri)
+        end
+        
+        should "not embed urls with embedder" do
+          stylesheets = [{ :path => "#{@document_root}/stylesheets/test_absolute_path.css", :content => "body: { background: url(#{@files.first[:filename]}?embed=false); }" }]
+          create_files(stylesheets)
+          
+          @another_embedder.save stylesheets.first[:path]
+          css_contents = File.read(stylesheets.first[:path])
+
+          # encode the image
+          assert css_contents.include?(@files.first[:filename])
+        end
+      end
+
       context "with duplicated urls" do
         setup do
           @stylesheets = [{