sprockets 3.0.0.beta.10 → 3.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62bc83e5dba29c526fc06ee79618cac3013f5ab1
-  data.tar.gz: 8d5716e9158a481ac8893badaddba2562b2d5e2d
+  metadata.gz: db0209bde9d0914d567ab73432b4081d0ee58496
+  data.tar.gz: 91da9e628f1837de6fef73391e211f512ceae82e
 SHA512:
-  metadata.gz: 4e31bcaac28fe9d231373471e49c91edf25bc27775ebc80f14949258be4dea66ddf9f48340b5e44613d195ade34b96c74898fd482224fe91a0204d69cea5312a
-  data.tar.gz: 48002bb898333ca896ec592603ef32ece5a1528d8dbc45d12618e5f80cd2cc905f758795f7d1305a6e44086fcf47f4ecdb422ca78404b70b2a454cbfd7df0473
+  metadata.gz: 66df808557bd8cb9f426cdde656a83231658f10ef1ccadd8865e15f513d31db1ac3d212b766e3e6c247e80c7ad45f5079f195cb5b2285d32e0237c8b70346e8e
+  data.tar.gz: f57cbb51a0ff274d44c0a62933eb26d8576d4d6c25dd85db79e93dbf35b219f558140b1a5bb404f8fc290625082bf2261a7a2e2d98ce74871d0f27a730b368e1

data/lib/sprockets.rb

@@ -1,5 +1,4 @@
 require 'sprockets/version'
-require 'sprockets/autoload'
 require 'sprockets/cache'
 require 'sprockets/environment'
 require 'sprockets/errors'

data/lib/sprockets/closure_compressor.rb

@@ -1,3 +1,5 @@
+require 'sprockets/autoload'
+
 module Sprockets
   # Public: Closure Compiler minifier.
   #

data/lib/sprockets/coffee_script_processor.rb

@@ -1,3 +1,5 @@
+require 'sprockets/autoload'
+
 module Sprockets
   # Processor engine class for the CoffeeScript compiler.
   # Depends on the `coffee-script` and `coffee-script-source` gems.

data/lib/sprockets/digest_utils.rb

@@ -111,7 +111,10 @@ module Sprockets
     #
     # Returns urlsafe base64 String.
     def pack_urlsafe_base64digest(bin)
-      pack_base64digest(bin).tr('+/', '-_').tr('=', '')
+      str = pack_base64digest(bin)
+      str.tr!('+/'.freeze, '-_'.freeze)
+      str.tr!('='.freeze, ''.freeze)
+      str
     end
 
     # Internal: Maps digest class to the named information hash algorithm name.

data/lib/sprockets/eco_processor.rb

@@ -1,3 +1,5 @@
+require 'sprockets/autoload'
+
 module Sprockets
   # Processor engine class for the Eco compiler. Depends on the `eco` gem.
   #

data/lib/sprockets/ejs_processor.rb

@@ -1,3 +1,5 @@
+require 'sprockets/autoload'
+
 module Sprockets
   # Processor engine class for the EJS compiler. Depends on the `ejs` gem.
   #

data/lib/sprockets/legacy.rb

@@ -291,6 +291,12 @@ module Sprockets
       end
     end
 
+    def self.simple_logical_path?(str)
+      str.is_a?(String) &&
+        !PathUtils.absolute_path?(str) &&
+        str !~ /\*|\*\*|\?|\[|\]|\{|\}/
+    end
+
     # Deprecated: Filter logical paths in environment. Useful for selecting what
     # files you want to compile.
     #

data/lib/sprockets/loader.rb

@@ -26,7 +26,7 @@ module Sprockets
     def load(uri)
       filename, params = parse_asset_uri(uri)
       if params.key?(:id)
-        asset = cache.fetch(['asset-uri', uri]) do
+        asset = cache.fetch(['asset-uri', VERSION, uri]) do
           load_asset_by_id_uri(uri, filename, params)
         end
       else
@@ -55,7 +55,7 @@ module Sprockets
         asset = load_asset_by_uri(uri, filename, params)
 
         if id && asset[:id] != id
-          raise VersionNotFound, "could not find specified id: #{id}"
+          raise VersionNotFound, "could not find specified id: #{uri}##{id}"
         end
 
         asset

data/lib/sprockets/manifest.rb

@@ -121,13 +121,23 @@ module Sprockets
 
       return to_enum(__method__, *args) unless block_given?
 
-      filters = args.flatten.map { |arg| self.class.compile_match_filter(arg) }
+      paths, filters = args.flatten.partition { |arg| self.class.simple_logical_path?(arg) }
+      filters = filters.map { |arg| self.class.compile_match_filter(arg) }
 
       environment = self.environment.cached
-      environment.logical_paths do |logical_path, filename|
-        if filters.any? { |f| f.call(logical_path, filename) }
-          environment.find_all_linked_assets(filename) do |asset|
-            yield asset
+
+      paths.each do |path|
+        environment.find_all_linked_assets(path) do |asset|
+          yield asset
+        end
+      end
+
+      if filters.any?
+        environment.logical_paths do |logical_path, filename|
+          if filters.any? { |f| f.call(logical_path, filename) }
+            environment.find_all_linked_assets(filename) do |asset|
+              yield asset
+            end
           end
         end
       end

data/lib/sprockets/path_dependency_utils.rb

@@ -41,7 +41,7 @@ module Sprockets
     #
     # Returns an Array of entry names and a Set of dependency URIs.
     def entries_with_dependencies(path)
-      return entries(path), Set.new([build_file_digest_uri(path)])
+      return entries(path), file_digest_dependency_set(path)
     end
 
     # Internal: List directory filenames and associated Stats under a
@@ -53,7 +53,16 @@ module Sprockets
     #
     # Returns an Array of filenames and a Set of dependency URIs.
     def stat_directory_with_dependencies(dir)
-      return stat_directory(dir).to_a, Set.new([build_file_digest_uri(dir)])
+      return stat_directory(dir).to_a, file_digest_dependency_set(dir)
+    end
+
+    # Internal: Returns a set of dependencies for a particular path.
+    #
+    # path - String directory path
+    #
+    # Returns a Set of dependency URIs.
+    def file_digest_dependency_set(path)
+      Set.new([build_file_digest_uri(path)])
     end
 
     # Internal: List directory filenames and associated Stats under an entire

data/lib/sprockets/path_utils.rb

@@ -55,7 +55,9 @@ module Sprockets
     # Returns an empty `Array` if the directory does not exist.
     def entries(path)
       if File.directory?(path)
-        Dir.entries(path, :encoding => Encoding.default_internal).reject { |entry| entry =~ /^\.|~$|^\#.*\#$/ }.sort
+        Dir.entries(path, :encoding => Encoding.default_internal).reject! { |entry|
+          entry =~ /^\.|~$|^\#.*\#$/
+        }.sort!
       else
         []
       end

data/lib/sprockets/resolve.rb

@@ -151,12 +151,9 @@ module Sprockets
       end
 
       def path_matches(load_path, logical_name, logical_basename)
-        candidates, deps = [], Set.new
-        dirname = File.dirname(File.join(load_path, logical_name))
-
-        result = dirname_matches(dirname, logical_basename)
-        candidates.concat(result[0])
-        deps.merge(result[1])
+        dirname    = File.dirname(File.join(load_path, logical_name))
+        candidates = dirname_matches(dirname, logical_basename)
+        deps       = file_digest_dependency_set(dirname)
 
         result = resolve_alternates(load_path, logical_name)
         result[0].each do |fn|
@@ -164,23 +161,27 @@ module Sprockets
         end
         deps.merge(result[1])
 
-        result = dirname_matches(File.join(load_path, logical_name), "index")
-        candidates.concat(result[0])
-        deps.merge(result[1])
+        dirname = File.join(load_path, logical_name)
+        if directory? dirname
+          result = dirname_matches(dirname, "index")
+          candidates.concat(result)
+        end
+
+        deps.merge(file_digest_dependency_set(dirname))
 
         return candidates.select { |fn, _| file?(fn) }, deps
       end
 
       def dirname_matches(dirname, basename)
         candidates = []
-        entries, deps = self.entries_with_dependencies(dirname)
+        entries = self.entries(dirname)
         entries.each do |entry|
           name, type, _, _ = parse_path_extnames(entry)
           if basename == name
             candidates << [File.join(dirname, entry), type]
           end
         end
-        return candidates, deps
+        candidates
       end
 
       def resolve_alternates(load_path, logical_name)

data/lib/sprockets/sass_compressor.rb

@@ -1,3 +1,5 @@
+require 'sprockets/autoload'
+
 module Sprockets
   # Public: Sass CSS minifier.
   #

data/lib/sprockets/sass_processor.rb

@@ -1,4 +1,5 @@
 require 'rack/utils'
+require 'sprockets/autoload'
 require 'uri'
 
 module Sprockets

data/lib/sprockets/uglifier_compressor.rb

@@ -1,3 +1,5 @@
+require 'sprockets/autoload'
+
 module Sprockets
   # Public: Uglifier/Uglify compressor.
   #

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.0.0.beta.10"
+  VERSION = "3.0.0.rc.1"
 end

data/lib/sprockets/yui_compressor.rb

@@ -1,3 +1,5 @@
+require 'sprockets/autoload'
+
 module Sprockets
   # Public: YUI compressor.
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.10
+  version: 3.0.0.rc.1
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack