rails-assets-manifest 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b37255b188591ca005e9421faf46d08a6906e5d13d7b6d2bc27cc278dde8ea
-  data.tar.gz: 1d3faec5a30ce6c2cbe41b7c543b9e1b3fd9162320c2a8babf08533b4aebec41
+  metadata.gz: 803f622685cadb160b0cf327865bf93587e178a4ffffead1f8605f9934cd6416
+  data.tar.gz: 5e41faf3bfb89d88005c3667d916ace976a4800c1b8336d1763e24b554b5dcd6
 SHA512:
-  metadata.gz: f2dce0a879ba0931ed9ff2544ebabae420780a3f6c25bc9617f36c833758d4408f4c2ef388ed5bf59974a225d6cdfa2a578d217f5c552f9b0abfc0242de381c1
-  data.tar.gz: b29d086dcf4a9c93f5892ae204ac1f0ad8a51cd24d918fdcecc56f02cc87de8b99cdeccce4eb2111de563d923aa4059ed8f294a2f1c00c71f066d3cb313de15b
+  metadata.gz: dd37845719179bf39ec81db748348b6d761a7877d1a0e3ddc20eb74115f45f6c0992c014a3be9087b3cdc432ce91faf87f2fcacc0bcdc2bd4a3c6dacc1da64ef
+  data.tar.gz: 5741fd20f61a7bde1f5acd7db3aa440a9613e125edc24b088e52a9ad3e6e1dec3d01c32c754a8120aadad66f2fb1195e58748642b6e4bfae8d1c169ddd7ae128

data/CHANGELOG.md

@@ -17,6 +17,17 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 ### Breaks
 
 
+## 2.1.0 - (2019-09-11)
+---
+
+### New
+* Automatically add `crossorigin="anonymous"` for SRI resources
+* Separate manifest caching and eager loading
+
+### Changes
+* Remove defunct onboot manifest validation (f3fe8f57)
+
+
 ## 2.0.1 - (2019-08-09)
 ---
 
@@ -33,7 +44,6 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 
 ### Breaks
 * Change `manifest` configuration option into `manifests` to support multiple files
-* Change  configuration option into  to support multiple files
 
 
 ## 1.1.0 - (2019-08-08)

data/README.md

@@ -17,7 +17,7 @@ This gem does not make any assumption on which tool to use to make your assets n
 }
 ```
 
-This gem does not add new helper methods but extends the existing helpers. SRI is automatically added if available and within a secure context:
+This gem does not add new helper methods but extends the existing helpers. SRI is automatically added if available and within a secure context. A `crossorigin="anonymous"` attribute is automatically added if non is present.
 
 ```slim
 html
@@ -27,8 +27,8 @@ html
 ```
 
 ```html
-<link rel="stylesheet" media="all" href="2b16adf6f756625a0194.css" integrity="sha384-/oreyvcV6U6htGZD0fDWR8/Txezke8KhD0QNgHb660hSaW7M+ZzxxuB4Vo+PuAC9">
-<script src="2b16adf6f756625a0194.js" integrity="sha384-iJ55fQQApbQGxWEWSbWStBabi+yNGxZSQy/010+1Dhxl+rymyhGF4NtjUkOsYv7B"></script>
+<link rel="stylesheet" media="all" href="2b16adf6f756625a0194.css" integrity="sha384-/oreyvcV6U6htGZD0fDWR8/Txezke8KhD0QNgHb660hSaW7M+ZzxxuB4Vo+PuAC9" crossorigin="anonymous">
+<script src="2b16adf6f756625a0194.js" integrity="sha384-iJ55fQQApbQGxWEWSbWStBabi+yNGxZSQy/010+1Dhxl+rymyhGF4NtjUkOsYv7B" crossorigin="anonymous"></script>
 ```
 
 ## Installation
@@ -47,7 +47,7 @@ The manifest path can be configured e.g. in an environment:
   config.assets.manifests = %w(public/.asset-manifest.json)
 ```
 
-If `config.cache_classes` is set to `true` the manifest file be loaded once on boot and raise errors if missing or invalid.
+If `config.cache_classes` is set to `true` the manifest file be loaded once on boot.
 
 Assets included with `integrity: true` will raise an error if the integrity option is missing in the manifest.
 

data/lib/rails/assets/manifest.rb

@@ -20,8 +20,10 @@ module Rails
       class << self
         delegate :lookup, :lookup!, to: :instance
 
-        def instance
-          @instance ||= begin
+        attr_reader :instance
+
+        def prepare!
+          @instance = begin
             config = Rails.application.config
 
             Manifest.new \
@@ -30,6 +32,11 @@ module Rails
           end
         end
 
+        def eager_load!
+          return unless @instance
+          @instance.eager_load!
+        end
+
         def passthrough?
           Rails.application.config.assets.passthrough
         end

data/lib/rails/assets/manifest/helper.rb

@@ -17,7 +17,7 @@ module Rails::Assets::Manifest
     end
 
     def javascript_include_tag(*sources, integrity: nil, **kwargs)
-      return super(*sources, **kwargs) unless compute_integrity?(integrity)
+      return super(*sources, **kwargs) unless manifest_use_integrity?(integrity)
 
       with_integrity(sources, integrity, :javascript, **kwargs) do |source, options|
         super(source, options)
@@ -25,7 +25,7 @@ module Rails::Assets::Manifest
     end
 
     def stylesheet_link_tag(*sources, integrity: nil, **kwargs)
-      return super(*sources, **kwargs) unless compute_integrity?(integrity)
+      return super(*sources, **kwargs) unless manifest_use_integrity?(integrity)
 
       with_integrity(sources, integrity, :stylesheet, **kwargs) do |source, options|
         super(source, options)
@@ -34,19 +34,24 @@ module Rails::Assets::Manifest
 
     private
 
-    def compute_integrity?(option)
-      return false unless secure_subresource_integrity_context?
+    def manifest_use_integrity?(option)
+      return false unless secure_request_context?
 
       option || option.nil?
     end
 
+    # http://www.w3.org/TR/SRI/#non-secure-contexts-remain-non-secure
+    def secure_request_context?
+      respond_to?(:request) && self.request && (self.request.local? || self.request.ssl?)
+    end
+
     def with_integrity(sources, required, type, **kwargs)
       sources.map do |source|
         path = path_with_extname(source, type: type, **kwargs)
 
         # integrity hash passed directly
         if required.is_a?(String)
-          next yield(source, integrity: required, **kwargs)
+          next yield(source, integrity: required, crossorigin: 'anonymous', **kwargs)
 
         # Explicit passed `true` option
         elsif required
@@ -56,7 +61,7 @@ module Rails::Assets::Manifest
             raise IntegrityMissing.new "SRI missing for #{path}"
           end
 
-          next yield(source, integrity: integrity, **kwargs)
+          next yield(source, integrity: integrity, crossorigin: 'anonymous', **kwargs)
 
         # No integrity option passed or `nil` default from above
         elsif required.nil?
@@ -65,7 +70,7 @@ module Rails::Assets::Manifest
           # Only if it is an asset from our manifest and there is an integrity
           # we default to adding one
           if(entry && entry.integrity)
-            next yield(source, integrity: entry.integrity, **kwargs)
+            next yield(source, integrity: entry.integrity, crossorigin: 'anonymous', **kwargs)
           end
         end
 
@@ -73,10 +78,6 @@ module Rails::Assets::Manifest
       end.join.html_safe
     end
 
-    def secure_subresource_integrity_context?
-      respond_to?(:request) && (request&.local? || request&.ssl?)
-    end
-
     def path_with_extname(path, options)
       path = path.to_s
       "#{path}#{compute_asset_extname(path, options)}"

data/lib/rails/assets/manifest/manifest.rb

@@ -7,8 +7,6 @@ module Rails::Assets::Manifest
     def initialize(files:, cache: true)
       @files = Array(files).flatten.each(&:freeze).freeze
       @cache = cache
-
-      data if cache?
     end
 
     def cache?
@@ -32,6 +30,10 @@ module Rails::Assets::Manifest
       data.key?(name.to_s)
     end
 
+    def eager_load!
+      data
+    end
+
     private
 
     Entry = Struct.new(:src, :integrity) do

data/lib/rails/assets/manifest/railtie.rb

@@ -26,26 +26,12 @@ module Rails
           end
         end
 
-        initializer 'rails-assets-manifest' do |app|
-          ::Rails::Assets::Manifest.instance if server?
+        config.to_prepare do
+          ::Rails::Assets::Manifest.prepare!
         end
 
-        private
-
-        def server?
-          !(console? || generator? || rake?)
-        end
-
-        def console?
-          defined?(Rails::Console)
-        end
-
-        def generator?
-          defined?(Rails::Generators)
-        end
-
-        def rake?
-          File.basename($0) == "rake"
+        config.before_eager_load do
+          ::Rails::Assets::Manifest.eager_load!
         end
       end
     end

data/lib/rails/assets/manifest/version.rb

@@ -5,8 +5,8 @@ module Rails
     module Manifest
       module VERSION
         MAJOR = 2
-        MINOR = 0
-        PATCH = 1
+        MINOR = 1
+        PATCH = 0
         STAGE = nil
 
         STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-assets-manifest
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Load all rails assets from an external manifest.