sprockets 3.0.0.rc.1 → 3.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0209bde9d0914d567ab73432b4081d0ee58496
-  data.tar.gz: 91da9e628f1837de6fef73391e211f512ceae82e
+  metadata.gz: 927a7d3d329ad614ee230b94912d3d2f64979382
+  data.tar.gz: 1b150071ee5ed020e9d0b3a7006e1f5b5553f4fd
 SHA512:
-  metadata.gz: 66df808557bd8cb9f426cdde656a83231658f10ef1ccadd8865e15f513d31db1ac3d212b766e3e6c247e80c7ad45f5079f195cb5b2285d32e0237c8b70346e8e
-  data.tar.gz: f57cbb51a0ff274d44c0a62933eb26d8576d4d6c25dd85db79e93dbf35b219f558140b1a5bb404f8fc290625082bf2261a7a2e2d98ce74871d0f27a730b368e1
+  metadata.gz: 0e326e611bdb66495f10b43cf890c420710fc00c4ac1f9f3c57fd8fba89c087561a680ce1733a6dfcbc92ffdfae1fa715a1e00e0f90822ea6304d49cde98fa46
+  data.tar.gz: 1529cd2dda83604b3505e744b88f74f6f71ffcf37dbc23449e571c1391347ee89e36cf62e5c186c4ec18c1e27a3ffadb8bbbee3d6dfb7543fc54f2c03f27ceab

data/lib/sprockets.rb

@@ -34,6 +34,7 @@ module Sprockets
     transformers: Hash.new { |h, k| {}.freeze }.freeze,
     version: ""
   }.freeze
+  self.computed_config = {}
 
   @context_class = Context
 

data/lib/sprockets/base.rb

@@ -50,7 +50,7 @@ module Sprockets
         # negligently reset thus appearing as if the file hasn't changed on
         # disk. Also, the mtime is only read to the nearest second. Its
         # also possible the file was updated more than once in a given second.
-        cache.fetch(['file_digest', path, stat.mtime.to_i]) do
+        cache.fetch("file_digest:#{path}:#{stat.mtime.to_i}") do
           self.stat_digest(path, stat)
         end
       end

data/lib/sprockets/configuration.rb

@@ -13,12 +13,15 @@ module Sprockets
 
     def initialize_configuration(parent)
       @config = parent.config
+      @computed_config = parent.computed_config
       @logger = parent.logger
       @context_class = Class.new(parent.context_class)
     end
 
     attr_reader :config
 
+    attr_accessor :computed_config
+
     def config=(config)
       raise TypeError, "can't assign mutable config" unless config.frozen?
       @config = config

data/lib/sprockets/engines.rb

@@ -53,6 +53,8 @@ module Sprockets
     def register_engine(ext, klass, options = {})
       ext = Sprockets::Utils.normalize_extension(ext)
 
+      self.computed_config = {}
+
       if klass.respond_to?(:call)
         processor = klass
         self.config = hash_reassoc(config, :engines) do |engines|
@@ -74,10 +76,6 @@ module Sprockets
           end
         end
       end
-
-      self.config = hash_reassoc(config, :_extnames) do
-        compute_extname_map
-      end
     end
   end
 end

data/lib/sprockets/loader.rb

@@ -26,15 +26,15 @@ module Sprockets
     def load(uri)
       filename, params = parse_asset_uri(uri)
       if params.key?(:id)
-        asset = cache.fetch(['asset-uri', VERSION, uri]) do
+        asset = cache.fetch("asset-uri:#{VERSION}#{uri}") do
           load_asset_by_id_uri(uri, filename, params)
         end
       else
         asset = fetch_asset_from_dependency_cache(uri, filename) do |paths|
           if paths
             digest = digest(resolve_dependencies(paths))
-            if id_uri = cache.get(['asset-uri-digest', VERSION, uri, digest], true)
-              cache.get(['asset-uri', VERSION, id_uri], true)
+            if id_uri = cache.get("asset-uri-digest:#{VERSION}:#{uri}:#{digest}", true)
+              cache.get("asset-uri:#{VERSION}:#{id_uri}", true)
             end
           else
             load_asset_by_uri(uri, filename, params)
@@ -150,14 +150,14 @@ module Sprockets
           end
         }.max
 
-        cache.set(['asset-uri', VERSION, asset[:uri]], asset, true)
-        cache.set(['asset-uri-digest', VERSION, uri, asset[:dependencies_digest]], asset[:uri], true)
+        cache.set("asset-uri:#{VERSION}:#{asset[:uri]}", asset, true)
+        cache.set("asset-uri-digest:#{VERSION}:#{uri}:#{asset[:dependencies_digest]}", asset[:uri], true)
 
         asset
       end
 
       def fetch_asset_from_dependency_cache(uri, filename, limit = 3)
-        key = ['asset-uri-cache-dependencies', VERSION, uri, file_digest(filename)]
+        key = "asset-uri-cache-dependencies:#{VERSION}:#{uri}:#{file_digest(filename)}"
         history = cache.get(key) || []
 
         history.each_with_index do |deps, index|

data/lib/sprockets/mime.rb

@@ -57,6 +57,8 @@ module Sprockets
       charset ||= :default if mime_type.start_with?('text/')
       charset = EncodingUtils::CHARSET_DETECT[charset] if charset.is_a?(Symbol)
 
+      self.computed_config = {}
+
       self.config = hash_reassoc(config, :mime_exts) do |mime_exts|
         extnames.each do |extname|
           mime_exts[extname] = mime_type
@@ -69,10 +71,6 @@ module Sprockets
         type[:charset] = charset if charset
         mime_types.merge(mime_type => type)
       end
-
-      self.config = hash_reassoc(config, :_extnames) do
-        compute_extname_map
-      end
     end
 
     # Internal: Get detecter function for MIME type.
@@ -106,13 +104,17 @@ module Sprockets
     end
 
     private
+      def extname_map
+        self.computed_config[:_extnames] ||= compute_extname_map
+      end
+
       def compute_extname_map
         graph = {}
 
         ([nil] + pipelines.keys.map(&:to_s)).each do |pipeline|
           pipeline_extname = ".#{pipeline}" if pipeline
           ([[nil, nil]] + config[:mime_exts].to_a).each do |format_extname, format_type|
-            3.times do |n|
+            4.times do |n|
               config[:engines].keys.permutation(n).each do |engine_extnames|
                 key = "#{pipeline_extname}#{format_extname}#{engine_extnames.join}"
                 type = format_type || config[:engine_mime_types][engine_extnames.first]

data/lib/sprockets/path_utils.rb

@@ -261,12 +261,14 @@ module Sprockets
     #
     # Returns nothing.
     def atomic_write(filename)
-      tmpname = [
-        File.dirname(filename),
+      dirname, basename = File.split(filename)
+      basename = [
+        basename,
         Thread.current.object_id,
         Process.pid,
         rand(1000000)
       ].join('.')
+      tmpname = File.join(dirname, basename)
 
       File.open(tmpname, 'wb+') do |f|
         yield f

data/lib/sprockets/resolve.rb

@@ -195,7 +195,7 @@ module Sprockets
       #
       def parse_path_extnames(path)
         engines = []
-        extname, value = match_path_extname(path, config[:_extnames])
+        extname, value = match_path_extname(path, extname_map)
 
         if extname
           path = path.chomp(extname)

data/lib/sprockets/transformers.rb

@@ -94,17 +94,22 @@ module Sprockets
         raise ArgumentError, "too few transform types: #{types.inspect}"
       end
 
+      i = 0
       processors = []
-      enum = types.each
 
       loop do
-        src, dst = enum.next, enum.peek
+        src = types[i]
+        dst = types[i+1]
+        break unless src && dst
+
         unless processor = transformers[src][dst]
           raise ArgumentError, "missing transformer for type: #{src} to #{dst}"
         end
         processors.concat config[:postprocessors][src]
         processors << processor
         processors.concat config[:preprocessors][dst]
+
+        i += 1
       end
 
       if processors.size > 1

data/lib/sprockets/version.rb

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

metadata

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