sprockets 4.3.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed3bbcd2acf1e69863e6ffbf1906f4c21c9818de0125fab07af7233adb4b896
-  data.tar.gz: bda5afe84773146933b12ea7c9789671231afa86536f12d82dd2e6df0a951bab
+  metadata.gz: fa95962ec0936790685d6cbc86c52ee2a18b64dd53c0fc6d4d4b2768f770c0ff
+  data.tar.gz: 02f7be276656a15d0307316d330995d66a020f19b432b307a00da6a0ff30e97f
 SHA512:
-  metadata.gz: d6386915d85ef699768c8f59762cbb544e9a06840ccb1780df28ba6313aeb7e54e095c7d0a5567eb874c9e1613d1b01d6745cff747fcfdb53ba4856b99531df1
-  data.tar.gz: e41508e003694d4500b699dfeaa8254c462d2859a477c46e63c003cf928a01586603f4fa01adf80c9a403b0fb93dfe7f0d97bf1e118ffda6201084bca541a47a
+  metadata.gz: 84150daf942284304aad9eba323c15c453fb5d30a9b91b121721f810a938cda9e6c81592c0693e1af8f6538b8b4a167d7c87710b50405757364ee7e4f229722a
+  data.tar.gz: bf5083c1c49dcca322bbc66bde199c4f6a6dbbce955d6a0200438f401739ae995147f1acbe42aebb051dd51a324a9c757005e769d48a197c420ee8ac182f2c7e

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprockets/blob/master/UPGRADING.md
 
+# 4.4.1
+
+- Fix the `ignore_mtime` option to be shared between environments. [#834](https://github.com/rails/sprockets/pull/834)
+
+## 4.4.0
+
+- Implement `ignore_mtime` option. [#832](https://github.com/rails/sprockets/pull/832)
+- Allow disabling cache limits. [#831](https://github.com/rails/sprockets/pull/831)
+
 ## 4.3.0
 
 - Fixed compatibility with `json` 3+.

data/lib/sprockets/base.rb

@@ -62,14 +62,18 @@ module Sprockets
     # Returns a String digest or nil.
     def file_digest(path)
       if stat = self.stat(path)
-        # Caveat: Digests are cached by the path's current mtime. Its possible
-        # for a files contents to have changed and its mtime to have been
-        # negligently reset thus appearing as if the file hasn't changed on
-        # disk. Also, the mtime is only read to the nearest second. It's
-        # also possible the file was updated more than once in a given second.
-        key = UnloadedAsset.new(path, self).file_digest_key(stat.mtime.to_i)
-        cache.fetch(key) do
+        if ignore_mtime
           self.stat_digest(path, stat)
+        else
+          # Caveat: Digests are cached by the path's current mtime. Its possible
+          # for a files contents to have changed and its mtime to have been
+          # negligently reset thus appearing as if the file hasn't changed on
+          # disk. Also, the mtime is only read to the nearest second. It's
+          # also possible the file was updated more than once in a given second.
+          key = UnloadedAsset.new(path, self).file_digest_key(stat.mtime.to_i)
+          cache.fetch(key) do
+            self.stat_digest(path, stat)
+          end
         end
       end
     end

data/lib/sprockets/cache/file_store.rb

@@ -36,13 +36,13 @@ module Sprockets
       #
       # root     - A String path to a directory to persist cached values to.
       # max_size - A Integer of the maximum size the store will hold (in bytes).
-      #            (default: 25MB).
+      #            (default: 25MB). Can be set to +false+ for no limit.
       # logger   - The logger to which some info will be printed.
       #            (default logger level is FATAL and won't output anything).
       def initialize(root, max_size = DEFAULT_MAX_SIZE, logger = self.class.default_logger)
         @root     = root
         @max_size = max_size
-        @gc_size  = max_size * 0.75
+        @gc_size  = max_size * 0.75 if max_size
         @logger   = logger
       end
 
@@ -111,11 +111,13 @@ module Sprockets
         # Write data
         PathUtils.atomic_write(path) do |f|
           f.write(raw)
-          @size = size + f.size unless exists
+          if defined?(@size) && !exists
+            @size += f.size
+          end
         end
 
         # GC if necessary
-        gc! if size > @max_size
+        gc! if @max_size && size > @max_size
 
         value
       end

data/lib/sprockets/cache/memory_store.rb

@@ -18,7 +18,7 @@ module Sprockets
       # Public: Initialize the cache store.
       #
       # max_size - A Integer of the maximum number of keys the store will hold.
-      #            (default: 1000).
+      #            (default: 1000). Can be set to +false+ for no limit.
       def initialize(max_size = DEFAULT_MAX_SIZE)
         @max_size = max_size
         @cache = {}
@@ -56,7 +56,7 @@ module Sprockets
         @mutex.synchronize do
           @cache.delete(key)
           @cache[key] = value
-          @cache.shift if @cache.size > @max_size
+          @cache.shift if @max_size && @cache.size > @max_size
         end
         value
       end

data/lib/sprockets/configuration.rb

@@ -67,6 +67,19 @@ module Sprockets
       self.config = config.merge(digest_class: klass).freeze
     end
 
+    def ignore_mtime
+      config[:ignore_mtime]
+    end
+
+    # By default sprockets tries to quickly revalidate the cache for a source file
+    # by comparing its last modified time.
+    # This is efficient in development, but in some CI or producton environments
+    # where the source files are restored from version control, the last modified time
+    # tend to be somewhat random, and checking it is just needless overhead.
+    def ignore_mtime=(ignore_mtime)
+      self.config = config.merge(ignore_mtime: ignore_mtime).freeze
+    end
+
     # This class maybe mutated and mixed in with custom helpers.
     #
     #     environment.context_class.instance_eval do

data/lib/sprockets/path_utils.rb

@@ -91,6 +91,8 @@ module Sprockets
       SEPARATOR_PATTERN = "#{Regexp.quote(File::SEPARATOR)}"
     end
 
+    RELATIVE_PATH_PATTERN = /^\.\.?($|#{SEPARATOR_PATTERN})/
+
     # Public: Check if path is explicitly relative.
     # Starts with "./" or "../".
     #
@@ -98,7 +100,7 @@ module Sprockets
     #
     # Returns true if path is relative, otherwise false.
     def relative_path?(path)
-      path.match?(/^\.\.?($|#{SEPARATOR_PATTERN})/) ? true : false
+      path.match?(RELATIVE_PATH_PATTERN) ? true : false
     end
 
     # Public: Get relative path from `start` to `dest`.

data/lib/sprockets/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.1
 platform: ruby
 authors:
 - Sam Stephenson