sprockets 3.7.0 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f3dc22bf9c6e294e72cca5cf894e39d28d56b419
-  data.tar.gz: 58e0dcc75e743f649f83e48080c5f060c091dd85
+SHA256:
+  metadata.gz: d8d2739c5e14edf6aa95989aef8057d65eeb1525b4fccda72ba6099a8fe94bd3
+  data.tar.gz: 42fea69a2cf60adff7848fea3c8cd7fff222703611feda467aa8c5236aed9d84
 SHA512:
-  metadata.gz: 2c2cd23c31002b28297944e76fff80b8a05fcdc1f4aa64652bf43c5481c2f006854b20e6d4e45e234a482bf45ddd2e8cf122f0a9a5b1ae71ee421f346a2ba478
-  data.tar.gz: 06168eae576a776fef2b13ba12f5c4a51e6e7846e1b7e098e0052e9da52fd40e9aef3830aad0bb36dc099643d113182eae39e1d0ac09456bd63bb3e19e5e5cac
+  metadata.gz: 753ee6f089d3e281ba3eb81fe4fbd133d50065337f84c02891895de4544d2204bc884c1599781d632f290b1d407d684f473e101e5ba535f12afebc82a979cdd8
+  data.tar.gz: 9c57173eb38957dc992617903bd15b922caf20468c5952c158ffa00472c52ce6e0029011495f8b2fcd9a9148cd7b4ce3525b1749b3c9b1a982038ca9afe0e737

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-** 3.7.0** (July 21, 2016)
+**3.7.3** (March 28, 2024)
+
+* Various compatibility fixes for newer Ruby versions.
+
+**3.7.2** (June 19, 2018)
+
+* Security release for [CVE-2018-3760](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-3760).
+
+**3.7.1** (December 19, 2016)
+
+* Ruby 2.4 support for Sprockets 3.
+
+**3.7.0** (July 21, 2016)
 
 * Deprecated interfaces now emit deprecation warnings #345
 
@@ -103,7 +115,7 @@
 
 **3.0.0** (April 12, 2015)
 
-[Guide to upgrading from Sprockets 2.x to 3.x](https://github.com/rails/sprockets/blob/master/UPGRADING.md)
+[Guide to upgrading from Sprockets 2.x to 3.x](https://github.com/rails/sprockets/blob/3.x/UPGRADING.md)
 
 * New processor API. Tilt interface is deprecated.
 * Improved file store caching backend.

data/bin/sprockets

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$VERBOSE = nil
 
 require 'sprockets'
 require 'optparse'

data/lib/sprockets/closure_compressor.rb

@@ -35,11 +35,12 @@ module Sprockets
     attr_reader :cache_key
 
     def initialize(options = {})
-      @compiler = Autoload::Closure::Compiler.new(options)
+      @options = options
       @cache_key = "#{self.class.name}:#{Autoload::Closure::VERSION}:#{Autoload::Closure::COMPILER_VERSION}:#{VERSION}:#{DigestUtils.digest(options)}".freeze
     end
 
     def call(input)
+      @compiler ||= Autoload::Closure::Compiler.new(@options)
       @compiler.compile(input[:data])
     end
   end

data/lib/sprockets/digest_utils.rb

@@ -44,12 +44,8 @@ module Sprockets
         digest << 'Symbol'.freeze
         digest << val.to_s
       },
-      Fixnum => ->(val, digest) {
-        digest << 'Fixnum'.freeze
-        digest << val.to_s
-      },
-      Bignum => ->(val, digest) {
-        digest << 'Bignum'.freeze
+      Integer => ->(val, digest) {
+        digest << 'Integer'.freeze
         digest << val.to_s
       },
       Array => ->(val, digest) {
@@ -73,6 +69,16 @@ module Sprockets
         digest << val.name
       },
     }
+    if 0.class != Integer # Ruby < 2.4
+      ADD_VALUE_TO_DIGEST[Fixnum] = ->(val, digest) {
+        digest << 'Integer'.freeze
+        digest << val.to_s
+      }
+      ADD_VALUE_TO_DIGEST[Bignum] = ->(val, digest) {
+        digest << 'Integer'.freeze
+        digest << val.to_s
+      }
+    end
     ADD_VALUE_TO_DIGEST.default_proc = ->(_, val) {
       raise TypeError, "couldn't digest #{ val }"
     }

data/lib/sprockets/directive_processor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'set'
 require 'shellwords'
 

data/lib/sprockets/erb_processor.rb

@@ -18,7 +18,12 @@ module Sprockets
     end
 
     def call(input)
-      engine = ::ERB.new(input[:data], nil, '<>')
+      if keyword_constructor? # Ruby 2.6+
+        engine = ::ERB.new(input[:data], trim_mode: '<>')
+      else
+        engine = ::ERB.new(input[:data], nil, '<>')
+      end
+
       context = input[:environment].context_class.new(input)
       klass = (class << context; self; end)
       klass.class_eval(&@block) if @block
@@ -26,5 +31,12 @@ module Sprockets
       data = context._evaluate_template
       context.metadata.merge(data: data)
     end
+
+    private
+
+    def keyword_constructor?
+      return @keyword_constructor if defined? @keyword_constructor
+      @keyword_constructor = ::ERB.instance_method(:initialize).parameters.include?([:key, :trim_mode])
+    end
   end
 end

data/lib/sprockets/manifest.rb

@@ -161,7 +161,8 @@ module Sprockets
         end
       else
         args.each do |path|
-          yield File.binread(File.join(dir, assets[path]))
+          asset = assets[path]
+          yield File.binread(File.join(dir, asset)) if asset
         end
       end
     end

data/lib/sprockets/mime.rb

@@ -111,17 +111,37 @@ module Sprockets
       def compute_extname_map
         graph = {}
 
+        engine_extname_permutation = []
+
+        4.times do |n|
+          config[:engines].keys.permutation(n).each do |engine_extnames|
+            engine_extname_permutation << engine_extnames
+          end
+        end
+
+        mime_exts_grouped_by_mime_type = {}
+        config[:mime_exts].each do |format_extname,format_type|
+          mime_exts_grouped_by_mime_type[format_type] ||= []
+          mime_exts_grouped_by_mime_type[format_type] << format_extname
+        end
+
         ([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|
-            4.times do |n|
-              config[:engines].keys.permutation(n).each do |engine_extnames|
+          pipeline_extname = pipeline ? ".#{pipeline}" : ''.freeze
+          engine_extname_permutation.each do |engine_extnames|
+            mime_exts_grouped_by_mime_type.each do |format_type, format_extnames|
+              type = format_type
+              value = [type, engine_extnames, pipeline]
+              format_extnames.each do |format_extname|
                 key = "#{pipeline_extname}#{format_extname}#{engine_extnames.join}"
-                type = format_type || config[:engine_mime_types][engine_extnames.first]
-                graph[key] = {type: type, engines: engine_extnames, pipeline: pipeline}
+                graph[key] = value
+              end
+              if format_type == config[:engine_mime_types][engine_extnames.first]
+                key =  "#{pipeline_extname}#{engine_extnames.join}"
+                graph[key] = value
               end
             end
           end
+          graph[pipeline_extname] = [nil, [], pipeline]
         end
 
         graph

data/lib/sprockets/processing.rb

@@ -232,7 +232,7 @@ module Sprockets
       end
 
       def deprecate_legacy_processor_interface(interface)
-        msg = "You are using the a deprecated processor interface #{ interface.inspect }.\n" +
+        msg = "You are using a deprecated processor interface #{ interface.inspect }.\n" +
         "Please update your processor interface:\n" +
         "https://github.com/rails/sprockets/blob/master/guides/extending_sprockets.md#supporting-all-versions-of-sprockets-in-processors\n"
 

data/lib/sprockets/processor_utils.rb

@@ -107,12 +107,10 @@ module Sprockets
     VALID_METADATA_VALUE_TYPES = Set.new([
       String,
       Symbol,
-      Fixnum,
-      Bignum,
       TrueClass,
       FalseClass,
       NilClass
-    ]).freeze
+    ] + (0.class == Integer ? [Integer] : [Bignum, Fixnum])).freeze
 
     # Internal: Set of all nested compound metadata types that can nest values.
     VALID_METADATA_COMPOUND_TYPES = Set.new([

data/lib/sprockets/resolve.rb

@@ -202,7 +202,7 @@ module Sprockets
 
         if extname
           path = path.chomp(extname)
-          type, engines, pipeline = value.values_at(:type, :engines, :pipeline)
+          type, engines, pipeline = value
         end
 
         return path, type, engines, pipeline

data/lib/sprockets/server.rb

@@ -23,7 +23,7 @@ module Sprockets
       start_time = Time.now.to_f
       time_elapsed = lambda { ((Time.now.to_f - start_time) * 1000).to_i }
 
-      if env['REQUEST_METHOD'] != 'GET'
+      if !['GET', 'HEAD'].include?(env['REQUEST_METHOD'])
         return method_not_allowed_response
       end
 
@@ -39,7 +39,7 @@ module Sprockets
 
       # URLs containing a `".."` are rejected for security reasons.
       if forbidden_request?(path)
-        return forbidden_response
+        return forbidden_response(env)
       end
 
       # Look up the asset.
@@ -86,10 +86,10 @@ module Sprockets
         not_modified_response(env, if_none_match)
       when :not_found
         logger.info "#{msg} 404 Not Found (#{time_elapsed.call}ms)"
-        not_found_response
+        not_found_response(env)
       when :precondition_failed
         logger.info "#{msg} 412 Precondition Failed (#{time_elapsed.call}ms)"
-        precondition_failed_response
+        precondition_failed_response(env)
       end
     rescue Exception => e
       logger.error "Error compiling asset #{path}:"
@@ -115,12 +115,20 @@ module Sprockets
         #
         #     http://example.org/assets/../../../etc/passwd
         #
-        path.include?("..") || absolute_path?(path)
+        path.include?("..") || absolute_path?(path) || path.include?("://")
+      end
+
+      def head_request?(env)
+        env['REQUEST_METHOD'] == 'HEAD'
       end
 
       # Returns a 200 OK response tuple
       def ok_response(asset, env)
-        [ 200, headers(env, asset, asset.length), asset ]
+        if head_request?(env)
+          [ 200, headers(env, asset, 0), [] ]
+        else
+          [ 200, headers(env, asset, asset.length), asset ]
+        end
       end
 
       # Returns a 304 Not Modified response tuple
@@ -129,21 +137,33 @@ module Sprockets
       end
 
       # Returns a 403 Forbidden response tuple
-      def forbidden_response
-        [ 403, { "Content-Type" => "text/plain", "Content-Length" => "9" }, [ "Forbidden" ] ]
+      def forbidden_response(env)
+        if head_request?(env)
+          [ 403, { "Content-Type" => "text/plain", "Content-Length" => "0" }, [] ]
+        else
+          [ 403, { "Content-Type" => "text/plain", "Content-Length" => "9" }, [ "Forbidden" ] ]
+        end
       end
 
       # Returns a 404 Not Found response tuple
-      def not_found_response
-        [ 404, { "Content-Type" => "text/plain", "Content-Length" => "9", "X-Cascade" => "pass" }, [ "Not found" ] ]
+      def not_found_response(env)
+        if head_request?(env)
+          [ 404, { "Content-Type" => "text/plain", "Content-Length" => "0", "X-Cascade" => "pass" }, [] ]
+        else
+          [ 404, { "Content-Type" => "text/plain", "Content-Length" => "9", "X-Cascade" => "pass" }, [ "Not found" ] ]
+        end
       end
 
       def method_not_allowed_response
         [ 405, { "Content-Type" => "text/plain", "Content-Length" => "18" }, [ "Method Not Allowed" ] ]
       end
 
-      def precondition_failed_response
-        [ 412, { "Content-Type" => "text/plain", "Content-Length" => "19", "X-Cascade" => "pass" }, [ "Precondition Failed" ] ]
+      def precondition_failed_response(env)
+        if head_request?(env)
+          [ 412, { "Content-Type" => "text/plain", "Content-Length" => "0", "X-Cascade" => "pass" }, [] ]
+        else
+          [ 412, { "Content-Type" => "text/plain", "Content-Length" => "19", "X-Cascade" => "pass" }, [ "Precondition Failed" ] ]
+        end
       end
 
       # Returns a JavaScript response that re-throws a Ruby exception
@@ -231,11 +251,11 @@ module Sprockets
         # If the request url contains a fingerprint, set a long
         # expires on the response
         if path_fingerprint(env["PATH_INFO"])
-          headers["Cache-Control"] << ", max-age=31536000"
+          headers["Cache-Control"] += ", max-age=31536000"
 
         # Otherwise set `must-revalidate` since the asset could be modified.
         else
-          headers["Cache-Control"] << ", must-revalidate"
+          headers["Cache-Control"] += ", must-revalidate"
           headers["Vary"] = "Accept-Encoding"
         end
 

data/lib/sprockets/uglifier_compressor.rb

@@ -44,11 +44,12 @@ module Sprockets
         options[:comments] ||= :none
       end
 
-      @uglifier = Autoload::Uglifier.new(options)
+      @options = options
       @cache_key = "#{self.class.name}:#{Autoload::Uglifier::VERSION}:#{VERSION}:#{DigestUtils.digest(options)}".freeze
     end
 
     def call(input)
+      @uglifier ||= Autoload::Uglifier.new(@options)
       @uglifier.compile(input[:data])
     end
   end

data/lib/sprockets/uri_utils.rb

@@ -50,6 +50,9 @@ module Sprockets
       # Hack for parsing Windows "file:///C:/Users/IEUser" paths
       path.gsub!(/^\/([a-zA-Z]:)/, '\1'.freeze)
 
+      host = nil if host && host.empty?
+      query = nil if query && query.empty?
+
       [scheme, host, path, query]
     end
 

data/lib/sprockets/utils.rb

@@ -14,11 +14,15 @@ module Sprockets
     #
     # Returns false if .dup would raise a TypeError, otherwise true.
     def duplicable?(obj)
-      case obj
-      when NilClass, FalseClass, TrueClass, Symbol, Numeric
-        false
-      else
+      if RUBY_VERSION >= "2.4.0"
         true
+      else
+        case obj
+        when NilClass, FalseClass, TrueClass, Symbol, Numeric
+          false
+        else
+          true
+        end
       end
     end
 
@@ -98,6 +102,7 @@ module Sprockets
     #
     # Returns buf String.
     def concat_javascript_sources(buf, source)
+      buf = +buf
       if source.bytesize > 0
         buf << source
 

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.7.0"
+  VERSION = "3.7.3"
 end

data/lib/sprockets.rb

@@ -105,7 +105,7 @@ module Sprockets
   register_bundle_processor 'application/javascript', Bundle
   register_bundle_processor 'text/css', Bundle
 
-  register_bundle_metadata_reducer '*/*', :data, proc { "" }, :concat
+  register_bundle_metadata_reducer '*/*', :data, proc { "" }, :+
   register_bundle_metadata_reducer 'application/javascript', :data, proc { "" }, Utils.method(:concat_javascript_sources)
   register_bundle_metadata_reducer '*/*', :links, :+
 

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.3
 platform: ruby
 authors:
 - Sam Stephenson
 - Joshua Peek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2024-03-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -175,16 +189,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -317,7 +331,7 @@ homepage: https://github.com/rails/sprockets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -332,9 +346,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: sprockets
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Rack-based asset packaging system
 test_files: []