jekyll-minibundle 1.0.0 → 1.1.0

data/test/integration/ministamp_test.rb

@@ -5,24 +5,28 @@ module Jekyll::Minibundle::Test
   class MiniStampTest < TestCase
     include FixtureConfig
 
-    EXPECTED_ASSET_PATH = 'assets/screen-390be921ee0eff063817bb5ef2954300.css'
+    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
+      end
+    end
 
-    def test_asset_path_has_stamp
+    def test_asset_destination_path_has_stamp_in_production_mode
       with_precompiled_site :production do
-        assert_equal EXPECTED_ASSET_PATH, find_css_path_from_index
+        assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
       end
     end
 
     def test_asset_file_is_copied_to_destination_dir
       with_precompiled_site :production do
-        assert File.exists?(destination_path(EXPECTED_ASSET_PATH))
+        assert File.exists?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
       end
     end
 
     def test_asset_file_is_equal_to_source_file
       with_precompiled_site :production do
-        source_contents = File.read site_fixture_path(CSS_STAMP_SOURCE_FILE)
-        destination_contents = File.read destination_path(EXPECTED_ASSET_PATH)
+        source_contents = File.read site_fixture_path(STAMP_SOURCE_PATH)
+        destination_contents = File.read destination_path(STAMP_DESTINATION_FINGERPRINT_PATH)
         assert_equal source_contents, destination_contents
       end
     end
@@ -30,10 +34,10 @@ module Jekyll::Minibundle::Test
     def test_change_asset_file
       with_site do
         generate_site :production
-        assert File.exists?(destination_path(EXPECTED_ASSET_PATH))
-        File.write source_path(CSS_STAMP_SOURCE_FILE), 'h1 {}'
+        assert File.exists?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
+        File.write source_path(STAMP_SOURCE_PATH), 'h1 {}'
         generate_site :production
-        refute File.exists?(destination_path(EXPECTED_ASSET_PATH))
+        refute File.exists?(destination_path(STAMP_DESTINATION_FINGERPRINT_PATH))
         expected_new_path = 'assets/screen-0f5dbd1e527a2bee267e85007b08d2a5.css'
         assert_equal expected_new_path, find_css_path_from_index
         assert File.exists?(destination_path(expected_new_path))
@@ -42,19 +46,35 @@ module Jekyll::Minibundle::Test
 
     def test_supports_relative_and_absolute_destination_paths
       with_site do
-        expected_path = destination_path EXPECTED_ASSET_PATH
-
         generate_site :production
+        expected_path = destination_path STAMP_DESTINATION_FINGERPRINT_PATH
 
         assert File.exists?(expected_path)
-        assert_equal EXPECTED_ASSET_PATH, find_css_path_from_index
+        assert_equal STAMP_DESTINATION_FINGERPRINT_PATH, find_css_path_from_index
 
         find_and_gsub_in_file(source_path('index.html'), %r{assets/screen.css}, '/\0')
 
         generate_site :production
 
         assert File.exists?(expected_path)
-        assert_equal "/#{EXPECTED_ASSET_PATH}", find_css_path_from_index
+        assert_equal "/#{STAMP_DESTINATION_FINGERPRINT_PATH}", find_css_path_from_index
+      end
+    end
+
+    def test_do_not_copy_source_when_other_files_change
+      with_site 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
+
+        assert_equal org_mtime, mtime_of(expected_path)
+
+        ensure_file_mtime_changes { FileUtils.touch 'index.html' }
+        generate_site :production
+
+        assert_equal org_mtime, mtime_of(expected_path)
       end
     end
 

data/test/support/fixture_config.rb

@@ -1,11 +1,15 @@
 module Jekyll::Minibundle::Test
   module FixtureConfig
-    CSS_STAMP_SOURCE_FILE = '_tmp/site.css'
+    STAMP_SOURCE_PATH = '_tmp/site.css'
+    STAMP_DESTINATION_PATH = 'assets/screen.css'
+    STAMP_DESTINATION_FINGERPRINT_PATH = 'assets/screen-390be921ee0eff063817bb5ef2954300.css'
 
-    CSS_BUNDLE_DESTINATION_DIR = 'assets/site'
+    CSS_BUNDLE_DESTINATION_PATH = 'assets/site'
     CSS_BUNDLE_SOURCE_DIR = '_assets/styles'
+    EXPECTED_CSS_BUNDLE_PATH = CSS_BUNDLE_DESTINATION_PATH + '-b2e0ecc1c100effc2c7353caad20c327.css'
     
-    JS_BUNDLE_DESTINATION_DIR = 'assets/site'
+    JS_BUNDLE_DESTINATION_PATH = 'assets/site'
     JS_BUNDLE_SOURCE_DIR = '_assets/scripts'
+    EXPECTED_JS_BUNDLE_PATH = JS_BUNDLE_DESTINATION_PATH + '-4782a1f67803038d4f8351051e67deb8.js'
   end
 end

data/test/support/test_case.rb

@@ -33,6 +33,10 @@ module Jekyll::Minibundle::Test
       File.write file, new_content
     end
 
+    def mtime_of(path)
+      File.stat(path).mtime
+    end
+
     def with_env(env)
       org_env = {}
       env.each do |k, v|
@@ -57,12 +61,25 @@ module Jekyll::Minibundle::Test
       Dir.chdir(_get_precompiled_site(mode), &block)
     end
 
-    def generate_site(mode)
+    def generate_site(mode, options = {})
       with_env 'JEKYLL_MINIBUNDLE_MODE' => mode.to_s do
-        _generate_site Dir.pwd, '_site'
+        _generate_site _get_site_generation_test_options(options)
       end
     end
 
+    def ensure_file_mtime_changes(&block)
+      sleep 1.5
+      yield
+    end
+
+    def cmd_to_remove_comments_and_count
+      site_fixture_path('_bin/with_count') + ' count _bin/remove_comments'
+    end
+
+    def get_cmd_count
+      File.read('count').to_i
+    end
+
     private
 
     def _copy_fixture_site_dir(dir)
@@ -76,23 +93,37 @@ module Jekyll::Minibundle::Test
         dir = Dir.mktmpdir("jekyll-minibundle-test-precompiled-site-#{mode}-")
         at_exit do
           FileUtils.rm_rf dir
-          puts "\nCleaned precompiled site for tests: #{dir}"
+          puts "\nCleaned precompiled site in #{mode} mode for tests: #{dir}"
         end
         Dir.chdir(dir) do
           _copy_fixture_site_dir Dir.pwd
           generate_site mode
         end
-        puts "\nGenerated precompiled site in #{mode} mode for tests: #{dir}"
         dir
       end
     end
 
-    def _generate_site(source, destination)
-      options = {
-        'source'      => source,
-        'destination' => destination
+    def _generate_site(test_options)
+      BundleFile.clear_cache if test_options[:clear_cache]
+
+      capture_io do
+        Jekyll::Site.new(Jekyll.configuration(TestCase.site_generation_jekyll_options)).process
+      end
+    end
+
+    def _get_site_generation_test_options(options)
+      TestCase.site_generation_test_options.merge options
+    end
+
+    def self.site_generation_test_options
+      { clear_cache: true }
+    end
+
+    def self.site_generation_jekyll_options
+      {
+        'source'      => Dir.pwd,
+        'destination' => '_site'
       }
-      capture_io { Jekyll::Site.new(Jekyll.configuration(options)).process }
     end
   end
 end

data/test/unit/asset_bundle_test.rb

@@ -21,7 +21,7 @@ module Jekyll::Minibundle::Test
     def test_raise_exception_if_bundle_command_not_configured
       with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => nil do
         err = assert_raises(RuntimeError) { make_bundle }
-        assert_equal 'You need to set bundling command in $JEKYLL_MINIBUNDLE_CMD_JS', err.to_s
+        assert_equal 'You need to set command for minification in $JEKYLL_MINIBUNDLE_CMD_JS', err.to_s
       end
     end
 

data/test/unit/bundle_file_test.rb

@@ -0,0 +1,57 @@
+require 'support/test_case'
+require 'support/fixture_config'
+require 'jekyll/minibundle/bundle_file'
+
+module Jekyll::Minibundle::Test
+  class BundleFileTest < TestCase
+    include FixtureConfig
+
+    def test_consistent_fingerprint_in_file_and_markup
+      with_site do
+        with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count do
+          bundle_file = BundleFile.new({
+            'type'             => :js,
+            'site_dir'         => '.',
+            'source_dir'       => JS_BUNDLE_SOURCE_DIR,
+            'assets'           => %w{dependency app},
+            'destination_path' => JS_BUNDLE_DESTINATION_PATH,
+            'attributes'       => {}
+          })
+          source = source_path JS_BUNDLE_SOURCE_DIR, 'app.js'
+          old_destination = destination_path EXPECTED_JS_BUNDLE_PATH
+          org_markup, last_markup = nil
+
+          capture_io do
+            org_markup = bundle_file.markup
+            bundle_file.write '_site'
+          end
+
+          org_mtime = mtime_of old_destination
+
+          assert_equal 1, get_cmd_count
+
+          last_markup = bundle_file.markup
+          ensure_file_mtime_changes { File.write source, '(function() {})()' }
+          bundle_file.write '_site'
+
+          # preserve fingerprint and content seen in last markup phase
+          assert_equal org_markup, last_markup
+          assert_equal org_mtime, mtime_of(old_destination)
+          assert_equal 1, get_cmd_count
+
+          capture_io do
+            last_markup = bundle_file.markup
+            bundle_file.write '_site'
+          end
+
+          new_destination = destination_path 'assets/site-375a0b430b0c5555d0edd2205d26c04d.js'
+
+          # see updated fingerprint in the next round
+          refute_equal org_markup, last_markup
+          assert_operator mtime_of(new_destination), :>, org_mtime
+          assert_equal 2, get_cmd_count
+        end
+      end
+    end
+  end
+end

data/test/unit/stamp_file_test.rb

@@ -0,0 +1,42 @@
+require 'support/test_case'
+require 'support/fixture_config'
+require 'jekyll/minibundle/stamp_file'
+
+module Jekyll::Minibundle::Test
+  class StampFileTest < TestCase
+    include FixtureConfig
+
+    def test_consistent_fingerprint_in_file_and_markup
+      with_site do
+        basenamer = ->(base, ext, stamper) { "#{base}-#{stamper.call}#{ext}" }
+        stamp_file = StampFile.new(STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH, &basenamer)
+
+        source = source_path STAMP_SOURCE_PATH
+        old_destination = destination_path STAMP_DESTINATION_FINGERPRINT_PATH
+
+        org_markup = stamp_file.markup
+        stamp_file.write '_site'
+        org_mtime = mtime_of old_destination
+
+        last_markup = stamp_file.markup
+        ensure_file_mtime_changes { File.write source, 'h1 {}' }
+        stamp_file.write '_site'
+
+        # preserve fingerprint and content seen in last markup phase
+        assert_equal org_markup, last_markup
+        assert_equal org_mtime, mtime_of(old_destination)
+        assert_equal File.read(site_fixture_path(STAMP_SOURCE_PATH)), File.read(old_destination)
+
+        last_markup = stamp_file.markup
+        stamp_file.write '_site'
+
+        new_destination = destination_path 'assets/screen-0f5dbd1e527a2bee267e85007b08d2a5.css'
+
+        # see updated fingerprint in the next round
+        refute_equal org_markup, last_markup
+        assert_operator mtime_of(new_destination), :>, org_mtime
+        assert_equal File.read(source), File.read(new_destination)
+      end
+    end
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,10 +78,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- History.md
-- License.txt
+- CHANGELOG.md
+- LICENSE.txt
+- README.md
+- RELEASING.txt
 - Rakefile
-- Readme.md
+- jekyll-minibundle.gemspec
 - lib/jekyll/minibundle/asset_bundle.rb
 - lib/jekyll/minibundle/asset_file_operations.rb
 - lib/jekyll/minibundle/asset_file_paths.rb
@@ -99,6 +92,7 @@ files:
 - lib/jekyll/minibundle/bundle_file.rb
 - lib/jekyll/minibundle/development_file.rb
 - lib/jekyll/minibundle/development_file_collection.rb
+- lib/jekyll/minibundle/environment.rb
 - lib/jekyll/minibundle/mini_bundle_block.rb
 - lib/jekyll/minibundle/mini_stamp_tag.rb
 - lib/jekyll/minibundle/stamp_file.rb
@@ -109,6 +103,7 @@ files:
 - test/fixture/site/_assets/styles/common.css
 - test/fixture/site/_assets/styles/reset.css
 - test/fixture/site/_bin/remove_comments
+- test/fixture/site/_bin/with_count
 - test/fixture/site/_plugins/minibundle.rb
 - test/fixture/site/_tmp/site.css
 - test/fixture/site/index.html
@@ -119,9 +114,12 @@ files:
 - test/support/test_case.rb
 - test/unit/asset_bundle_test.rb
 - test/unit/asset_tag_markup_test.rb
+- test/unit/bundle_file_test.rb
+- test/unit/stamp_file_test.rb
 homepage: https://github.com/tkareine/jekyll-minibundle
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -132,22 +130,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A minimalistic asset bundling plugin for Jekyll
 test_files:
 - test/fixture/site/_assets/scripts/app.js
@@ -155,6 +151,7 @@ test_files:
 - test/fixture/site/_assets/styles/common.css
 - test/fixture/site/_assets/styles/reset.css
 - test/fixture/site/_bin/remove_comments
+- test/fixture/site/_bin/with_count
 - test/fixture/site/_plugins/minibundle.rb
 - test/fixture/site/_tmp/site.css
 - test/fixture/site/index.html
@@ -165,4 +162,6 @@ test_files:
 - test/support/test_case.rb
 - test/unit/asset_bundle_test.rb
 - test/unit/asset_tag_markup_test.rb
+- test/unit/bundle_file_test.rb
+- test/unit/stamp_file_test.rb
 has_rdoc: