jekyll-minibundle 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e710ae4041aa12d52354bcfe4d26cede0a7f8c11
-  data.tar.gz: d50a377c564e3186c790203e8c90d71a02c66cf8
+  metadata.gz: 53e069cbc2278b08d8cf93fc9598882f24a56b7f
+  data.tar.gz: 3fa82515fa89f2d632c5428f29adb233663e5f8f
 SHA512:
-  metadata.gz: dadbb64b20d2000b3f02285ed43b9d69ebcfd46201f62a034ec08cd7d24cf645cd2415265a05af1d7dc0d6c65438cf61ed1c657cd4abd02f53daff0a221d76c7
-  data.tar.gz: b214ee8464dc1f7ac95da50cbbf3635491fc9f990b167add78ef6f956e421770d9b8391d4b2e9572ce8f735c64eb9c796a4e08326f6b8c7d4d21c01deb851f78
+  metadata.gz: 158f82d5e10ea274b76d353b159fbed84b81d12c82cbd6339d3829056edda0adb473f7700336c24e18c765b0f632797e0227ce0e5ae488f01383989a4022f90c
+  data.tar.gz: 8380c680bda3674dfd760c32aa6b5cbb69f7d9a88ca9b1825d97f20c7d03f1be9bb2bf2334e418fcf1ab01be5fd2188881c3b145d917f73d40a5017cc3f6276a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.4.1 / 2013-12-27
+
+* Add missing files to gem package
+
 # 1.4.0 / 2013-12-27
 
 * Fix bug causing exception to be thrown when `ministamp` or

data/jekyll-minibundle.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
 
   s.description = <<-END
 A straightforward asset bundling plugin for Jekyll, utilizing external
-minification tool of your choice. Provides asset concatenation for
-bundling and asset fingerprinting with MD5 digest for cache busting. No
-other runtime dependencies besides the minification tool (not even
-other gems).
+minification tool of your choice. It provides asset concatenation for
+bundling and asset fingerprinting with MD5 digest for cache
+busting. There are no other runtime dependencies besides the
+minification tool (not even other gems).
   END
 
   s.files = %w{
@@ -24,9 +24,11 @@ other gems).
     RELEASING.txt
     Rakefile
     jekyll-minibundle.gemspec
+    lib/jekyll/minibundle.rb
     lib/jekyll/minibundle/asset_bundle.rb
     lib/jekyll/minibundle/asset_file_operations.rb
     lib/jekyll/minibundle/asset_file_paths.rb
+    lib/jekyll/minibundle/asset_file_registry.rb
     lib/jekyll/minibundle/asset_stamp.rb
     lib/jekyll/minibundle/asset_tag_markup.rb
     lib/jekyll/minibundle/bundle_file.rb
@@ -37,7 +39,6 @@ other gems).
     lib/jekyll/minibundle/mini_stamp_tag.rb
     lib/jekyll/minibundle/stamp_file.rb
     lib/jekyll/minibundle/version.rb
-    lib/jekyll/minibundle.rb
   }
 
   s.test_files = %w{
@@ -47,15 +48,21 @@ other gems).
     test/fixture/site/_assets/styles/reset.css
     test/fixture/site/_bin/remove_comments
     test/fixture/site/_bin/with_count
+    test/fixture/site/_config.yml
+    test/fixture/site/_layouts/default.html
     test/fixture/site/_plugins/minibundle.rb
     test/fixture/site/_tmp/site.css
+    test/fixture/site/about.html
+    test/fixture/site/assets/styles/reset.css
     test/fixture/site/index.html
     test/integration/minibundle_development_mode_test.rb
     test/integration/minibundle_production_mode_test.rb
     test/integration/ministamp_test.rb
+    test/integration/static_files_as_asset_sources_test.rb
     test/support/fixture_config.rb
     test/support/test_case.rb
     test/unit/asset_bundle_test.rb
+    test/unit/asset_file_registry_test.rb
     test/unit/asset_tag_markup_test.rb
     test/unit/bundle_file_test.rb
     test/unit/stamp_file_test.rb

data/lib/jekyll/minibundle/asset_file_registry.rb

@@ -0,0 +1,49 @@
+require 'jekyll/minibundle/environment'
+require 'jekyll/minibundle/development_file_collection'
+require 'jekyll/minibundle/bundle_file'
+require 'jekyll/minibundle/stamp_file'
+
+module Jekyll::Minibundle
+  module AssetFileRegistry
+    def self.clear
+      @@_instances = {}
+    end
+
+    clear
+
+    def self.bundle_file(config)
+      asset_destination_path = "#{config['destination_path']}.#{config['type']}"
+      @@_instances[asset_destination_path] ||= register_bundle_file config
+    end
+
+    def self.stamp_file(asset_source_path, asset_destination_path)
+      @@_instances[asset_destination_path] ||= register_stamp_file asset_source_path, asset_destination_path
+    end
+
+    def self.register_bundle_file(config)
+      if Environment.development?
+        DevelopmentFileCollection.new config
+      else
+        BundleFile.new config
+      end
+    end
+
+    private_class_method :register_bundle_file
+
+    def self.register_stamp_file(asset_source_path, asset_destination_path)
+      StampFile.new(asset_source_path, asset_destination_path, &get_stamp_file_basenamer)
+    end
+
+    private_class_method :register_stamp_file
+
+    def self.get_stamp_file_basenamer
+      if Environment.development?
+        ->(base, ext, _) { base + ext }
+      else
+        ->(base, ext, stamper) { "#{base}-#{stamper.call}#{ext}" }
+      end
+    end
+
+    private_class_method :get_stamp_file_basenamer
+  end
+end

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '1.4.0'
+    VERSION = '1.4.1'
   end
 end

data/test/fixture/site/_config.yml

@@ -0,0 +1 @@
+safe: false

data/test/fixture/site/_layouts/default.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <link rel="stylesheet" href="{% ministamp _tmp/site.css assets/screen.css %}" media="screen">
+    {% minibundle css %}
+    source_dir: _assets/styles
+    destination_path: assets/site
+    assets:
+      - reset
+      - common
+    attributes:
+      id: my-styles
+      media: projection
+    {% endminibundle %}
+  </head>
+  <body>
+    {% minibundle js %}
+    source_dir: _assets/scripts
+    destination_path: assets/site
+    assets:
+      - dependency
+      - app
+    attributes:
+      id: my-scripts
+    {% endminibundle %}
+  </body>
+  <title>{{ page.title }}</title>
+</html>

data/test/fixture/site/about.html

@@ -0,0 +1,4 @@
+---
+layout: default
+title: About
+---

data/test/fixture/site/assets/styles/reset.css

@@ -0,0 +1,2 @@
+/* static file, handled by Jekyll */
+html { margin: 0; }

data/test/integration/static_files_as_asset_sources_test.rb

@@ -0,0 +1,55 @@
+require 'support/test_case'
+
+module Jekyll::Minibundle::Test
+  class StaticFilesAsAssetSourcesTest < TestCase
+    [:development, :production].each do |env|
+      define_method :"test_ministamp_allows_using_static_file_as_asset_source_in_#{env}_mode" do
+        with_site do
+          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']
+
+          assert_equal 1, asset_files.size
+          assert_equal contents, File.read(destination_path('assets/shared.css'))
+          assert_equal contents, File.read(asset_files.first)
+        end
+      end
+    end
+
+    def test_minibundle_allows_using_static_file_as_asset_source_in_development_mode
+      with_site do
+        dep_contents = 'console.log("lol")'
+        app_contents = 'console.log("balal")'
+        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'))
+        assert_equal app_contents, File.read(destination_path('assets/app.js'))
+      end
+    end
+
+    def test_minibundle_allows_using_static_file_as_asset_source_in_production_mode
+      with_site do
+        dep_contents = 'console.log("lol")'
+        app_contents = 'console.log("balal")'
+        bundled_contents = "#{dep_contents};\n#{app_contents};\n"
+        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']
+
+        assert_equal 1, asset_files.size
+        assert_equal dep_contents, File.read(destination_path('assets/dependency.js'))
+        assert_equal app_contents, File.read(destination_path('assets/app.js'))
+        assert_equal bundled_contents, File.read(asset_files.first)
+      end
+    end
+  end
+end

data/test/unit/asset_file_registry_test.rb

@@ -0,0 +1,50 @@
+require 'support/test_case'
+require 'support/fixture_config'
+require 'jekyll/minibundle/asset_file_registry'
+
+module Jekyll::Minibundle::Test
+  class AssetFileRegistryTest < TestCase
+    include FixtureConfig
+
+    def setup
+      AssetFileRegistry.clear
+    end
+
+    def test_returns_same_instance_for_same_stamp_file_config
+      first = AssetFileRegistry.stamp_file STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH
+      second = AssetFileRegistry.stamp_file STAMP_SOURCE_PATH, STAMP_DESTINATION_PATH
+      assert_same first, second
+      assert_equal 1, asset_file_registry_size
+    end
+
+    def test_returns_same_instance_for_same_bundle_file_config
+      first = AssetFileRegistry.bundle_file bundle_config
+      second = AssetFileRegistry.bundle_file bundle_config
+      assert_same first, second
+      assert_equal 1, asset_file_registry_size
+    end
+
+    def test_bundle_files_allow_same_path_for_different_types
+      AssetFileRegistry.bundle_file bundle_config.merge('type' => :css)
+      AssetFileRegistry.bundle_file bundle_config.merge('type' => :js)
+      assert_equal 2, asset_file_registry_size
+    end
+
+    private
+
+    def bundle_config
+      {
+        'type'             => :css,
+        'site_dir'         => '.',
+        'source_dir'       => JS_BUNDLE_SOURCE_DIR,
+        'assets'           => %w{dependency app},
+        'destination_path' => JS_BUNDLE_DESTINATION_PATH,
+        'attributes'       => {}
+      }
+    end
+
+    def asset_file_registry_size
+      AssetFileRegistry.class_variable_get(:@@_instances).size
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Tuomas Kareinen
@@ -68,10 +68,10 @@ dependencies:
         version: 10.1.1
 description: |
   A straightforward asset bundling plugin for Jekyll, utilizing external
-  minification tool of your choice. Provides asset concatenation for
-  bundling and asset fingerprinting with MD5 digest for cache busting. No
-  other runtime dependencies besides the minification tool (not even
-  other gems).
+  minification tool of your choice. It provides asset concatenation for
+  bundling and asset fingerprinting with MD5 digest for cache
+  busting. There are no other runtime dependencies besides the
+  minification tool (not even other gems).
 email: tkareine@gmail.com
 executables: []
 extensions: []
@@ -83,9 +83,11 @@ files:
 - RELEASING.txt
 - Rakefile
 - jekyll-minibundle.gemspec
+- lib/jekyll/minibundle.rb
 - lib/jekyll/minibundle/asset_bundle.rb
 - lib/jekyll/minibundle/asset_file_operations.rb
 - lib/jekyll/minibundle/asset_file_paths.rb
+- lib/jekyll/minibundle/asset_file_registry.rb
 - lib/jekyll/minibundle/asset_stamp.rb
 - lib/jekyll/minibundle/asset_tag_markup.rb
 - lib/jekyll/minibundle/bundle_file.rb
@@ -96,22 +98,27 @@ files:
 - 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
 - test/fixture/site/_assets/styles/reset.css
 - test/fixture/site/_bin/remove_comments
 - test/fixture/site/_bin/with_count
+- test/fixture/site/_config.yml
+- test/fixture/site/_layouts/default.html
 - test/fixture/site/_plugins/minibundle.rb
 - test/fixture/site/_tmp/site.css
+- test/fixture/site/about.html
+- test/fixture/site/assets/styles/reset.css
 - test/fixture/site/index.html
 - test/integration/minibundle_development_mode_test.rb
 - test/integration/minibundle_production_mode_test.rb
 - test/integration/ministamp_test.rb
+- test/integration/static_files_as_asset_sources_test.rb
 - test/support/fixture_config.rb
 - test/support/test_case.rb
 - test/unit/asset_bundle_test.rb
+- test/unit/asset_file_registry_test.rb
 - test/unit/asset_tag_markup_test.rb
 - test/unit/bundle_file_test.rb
 - test/unit/stamp_file_test.rb
@@ -151,15 +158,21 @@ test_files:
 - test/fixture/site/_assets/styles/reset.css
 - test/fixture/site/_bin/remove_comments
 - test/fixture/site/_bin/with_count
+- test/fixture/site/_config.yml
+- test/fixture/site/_layouts/default.html
 - test/fixture/site/_plugins/minibundle.rb
 - test/fixture/site/_tmp/site.css
+- test/fixture/site/about.html
+- test/fixture/site/assets/styles/reset.css
 - test/fixture/site/index.html
 - test/integration/minibundle_development_mode_test.rb
 - test/integration/minibundle_production_mode_test.rb
 - test/integration/ministamp_test.rb
+- test/integration/static_files_as_asset_sources_test.rb
 - test/support/fixture_config.rb
 - test/support/test_case.rb
 - test/unit/asset_bundle_test.rb
+- test/unit/asset_file_registry_test.rb
 - test/unit/asset_tag_markup_test.rb
 - test/unit/bundle_file_test.rb
 - test/unit/stamp_file_test.rb