juicer 1.0.22 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.22
+1.1.0

data/lib/juicer.rb

@@ -3,7 +3,7 @@ require "logger"
 module Juicer
 
   # :stopdoc:
-  VERSION = "1.0.22"
+  VERSION = "1.1.0"
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   LOGGER = Logger.new(STDOUT)

data/lib/juicer/cache_buster.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'digest/md5'
 
 module Juicer
   #
@@ -80,7 +81,7 @@ module Juicer
     #
     def self.path(file, type = :soft, parameter = DEFAULT_PARAMETER)
       return file if file =~ /data:.*;base64/
-      type = [:soft, :hard, :rails].include?(type) ? type : :soft
+      type = [:soft, :hard, :rails, :md5].include?(type) ? type : :soft
       parameter = nil if type == :rails
       file = self.clean(file, parameter)
       filename = file.split("?").first
@@ -92,11 +93,25 @@ module Juicer
         return "#{file}#{file.index('?') ? '&' : '?'}#{parameter}#{mtime}"
       elsif type == :rails
         return "#{file}#{file.index('?') ? '' : "?#{mtime}"}"
+      elsif type == :md5
+        md5 = Digest::MD5.hexdigest(File.read(filename))
+        return file.sub(/(\.[^\.]+$)/, "-#{parameter}#{md5}" + '\1')
       end
 
       file.sub(/(\.[^\.]+$)/, "-#{parameter}#{mtime}" + '\1')
     end
 
+    #
+    # Add a md5 cache buster to a filename. The parameter is an optional prefix
+    # that is added before the md5 digest. It results in filenames of the form:
+    # <tt>file-[parameter name][md5].suffix</tt>, ie
+    # <tt>images/logo-cb4fdbd4c637ad377adf0fc0c88f6854b3.png</tt> which is the case for the default
+    # parameter name "cb" (as in *c*ache *b*uster).
+    #
+    def self.md5(file, parameter = DEFAULT_PARAMETER)
+      self.path(file, :md5, parameter)
+    end
+
     #
     # Add a hard cache buster to a filename. The parameter is an optional prefix
     # that is added before the mtime timestamp. It results in filenames of the form:
@@ -140,7 +155,7 @@ module Juicer
         new_file = file.sub(/#{query_param}\d+&?/, "").sub(/(\?|&)$/, "")
         return new_file unless new_file == file
 
-        file.sub(/-#{parameter}\d+(\.\w+)($|\?)/, '\1\2')
+        file.sub(/-#{parameter}[0-9a-f]+(\.\w+)($|\?)/, '\1\2')
       end
     end
   end

data/lib/juicer/command/merge.rb

@@ -75,11 +75,11 @@ the compressor the path should be the path to where the jar file is found.
           opt.on("-b", "--absolute-urls", "Convert all referenced URLs to absolute URLs. Requires --document-root.\n" +
                            (" " * 37) + "Works with cycled asset hosts. Only valid for CSS files") { |t| @absolute_urls = true }
           opt.on("-d", "--document-root dir", "Path to resolve absolute URLs relative to") { |path| @document_root = path }
-          opt.on("-c", "--cache-buster type", "none, soft, rails, or hard. Default is soft, which adds timestamps to\n" +
+          opt.on("-c", "--cache-buster type", "none, soft, rails, hard or md5. Default is soft, which adds timestamps to\n" +
                            (" " * 37) + "reference URLs as query parameters. None leaves URLs untouched, rails adds\n" +
-                           (" " * 37) + "timestamps in the same format as Rails' image_tag helper, and hard alters\n" +
+                           (" " * 37) + "timestamps in the same format as Rails' image_tag helper. Hard and md5 alters\n" +
                            (" " * 37) + "file names") do |type|
-            @cache_buster = [:soft, :hard, :rails].include?(type.to_sym) ? type.to_sym : nil
+            @cache_buster = [:soft, :hard, :rails, :md5].include?(type.to_sym) ? type.to_sym : nil
           end
           opt.on("-e", "--embed-images type", "none or data_uri. Default is none. Data_uri embeds images using Base64 encoding\n" +
                            (" " * 37) + "None leaves URLs untouched. Candiate images must be flagged with '?embed=true to be considered") do |embed|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: juicer
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors: