sprockets 4.2.2 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6be8e97ff1bd7395fc078716cac0b775bacd30e1aad43153113df1b05b292164
-  data.tar.gz: e63069b6630898f92fe1853e51e7259714e126a44bd7b52442b9308533bee1d6
+  metadata.gz: 2ed3bbcd2acf1e69863e6ffbf1906f4c21c9818de0125fab07af7233adb4b896
+  data.tar.gz: bda5afe84773146933b12ea7c9789671231afa86536f12d82dd2e6df0a951bab
 SHA512:
-  metadata.gz: 37b62ffb61ca730485fcdf0526085a3eaabf21ebcc61f27f98510d4c013e7f64a0d5910879677a4d364bec5506b3d58a044ec4708e076a8791b3bf462699fdcd
-  data.tar.gz: 8d1178cbe5d033538d85a8ee9fb106bacc3ee7194d40332d42212f86298b458c3c45945a3be52320795f4fc1c3295d8ba27a4a05b2acefae24a191ee04a38c0f
+  metadata.gz: d6386915d85ef699768c8f59762cbb544e9a06840ccb1780df28ba6313aeb7e54e095c7d0a5567eb874c9e1613d1b01d6745cff747fcfdb53ba4856b99531df1
+  data.tar.gz: e41508e003694d4500b699dfeaa8254c462d2859a477c46e63c003cf928a01586603f4fa01adf80c9a403b0fb93dfe7f0d97bf1e118ffda6201084bca541a47a

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprockets/blob/master/UPGRADING.md
 
+## 4.3.0
+
+- Fixed compatibility with `json` 3+.
+- Do not set variable `GZip#mtime` but do always set `File#mtime`. [#821](https://github.com/rails/sprockets/pull/821)
+
 ## 4.2.2
 
 - Added missing dependency on `logger`. [#813](https://github.com/rails/sprockets/pull/813)

data/README.md

@@ -44,7 +44,7 @@ If you want to work on Sprockets or better understand how it works read [How Spr
 
 You can interact with Sprockets primarily through directives and file extensions. This section covers how to use each of these things, and the defaults that ship with Sprockets.
 
-Since you are likely using Sprockets through another framework (such as the [the Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html)), there will be configuration options you can toggle that will change behavior such as what directories or files get compiled. For that documentation you should see your framework's documentation.
+Since you are likely using Sprockets through another framework (such as the [Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html)), there will be configuration options you can toggle that will change behavior such as what directories or files get compiled. For that documentation you should see your framework's documentation.
 
 #### Accessing Assets
 
@@ -119,7 +119,7 @@ Here is a list of the available directives:
 - [`link_directory`](#link_directory) - Make target directory compile and be publicly available without adding contents to current
 - [`link_tree`](#link_tree) - Make target tree compile and be publicly available without adding contents to current
 - [`depend_on`](#depend_on) - Recompile current file if target has changed
-- [`depend_on_directory`](#depend_on_directory) - Recompile current file if any files in target directory has changed
+- [`depend_on_directory`](#depend_on_directory) - Recompile current file if any files in target directory have changed
 - [`stub`](#stub) - Ignore target file
 
 You can see what each of these does below.
@@ -150,7 +150,7 @@ When "asking" for a compiled file, you always ask for the extension you want. Fo
 asset_path("application.css")
 ```
 
-Sprockets understands that `application.scss.erb` will compile down to a `application.css`. Ask for what you need, not what you have.
+Sprockets understands that `application.scss.erb` will compile down to an `application.css`. Ask for what you need, not what you have.
 
 If this isn't working like you expect, make sure you didn't typo an extension, and make sure the file is on a "load path" (see framework docs for adding new load paths).
 
@@ -174,7 +174,7 @@ beta.js
 jquery.js
 ```
 
-Then `alpha.js` will be loaded before either of the other two. This can be a problem if `alpha.js` uses jquery. For this reason it is not recommend to use `require_directory` with files that are ordering dependent. You can either require individual files manually:
+Then `alpha.js` will be loaded before either of the other two. This can be a problem if `alpha.js` uses jquery. For this reason it is not recommended to use `require_directory` with files that are ordering dependent. You can either require individual files manually:
 
 ```js
 //= require jquery
@@ -253,7 +253,7 @@ Directives take a path or a path to a file. Paths for directive can be relative
 //= require ../foo.js
 ```
 
-This would load the file up one directory and named `foo.js`. However this isn't required if `foo.js` is on one of Sprocket's load paths. You can simply use
+This would load a file named `foo.js` from one directory up. However this isn't required if `foo.js` is on one of Sprocket's load paths. You can simply use
 
 ```js
 //= require foo.js
@@ -396,7 +396,7 @@ This would find a manifest file at `my_engine/app/assets/config/my_engine_manife
 
 Files in subdirectories will not be linked (Compare to [link_tree](#link_tree)).
 
-The *path* argument to `link_directory` is _not_ a logical path (it does not use the asset load paths), but is a path relative to the file the `link_directory` directive is found in, and can use `..` to  . For instance, you might want:
+The *path* argument to `link_directory` is _not_ a logical path (it does not use the asset load paths), but is a path relative to the file the `link_directory` directive is found in, and can use `..` to reference parent directories. For instance, you might want:
 
 ```js
 //= link_directory ../stylesheets
@@ -426,7 +426,7 @@ Example:
 //= link_tree ./path/to/folder
 ```
 
-Like `link_directory`, the argument is path relative to the current file, it is *not* a 'logical path' tresolved against load paths.
+Like `link_directory`, the argument is a path relative to the current file, it is *not* a 'logical path' resolved against load paths.
 
 
 As with `link_directory`, you can also specify a second argument -- separated by a space --  so any extra files not matching the content-type specified will be ignored:
@@ -469,7 +469,7 @@ asset's cache in response to a change in multiple files in a single directory.
 
 All paths are relative to your declaration and must begin with `./`
 
-Also, your must include these directories in your [load path](guides/building_an_asset_processing_framework.md#the-load-path).
+Also, you must include these directories in your [load path](guides/building_an_asset_processing_framework.md#the-load-path).
 
 **Example:**
 
@@ -488,8 +488,8 @@ B
 ```
 // ./file.js.erb
 //= depend_on_directory ./data
-var a = '<% File.read('data/a.data') %>'
-var b = '<% File.read('data/b.data') %>'
+var a = '<%= File.read("data/a.data") %>'
+var b = '<%= File.read("data/b.data") %>'
 ```
 
 Would produce:
@@ -514,7 +514,7 @@ Sprockets provides an ERB engine for preprocessing assets using
 embedded Ruby code. Append `.erb` to a CSS or JavaScript asset's
 filename to enable the ERB engine.
 
-For example if you have an `app/application/javascripts/app_name.js.erb`
+For example if you have an `app/assets/javascripts/app_name.js.erb`
 you could have this in the template
 
 ```js
@@ -559,7 +559,7 @@ Sprockets supports both Sass syntaxes. For the original
 whitespace-sensitive syntax, use the extension `.sass`. For the
 new SCSS syntax, use the extension `.scss`.
 
-In Rails if you have `app/application/stylesheets/foo.scss` it can
+In Rails if you have `app/assets/stylesheets/foo.scss` it can
 be referenced with `<%= asset_path("foo.css") %>`. When referencing
 an asset in Rails, always specify the extension you want. Sprockets will
 convert `foo.scss` to `foo.css`.
@@ -580,7 +580,7 @@ on your system to invoke it.
 To write JavaScript assets with CoffeeScript, use the extension
 `.coffee`.
 
-In Rails if you have `app/application/javascripts/foo.coffee` it can
+In Rails if you have `app/assets/javascripts/foo.coffee` it can
 be referenced with `<%= asset_path("foo.js") %>`. When referencing
 an asset in Rails, always specify the extension you want. Sprockets will
 convert `foo.coffee` to `foo.js`.

data/lib/sprockets/asset.rb

@@ -97,7 +97,7 @@ module Sprockets
       if @source
         @source
       else
-        # File is read everytime to avoid memory bloat of large binary files
+        # File is read every time to avoid memory bloat of large binary files
         File.binread(filename)
       end
     end

data/lib/sprockets/bower.rb

@@ -46,7 +46,7 @@ module Sprockets
     #
     # Returns nothing.
     def read_bower_main(dirname, filename)
-      bower = JSON.parse(File.read(filename), create_additions: false)
+      bower = JSON.parse(File.read(filename))
 
       case bower['main']
       when String

data/lib/sprockets/compressing.rb

@@ -106,7 +106,7 @@ module Sprockets
     #
     #     environment.gzip = false
     #
-    # To enable set to a truthy value. By default zlib wil
+    # To enable set to a truthy value. By default zlib will
     # be used to gzip assets. If you have the Zopfli gem
     # installed you can specify the zopfli algorithm to be used
     # instead:

data/lib/sprockets/encoding_utils.rb

@@ -50,6 +50,8 @@ module Sprockets
       Marshal.load(marshaled)
     end
 
+    GZIP_MTIME = RUBY_VERSION >= "2.7" ? 0 : 1
+
     # Public: Use gzip to compress data.
     #
     # str - String data
@@ -58,7 +60,7 @@ module Sprockets
     def gzip(str)
       io = StringIO.new
       gz = Zlib::GzipWriter.new(io, Zlib::BEST_COMPRESSION)
-      gz.mtime = 1
+      gz.mtime = Sprockets::EncodingUtils::GZIP_MTIME
       gz << str
       gz.finish
       io.string

data/lib/sprockets/loader.rb

@@ -179,7 +179,7 @@ module Sprockets
         processors_dep_uri = build_processors_uri(type, file_type, pipeline)
         dependencies = config[:dependencies] + [processors_dep_uri]
 
-        # Read into memory and process if theres a processor pipeline
+        # Read into memory and process if there's a processor pipeline
         if processors.any?
           result = call_processors(processors, {
             environment: self,

data/lib/sprockets/manifest.rb

@@ -120,14 +120,14 @@ module Sprockets
       return to_enum(__method__, *args) unless block_given?
 
       environment = self.environment.cached
-      promises = args.flatten.map do |path|
-        Concurrent::Promise.execute(executor: executor) do
+      futures = args.flatten.map do |path|
+        Concurrent::Promises.future_on(executor) do
           environment.find_all_linked_assets(path).to_a
         end
       end
 
-      promises.each do |promise|
-        promise.value!.each(&block)
+      futures.each do |future|
+        future.value!.each(&block)
       end
 
       nil
@@ -188,15 +188,15 @@ module Sprockets
 
         filenames << asset.filename
 
-        promise      = nil
+        future = nil
         exporters_for_asset(asset) do |exporter|
           next if exporter.skip?(logger)
 
-          if promise.nil?
-            promise = Concurrent::Promise.new(executor: executor) { exporter.call }
-            concurrent_exporters << promise.execute
+          if future.nil?
+            future = Concurrent::Promises.future_on(executor) { exporter.call }
+            concurrent_exporters << future
           else
-            concurrent_exporters << promise.then { exporter.call }
+            concurrent_exporters << future.then { exporter.call }
           end
         end
       end
@@ -315,7 +315,7 @@ module Sprockets
       end
 
       def json_decode(obj)
-        JSON.parse(obj, create_additions: false)
+        JSON.parse(obj)
       end
 
       def json_encode(obj)

data/lib/sprockets/npm.rb

@@ -37,7 +37,7 @@ module Sprockets
     #
     # Returns nothing.
     def read_package_directives(dirname, filename)
-      package = JSON.parse(File.read(filename), create_additions: false)
+      package = JSON.parse(File.read(filename))
 
       case package['main']
       when String

data/lib/sprockets/path_dependency_utils.rb

@@ -18,7 +18,7 @@ module Sprockets
   # The returned dependency set can be passed to resolve_dependencies(deps)
   # to check if the returned result is still fresh. In this case, entry always
   # returns a single path, but multiple calls should accumulate dependencies
-  # into a single set thats saved off and checked later.
+  # into a single set that's saved off and checked later.
   #
   #     resolve_dependencies(deps)
   #     # => "\x01\x02\x03"

data/lib/sprockets/utils/gzip.rb

@@ -10,13 +10,15 @@ module Sprockets
       # writes contents to the `file` passed in. Sets `mtime` of
       # written file to passed in `mtime`
       module ZlibArchiver
-        def self.call(file, source, mtime)
+        MTIME = RUBY_VERSION >= "2.7" ? 0 : 1
+
+        def self.call(file, source)
           gz = Zlib::GzipWriter.new(file, Zlib::BEST_COMPRESSION)
-          gz.mtime = mtime
+          gz.mtime = MTIME
           gz.write(source)
           gz.close
 
-          File.utime(mtime, mtime, file.path)
+          nil
         end
       end
 
@@ -28,8 +30,8 @@ module Sprockets
       # writes contents to the `file` passed in. Sets `mtime` of
       # written file to passed in `mtime`
       module ZopfliArchiver
-        def self.call(file, source, mtime)
-          compressed_source = Autoload::Zopfli.deflate(source, format: :gzip, mtime: mtime)
+        def self.call(file, source)
+          compressed_source = Autoload::Zopfli.deflate(source, format: :gzip)
           file.write(compressed_source)
           file.close
 
@@ -49,7 +51,7 @@ module Sprockets
 
       # What non-text mime types should we compress? This list comes from:
       # https://www.fastly.com/blog/new-gzip-settings-and-deciding-what-compress
-      COMPRESSABLE_MIME_TYPES = {
+      COMPRESSIBLE_MIME_TYPES = {
         "application/vnd.ms-fontobject" => true,
         "application/x-font-opentype" => true,
         "application/x-font-ttf" => true,
@@ -71,7 +73,7 @@ module Sprockets
         # can be compressed.
         #
         # We also check against our list of non-text compressible mime types
-        @charset || COMPRESSABLE_MIME_TYPES.include?(@content_type)
+        @charset || COMPRESSIBLE_MIME_TYPES.include?(@content_type)
       end
 
       # Private: Opposite of `can_compress?`.
@@ -90,7 +92,8 @@ module Sprockets
       # Returns nothing.
       def compress(file, target)
         mtime = Sprockets::PathUtils.stat(target).mtime
-        archiver.call(file, source, mtime)
+        archiver.call(file, source)
+        File.utime(mtime, mtime, file.path)
 
         nil
       end

data/lib/sprockets/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sprockets
-  VERSION = "4.2.2"
+  VERSION = "4.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.3.0
 platform: ruby
 authors:
 - Sam Stephenson
 - Joshua Peek
 bindir: bin
 cert_chain: []
-date: 2025-04-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -450,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Rack-based asset packaging system
 test_files: []