jekyll-minibundle 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmU4ZTUwM2ZlNTlhNGI1OGFjMTg4OGRhNDEyNWYwOWUyYjI1OWUwMQ==
-  data.tar.gz: !binary |-
-    ZDdiN2RjN2JiMDY3Yjc4ODA4MTI2YTA5YWVlY2RkMzM3NGFhOTMzYg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGFiYmJhNGY1MTRhOTRiYWYxM2FkOWQxYmE5YzU0ZGM5NjMwMTkxNDRlY2Q0
-    MWQxZmIwZTY5NWY5YTg5ZGIzYjkyMjlkNzk4Yjg1NTNlN2QzMzA5ZjU3NDZl
-    OTcwODM2ZjU3YjQ1NGFjNmRlYzcyNDU0NDg5Y2I4YTQ2YWZiYmE=
-  data.tar.gz: !binary |-
-    ZWZjNmNlZmMxZTQ3MmFkNGY0YzExYmY1NGFjM2VmZjVkMzFiZjQxMTY1ODNi
-    OWVhODdjNTIzM2E5NjRkMDNjMDA4Njc1NjI4MmVjOTZjMjlkNjVlZWJhZWIx
-    MWE3YzVmZThlMmQ0YzIxODgxZmFiZmQ2ODg4NzQ2M2Q0YmE4M2E=
+SHA1:
+  metadata.gz: 356988a5df27a7a0f043977db61538733db30af1
+  data.tar.gz: 910c98db3db8895ec27d4ffecf6aceb0ebae79d3
+SHA512:
+  metadata.gz: bc17940f1f3c8b1c52bd65d5fe6718bf11e7147b0442b2d6212248b8daa34fd220dbf16c7f753668a904f1937cb3358cadc8158b5702a845873445a024b9033c
+  data.tar.gz: 4229020fbfb1ad6c35db2d35d813d82ce3648597c9c015505c02ee9070b853232c3b11ac3685550075e7e6777376790ba2132282c010dbd05d4dbb3effc36920

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.2.0 / 2013-09-29
+
+* If Jekyll's logger is available, use it for nice output when bundling
+* Upgrade development dependencies
+* Simplify `BundleFile` class implementation
+
 # 1.1.0 / 2013-02-27
 
 * `ministamp` tag omits fingerprint in development mode

data/README.md

@@ -1,14 +1,13 @@
 # Jekyll Minibundle plugin
 
-A minimalistic plugin for bundling assets to
-[Jekyll](https://github.com/mojombo/jekyll)'s site generation
-directory.
+A straightforward asset bundling plugin for
+[Jekyll](https://github.com/mojombo/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).
 
-In addition to the plugin itself, you need a minification tool
-supporting standard unix input and output. There are no gem
-dependencies at runtime.
-
-Tested with Ruby MRI 1.9.3. Ruby 1.8 is *not* supported.
+Tested with Ruby MRI 1.9.3 and 2.0.0. Ruby 1.8 is *not* supported.
 
 [![Build Status](https://secure.travis-ci.org/tkareine/jekyll-minibundle.png)](http://travis-ci.org/tkareine/jekyll-minibundle)
 
@@ -25,7 +24,7 @@ a good and fast minifier. The plugin connects to the minifier with
 standard unix pipe, feeding asset file contents to it in desired order
 via standard input, and reads the result from standard output.
 
-Why is this good? Well, a fingerprint in asset's path is the
+Why is this good? A fingerprint in asset's path is the
 [recommended way](https://developers.google.com/speed/docs/best-practices/caching)
 to handle caching of static resources, because you can allow caching
 the asset forever. Calculating MD5 digest over the contents of the
@@ -138,7 +137,7 @@ And then specify the command for launching bundling in
 ## Development mode
 
 The plugin has one more trick in its sleeves. If you set environment
-variable `JEKYLL_MINIBUNDLE_MODE` to `development`, then the plugin
+variable `$JEKYLL_MINIBUNDLE_MODE` to `development`, then the plugin
 will copy asset files as is to the destination directory (using
 `destination_path` as directory for `minibundle` block), and omit
 fingerprinting. This is useful in development workflow, where you need

data/Rakefile

@@ -35,11 +35,13 @@ end
 
 desc 'Run tests'
 task :test do
-  tests = Dir['test/**/*_test.rb'].
+  glob = ENV['tests'] || 'test/{unit,integration}/*_test.rb'
+  files = Dir[glob].
     map { |file| %r{^test/(.+)\.rb$}.match(file)[1] }.
     shelljoin
-  test_cmd = %{ruby -e 'ARGV.each { |f| require f }' #{tests}}
-  sh(get_minibundle_env('RUBYLIB' => 'lib:test'), test_cmd)
+  opts = '-rpp -rpry' if ENV['debug']
+  cmd = %{ruby #{opts} -e 'ARGV.each { |f| require f }' #{files}}
+  sh(get_minibundle_env('RUBYLIB' => 'lib:test'), cmd)
 end
 
 desc 'Generate fixture site for debugging'

data/jekyll-minibundle.gemspec

@@ -10,9 +10,11 @@ Gem::Specification.new do |s|
   s.licenses    = %w{MIT}
 
   s.description = <<-END
-A minimalistic asset bundling plugin for Jekyll, requiring only your
-bundling tool of choice (no other dependencies, not even other gems).
-Provides asset bundling and filename stamping with MD5 digest.
+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).
   END
 
   s.files = %w{
@@ -59,10 +61,10 @@ Provides asset bundling and filename stamping with MD5 digest.
     test/unit/stamp_file_test.rb
   }
 
-  s.add_development_dependency 'jekyll',   '~> 0.12.0'
-  s.add_development_dependency 'minitest', '~> 4.6.0'
-  s.add_development_dependency 'nokogiri', '~> 1.5.6'
-  s.add_development_dependency 'rake',     '~> 10.0.2'
+  s.add_development_dependency 'jekyll',   '~> 1.2.1'
+  s.add_development_dependency 'minitest', '~> 5.0.8'
+  s.add_development_dependency 'nokogiri', '~> 1.6.0'
+  s.add_development_dependency 'rake',     '~> 10.1.0'
 
   s.required_ruby_version = '>= 1.9.3'
 

data/lib/jekyll/minibundle/asset_bundle.rb

@@ -15,9 +15,10 @@ module Jekyll::Minibundle
 
     def make_bundle
       pipe_bundling_to_temp_file bundling_cmd do |wr|
-        puts "Bundling #{@type} assets:"
+        $stdout.puts  # place newline after "(Re)generating..." log messages
+        log "Bundling #{@type} assets:"
         @assets.each do |asset|
-          puts "  #{asset}"
+          log asset
           IO.foreach(asset) { |line| wr.write line }
           wr.puts ';' if @type == :js
         end
@@ -27,6 +28,16 @@ module Jekyll::Minibundle
 
     private
 
+    if defined? ::Jekyll.logger  # introduced in Jekyll 1.0.0
+      def log(msg)
+        ::Jekyll.logger.info 'Minibundle', msg
+      end
+    else
+      def log(msg)
+        $stdout.puts msg
+      end
+    end
+
     def bundling_cmd
       Environment.command_for @type
     end

data/lib/jekyll/minibundle/bundle_file.rb

@@ -9,7 +9,7 @@ module Jekyll::Minibundle
 
     def self.clear_cache
       @@mtimes = {}
-      @@writes_after_mtime_updates = Hash.new false
+      @@writes_after_rebundling = Hash.new false
       @@asset_bundles = {}
     end
 
@@ -51,16 +51,12 @@ module Jekyll::Minibundle
       @@mtimes[asset_destination_canonical_path] != mtime
     end
 
-    def destination_written_after_mtime_update?
-      @@writes_after_mtime_updates[asset_destination_canonical_path]
-    end
-
     def write(site_destination_dir)
-      if File.exists?(destination(site_destination_dir)) && destination_written_after_mtime_update?
+      if File.exists?(destination(site_destination_dir)) && destination_written_after_rebundling?
         false
       else
         write_destination site_destination_dir
-        @@writes_after_mtime_updates[asset_destination_canonical_path] = true
+        @@writes_after_rebundling[asset_destination_canonical_path] = true
         true
       end
     end
@@ -80,15 +76,15 @@ module Jekyll::Minibundle
     end
 
     def rebundle_assets
+      p = asset_destination_canonical_path
+      @@writes_after_rebundling[p] = false
+      @@mtimes[p] = mtime
       @asset_stamp = nil
       asset_bundle.make_bundle
-      update_mtime
     end
 
-    def update_mtime
-      p = asset_destination_canonical_path
-      @@mtimes[p] = mtime
-      @@writes_after_mtime_updates[p] = false
+    def destination_written_after_rebundling?
+      @@writes_after_rebundling[asset_destination_canonical_path]
     end
   end
 end

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

data/test/support/test_case.rb

@@ -6,7 +6,7 @@ require 'jekyll'
 require 'jekyll/minibundle'
 
 module Jekyll::Minibundle::Test
-  class TestCase < ::MiniTest::Unit::TestCase
+  class TestCase < ::Minitest::Test
     include ::Jekyll::Minibundle
 
     FIXTURE_DIR = File.expand_path(File.join(File.dirname(__FILE__), '../fixture'))

data/test/unit/bundle_file_test.rb

@@ -7,6 +7,8 @@ module Jekyll::Minibundle::Test
     include FixtureConfig
 
     def test_consistent_fingerprint_in_file_and_markup
+      BundleFile.clear_cache
+
       with_site do
         with_env 'JEKYLL_MINIBUNDLE_CMD_JS' => cmd_to_remove_comments_and_count do
           bundle_file = BundleFile.new({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,63 +16,62 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 5.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 5.0.8
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.2
-description: ! 'A minimalistic asset bundling plugin for Jekyll, requiring only your
-
-  bundling tool of choice (no other dependencies, not even other gems).
-
-  Provides asset bundling and filename stamping with MD5 digest.
-
-'
+        version: 10.1.0
+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).
 email: tkareine@gmail.com
 executables: []
 extensions: []
@@ -131,17 +130,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: A minimalistic asset bundling plugin for Jekyll
@@ -164,4 +163,3 @@ test_files:
 - test/unit/asset_tag_markup_test.rb
 - test/unit/bundle_file_test.rb
 - test/unit/stamp_file_test.rb
-has_rdoc: