jekyll-minibundle 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c57552878f3ad0d964086ad33177b243dcf74586
-  data.tar.gz: c784618a1d7e99af9e26a8f62b0ea507f013d6f3
+  metadata.gz: 3033c98c36f602ceef9d58172d191d2a11508f79
+  data.tar.gz: b8c1a7471f47be584ecf61964f078225ed9e7ae4
 SHA512:
-  metadata.gz: bfa016f615363e82e82a300d5a1a441ceef2467f167fbeb284f1850b88497c3573ef4e11ef37a09a99e0d51a59e1b71780d2fb05928f495a25aaadd6a3d808c0
-  data.tar.gz: 6d78b169081c7fa690d21efcda81dc5a7f3f60ae5aefa50d604d2623fc6d33959892c0a4770fc705516230c876bc17bbe4e0c57d5b0254959f0f74bc96082e46
+  metadata.gz: 65cacc8d91187ec779f4fd94a2bd11fe2c708d7526a353d2e12ad519307a9e041d6c6bb9670414cbf57a3ba451081e991b541e2457d9026a871ae70a7dad7784
+  data.tar.gz: 94e875d5205d0ba70ed44bb88dc93592766bb792361d8073d9604750b14fc6d00faf8fc78a1b80df823a63baeeb32c898c1fd49c41c01fd070f9e8e7b3466af8

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.4.6 / 2014-05-10
+
+* Handle compatibility issues with safe_yaml and logger flexibly. This
+  should allow using the plugin with Jekyll 1.0 and 2.0.
+
 # 1.4.5 / 2014-05-10
 
 * Use SafeYAML to load user input from `minibundle` block for
@@ -45,14 +50,14 @@
 * Fix bug causing exception to be thrown when `ministamp` or
   `minibundle` is called twice with same asset source argument. Allow
   handling asset source files that are already static files in Jekyll
-  (remove the restriction introduced in 1.3.0). (@agrigg)
+  (remove the restriction introduced in 1.3.0). (#2, @agrigg)
 
 # 1.3.0 / 2013-12-25
 
 * Disallow handling asset source files that are already static files
   in Jekyll. Otherwise, we would potentially get to inconsistencies in
   Jekyll's watch mode. See "Jekyll static file restriction" in
-  README.md. (@agrigg)
+  README.md. (#2, @agrigg)
 * Upgrade development dependencies
 
 # 1.2.0 / 2013-09-29
@@ -65,7 +70,7 @@
 
 * `ministamp` tag omits fingerprint in development mode
 * Clarify documentation
-* Comply with (Gemnasium) conventions for changelogs (@tmatilai)
+* Comply with (Gemnasium) conventions for changelogs (#1, @tmatilai)
 * Bug fix: do not bundle assets when nonrelated files change
 * Bug fix: do not bundle assets twice upon startup
 

data/lib/jekyll/minibundle/asset_bundle.rb

@@ -1,5 +1,6 @@
 require 'tempfile'
 require 'jekyll/minibundle/environment'
+require 'jekyll/minibundle/compatibility'
 
 module Jekyll::Minibundle
   class AssetBundle
@@ -17,9 +18,9 @@ module Jekyll::Minibundle
       cmd = get_minifier_cmd
       exit_status = spawn_minifier(cmd) do |input|
         $stdout.puts  # place newline after "(Re)generating..." log messages
-        log("Bundling #{@type} assets:")
+        Compatibility.log_info("Bundling #{@type} assets:")
         @asset_paths.each do |asset|
-          log(relative_path_from(asset, @site_dir))
+          Compatibility.log_info(relative_path_from(asset, @site_dir))
           IO.foreach(asset) { |line| input.write(line) }
           input.puts(';') if @type == :js
         end
@@ -30,16 +31,6 @@ 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 relative_path_from(path, base)
       path.sub(/\A#{base}\//, '')
     end

data/lib/jekyll/minibundle/compatibility.rb

@@ -0,0 +1,27 @@
+module Jekyll::Minibundle
+  module Compatibility
+    class << self
+      # SafeYAML.load is introduced in Jekyll 2.0.0
+      if defined?(::SafeYAML) && ::SafeYAML.respond_to?(:load)
+        def load_yaml(*args)
+          ::SafeYAML.load(*args)
+        end
+      else
+        def load_yaml(*args)
+          ::YAML.load(*args)
+        end
+      end
+
+      # Jekyll.logger is introduced in Jekyll 1.0.3
+      if ::Jekyll.respond_to?(:logger)
+        def log_info(msg)
+          ::Jekyll.logger.info('Minibundle:', msg)
+        end
+      else
+        def log_info(msg)
+          $stdout.puts(msg)
+        end
+      end
+    end
+  end
+end

data/lib/jekyll/minibundle/mini_bundle_block.rb

@@ -1,5 +1,5 @@
-require 'safe_yaml/load'
 require 'jekyll/minibundle/asset_file_registry'
+require 'jekyll/minibundle/compatibility'
 
 module Jekyll::Minibundle
   class MiniBundleBlock < Liquid::Block
@@ -10,7 +10,7 @@ module Jekyll::Minibundle
 
     def render(context)
       site = context.registers.fetch(:site)
-      config = get_current_config(SafeYAML.load(super), site)
+      config = get_current_config(Compatibility.load_yaml(super), site)
       file = AssetFileRegistry.bundle_file(site, config)
       file.add_as_static_file_to(site)
       file.destination_path_for_markup

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '1.4.5'
+    VERSION = '1.4.6'
   end
 end

data/test/unit/asset_file_registry_test.rb

@@ -44,7 +44,7 @@ module Jekyll::Minibundle::Test
     end
 
     def site
-      OpenStruct.new(:source => '.')
+      new_fake_site('.')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Tuomas Kareinen
@@ -90,6 +90,7 @@ files:
 - lib/jekyll/minibundle/asset_stamp.rb
 - lib/jekyll/minibundle/asset_tag_markup.rb
 - lib/jekyll/minibundle/bundle_file.rb
+- lib/jekyll/minibundle/compatibility.rb
 - lib/jekyll/minibundle/development_file.rb
 - lib/jekyll/minibundle/development_file_collection.rb
 - lib/jekyll/minibundle/environment.rb