Move fingerprint utils out of Pathname

lib/sprockets/engine_pathname.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'rack/mime'
 require 'sprockets/template_mappings'
+require 'sprockets/utils'
 
 module Sprockets
   class EnginePathname < ::Pathname
@@ -55,27 +56,6 @@ def without_engine_extensions
       end
     end
 
-    def fingerprint
-      if defined? @fingerprint
-        @fingerprint
-      elsif basename_without_extensions.to_s =~ /-([0-9a-f]{7,40})$/
-        @fingerprint = $1
-      else
-        @fingerprint = nil
-      end
-    end
-
-    def with_fingerprint(digest)
-      if fingerprint
-        path = self.to_s.sub(fingerprint, digest)
-      else
-        basename = "#{basename_without_extensions}-#{digest}#{extensions.join}"
-        path = dirname.to_s == '.' ? basename : dirname.join(basename)
-      end
-
-      self.class.new(path)
-    end
-
     private
       def lookup_mime_type(ext)
         Rack::Mime.mime_type(ext, nil)

lib/sprockets/environment.rb

@@ -2,6 +2,7 @@
 require 'sprockets/environment_index'
 require 'sprockets/server'
 require 'sprockets/template_mappings'
+require 'sprockets/utils'
 require 'fileutils'
 require 'hike'
 require 'logger'
@@ -106,7 +107,7 @@ def find_fresh_asset_from_cache(logical_path)
         logical_path = EnginePathname.new(logical_path)
 
         if asset = @cache[logical_path.to_s]
-          if logical_path.fingerprint
+          if Utils.path_fingerprint(logical_path)
             asset
           elsif asset.stale?
             logger.warn "[Sprockets] #{logical_path} #{asset.digest} stale"

lib/sprockets/environment_index.rb

@@ -51,7 +51,8 @@ def precompile(*paths)
           end
 
           if asset = @path_index.find_asset(logical_path)
-            filename = @static_index.root.join(logical_path.with_fingerprint(asset.digest))
+            digest_path = Utils.path_with_fingerprint(logical_path, asset.digest)
+            filename = @static_index.root.join(digest_path)
 
             FileUtils.mkdir_p filename.dirname
 

lib/sprockets/path_index.rb

@@ -2,6 +2,7 @@
 require 'sprockets/engine_pathname'
 require 'sprockets/errors'
 require 'sprockets/static_asset'
+require 'sprockets/utils'
 require 'pathname'
 require 'set'
 
@@ -66,7 +67,7 @@ def find_asset(logical_path)
         return @assets[logical_path.to_s]
       end
 
-      if fingerprint = logical_path.fingerprint
+      if fingerprint = Utils.path_fingerprint(logical_path)
         pathname = resolve(logical_path.to_s.sub("-#{fingerprint}", ''))
       else
         pathname = resolve(logical_path)

lib/sprockets/server.rb

@@ -1,5 +1,5 @@
+require 'sprockets/utils'
 require 'rack/request'
-require 'sprockets/engine_pathname'
 require 'time'
 
 module Sprockets
@@ -21,12 +21,10 @@ def call(env)
     end
 
     def path(logical_path, fingerprint = true, prefix = nil)
-      logical_path = EnginePathname.new(logical_path)
-
       if fingerprint && asset = find_asset(logical_path)
-        url = logical_path.with_fingerprint(asset.digest).to_s
+        url = Utils.path_with_fingerprint(logical_path, asset.digest)
       else
-        url = logical_path.to_s
+        url = logical_path
       end
 
       url = File.join(prefix, url) if prefix
@@ -90,7 +88,7 @@ def headers(asset, env)
           headers["Last-Modified"]  = asset.mtime.httpdate
           headers["ETag"]           = etag(asset)
 
-          if EnginePathname.new(env["PATH_INFO"]).fingerprint
+          if Utils.path_fingerprint(env["PATH_INFO"])
             headers["Cache-Control"] << ", max-age=31536000"
           else
             headers["Cache-Control"] << ", must-revalidate"

lib/sprockets/static_asset.rb

@@ -1,4 +1,5 @@
 require 'sprockets/engine_pathname'
+require 'sprockets/utils'
 require 'digest/md5'
 require 'time'
 
@@ -12,7 +13,7 @@ def initialize(pathname)
       @mtime  = @pathname.mtime
       @length = @pathname.size
 
-      if digest = @pathname.fingerprint
+      if digest = Utils.path_fingerprint(@pathname)
         @digest = digest
       else
         @digest = Digest::MD5.hexdigest(pathname.read)
@@ -24,7 +25,7 @@ def content_type
     end
 
     def stale?
-      if pathname.fingerprint
+      if Utils.path_fingerprint(pathname)
         false
       else
         mtime < pathname.mtime

lib/sprockets/static_index.rb

@@ -30,7 +30,7 @@ def find_asset(logical_path)
         return nil
       end
 
-      if !pathname.fingerprint
+      if !Utils.path_fingerprint(pathname)
         pattern = /^#{Regexp.escape(pathname.basename_without_extensions.to_s)}
                    -[0-9a-f]{7,40}
                    #{Regexp.escape(pathname.extensions.join)}$/x

lib/sprockets/utils.rb

@@ -0,0 +1,26 @@
+require 'pathname'
+
+module Sprockets
+  # TODO: Junk drawer
+  module Utils
+    def path_fingerprint(path)
+      pathname = Pathname.new(path)
+      extensions = pathname.basename.to_s.scan(/\.[^.]+/).join
+      pathname.basename(extensions).to_s =~ /-([0-9a-f]{7,40})$/ ? $1 : nil
+    end
+    module_function :path_fingerprint
+
+    def path_with_fingerprint(path, digest)
+      pathname = Pathname.new(path)
+      extensions = pathname.basename.to_s.scan(/\.[^.]+/).join
+
+      if pathname.basename(extensions).to_s =~ /-([0-9a-f]{7,40})$/
+        path.sub($1, digest)
+      else
+        basename = "#{pathname.basename(extensions)}-#{digest}#{extensions}"
+        pathname.dirname.to_s == '.' ? basename : pathname.dirname.join(basename).to_s
+      end
+    end
+    module_function :path_with_fingerprint
+  end
+end

test/test_engine_pathname.rb

@@ -105,16 +105,4 @@ class TestEnginePathname < Sprockets::TestCase
         EnginePathname.new("application.coffee").content_type
     end
   end
-
-  test "fingerprint" do
-    assert_nil EnginePathname.new("print.css").fingerprint
-    assert_equal "f7531e2d0ea27233ce00b5f01c5bf335", EnginePathname.new("print-f7531e2d0ea27233ce00b5f01c5bf335.css").fingerprint
-  end
-
-  test "with fingerprint" do
-    assert_equal "print-f7531e2d0ea27233ce00b5f01c5bf335.css",
-      EnginePathname.new("print.css").with_fingerprint("f7531e2d0ea27233ce00b5f01c5bf335").to_s
-    assert_equal "/stylesheets/print-f7531e2d0ea27233ce00b5f01c5bf335.css",
-      EnginePathname.new("/stylesheets/print-37b51d194a7513e45b56f6524f2d51f2.css").with_fingerprint("f7531e2d0ea27233ce00b5f01c5bf335").to_s
-  end
 end