sprockets 3.7.3 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8d2739c5e14edf6aa95989aef8057d65eeb1525b4fccda72ba6099a8fe94bd3
-  data.tar.gz: 42fea69a2cf60adff7848fea3c8cd7fff222703611feda467aa8c5236aed9d84
+  metadata.gz: 1247cdff923f74bc8e25b4941797f3137e9d1765306bb79543543e17e4f1bc50
+  data.tar.gz: 4e05e0a201f4cb7713392c5ba7187d43663c1c23d0e44d1b0b2343ba7138f378
 SHA512:
-  metadata.gz: 753ee6f089d3e281ba3eb81fe4fbd133d50065337f84c02891895de4544d2204bc884c1599781d632f290b1d407d684f473e101e5ba535f12afebc82a979cdd8
-  data.tar.gz: 9c57173eb38957dc992617903bd15b922caf20468c5952c158ffa00472c52ce6e0029011495f8b2fcd9a9148cd7b4ce3525b1749b3c9b1a982038ca9afe0e737
+  metadata.gz: fae3ef101561cdcde39a89c15d9953d9492317d1072bbf339dd94f4bc9fa4fbffd81c258d302dde38fef3e3225b4029fa63328312a19cd808ea05fb6c2b6cd81
+  data.tar.gz: be67fc1164cf0a748c9c437d29f70502f6df06a09a3ab2a4b306eecdf1d7fcdee8492479a6290601dac261e285def2dce56dc3e2f44b71b56820bb843bfac4e6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**3.7.4** (March 28, 2024)
+
+* Fix deprecated calls to the `uri` gem.
+
 **3.7.3** (March 28, 2024)
 
 * Various compatibility fixes for newer Ruby versions.

data/lib/sprockets/legacy.rb

@@ -154,18 +154,10 @@ module Sprockets
         end
       end
 
-      # URI.unescape is deprecated on 1.9. We need to use URI::Parser
-      # if its available.
-      if defined? URI::DEFAULT_PARSER
-        def unescape(str)
-          str = URI::DEFAULT_PARSER.unescape(str)
-          str.force_encoding(Encoding.default_internal) if Encoding.default_internal
-          str
-        end
-      else
-        def unescape(str)
-          URI.unescape(str)
-        end
+      def unescape(str)
+        URIUtils::URI_PARSER.unescape(str)
+        str.force_encoding(Encoding.default_internal) if Encoding.default_internal
+        str
       end
   end
 

data/lib/sprockets/uri_utils.rb

@@ -20,6 +20,8 @@ module Sprockets
   module URIUtils
     extend self
 
+    URI_PARSER = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::RFC2396_Parser.new
+
     # Internal: Parse URI into component parts.
     #
     # uri - String uri
@@ -44,7 +46,7 @@ module Sprockets
     def split_file_uri(uri)
       scheme, _, host, _, _, path, _, query, _ = URI.split(uri)
 
-      path = URI::Generic::DEFAULT_PARSER.unescape(path)
+      path = URI_PARSER.unescape(path)
       path.force_encoding(Encoding::UTF_8)
 
       # Hack for parsing Windows "file:///C:/Users/IEUser" paths
@@ -63,7 +65,7 @@ module Sprockets
       str = "#{scheme}://"
       str << host if host
       path = "/#{path}" unless path.start_with?("/")
-      str << URI::Generic::DEFAULT_PARSER.escape(path)
+      str << URI_PARSER.escape(path)
       str << "?#{query}" if query
       str
     end
@@ -162,7 +164,7 @@ module Sprockets
         when Integer
           query << "#{key}=#{value}"
         when String, Symbol
-          query << "#{key}=#{URI::Generic::DEFAULT_PARSER.escape(value.to_s)}"
+          query << "#{key}=#{URI_PARSER.escape(value.to_s)}"
         when TrueClass
           query << "#{key}"
         when FalseClass, NilClass
@@ -182,7 +184,7 @@ module Sprockets
     def parse_uri_query_params(query)
       query.to_s.split('&').reduce({}) do |h, p|
         k, v = p.split('=', 2)
-        v = URI::Generic::DEFAULT_PARSER.unescape(v) if v
+        v = URI_PARSER.unescape(v) if v
         h[k.to_sym] = v || true
         h
       end

data/lib/sprockets/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.7.4
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -346,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Rack-based asset packaging system