jekyll-minibundle 1.5.1 → 1.6.0

data/test/integration/ministamp_development_mode_test.rb

@@ -0,0 +1,145 @@
+require 'support/test_case'
+require 'support/fixture_config'
+
+module Jekyll::Minibundle::Test
+  class MiniStampProductionModeTest < TestCase
+    include FixtureConfig
+
+    def test_asset_destination_path_has_no_stamp
+      with_precompiled_site(:development) do
+        assert_equal STAMP_DESTINATION_PATH, find_css_path_from_index
+        assert File.exist?(destination_path(STAMP_DESTINATION_PATH))
+      end
+    end
+
+    def test_contents_of_asset_destination_are_equal_to_source
+      with_precompiled_site(:development) do
+        source_contents = File.read(site_fixture_path(STAMP_SOURCE_PATH))
+        destination_contents = File.read(destination_path(STAMP_DESTINATION_PATH))
+        assert_equal source_contents, destination_contents
+      end
+    end
+
+    def test_changing_asset_source_file_rewrites_destination
+      with_site_dir do
+        generate_site(:development)
+
+        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        ensure_file_mtime_changes { File.write(source_path(STAMP_SOURCE_PATH), 'h1 {}') }
+
+        generate_site(:development, clear_cache: false)
+
+        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        assert_operator new_mtime, :>, org_mtime
+      end
+    end
+
+    def test_touching_asset_source_file_rewrites_destination
+      with_site_dir do
+        generate_site(:development)
+
+        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        ensure_file_mtime_changes { FileUtils.touch(source_path(STAMP_SOURCE_PATH)) }
+
+        generate_site(:development, clear_cache: false)
+
+        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+        assert_operator new_mtime, :>, org_mtime
+      end
+    end
+
+    def test_changing_asset_source_path_rewrites_destination
+      with_site_dir do
+        generate_site(:development)
+
+        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+
+        ensure_file_mtime_changes do
+          FileUtils.mv(source_path('_tmp/site.css'), source_path('_tmp/site2.css'))
+
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            '{% ministamp _tmp/site.css assets/screen.css',
+            '{% ministamp _tmp/site2.css assets/screen.css'
+          )
+        end
+
+        generate_site(:development, clear_cache: false)
+
+        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_PATH))
+
+        assert_operator new_mtime, :>, org_mtime
+      end
+    end
+
+    def test_changing_asset_destination_path_rewrites_destination
+      with_site_dir do
+        generate_site(:development)
+
+        assert File.exist?(destination_path(STAMP_DESTINATION_PATH))
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            '{% ministamp _tmp/site.css assets/screen.css',
+            '{% ministamp _tmp/site.css assets/screen2.css'
+          )
+        end
+
+        generate_site(:development, clear_cache: false)
+
+        refute File.exist?(destination_path(STAMP_DESTINATION_PATH))
+
+        new_destination = 'assets/screen2.css'
+
+        assert_equal new_destination, find_css_path_from_index
+        assert File.exist?(destination_path(new_destination))
+      end
+    end
+
+    def test_supports_relative_and_absolute_destination_paths
+      with_site_dir do
+        generate_site(:development)
+
+        assert File.exist?(destination_path(STAMP_DESTINATION_PATH))
+        assert_equal STAMP_DESTINATION_PATH, find_css_path_from_index
+
+        find_and_gsub_in_file(
+          source_path('_layouts/default.html'),
+          '{% ministamp _tmp/site.css assets/screen.css',
+          '{% ministamp _tmp/site.css /assets/screen.css'
+        )
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal "/#{STAMP_DESTINATION_PATH}", find_css_path_from_index
+      end
+    end
+
+    def test_does_not_rewrite_destination_when_nonsource_files_change
+      with_site_dir do
+        generate_site(:development)
+
+        expected_path = destination_path(STAMP_DESTINATION_PATH)
+        org_mtime = mtime_of(expected_path)
+        ensure_file_mtime_changes { File.write(source_path(JS_BUNDLE_SOURCE_DIR, 'dependency.js'), '(function() {})()') }
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal org_mtime, mtime_of(expected_path)
+
+        ensure_file_mtime_changes { FileUtils.touch('index.html') }
+
+        generate_site(:development, clear_cache: false)
+
+        assert_equal org_mtime, mtime_of(expected_path)
+      end
+    end
+
+    private
+
+    def find_css_path_from_index
+      find_html_element(File.read(destination_path('index.html')), 'head link').first['href']
+    end
+  end
+end

data/test/integration/{ministamp_test.rb → ministamp_production_mode_test.rb}

@@ -2,17 +2,10 @@ require 'support/test_case'
 require 'support/fixture_config'
 
 module Jekyll::Minibundle::Test
-  class MiniStampTest < TestCase
+  class MiniStampProductionModeTest < TestCase
     include FixtureConfig
 
-    def test_asset_destination_path_has_no_stamp_in_development_mode
-      with_precompiled_site(:development) do
-        assert_equal STAMP_DESTINATION_PATH, find_css_path_from_index
-        assert File.exist?(destination_path(STAMP_DESTINATION_PATH))
-      end
-    end
-
-    def test_asset_destination_path_has_stamp_in_production_mode
+    def test_asset_destination_path_has_stamp
       with_precompiled_site(:production) do
         assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
         assert File.exist?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
@@ -27,11 +20,12 @@ module Jekyll::Minibundle::Test
       end
     end
 
-    def test_changing_asset_source_rewrites_destination
+    def test_changing_asset_source_file_rewrites_destination
       with_site_dir do
         generate_site(:production)
-        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+
         ensure_file_mtime_changes { File.write(source_path(STAMP_SOURCE_PATH), 'h1 {}') }
+
         generate_site(:production, clear_cache: false)
 
         refute File.exist?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
@@ -40,51 +34,106 @@ module Jekyll::Minibundle::Test
 
         assert_equal new_destination, find_css_path_from_index
         assert File.exist?(destination_path(new_destination))
-        assert_operator mtime_of(destination_path(new_destination)), :>, org_mtime
       end
     end
 
-    def test_touching_asset_source_rewrites_destination
+    def test_touching_asset_source_file_rewrites_destination
       with_site_dir do
         generate_site(:production)
-        destination = STAMP_DESTINATION_FINGERPRINT_PATH
-        org_mtime = mtime_of(destination_path(destination))
+
+        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
         ensure_file_mtime_changes { FileUtils.touch(source_path(STAMP_SOURCE_PATH)) }
         generate_site(:production, clear_cache: false)
 
-        assert_equal destination, find_css_path_from_index
-        assert File.exist?(destination_path(destination))
-        assert_operator mtime_of(destination_path(destination)), :>, org_mtime
+        assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
+
+        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        assert_operator new_mtime, :>, org_mtime
+      end
+    end
+
+    def test_changing_asset_source_path_rewrites_destination
+      with_site_dir do
+        generate_site(:production)
+
+        org_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+
+        ensure_file_mtime_changes do
+          FileUtils.mv(source_path('_tmp/site.css'), source_path('_tmp/site2.css'))
+
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            '{% ministamp _tmp/site.css assets/screen.css',
+            '{% ministamp _tmp/site2.css assets/screen.css'
+          )
+        end
+
+        generate_site(:production, clear_cache: false)
+
+        new_mtime = mtime_of(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+
+        assert_operator new_mtime, :>, org_mtime
+      end
+    end
+
+    def test_changing_asset_destination_path_rewrites_destination
+      with_site_dir do
+        generate_site(:production)
+
+        assert File.exist?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+
+        ensure_file_mtime_changes do
+          find_and_gsub_in_file(
+            source_path('_layouts/default.html'),
+            '{% ministamp _tmp/site.css assets/screen.css',
+            '{% ministamp _tmp/site.css assets/screen2.css'
+          )
+        end
+
+        generate_site(:production, clear_cache: false)
+
+        refute File.exist?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+
+        new_destination = "assets/screen2-#{STAMP_FINGERPRINT}.css"
+
+        assert_equal new_destination, find_css_path_from_index
+        assert File.exist?(destination_path(new_destination))
       end
     end
 
     def test_supports_relative_and_absolute_destination_paths
       with_site_dir do
         generate_site(:production)
-        expected_path = destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
 
-        assert File.exist?(expected_path)
+        assert File.exist?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
         assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
 
-        find_and_gsub_in_file(source_path('_layouts/default.html'), %r{assets/screen.css}, '/\0')
+        find_and_gsub_in_file(
+          source_path('_layouts/default.html'),
+          '{% ministamp _tmp/site.css assets/screen.css',
+          '{% ministamp _tmp/site.css /assets/screen.css'
+        )
+
         generate_site(:production, clear_cache: false)
 
-        assert File.exist?(expected_path)
         assert_equal "/#{STAMP_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
       end
     end
 
-    def test_does_not_rewrite_destination_when_nonsource_files_change
+    def test_does_not_rewrite_destination_when_changing_nonsource_files
       with_site_dir do
         generate_site(:production)
+
         expected_path = destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
         org_mtime = mtime_of(expected_path)
         ensure_file_mtime_changes { File.write(source_path(JS_BUNDLE_SOURCE_DIR, 'dependency.js'), '(function() {})()') }
+
         generate_site(:production, clear_cache: false)
 
         assert_equal org_mtime, mtime_of(expected_path)
 
         ensure_file_mtime_changes { FileUtils.touch('index.html') }
+
         generate_site(:production, clear_cache: false)
 
         assert_equal org_mtime, mtime_of(expected_path)

data/test/integration/static_files_as_asset_sources_test.rb

@@ -23,6 +23,7 @@ module Jekyll::Minibundle::Test
           contents = 'h2 {}'
           File.write(source_path('assets/shared.css'), contents)
           find_and_gsub_in_file(source_path('_layouts/default.html'), 'ministamp _tmp/site.css', 'ministamp assets/shared.css')
+
           generate_site(env)
 
           asset_files = Dir[destination_path('assets') + '/screen*.css']
@@ -41,6 +42,7 @@ module Jekyll::Minibundle::Test
         File.write(source_path('assets/dependency.js'), dep_contents)
         File.write(source_path('assets/app.js'), app_contents)
         find_and_gsub_in_file(source_path('_layouts/default.html'), 'source_dir: _assets/scripts', 'source_dir: assets')
+
         generate_site(:development)
 
         assert_equal dep_contents, File.read(destination_path('assets/dependency.js'))
@@ -56,6 +58,7 @@ module Jekyll::Minibundle::Test
         File.write(source_path('assets/dependency.js'), dep_contents)
         File.write(source_path('assets/app.js'), app_contents)
         find_and_gsub_in_file(source_path('_layouts/default.html'), 'source_dir: _assets/scripts', 'source_dir: assets')
+
         generate_site(:production)
 
         asset_files = Dir[destination_path('assets/site-*.js')]

data/test/support/assertions.rb

@@ -0,0 +1,24 @@
+module Jekyll::Minibundle::Test
+  module Assertions
+    def assert_contains_only(collection, expected_elements)
+      assert_respond_to collection, :size
+
+      collection_size = collection.size
+      expected_elements_size = expected_elements.size
+
+      assert_equal(expected_elements_size, collection_size, lambda do
+        "Expected #{mu_pp(collection)} to have size #{expected_elements_size} instead of #{collection_size}"
+      end)
+
+      remaining = collection.dup.to_a
+      expected_elements.each do |e|
+        index = remaining.index(e)
+        remaining.delete_at(index) if index
+      end
+
+      assert(remaining.empty?, lambda do
+        "Expected #{mu_pp(collection)} to include only #{mu_pp(expected_elements)}"
+      end)
+    end
+  end
+end

data/test/support/fixture_config.rb

@@ -1,15 +1,18 @@
 module Jekyll::Minibundle::Test
   module FixtureConfig
-    STAMP_SOURCE_PATH = '_tmp/site.css'
-    STAMP_DESTINATION_PATH = 'assets/screen.css'
-    STAMP_DESTINATION_FINGERPRINT_PATH = 'assets/screen-d57c1404fe726e66d57128a1bd190cbb.css'
+    STAMP_SOURCE_PATH = '_tmp/site.css'.freeze
+    STAMP_DESTINATION_PATH = 'assets/screen.css'.freeze
+    STAMP_FINGERPRINT = 'd57c1404fe726e66d57128a1bd190cbb'.freeze
+    STAMP_DESTINATION_FINGERPRINT_PATH = "assets/screen-#{STAMP_FINGERPRINT}.css".freeze
 
-    CSS_BUNDLE_SOURCE_DIR = '_assets/styles'
-    CSS_BUNDLE_DESTINATION_PATH = 'assets/site'
-    CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH = CSS_BUNDLE_DESTINATION_PATH + '-b2e0ecc1c100effc2c7353caad20c327.css'
-    
-    JS_BUNDLE_SOURCE_DIR = '_assets/scripts'
-    JS_BUNDLE_DESTINATION_PATH = 'assets/site'
-    JS_BUNDLE_DESTINATION_FINGERPRINT_PATH = JS_BUNDLE_DESTINATION_PATH + '-4782a1f67803038d4f8351051e67deb8.js'
+    CSS_BUNDLE_SOURCE_DIR = '_assets/styles'.freeze
+    CSS_BUNDLE_DESTINATION_PATH = 'assets/site'.freeze
+    CSS_BUNDLE_FINGERPRINT = 'b2e0ecc1c100effc2c7353caad20c327'.freeze
+    CSS_BUNDLE_DESTINATION_FINGERPRINT_PATH = "#{CSS_BUNDLE_DESTINATION_PATH}-#{CSS_BUNDLE_FINGERPRINT}.css".freeze
+
+    JS_BUNDLE_SOURCE_DIR = '_assets/scripts'.freeze
+    JS_BUNDLE_DESTINATION_PATH = 'assets/site'.freeze
+    JS_BUNDLE_FINGERPRINT = '4782a1f67803038d4f8351051e67deb8'.freeze
+    JS_BUNDLE_DESTINATION_FINGERPRINT_PATH = "#{JS_BUNDLE_DESTINATION_PATH}-#{JS_BUNDLE_FINGERPRINT}.js".freeze
   end
 end

data/test/support/static_file_api_config.rb

@@ -1,10 +1,16 @@
 module Jekyll::Minibundle::Test
   module StaticFileAPIConfig
     STATIC_FILE_API_PROPERTIES = [
-      :to_liquid,
-      :extname,
+      :defaults,
       :destination_rel_dir,
+      :extname,
+      :modified_time,
+      :mtime,
+      :placeholders,
+      :relative_path,
+      :to_liquid,
+      :type,
       :write?
-    ]
+    ].freeze
   end
 end

data/test/support/test_case.rb

@@ -3,11 +3,13 @@ require 'ostruct'
 require 'tempfile'
 require 'minitest/autorun'
 require 'nokogiri'
+require 'support/assertions'
 require 'jekyll'
 require 'jekyll/minibundle'
 
 module Jekyll::Minibundle::Test
   class TestCase < ::Minitest::Test
+    include Assertions
     include ::Jekyll::Minibundle
 
     FIXTURE_DIR = File.expand_path(File.join(File.dirname(__FILE__), '../fixture'))
@@ -54,10 +56,10 @@ module Jekyll::Minibundle::Test
     end
 
     def with_site_dir(&block)
-      Dir.mktmpdir("jekyll-minibundle-test-site-") do |dir|
+      Dir.mktmpdir('jekyll-minibundle-test-site-') do |dir|
         Dir.chdir(dir) do
           _copy_fixture_site_dir(Dir.pwd)
-          yield dir
+          block.call(dir)
         end
       end
     end
@@ -76,7 +78,7 @@ module Jekyll::Minibundle::Test
 
     def with_fake_site(&block)
       with_site_dir do |dir|
-        yield new_fake_site(dir)
+        block.call(new_fake_site(dir))
       end
     end
 
@@ -95,7 +97,7 @@ module Jekyll::Minibundle::Test
 
     def ensure_file_mtime_changes(&block)
       sleep 1.5
-      yield
+      block.call
     end
 
     def minifier_cmd_to_remove_comments
@@ -115,9 +117,8 @@ module Jekyll::Minibundle::Test
     end
 
     def get_send_results(obj, method_names)
-      method_names.reduce({}) do |acc, method_name|
+      method_names.each_with_object({}) do |method_name, acc|
         acc[method_name] = obj.send(method_name)
-        acc
       end
     end