juicer 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    juicer (1.0.17)
+    juicer (1.1.1)
       cmdparse
       nokogiri (>= 1.5.0)
-      rubyzip
+      rubyzip (= 0.9.9)
 
 GEM
   remote: http://rubygems.org/
@@ -23,11 +23,14 @@ GEM
       rdoc
     json (1.7.5)
     metaclass (0.0.1)
+    mini_portile (0.5.2)
     mocha (0.12.7)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
-    nokogiri (1.5.5)
-    nokogiri (1.5.5-x86-mingw32)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.0-x86-mingw32)
+      mini_portile (~> 0.5.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/juicer.rb

@@ -3,7 +3,7 @@ require "logger"
 module Juicer
 
   # :stopdoc:
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
   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

@@ -84,7 +84,7 @@ module Juicer
       type = [:soft, :hard, :rails, :md5].include?(type) ? type : :soft
       parameter = nil if type == :rails
       file = self.clean(file, parameter)
-      filename = file.split("?").first
+      filename = file.split(/[\?\#]/).first
       raise ArgumentError.new("#{file} could not be found") unless File.exists?(filename)
       mtime = File.mtime(filename).to_i
 
@@ -95,10 +95,10 @@ module Juicer
         return "#{file}#{file.index('?') ? '' : "?#{mtime}"}"
       elsif type == :md5
         md5 = Digest::MD5.hexdigest(File.read(filename))
-        return file.sub(/(\.[^\.]+$)/, "-#{parameter}#{md5}" + '\1')
+        return file.sub(/(\.[^\.]+([\?\#].*)?$)/, "-#{parameter}#{md5}" + '\1')
       end
 
-      file.sub(/(\.[^\.]+$)/, "-#{parameter}#{mtime}" + '\1')
+      file.sub(/(\.[^\.]+([\?\#].*)?$)/, "-#{parameter}#{mtime}" + '\1')
     end
 
     #

metadata

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