jekyll-minibundle 0.2.0 → 1.0.0

data/History.md

@@ -1,3 +1,10 @@
+### 1.0.0 / 2013-02-15
+
+* Add development mode, where `minibundle` block will copy each asset
+  as-is to the destination directory
+* Clarify documentation
+* Increase test coverage
+
 ### 0.2.0 / 2012-12-15
 
 * Escape the values of custom attributes given in `minibundle` block

data/Readme.md

@@ -50,8 +50,7 @@ this line:
 
 Asset stamping is intended to be used together with
 [Compass](http://compass-style.org/) and other similar asset
-generation tools where you do not want to include unprocessed input
-assets in the generated site.
+generation tools that have their own configuration for input sources.
 
 Configure Compass to take inputs from `_assets/styles/*.scss` and to
 put output to `_tmp/site.css`. Use `ministamp` tag to copy the
@@ -59,7 +58,7 @@ processed style asset to the generated site:
 
     <link href="{% ministamp _tmp/site.css assets/site.css %}" rel="stylesheet" media="screen, projection">
 
-Output, containing the MD5 digest in the filename:
+Output, containing the MD5 digest of the file in the filename:
 
     <link href="assets/site-390be921ee0eff063817bb5ef2954300.css" rel="stylesheet" media="screen, projection">
 
@@ -67,13 +66,17 @@ This feature does not require any external tools.
 
 ## Asset bundling
 
-A straightforward way to bundle assets with any tool that supports
-reading input files from STDIN and writing the output to STDOUT. The
-bundled file has MD5 digest in the filename.
+This is a straightforward way to bundle assets with any tool that
+supports reading input from STDIN and writing the output to STDOUT.
+You write the configuration for input sources directly into the
+content file where you want the markup tag for the bundle file to
+appear. The outcome will be a markup tag containing the path to the
+bundle file, and the generated site will have the bundle file in that
+path. The MD5 digest of the file will be included in the filename.
 
-Place `minibundle` block with configuration to your content file where
-you want the generated markup to appear. For example, for bundling
-JavaScript sources:
+Place `minibundle` block with configuration into your content file
+where you want the generated markup to appear. For example, to bundle
+a set of JavaScript sources:
 
     {% minibundle js %}
     source_dir: _assets/scripts
@@ -89,12 +92,12 @@ Then, specify the command for launching your favorite bundling tool in
 `$JEKYLL_MINIBUNDLE_CMD_JS` environment variable. For example, when
 launching Jekyll:
 
-    $ JEKYLL_MINIBUNDLE_CMD_JS="./node_modules/.bin/uglifyjs --" jekyll
+    $ JEKYLL_MINIBUNDLE_CMD_JS='./node_modules/.bin/uglifyjs --' jekyll
 
 You can pass custom attributes to the generated markup with
 `attributes` map in the configuration.
 
-Output:
+Output in the content file:
 
     <script src="assets/site-8e764372a0dbd296033cb2a416f064b5.js" type="text/javascript" id="my-scripts"></script>
 
@@ -113,6 +116,16 @@ For bundling CSS assets, you use `css` as the argument to `minibundle` block:
 And then specify the command for launching bundling in
 `$JEKYLL_MINIBUNDLE_CMD_CSS` environment variable.
 
+## Development mode
+
+For your development workflow, asset bundling can get in the way. To
+remedy this, you can instruct the library into development mode. Then,
+`minibundle` block will not bundle assets, but copy each asset as-is
+to the destination directory under the path specified in
+`destination_path` configuration setting.
+
+    $ JEKYLL_MINIBUNDLE_MODE=development jekyll --auto --server
+
 # Example site
 
 See the contents of `test/fixture/site` directory.

data/lib/jekyll/minibundle/{asset_file_support.rb → asset_file_operations.rb}

@@ -1,7 +1,7 @@
 require 'fileutils'
 
 module Jekyll::Minibundle
-  module AssetFileSupport
+  module AssetFileOperations
     def static_file!(site)
       static_file_exists = site.static_files.find { |f| f.path == path }
       site.static_files << self unless static_file_exists

data/lib/jekyll/minibundle/asset_file_paths.rb

@@ -0,0 +1,27 @@
+module Jekyll::Minibundle
+  module AssetFilePaths
+    def path
+      asset_source_path
+    end
+
+    def asset_path
+      File.join asset_destination_dir, asset_destination_basename
+    end
+
+    def destination(site_destination_dir)
+      File.join site_destination_dir, asset_destination_dir, asset_destination_basename
+    end
+
+    def destination_exists?(site_destination_dir)
+      File.exists? destination(site_destination_dir)
+    end
+
+    def mtime
+      File.stat(path).mtime.to_i
+    end
+
+    def modified?
+      last_mtime_of(path) != mtime
+    end
+  end
+end

data/lib/jekyll/minibundle/{bundle_markup.rb → asset_tag_markup.rb}

@@ -1,7 +1,7 @@
 require 'cgi'
 
 module Jekyll::Minibundle
-  module BundleMarkup
+  module AssetTagMarkup
     def self.make_markup(type, path, attributes)
       case type
       when :js

data/lib/jekyll/minibundle/bundle_file.rb

@@ -1,12 +1,13 @@
 require 'jekyll/minibundle/asset_bundle'
-require 'jekyll/minibundle/asset_file_support'
-require 'jekyll/minibundle/bundle_markup'
+require 'jekyll/minibundle/asset_file_operations'
+require 'jekyll/minibundle/asset_stamp'
+require 'jekyll/minibundle/asset_tag_markup'
 
 module Jekyll::Minibundle
   class BundleFile
-    include AssetFileSupport
+    include AssetFileOperations
 
-    @@mtimes = Hash.new
+    @@mtimes = {}
 
     def initialize(config)
       @type = config['type']
@@ -15,7 +16,6 @@ module Jekyll::Minibundle
       @assets = config['assets'].map { |asset_path| File.join asset_source_dir, "#{asset_path}.#{@type}" }
       @asset_destination_path = config['destination_path']
       @attributes = config['attributes']
-      update_mtime
     end
 
     def path
@@ -39,19 +39,21 @@ module Jekyll::Minibundle
     end
 
     def write(site_destination_dir)
-      rebundle_assets if modified?
-      destination_path = destination site_destination_dir
+      is_modified = modified?
 
-      return false if File.exist?(destination_path) and !modified?
+      rebundle_assets if is_modified
 
-      update_mtime
-      write_destination site_destination_dir
-
-      true
+      if File.exists?(destination(site_destination_dir)) && !is_modified
+        false
+      else
+        update_mtime
+        write_destination site_destination_dir
+        true
+      end
     end
 
     def markup
-      BundleMarkup.make_markup @type, asset_path, @attributes
+      AssetTagMarkup.make_markup @type, asset_path, @attributes
     end
 
     private

data/lib/jekyll/minibundle/development_file.rb

@@ -0,0 +1,39 @@
+require 'jekyll/minibundle/asset_file_operations'
+require 'jekyll/minibundle/asset_file_paths'
+
+module Jekyll::Minibundle
+  class DevelopmentFile
+    include AssetFileOperations
+    include AssetFilePaths
+
+    @@mtimes = {}
+
+    attr_reader :asset_source_path, :asset_destination_dir, :asset_destination_basename
+
+    def initialize(asset_source_path, asset_destination_path)
+      @asset_source_path = asset_source_path
+      @asset_destination_dir = File.dirname asset_destination_path
+      @asset_destination_basename = File.basename asset_destination_path
+    end
+
+    def last_mtime_of(path)
+      @@mtimes[path]
+    end
+
+    def write(site_destination_dir)
+      if destination_exists?(site_destination_dir) && !modified?
+        false
+      else
+        update_mtime
+        write_destination site_destination_dir
+        true
+      end
+    end
+
+    private
+
+    def update_mtime
+      @@mtimes[path] = mtime
+    end
+  end
+end

data/lib/jekyll/minibundle/development_file_collection.rb

@@ -0,0 +1,34 @@
+require 'jekyll/minibundle/asset_tag_markup'
+require 'jekyll/minibundle/development_file'
+
+module Jekyll::Minibundle
+  class DevelopmentFileCollection
+    def initialize(config)
+      @type = config['type']
+      asset_source_dir = File.join config['site_dir'], config['source_dir']
+      asset_destination_path = config['destination_path']
+
+      @files = config['assets'].map do |asset_path|
+        asset_basename = "#{asset_path}.#{@type}"
+        asset_source = File.join asset_source_dir, asset_basename
+        asset_destination = File.join asset_destination_path, asset_basename
+        DevelopmentFile.new asset_source, asset_destination
+      end
+
+      @attributes = config['attributes']
+    end
+
+    def static_file!(site)
+      # NOTE: We could optimize here by iterating over site's static
+      # files only once instead of per each of our file. Seems like a
+      # premature optimization for now, however.
+      @files.each { |f| f.static_file! site }
+    end
+
+    def markup
+      @files.
+        map { |f| AssetTagMarkup.make_markup @type, f.asset_path, @attributes }.
+        join('')
+    end
+  end
+end

data/lib/jekyll/minibundle/mini_bundle_block.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'jekyll/minibundle/bundle_file'
+require 'jekyll/minibundle/development_file_collection'
 
 module Jekyll::Minibundle
   class MiniBundleBlock < Liquid::Block
@@ -9,12 +10,15 @@ module Jekyll::Minibundle
     end
 
     def render(context)
-      current_config = YAML.load super
       site = context.registers[:site]
-      config = default_config.
-        merge(current_config).
-        merge({ 'type' => @type, 'site_dir' => site.source})
-      file = BundleFile.new config
+      config = get_current_config YAML.load(super), site
+
+      file = if ENV['JEKYLL_MINIBUNDLE_MODE'] == 'development'
+        DevelopmentFileCollection.new config
+      else
+        BundleFile.new config
+      end
+
       file.static_file! site
       file.markup
     end
@@ -27,6 +31,14 @@ module Jekyll::Minibundle
         'attributes'        => {}
       }
     end
+
+    private
+
+    def get_current_config(user_config, site)
+      default_config.
+        merge(user_config).
+        merge({ 'type' => @type, 'site_dir' => site.source })
+    end
   end
 end
 

data/lib/jekyll/minibundle/stamp_file.rb

@@ -1,50 +1,39 @@
-require 'jekyll/minibundle/asset_file_support'
+require 'jekyll/minibundle/asset_file_operations'
+require 'jekyll/minibundle/asset_file_paths'
 require 'jekyll/minibundle/asset_stamp'
 
 module Jekyll::Minibundle
   class StampFile
-    include AssetFileSupport
+    include AssetFileOperations
+    include AssetFilePaths
 
-    @@mtimes = Hash.new
+    @@mtimes = {}
+
+    attr_reader :asset_source_path, :asset_destination_dir
 
     def initialize(asset_source_path, asset_destination_path)
       @asset_source_path = asset_source_path
       @asset_destination_dir = File.dirname asset_destination_path
       @asset_destination_extension = File.extname asset_destination_path
       @asset_destination_base_prefix = File.basename(asset_destination_path)[0 .. -(@asset_destination_extension.size + 1)]
-      update_mtime
-    end
-
-    def path
-      @asset_source_path
-    end
-
-    def asset_path
-      File.join @asset_destination_dir, asset_destination_basename
     end
 
-    def destination(site_destination_dir)
-      File.join site_destination_dir, @asset_destination_dir, asset_destination_basename
-    end
-
-    def mtime
-      File.stat(path).mtime.to_i
-    end
-
-    def modified?
-      @@mtimes[path] != mtime
+    def last_mtime_of(path)
+      @@mtimes[path]
     end
 
     def write(site_destination_dir)
-      clear_asset_stamp if modified?
-      destination_path = destination site_destination_dir
-
-      return false if File.exist?(destination_path) and !modified?
+      is_modified = modified?
 
-      update_mtime
-      write_destination site_destination_dir
+      clear_asset_stamp if is_modified
 
-      true
+      if destination_exists?(site_destination_dir) && !is_modified
+        false
+      else
+        update_mtime
+        write_destination site_destination_dir
+        true
+      end
     end
 
     private

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '0.2.0'
+    VERSION = '1.0.0'
   end
 end

data/test/integration/minibundle_development_mode_test.rb

@@ -0,0 +1,121 @@
+require 'support/test_case'
+require 'support/fixture_config'
+
+module Jekyll::Minibundle::Test
+  class MiniBundleDevelopmentModeTest < TestCase
+    include FixtureConfig
+
+    EXPECTED_CSS_ASSET_PATHS = %w{reset common}.map { |f| File.join(CSS_BUNDLE_DESTINATION_DIR, "#{f}.css") }
+    EXPECTED_JS_ASSET_PATHS = %w{dependency app}.map { |f| File.join(JS_BUNDLE_DESTINATION_DIR, "#{f}.js") }
+
+    def test_css_assets_have_tags_in_configured_order
+      with_precompiled_site :development do
+        assert_equal EXPECTED_CSS_ASSET_PATHS, find_css_paths_from_index
+      end
+    end
+
+    def test_js_assets_have_tags_in_configured_order
+      with_precompiled_site :development do
+        assert_equal EXPECTED_JS_ASSET_PATHS, find_js_paths_from_index
+      end
+    end
+
+    def test_css_assets_are_copied_to_destination_dir
+      with_precompiled_site :development do
+        EXPECTED_CSS_ASSET_PATHS.each do |path|
+          expect_file_exists_and_is_equal_to(destination_path(path), site_fixture_path(CSS_BUNDLE_SOURCE_DIR, File.basename(path)))
+        end
+      end
+    end
+
+    def test_js_assets_are_copied_to_destination_dir
+      with_precompiled_site :development do
+        EXPECTED_JS_ASSET_PATHS.each do |path|
+          expect_file_exists_and_is_equal_to(destination_path(path), site_fixture_path(JS_BUNDLE_SOURCE_DIR, File.basename(path)))
+        end
+      end
+    end
+
+    def test_changing_css_asset_copies_it_to_destination_dir
+      with_site do
+        destination = destination_path CSS_BUNDLE_DESTINATION_DIR, 'common.css'
+        source = source_path CSS_BUNDLE_SOURCE_DIR, 'common.css'
+
+        generate_site :development
+        ensure_file_mtime_change { File.write source, 'h1 {}' }
+        refute_equal File.read(destination), File.read(source)
+        generate_site :development
+        assert_equal File.read(destination), File.read(source)
+      end
+    end
+
+    def test_changing_js_asset_copies_it_to_destination_dir
+      with_site do
+        destination = destination_path JS_BUNDLE_DESTINATION_DIR, 'app.js'
+        source = source_path JS_BUNDLE_SOURCE_DIR, 'app.js'
+
+        generate_site :development
+        ensure_file_mtime_change { File.write source, '(function() {})()' }
+        refute_equal File.read(destination), File.read(source)
+        generate_site :development
+        assert_equal File.read(destination), File.read(source)
+      end
+    end
+
+    def test_supports_relative_and_absolute_destination_paths
+      with_site do
+        expected_css_path = destination_path CSS_BUNDLE_DESTINATION_DIR, 'common.css'
+        expected_js_path = destination_path JS_BUNDLE_DESTINATION_DIR, 'app.js'
+
+        generate_site :development
+
+        assert File.exists?(expected_css_path)
+        assert File.exists?(expected_js_path)
+        assert_equal 'assets/site/common.css', find_css_paths_from_index.last
+        assert_equal 'assets/site/app.js', find_js_paths_from_index.last
+
+        find_and_gsub_in_file source_path('index.html'), 'destination_path: assets/site', 'destination_path: /assets/site'
+
+        generate_site :development
+
+        assert File.exists?(expected_css_path)
+        assert File.exists?(expected_js_path)
+        assert_equal '/assets/site/common.css', find_css_paths_from_index.last
+        assert_equal '/assets/site/app.js', find_js_paths_from_index.last
+      end
+    end
+
+    def test_do_not_require_bundling_cmds
+      with_site do
+        with_env 'JEKYLL_MINIBUNDLE_CMD_CSS' => nil, 'JEKYLL_MINIBUNDLE_CMD_JS' => nil do
+          generate_site :development
+          pass
+        end
+      end
+    end
+
+    private
+
+    def find_css_paths_from_index
+      find_html_elements_from_index('head link[media="projection"]').map { |el| el['href'] }
+    end
+
+    def find_js_paths_from_index
+      find_html_elements_from_index('body script').map { |el| el['src'] }
+    end
+
+    def find_html_elements_from_index(css)
+      find_html_element(File.read(destination_path('index.html')), css)
+    end
+
+    def expect_file_exists_and_is_equal_to(actual, expected)
+      assert File.exists?(actual)
+      assert_equal File.read(expected), File.read(actual)
+    end
+
+    def ensure_file_mtime_change(&block)
+      sleep 1.5  # ensures file mtime gets changed
+      yield
+    end
+  end
+end

data/test/integration/minibundle_production_mode_test.rb

@@ -0,0 +1,157 @@
+require 'support/test_case'
+require 'support/fixture_config'
+
+module Jekyll::Minibundle::Test
+  class MiniBundleProductionModeTest < TestCase
+    include FixtureConfig
+
+    EXPECTED_CSS_ASSET_PATH = 'assets/site-b2e0ecc1c100effc2c7353caad20c327.css'
+    EXPECTED_JS_ASSET_PATH = 'assets/site-4782a1f67803038d4f8351051e67deb8.js'
+
+    def test_css_asset_bundle_has_configured_attributes
+      with_precompiled_site :production do
+        element = find_html_element_from_index %{head link[href="#{EXPECTED_CSS_ASSET_PATH}"]}
+        assert_equal 'my-styles', element['id']
+        assert_equal 'projection', element['media']
+      end
+    end
+
+    def test_js_asset_bundle_has_configured_attributes
+      with_precompiled_site :production do
+        element = find_html_element_from_index %{body script[src="#{EXPECTED_JS_ASSET_PATH}"]}
+        assert_equal 'my-scripts', element['id']
+      end
+    end
+
+    def test_css_asset_bundle_has_stamp
+      with_precompiled_site :production do
+        assert_equal EXPECTED_CSS_ASSET_PATH, find_css_path_from_index
+      end
+    end
+
+    def test_js_asset_bundle_has_stamp
+      with_precompiled_site :production do
+        assert_equal EXPECTED_JS_ASSET_PATH, find_js_path_from_index
+      end
+    end
+
+    def test_css_asset_bundle_is_copied_to_destination_dir
+      with_precompiled_site :production do
+        assert File.exists?(destination_path(EXPECTED_CSS_ASSET_PATH))
+      end
+    end
+
+    def test_js_asset_bundle_is_copied_to_destination_dir
+      with_precompiled_site :production do
+        assert File.exists?(destination_path(EXPECTED_JS_ASSET_PATH))
+      end
+    end
+
+    def test_css_asset_bundle_is_concatenated_in_configured_order
+      with_precompiled_site :production do
+        bundle = File.read(destination_path(EXPECTED_CSS_ASSET_PATH))
+        assert_operator bundle.index('html { margin: 0; }'), :<, bundle.index('p { margin: 0; }')
+      end
+    end
+
+    def test_js_asset_bundle_is_concatenated_in_configured_order
+      with_precompiled_site :production do
+        bundle = File.read(destination_path(EXPECTED_JS_ASSET_PATH))
+        assert_operator bundle.index('root.dependency = {};'), :<, bundle.index('root.app = {};')
+      end
+    end
+
+    def test_js_asset_bundle_has_inserted_semicolons_between_assets
+      with_precompiled_site :production do
+        bundle = File.read(destination_path(EXPECTED_JS_ASSET_PATH))
+        assert_match(%r|}\)\(window\)\n;\n\(function|, bundle)
+      end
+    end
+
+    def test_css_asset_bundle_is_minified
+      with_precompiled_site :production do
+        source_contents_size = source_assets_size(CSS_BUNDLE_SOURCE_DIR, %w{reset common}, 'css')
+        destination_contents_size = File.read(destination_path(EXPECTED_CSS_ASSET_PATH)).size
+        assert_operator destination_contents_size, :<, source_contents_size
+      end
+    end
+
+    def test_js_asset_bundle_is_minified
+      with_precompiled_site :production do
+        source_contents_size = source_assets_size(JS_BUNDLE_SOURCE_DIR, %w{dependency app}, 'js')
+        destination_contents_size = File.read(destination_path(EXPECTED_JS_ASSET_PATH)).size
+        assert_operator destination_contents_size, :<, source_contents_size
+      end
+    end
+
+    def test_changing_css_assets_changes_bundle
+      with_site do
+        generate_site :production
+        assert File.exists?(destination_path(EXPECTED_CSS_ASSET_PATH))
+        File.write source_path('_assets/styles/common.css'), 'h1 {}'
+        generate_site :production
+        refute File.exists?(destination_path(EXPECTED_CSS_ASSET_PATH))
+        expected_new_path = 'assets/site-9fd3995d6f0fce425db81c3691dfe93f.css'
+        assert_equal expected_new_path, find_css_path_from_index
+        assert File.exists?(destination_path(expected_new_path))
+      end
+    end
+
+    def test_changing_js_assets_changes_bundle
+      with_site do
+        generate_site :production
+        assert File.exists?(destination_path(EXPECTED_JS_ASSET_PATH))
+        File.write source_path('_assets/scripts/app.js'), '(function() {})()'
+        generate_site :production
+        refute File.exists?(destination_path(EXPECTED_JS_ASSET_PATH))
+        expected_new_path = 'assets/site-375a0b430b0c5555d0edd2205d26c04d.js'
+        assert_equal expected_new_path, find_js_path_from_index
+        assert File.exists?(destination_path(expected_new_path))
+      end
+    end
+
+    def test_supports_relative_and_absolute_destination_paths
+      with_site do
+        expected_css_path = destination_path EXPECTED_CSS_ASSET_PATH
+        expected_js_path = destination_path EXPECTED_JS_ASSET_PATH
+
+        generate_site :production
+
+        assert File.exists?(expected_css_path)
+        assert File.exists?(expected_js_path)
+        assert_equal EXPECTED_CSS_ASSET_PATH, find_css_path_from_index
+        assert_equal EXPECTED_JS_ASSET_PATH, find_js_path_from_index
+
+        find_and_gsub_in_file source_path('index.html'), 'destination_path: assets/site', 'destination_path: /assets/site'
+
+        generate_site :production
+
+        assert File.exists?(expected_css_path)
+        assert File.exists?(expected_js_path)
+        assert_equal "/#{EXPECTED_CSS_ASSET_PATH}", find_css_path_from_index
+        assert_equal "/#{EXPECTED_JS_ASSET_PATH}", find_js_path_from_index
+      end
+    end
+
+    private
+
+    def find_css_path_from_index
+      find_html_element_from_index('head link[media="projection"]')['href']
+    end
+
+    def find_js_path_from_index
+      find_html_element_from_index('body script')['src']
+    end
+
+    def find_html_element_from_index(css)
+      find_html_element(File.read(destination_path('index.html')), css).first
+    end
+
+    def source_assets_size(source_subdir, assets, type)
+      assets.
+        map { |f| File.read site_fixture_path(source_subdir, "#{f}.#{type}") }.
+        join('').
+        size
+    end
+  end
+end

data/test/integration/ministamp_test.rb

@@ -1,22 +1,67 @@
 require 'support/test_case'
+require 'support/fixture_config'
 
 module Jekyll::Minibundle::Test
   class MiniStampTest < TestCase
+    include FixtureConfig
+
     EXPECTED_ASSET_PATH = 'assets/screen-390be921ee0eff063817bb5ef2954300.css'
 
     def test_asset_path_has_stamp
-      actual = find_html_element(read_from_destination('index.html'), 'head link').first['href']
-      assert_equal EXPECTED_ASSET_PATH, actual
+      with_precompiled_site :production do
+        assert_equal EXPECTED_ASSET_PATH, find_css_path_from_index
+      end
     end
 
     def test_asset_file_is_copied_to_destination_dir
-      assert File.exists?(destination_path(EXPECTED_ASSET_PATH))
+      with_precompiled_site :production do
+        assert File.exists?(destination_path(EXPECTED_ASSET_PATH))
+      end
     end
 
     def test_asset_file_is_equal_to_source_file
-      source_contents = File.read source_path('_tmp/site.css')
-      destination_contents = File.read destination_path(EXPECTED_ASSET_PATH)
-      assert_equal source_contents, destination_contents
+      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)
+        assert_equal source_contents, destination_contents
+      end
+    end
+
+    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 {}'
+        generate_site :production
+        refute File.exists?(destination_path(EXPECTED_ASSET_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))
+      end
+    end
+
+    def test_supports_relative_and_absolute_destination_paths
+      with_site do
+        expected_path = destination_path EXPECTED_ASSET_PATH
+
+        generate_site :production
+
+        assert File.exists?(expected_path)
+        assert_equal EXPECTED_ASSET_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
+      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/support/fixture_config.rb

@@ -0,0 +1,11 @@
+module Jekyll::Minibundle::Test
+  module FixtureConfig
+    CSS_STAMP_SOURCE_FILE = '_tmp/site.css'
+
+    CSS_BUNDLE_DESTINATION_DIR = 'assets/site'
+    CSS_BUNDLE_SOURCE_DIR = '_assets/styles'
+    
+    JS_BUNDLE_DESTINATION_DIR = 'assets/site'
+    JS_BUNDLE_SOURCE_DIR = '_assets/scripts'
+  end
+end

data/test/support/test_case.rb

@@ -10,24 +10,29 @@ module Jekyll::Minibundle::Test
     include ::Jekyll::Minibundle
 
     FIXTURE_DIR = File.expand_path(File.join(File.dirname(__FILE__), '../fixture'))
-    SOURCE_DIR = File.join(FIXTURE_DIR, 'site')
 
-    def source_path(*args)
-      File.join(SOURCE_DIR, *args)
+    def site_fixture_path(*args)
+      File.join(FIXTURE_DIR, 'site', *args)
     end
 
-    def destination_path(*args)
-      File.join(_destination_dir, *args)
+    def source_path(*args)
+      File.join(Dir.pwd, *args)
     end
 
-    def read_from_destination(*args)
-      File.read destination_path(*args)
+    def destination_path(*args)
+      File.join(Dir.pwd, '_site', *args)
     end
 
     def find_html_element(file, css)
       Nokogiri::HTML(file).css(css)
     end
 
+    def find_and_gsub_in_file(file, pattern, replacement)
+      old_content = File.read file
+      new_content = old_content.gsub pattern, replacement
+      File.write file, new_content
+    end
+
     def with_env(env)
       org_env = {}
       env.each do |k, v|
@@ -39,24 +44,52 @@ module Jekyll::Minibundle::Test
       org_env.each { |k, v| ENV[k] = v }
     end
 
+    def with_site(&block)
+      Dir.mktmpdir "jekyll-minibundle-test-site-" do |dir|
+        Dir.chdir dir do
+          _copy_fixture_site_dir Dir.pwd
+          yield dir
+        end
+      end
+    end
+
+    def with_precompiled_site(mode, &block)
+      Dir.chdir(_get_precompiled_site(mode), &block)
+    end
+
+    def generate_site(mode)
+      with_env 'JEKYLL_MINIBUNDLE_MODE' => mode.to_s do
+        _generate_site Dir.pwd, '_site'
+      end
+    end
+
     private
 
-    def _destination_dir(&block)
-      @@_destination_dir ||= begin
-        dir = Dir.mktmpdir('jekyll-minibundle-test-')
+    def _copy_fixture_site_dir(dir)
+      FileUtils.cp_r site_fixture_path('.'), dir
+    end
+
+    @@_precompiled_site_dirs = {}
+
+    def _get_precompiled_site(mode)
+      @@_precompiled_site_dirs[mode] ||= begin
+        dir = Dir.mktmpdir("jekyll-minibundle-test-precompiled-site-#{mode}-")
         at_exit do
           FileUtils.rm_rf dir
-          puts "\nCleaned generated site for tests: #{dir}"
+          puts "\nCleaned precompiled site for tests: #{dir}"
+        end
+        Dir.chdir(dir) do
+          _copy_fixture_site_dir Dir.pwd
+          generate_site mode
         end
-        Dir.chdir(dir) { _generate_site dir }
-        puts "\nGenerated site for tests: #{dir}"
+        puts "\nGenerated precompiled site in #{mode} mode for tests: #{dir}"
         dir
       end
     end
 
-    def _generate_site(destination)
+    def _generate_site(source, destination)
       options = {
-        'source'      => source_path,
+        'source'      => source,
         'destination' => destination
       }
       capture_io { Jekyll::Site.new(Jekyll.configuration(options)).process }

data/test/unit/asset_bundle_test.rb

@@ -5,7 +5,7 @@ module Jekyll::Minibundle::Test
   class AssetBundleTest < TestCase
     def test_raise_exception_if_bundle_command_fails
       capture_io do
-        with_env('JEKYLL_MINIBUNDLE_CMD_JS' => 'false') do
+        with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => 'false' do
           err = assert_raises(RuntimeError) { make_bundle }
           assert_equal 'Bundling js assets failed with exit status 1, command: false', err.to_s
         end
@@ -13,13 +13,13 @@ module Jekyll::Minibundle::Test
     end
 
     def test_raise_exception_if_bundle_command_not_found
-      with_env('JEKYLL_MINIBUNDLE_CMD_JS' => 'no-such-jekyll-minibundle-cmd') do
+      with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => 'no-such-jekyll-minibundle-cmd' do
         assert_raises(Errno::ENOENT) { make_bundle }
       end
     end
 
     def test_raise_exception_if_bundle_command_not_configured
-      with_env('JEKYLL_MINIBUNDLE_CMD_JS' => nil) do
+      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
       end
@@ -28,7 +28,7 @@ module Jekyll::Minibundle::Test
     private
 
     def make_bundle
-      bundle = AssetBundle.new :js, [source_path('_assets/scripts/dependency.js')], source_path
+      bundle = AssetBundle.new :js, [site_fixture_path('_assets/scripts/dependency.js')], site_fixture_path
       bundle.make_bundle
     end
   end

data/test/unit/{bundle_markup_test.rb → asset_tag_markup_test.rb}

@@ -1,11 +1,11 @@
 require 'support/test_case'
-require 'jekyll/minibundle/bundle_markup'
+require 'jekyll/minibundle/asset_tag_markup'
 
 module Jekyll::Minibundle::Test
-  class BundleMarkupTest < TestCase
+  class AssetTagMarkupTest < TestCase
     def test_escape_attribute_value
       attributes = { media: 'screen, projection', extra: '">attack<br' }
-      actual = BundleMarkup.make_markup :css, 'http://localhost', attributes
+      actual = AssetTagMarkup.make_markup :css, 'http://localhost', attributes
       expected = %{<link rel="stylesheet" href="http://localhost" media="screen, projection" extra="&quot;&gt;attack&lt;br">}
       assert_equal expected, actual
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: 4.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,16 +91,19 @@ files:
 - License.txt
 - Rakefile
 - Readme.md
-- lib/jekyll/minibundle.rb
 - lib/jekyll/minibundle/asset_bundle.rb
-- lib/jekyll/minibundle/asset_file_support.rb
+- lib/jekyll/minibundle/asset_file_operations.rb
+- lib/jekyll/minibundle/asset_file_paths.rb
 - lib/jekyll/minibundle/asset_stamp.rb
+- lib/jekyll/minibundle/asset_tag_markup.rb
 - lib/jekyll/minibundle/bundle_file.rb
-- lib/jekyll/minibundle/bundle_markup.rb
+- lib/jekyll/minibundle/development_file.rb
+- lib/jekyll/minibundle/development_file_collection.rb
 - lib/jekyll/minibundle/mini_bundle_block.rb
 - lib/jekyll/minibundle/mini_stamp_tag.rb
 - lib/jekyll/minibundle/stamp_file.rb
 - lib/jekyll/minibundle/version.rb
+- lib/jekyll/minibundle.rb
 - test/fixture/site/_assets/scripts/app.js
 - test/fixture/site/_assets/scripts/dependency.js
 - test/fixture/site/_assets/styles/common.css
@@ -109,11 +112,13 @@ files:
 - test/fixture/site/_plugins/minibundle.rb
 - test/fixture/site/_tmp/site.css
 - test/fixture/site/index.html
-- test/integration/minibundle_test.rb
+- test/integration/minibundle_development_mode_test.rb
+- test/integration/minibundle_production_mode_test.rb
 - test/integration/ministamp_test.rb
-- test/unit/asset_bundle_test.rb
-- test/unit/bundle_markup_test.rb
+- test/support/fixture_config.rb
 - test/support/test_case.rb
+- test/unit/asset_bundle_test.rb
+- test/unit/asset_tag_markup_test.rb
 homepage: https://github.com/tkareine/jekyll-minibundle
 licenses:
 - MIT
@@ -140,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A minimalistic asset bundling plugin for Jekyll
@@ -153,9 +158,11 @@ test_files:
 - test/fixture/site/_plugins/minibundle.rb
 - test/fixture/site/_tmp/site.css
 - test/fixture/site/index.html
-- test/integration/minibundle_test.rb
+- test/integration/minibundle_development_mode_test.rb
+- test/integration/minibundle_production_mode_test.rb
 - test/integration/ministamp_test.rb
-- test/unit/asset_bundle_test.rb
-- test/unit/bundle_markup_test.rb
+- test/support/fixture_config.rb
 - test/support/test_case.rb
+- test/unit/asset_bundle_test.rb
+- test/unit/asset_tag_markup_test.rb
 has_rdoc: 

data/test/integration/minibundle_test.rb

@@ -1,77 +0,0 @@
-require 'support/test_case'
-
-module Jekyll::Minibundle::Test
-  class MiniBundleTest < TestCase
-    EXPECTED_CSS_ASSET_PATH = 'assets/site-b2e0ecc1c100effc2c7353caad20c327.css'
-    EXPECTED_JS_ASSET_PATH = 'assets/site-4782a1f67803038d4f8351051e67deb8.js'
-
-    def test_css_asset_bundle_has_configured_attributes
-      element = find_html_element_from_index(%{head link[href="#{EXPECTED_CSS_ASSET_PATH}"]}).first
-      assert_equal 'my-styles', element['id']
-      assert_equal 'projection', element['media']
-    end
-
-    def test_js_asset_bundle_has_configured_attributes
-      element = find_html_element_from_index(%{body script[src="#{EXPECTED_JS_ASSET_PATH}"]}).first
-      assert_equal 'my-scripts', element['id']
-    end
-
-    def test_css_asset_bundle_has_stamp
-      actual = find_html_element_from_index('head link[media="projection"]').first['href']
-      assert_equal EXPECTED_CSS_ASSET_PATH, actual
-    end
-
-    def test_js_asset_bundle_has_stamp
-      actual = find_html_element_from_index('body script').first['src']
-      assert_equal EXPECTED_JS_ASSET_PATH, actual
-    end
-
-    def test_css_asset_bundle_is_copied_to_destination_dir
-      assert File.exists?(destination_path(EXPECTED_CSS_ASSET_PATH))
-    end
-
-    def test_js_asset_bundle_is_copied_to_destination_dir
-      assert File.exists?(destination_path(EXPECTED_JS_ASSET_PATH))
-    end
-
-    def test_css_asset_bundle_is_concatenated_in_configured_order
-      bundle = File.read(destination_path(EXPECTED_CSS_ASSET_PATH))
-      assert bundle.index('html { margin: 0; }') < bundle.index('p { margin: 0; }')
-    end
-
-    def test_js_asset_bundle_is_concatenated_in_configured_order
-      bundle = File.read(destination_path(EXPECTED_JS_ASSET_PATH))
-      assert bundle.index('root.dependency = {};') < bundle.index('root.app = {};')
-    end
-
-    def test_js_asset_bundle_has_inserted_semicolons_between_assets
-      bundle = File.read(destination_path(EXPECTED_JS_ASSET_PATH))
-      assert_match(%r|}\)\(window\)\n;\n\(function|, bundle)
-    end
-
-    def test_css_asset_bundle_is_minified
-      source_contents_size = source_assets_size('_assets/styles', %w{reset common}, 'css')
-      destination_contents_size = File.read(destination_path(EXPECTED_CSS_ASSET_PATH)).size
-      assert destination_contents_size < source_contents_size
-    end
-
-    def test_js_asset_bundle_is_minified
-      source_contents_size = source_assets_size('_assets/scripts', %w{dependency app}, 'js')
-      destination_contents_size = File.read(destination_path(EXPECTED_JS_ASSET_PATH)).size
-      assert destination_contents_size < source_contents_size
-    end
-
-    private
-
-    def find_html_element_from_index(css)
-      find_html_element(read_from_destination('index.html'), css)
-    end
-
-    def source_assets_size(source_subdir, assets, type)
-      assets.
-        map { |f| File.read source_path(source_subdir, "#{f}.#{type}") }.
-        join('').
-        size
-    end
-  end
-end