jekyll-minibundle 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 477c2a1ad9364dfb5457b7b2b7894d74a0d5dcf8
-  data.tar.gz: 3212bf6bb364f63ad2e565c2eff35fed43c984b1
+  metadata.gz: 27c6e3e700c2d0f5767edcebbb8df218df565536
+  data.tar.gz: 1fc68af34209d4556fcb726088fca486a318a33a
 SHA512:
-  metadata.gz: c563707b1fa6b8cb468b96b22e3bc5ac99ec11d6cf0ef7eb4d520af3a1909744ef6c18d9beb646939d5f72efb83d3b28912fe44a3e66e402ea144183e64a8d43
-  data.tar.gz: bdf079e3b4af862ba04f19c17b1ec832cbfc4994af873ffefea3c7f500327a9ec2769d85eefc275810dd133417faaa99e95a2840b70cc32bacfb046b6b8a6216
+  metadata.gz: c68cdff97eecd9343ea90498ff73e0c04987ef7020ee360d0c9a7c74d28782877e996cedd3e8ab8d1cdfbc5a9279bc8b18842c34a62d5206ff7320b46a056563
+  data.tar.gz: 6f6873bc41f2bfde2e7d38b5e4091672fb3a59cff7d026e2d18580ea706527920c035c5b27d6833773ebdce9eeb2d4687b76aebab42b0b02317d00ac3613a230

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.4.4 / 2014-01-16
+
+* Conserve memory when calculating fingerprint for an asset.
+  Previously, we read the whole asset file into memory and then
+  calculated the MD5 digest. This is bad for big assets. Now, we read
+  the file in chunks.
+
 # 1.4.3 / 2014-01-16
 
 * Do not leak read pipe file descriptor upon minifier command failure

data/Rakefile

@@ -42,7 +42,7 @@ end
 
 desc 'Run tests; envars: tests=<test_path> to select a particular suite, debug=1 to require Pry and PP'
 task :test do
-  glob = ENV['tests'] || 'test/{unit,integration}/*_test.rb'
+  glob = ENV.fetch('tests', 'test/{unit,integration}/*_test.rb')
   files = Dir[glob].
     map { |file| %r{^test/(.+)\.rb$}.match(file)[1] }.
     shelljoin

data/lib/jekyll/minibundle/asset_file_registry.rb

@@ -11,7 +11,7 @@ module Jekyll::Minibundle
       end
 
       def bundle_file(config)
-        asset_destination_path = "#{config['destination_path']}.#{config['type']}"
+        asset_destination_path = "#{config.fetch('destination_path')}.#{config.fetch('type')}"
         @_instances[asset_destination_path] ||= register_bundle_file(config)
       end
 

data/lib/jekyll/minibundle/asset_stamp.rb

@@ -3,7 +3,7 @@ require 'digest/md5'
 module Jekyll::Minibundle
   module AssetStamp
     def self.from_file(path)
-      Digest::MD5.hexdigest(File.read(path))
+      Digest::MD5.file(path).hexdigest
     end
   end
 end

data/lib/jekyll/minibundle/bundle_file.rb

@@ -8,12 +8,12 @@ module Jekyll::Minibundle
     include AssetFileOperations
 
     def initialize(config)
-      @type = config['type']
-      @site_source_dir = config['site_dir']
-      asset_source_dir = File.join(@site_source_dir, config['source_dir'])
-      @assets = config['assets'].map { |asset_path| File.join(asset_source_dir, "#{asset_path}.#{@type}") }
-      @destination_path = config['destination_path']
-      @attributes = config['attributes']
+      @type = config.fetch('type')
+      @site_source_dir = config.fetch('site_dir')
+      asset_source_dir = File.join(@site_source_dir, config.fetch('source_dir'))
+      @assets = config.fetch('assets').map { |asset_path| File.join(asset_source_dir, "#{asset_path}.#{@type}") }
+      @destination_path = config.fetch('destination_path')
+      @attributes = config.fetch('attributes')
       @stamped_at = nil
       @is_modified = false
     end

data/lib/jekyll/minibundle/development_file_collection.rb

@@ -4,18 +4,18 @@ 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'])
-      destination_path = config['destination_path']
+      @type = config.fetch('type')
+      asset_source_dir = File.join(config.fetch('site_dir'), config.fetch('source_dir'))
+      destination_path = config.fetch('destination_path')
 
-      @files = config['assets'].map do |asset_path|
+      @files = config.fetch('assets').map do |asset_path|
         asset_basename = "#{asset_path}.#{@type}"
         asset_source = File.join(asset_source_dir, asset_basename)
         asset_destination = File.join(destination_path, asset_basename)
         DevelopmentFile.new(asset_source, asset_destination)
       end
 
-      @attributes = config['attributes']
+      @attributes = config.fetch('attributes')
     end
 
     def static_file!(site)

data/lib/jekyll/minibundle/environment.rb

@@ -3,9 +3,7 @@ module Jekyll::Minibundle
     class << self
       def command_for(type)
         key = "JEKYLL_MINIBUNDLE_CMD_#{type.upcase}"
-        cmd = ENV[key]
-        fail "You need to set command for minification in $#{key}" if !cmd
-        cmd
+        ENV.fetch(key) { fail "You need to set command for minification in $#{key}" }
       end
 
       def development?

data/lib/jekyll/minibundle/mini_bundle_block.rb

@@ -9,7 +9,7 @@ module Jekyll::Minibundle
     end
 
     def render(context)
-      site = context.registers[:site]
+      site = context.registers.fetch(:site)
       config = get_current_config(YAML.load(super), site)
       file = AssetFileRegistry.bundle_file(config)
       file.static_file!(site)

data/lib/jekyll/minibundle/mini_stamp_tag.rb

@@ -8,7 +8,7 @@ module Jekyll::Minibundle
     end
 
     def render(context)
-      site = context.registers[:site]
+      site = context.registers.fetch(:site)
       file = AssetFileRegistry.stamp_file(File.join(site.source, @asset_source), @asset_destination)
       file.static_file!(site)
       file.markup

data/lib/jekyll/minibundle/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Minibundle
-    VERSION = '1.4.3'
+    VERSION = '1.4.4'
   end
 end

data/test/integration/minibundle_development_mode_test.rb

@@ -54,13 +54,13 @@ module Jekyll::Minibundle::Test
      {desc: "changing", action: ->(source) { File.write(source, 'h1 {}') }},
      {desc: "touching", action: ->(source) { FileUtils.touch(source) }}
     ].each do |spec|
-      define_method :"test_#{spec[:desc]}_css_asset_source_rewrites_destination" do
+      define_method :"test_#{spec.fetch(:desc)}_css_asset_source_rewrites_destination" do
         with_site do
           generate_site(:development)
           destination = destination_path(CSS_BUNDLE_DESTINATION_PATH, 'common.css')
           org_mtime = mtime_of(destination)
           source = source_path(CSS_BUNDLE_SOURCE_DIR, 'common.css')
-          ensure_file_mtime_changes { spec[:action].call(source) }
+          ensure_file_mtime_changes { spec.fetch(:action).call(source) }
           generate_site(:development, clear_cache: false)
 
           assert_equal File.read(destination), File.read(source)
@@ -73,13 +73,13 @@ module Jekyll::Minibundle::Test
      {desc: "changing", action: ->(source) { File.write(source, '(function() {})()') }},
      {desc: "touching", action: ->(source) { FileUtils.touch(source) }}
     ].each do |spec|
-      define_method :"test_#{spec[:desc]}_js_asset_source_rewrites_destination" do
+      define_method :"test_#{spec.fetch(:desc)}_js_asset_source_rewrites_destination" do
         with_site do
           generate_site(:development)
           destination = destination_path(JS_BUNDLE_DESTINATION_PATH, 'app.js')
           org_mtime = mtime_of(destination)
           source = source_path(JS_BUNDLE_SOURCE_DIR, 'app.js')
-          ensure_file_mtime_changes { spec[:action].call(source) }
+          ensure_file_mtime_changes { spec.fetch(:action).call(source) }
           generate_site(:development, clear_cache: false)
 
           assert_equal File.read(destination), File.read(source)

data/test/support/test_case.rb

@@ -108,7 +108,7 @@ module Jekyll::Minibundle::Test
     end
 
     def _generate_site(test_options)
-      AssetFileRegistry.clear if test_options[:clear_cache]
+      AssetFileRegistry.clear if test_options.fetch(:clear_cache)
 
       capture_io do
         Jekyll::Site.new(Jekyll.configuration(TestCase.site_generation_jekyll_options)).process

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-minibundle
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Tuomas Kareinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll