sprockets 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faadf5a06d9bd72e3aea6d55c30d04dc5521b3b9
-  data.tar.gz: 8f383977d36ebfa7ab7033304d01bb67a95665fc
+  metadata.gz: 868a8e68a48bc62811df5a4ab64435cda6212082
+  data.tar.gz: 539c10477811018ad2b8d0f0c8fa9d59191790ce
 SHA512:
-  metadata.gz: b42b6cb6a38a4301f18c419a903c3e3d352fd001067ab66a25d75e98ba091e599269d452041f0bb195190fdf60d74e077d13676c7a810889230f76442443aa0f
-  data.tar.gz: 5f386a5ef36a610d4a84f74283b5eeb7afa32567f47c6dab8c4ee0151d59b856d6d0995f0c7cc0de7e31fd283cad02f72c85d38aa779b023dd77a39fe9066c15
+  metadata.gz: 68ffe6c3fb1a5e6d78d44ddcf5450eb075dc7934e84635d73c7878494b958e2939f055686b7976d43448dda199410e0aa7813e341600a8490eaff9e8bd210996
+  data.tar.gz: 46d1701fce3b87c73e45deb3977385cdb3b73031ff245d5b57132910246b291ee937372a6dde87fc779eb27bffa6ad7dbea42d67fe823e085e4acc6261bcab06

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**3.3.4** (September 1, 2015)
+
+* Relative cache contents now work with windows.
+
 **3.3.3** (August 21, 2015)
 
 * Remove more absolute paths from cache contents.

data/lib/sprockets/unloaded_asset.rb

@@ -19,7 +19,7 @@ module Sprockets
     #
     # Returns UnloadedAsset.
     def initialize(uri, env)
-      @uri               = uri
+      @uri               = uri.to_s
       @env               = env
       @compressed_path   = URITar.new(uri, env).compressed_path
       @params            = nil # lazy loaded

data/lib/sprockets/uri_tar.rb

@@ -1,3 +1,5 @@
+require 'sprockets/path_utils'
+
 module Sprockets
  # Internal: used to "expand" and "compress" values for storage
   class URITar
@@ -10,6 +12,7 @@ module Sprockets
     def initialize(uri, env)
       @root = env.root
       @env  = env
+      uri   = uri.to_s
       if uri.include?("://".freeze)
         uri_array = uri.split("://".freeze)
         @scheme   = uri_array.shift
@@ -34,6 +37,15 @@ module Sprockets
       scheme + compressed_path
     end
 
+    # Internal: Tells us if we are using an absolute path
+    #
+    # Nix* systems start with a `/` like /Users/schneems.
+    # Windows systems start with a drive letter than colon and slash
+    # like C:/Schneems.
+    def absolute_path?
+      PathUtils.absolute_path?(path)
+    end
+
     # Internal: Convert a "compressed" uri to an absolute path
     #
     # If a uri is inside of the environment's root it will not
@@ -47,12 +59,17 @@ module Sprockets
     #
     # Returns String
     def expand
-      if path.start_with?("/".freeze)
+      if absolute_path?
         # Stored path was absolute, don't add root
         scheme + path
       else
-        # Stored path was relative, add root
-        scheme + File.join(root, path)
+        if scheme.empty?
+          File.join(root, path)
+        else
+          # We always want to return an absolute uri,
+          # make sure the path starts with a slash.
+          scheme + File.join("/".freeze, root, path)
+        end
       end
     end
 
@@ -66,7 +83,14 @@ module Sprockets
     #
     # Returns String
     def compressed_path
-      if compressed_path = @env.split_subpath(root, path)
+      # windows
+      if !@root.start_with?("/".freeze) && path.start_with?("/".freeze)
+        consistent_root = "/".freeze + @root
+      else
+        consistent_root = @root
+      end
+
+      if compressed_path = PathUtils.split_subpath(consistent_root, path)
         compressed_path
       else
         path

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.3.3"
+  VERSION = "3.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack