sprockets 3.0.0.beta.5 → 3.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6bee17ca558f25cc69850e82405f479f3d3af3
-  data.tar.gz: b513251bb8582e5fc2d30ccf3b0a65336e14edd9
+  metadata.gz: 8efcdd68f447ff7e005fe4edd68eaae03f06f1d6
+  data.tar.gz: d0b92f39df358468d6039d3d1bb08970d271a733
 SHA512:
-  metadata.gz: 2b16c9ea238f143f8b9e0881c74748446ae160179db5895195d00075e72eb7982630270ab8e1609ed93d05a86259d48b21c29723d9c9e90749b6010fa6599b89
-  data.tar.gz: 02c9e685bb2b994590402d7761b5476dc6c67afb49563ea04b6493c5b89a16d17069176ab4c3d7900367b41176ee059d2f653416d002dc4b7393c64ce9622794
+  metadata.gz: 6819d688dd19334c5f09ba24e3399fcb2a8cf5c233e6be75450d8fdeb909abfc356c68dc0a38203e07bc6a8aa636e6ccaa1868a1396fd346d5145405806ca580
+  data.tar.gz: c8d3438168908e7f72ca0f4fe68669ed3d91c237e4712be6c43970de7ccd87d5178acf7171abcbde28d448bcdf1a0c7cd73b52122abe299cbb53ddb274d7fc67

data/lib/rake/sprocketstask.rb

@@ -127,9 +127,9 @@ module Rake
       task :clobber => ["clobber_#{name}"]
 
       desc name == :assets ? "Clean old assets" : "Clean old #{name} assets"
-      task "clean_#{name}" do
+      task "clean_#{name}", [:keep] do |t, args|
         with_logger do
-          manifest.clean(keep)
+          manifest.clean(Integer(args.keep || self.keep))
         end
       end
 

data/lib/sprockets/asset_uri.rb

@@ -2,6 +2,18 @@ require 'uri'
 
 module Sprockets
   module AssetURI
+    # Internal: Check if String is a valid Asset URI.
+    #
+    # str - Possible String asset URI.
+    #
+    # Returns true or false.
+    def self.valid?(str)
+      # Quick prefix check before attempting a full parse
+      str.start_with?("file://") && parse(str) ? true : false
+    rescue URI::InvalidURIError
+      false
+    end
+
     # Internal: Parse Asset URI.
     #
     # Examples

data/lib/sprockets/cache/file_store.rb

@@ -53,13 +53,7 @@ module Sprockets
 
         value = safe_open(path) do |f|
           begin
-            raw = f.read
-            if raw =~ /\A\x04\x08/
-              marshaled = raw
-            else
-              marshaled = Zlib::Inflate.new(Zlib::MAX_WBITS).inflate(raw)
-            end
-            Marshal.load(marshaled)
+            EncodingUtils.unmarshaled_deflated(f.read, Zlib::MAX_WBITS)
           rescue Exception => e
             @logger.error do
               "#{self.class}[#{path}] could not be unmarshaled: " +

data/lib/sprockets/context.rb

@@ -119,7 +119,11 @@ module Sprockets
     end
 
     def locate(path, options = {})
-      _resolve(:locate, path, options)
+      if AssetURI.valid?(path)
+        path
+      else
+        _resolve(:locate, path, options)
+      end
     end
 
     # `depend_on` allows you to state a dependency on a file without
@@ -165,7 +169,7 @@ module Sprockets
     # `path` must be an asset which may or may not already be included
     # in the bundle.
     def stub_asset(path)
-      @stubbed << @environment.locate(path, accept: @content_type, bundle: false)
+      @stubbed << locate(path, accept: @content_type, bundle: false)
       nil
     end
 

data/lib/sprockets/directive_processor.rb

@@ -80,10 +80,7 @@ module Sprockets
       @content_type = input[:content_type]
 
       data = input[:data]
-      cache_key = ['DirectiveProcessor', VERSION, data]
-      result = input[:cache].fetch(cache_key) do
-        process_source(data)
-      end
+      result = process_source(data)
 
       data, directives = result.values_at(:data, :directives)
 

data/lib/sprockets/encoding_utils.rb

@@ -27,6 +27,30 @@ module Sprockets
     # Public: Alias for CodingUtils.deflate
     DEFLATE = method(:deflate)
 
+    # Internal: Unmarshal optionally deflated data.
+    #
+    # Checks leading marshal header to see if the bytes are uncompressed
+    # otherwise inflate the data an unmarshal.
+    #
+    # str - Marshaled String
+    # window_bits - Integer deflate window size. See ZLib::Inflate.new()
+    #
+    # Returns unmarshaled Object or raises an Exception.
+    def unmarshaled_deflated(str, window_bits = -Zlib::MAX_WBITS)
+      major, minor = str[0], str[1]
+      if major && major.ord == Marshal::MAJOR_VERSION &&
+          minor && minor.ord <= Marshal::MINOR_VERSION
+        marshaled = str
+      else
+        begin
+          marshaled = Zlib::Inflate.new(window_bits).inflate(str)
+        rescue Zlib::DataError
+          marshaled = str
+        end
+      end
+      Marshal.load(marshaled)
+    end
+
     # Public: Use gzip to compress data.
     #
     # str - String data

data/lib/sprockets/manifest.rb

@@ -106,7 +106,7 @@ module Sprockets
       @data['files'] ||= {}
     end
 
-    # Internal: Compile logical path matching filter into a proc that can be
+    # Deprecated: Compile logical path matching filter into a proc that can be
     # passed to logical_paths.select(&proc).
     #
     #   compile_match_filter(proc { |logical_path|
@@ -139,7 +139,7 @@ module Sprockets
       end
     end
 
-    # Public: Filter logical paths in environment. Useful for selecting what
+    # Deprecated: Filter logical paths in environment. Useful for selecting what
     # files you want to compile.
     #
     # Returns an Enumerator.
@@ -150,6 +150,29 @@ module Sprockets
       end
     end
 
+    # Public: Find all assets matching pattern set in environment.
+    #
+    # Returns Enumerator of Assets.
+    def find(*args)
+      unless environment
+        raise Error, "manifest requires environment for compilation"
+      end
+
+      return to_enum(__method__, *args) unless block_given?
+
+      filters = args.flatten.map { |arg| self.class.compile_match_filter(arg) }
+
+      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
+
+      nil
+    end
+
     # Deprecated alias.
     alias_method :find_logical_paths, :filter_logical_paths
 
@@ -167,28 +190,26 @@ module Sprockets
 
       filenames = []
 
-      filter_logical_paths(*args).each do |_, filename|
-        find_assets(filename) do |asset|
-          files[asset.digest_path] = {
-            'logical_path' => asset.logical_path,
-            'mtime'        => asset.mtime.iso8601,
-            'size'         => asset.bytesize,
-            'digest'       => asset.hexdigest,
-            'integrity'    => asset.integrity
-          }
-          assets[asset.logical_path] = asset.digest_path
-
-          target = File.join(dir, asset.digest_path)
-
-          if File.exist?(target)
-            logger.debug "Skipping #{target}, already exists"
-          else
-            logger.info "Writing #{target}"
-            asset.write_to target
-          end
+      find(*args) do |asset|
+        files[asset.digest_path] = {
+          'logical_path' => asset.logical_path,
+          'mtime'        => asset.mtime.iso8601,
+          'size'         => asset.bytesize,
+          'digest'       => asset.hexdigest,
+          'integrity'    => asset.integrity
+        }
+        assets[asset.logical_path] = asset.digest_path
+
+        target = File.join(dir, asset.digest_path)
 
-          filenames << filename
+        if File.exist?(target)
+          logger.debug "Skipping #{target}, already exists"
+        else
+          logger.info "Writing #{target}"
+          asset.write_to target
         end
+
+        filenames << asset.filename
       end
       save
 
@@ -249,18 +270,6 @@ module Sprockets
     end
 
     protected
-      # Basic wrapper around Environment#find_asset. Logs compile time.
-      def find_assets(path)
-        start = Utils.benchmark_start
-        environment.find_all_linked_assets(path) do |asset|
-          logger.debug do
-            "Compiled #{asset.logical_path}  (#{Utils.benchmark_end(start)}ms)"
-          end
-          yield asset
-          start = Utils.benchmark_start
-        end
-      end
-
       # Persist manfiest back to FS
       def save
         FileUtils.mkdir_p File.dirname(filename)

data/lib/sprockets/resolve.rb

@@ -61,7 +61,9 @@ module Sprockets
 
       paths = options[:load_paths] || self.paths
 
-      if absolute_path?(path)
+      if AssetURI.valid?(path)
+        return path
+      elsif absolute_path?(path)
         path = File.expand_path(path)
         if paths_split(paths, path) && file?(path)
           mime_type = parse_path_extnames(path)[1]

data/lib/sprockets/server.rb

@@ -46,6 +46,13 @@ module Sprockets
       options = {}
       options[:bundle] = !body_only?(env)
 
+      # 2.x/3.x compatibility hack. Just ignore fingerprints on ?body=1 requests.
+      # 3.x/4.x prefers strong validation of fingerprint to body contents, but
+      # 2.x just ignored it. 
+      if options[:bundle] == false
+        fingerprint = nil
+      end
+
       if fingerprint
         if_match = fingerprint
       elsif env['HTTP_IF_MATCH']

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.0.0.beta.5"
+  VERSION = "3.0.0.beta.6"
 end

metadata

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