sprockets 4.0.0.beta10 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64c1ac060b88edc01f8adc37ab2f49c9c9f1e02d74112da9270de257df718032
-  data.tar.gz: 594abd92af901e94006089cec0f512f6098d075528ba0a753c976d3acdf75532
+  metadata.gz: cbc5f0a881069d09632a087bb32f43c8e5d01a631f2ff6fbc6e776e3695bd51c
+  data.tar.gz: 580922aaccc4defd65fdf239b441f7e8e96216d98dae8fdfe0a64afc3b40a4bc
 SHA512:
-  metadata.gz: b242856a5477ce327a65ed075071dc31248abcc9fabf4c9efc8a094dc06ff48353659727bf2038903199790fbbb677f06dc2ddc4f5421c073d75e400b14e1d9e
-  data.tar.gz: 04e32fbe2acfe7462d36371e686677d876c5be5af1cd3013f7ee272df45ed4a0e08709c3f890f71c92dfaf466b14b4915a4d168c46b85954f448e1397038fb67
+  metadata.gz: f474ef02d068783020ae4a3833bded8783d1a1bfa1ee5ae106dd7e8dfbcf12723c8582155cb44c0594b0c36bcad476b7139814f2577fa2e25a82ad6675763dc4
+  data.tar.gz: 853bbac33f50b2097126190c01bdc182306b7aa7132d50b91248efd1dcc1b7a35863fa1a5e529eacc8d967ee9d2de8083ae68b72e02889e01a821d794d0ad147

data/CHANGELOG.md

@@ -4,6 +4,11 @@ Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprocket
 
 ## Master
 
+## 4.0.0
+
+- Fixes for Ruby 2.7 keyword arguments warnings [#625](https://github.com/rails/sprockets/pull/625)
+- Manifest files are sorted alphabetically [#626](https://github.com/rails/sprockets/pull/626)
+
 ## 4.0.0.beta10
 
 - Fix YACB (Yet Another Caching Bug) [Fix broken expansion of asset link paths](https://github.com/rails/sprockets/pull/614)

data/lib/sprockets/base.rb

@@ -75,8 +75,8 @@ module Sprockets
     end
 
     # Find asset by logical path or expanded path.
-    def find_asset(*args)
-      uri, _ = resolve(*args)
+    def find_asset(*args, **options)
+      uri, _ = resolve(*args, **options)
       if uri
         load(uri)
       end

data/lib/sprockets/environment.rb

@@ -27,8 +27,8 @@ module Sprockets
     end
     alias_method :index, :cached
 
-    def find_asset(*args)
-      cached.find_asset(*args)
+    def find_asset(*args, **options)
+      cached.find_asset(*args, **options)
     end
 
     def find_asset!(*args)

data/lib/sprockets/manifest_utils.rb

@@ -38,6 +38,7 @@ module Sprockets
       entries = File.directory?(dirname) ? Dir.entries(dirname) : []
       manifest_entries = entries.select { |e| e =~ MANIFEST_RE }
       if manifest_entries.length > 1
+        manifest_entries.sort!
         logger.warn("Found multiple manifests: #{manifest_entries}. Choosing the first alphabetically: #{manifest_entries.first}")
       end
       entry = manifest_entries.first || generate_manifest_path

data/lib/sprockets/source_map_utils.rb

@@ -428,21 +428,23 @@ module Sprockets
     # Returns an Array of Integers.
     def vlq_decode(str)
       result = []
-      chars = str.split('')
-      while chars.any?
-        vlq = 0
-        shift = 0
-        continuation = true
-        while continuation
-          char = chars.shift
-          raise ArgumentError unless char
-          digit = BASE64_VALUES[char]
-          continuation = false if (digit & VLQ_CONTINUATION_BIT) == 0
-          digit &= VLQ_BASE_MASK
-          vlq   += digit << shift
+      shift = 0
+      value = 0
+      i = 0
+
+      while i < str.size do
+        digit = BASE64_VALUES[str[i]]
+        raise ArgumentError unless digit
+        continuation = (digit & VLQ_CONTINUATION_BIT) != 0
+        digit &= VLQ_CONTINUATION_BIT - 1
+          value += digit << shift
+        if continuation
           shift += VLQ_BASE_SHIFT
+        else
+          result << ((value & 1) == 1 ? -(value >> 1) : value >> 1)
+          value = shift = 0
         end
-        result << (vlq & 1 == 1 ? -(vlq >> 1) : vlq >> 1)
+        i += 1
       end
       result
     end

data/lib/sprockets/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sprockets
-  VERSION = "4.0.0.beta10"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta10
+  version: 4.0.0
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -433,9 +433,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: