rails-assets-manifest 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20fbdae0fd6c2a519e249839ea5d49d59cf397de3381b34554473a932abddc71
-  data.tar.gz: 40652e5ad01c108a0be622b689175c9f9a05c6b94042c88d89645e0a41881e70
+  metadata.gz: cf7f05873e248861f8c1e82511a9a2006336acceaed1446555cc0ee9e4262228
+  data.tar.gz: cdfac3bf315ea70fd619c095f156b346e8f0fef8e4710db98e262ad25c080f11
 SHA512:
-  metadata.gz: 44179030578e024114a95376ee277b130d4e6998d497eb96c7616a319a008d38ec33cf24dce8bd55410e3a687c0ad848ee5c20a9adfbf79b41384258d6b53311
-  data.tar.gz: 598b10ec984f8c488df4d3b7ed48409c06db220b2e85a86babcc7e42187e9380835f0140a57af523dd7d35848205a3c232e2721519783ac3d9343b8f69cb5720
+  metadata.gz: 8ac084087c8b7315975722241c18eef100a4148f10e70fa5f23ca515d26ede428bb222cae792c2cc116abe0873633d726f4dc23807f47622e0228ffbb203f519
+  data.tar.gz: e915fe0abf63b0c369aca79a5199b29f2d2e25927c4fbcd75d8c87adeb9f0e5634f50662d8090de96b69b638ba657e0e7fc4ba1b5be4ca3a81aab8719a31b0ba

data/CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Changelog](http://keepachangelog.com/).
 
 
+
 ## Unreleased
 ---
 
@@ -16,6 +17,16 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 ### Breaks
 
 
+## 1.1.0 - (2019-08-08)
+---
+
+### New
+* Add passthrough option to load assets from other plugins (e.g. sprockets)
+
+### Changes
+* Only default to add available integrity if asset is from the manifest
+
+
 ## 1.0.0 - (2019-08-07)
 ---
 

data/lib/rails/assets/manifest.rb

@@ -29,6 +29,10 @@ module Rails
               cache: config.cache_classes
           end
         end
+
+        def passthrough?
+          Rails.application.config.assets.passthrough
+        end
       end
     end
   end

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

@@ -4,10 +4,16 @@ module Rails::Assets::Manifest
   module Helper
     def compute_asset_path(name, **_kwargs)
       ::Rails::Assets::Manifest.lookup!(name).src
+    rescue EntryMissing => e
+      return super if Rails::Assets::Manifest.passthrough?
+      raise
     end
 
     def asset_integrity(name, **kwargs)
       ::Rails::Assets::Manifest.lookup!(path_with_extname(name, **kwargs)).integrity
+    rescue EntryMissing => e
+      return super if Rails::Assets::Manifest.passthrough?
+      raise
     end
 
     def javascript_include_tag(*sources, integrity: nil, **kwargs)
@@ -36,15 +42,34 @@ module Rails::Assets::Manifest
 
     def with_integrity(sources, required, type, **kwargs)
       sources.map do |source|
-        integrity = asset_integrity(source, type: type, **kwargs)
+        path = path_with_extname(source, type: type, **kwargs)
 
-        if required && !integrity
-          raise IntegrityMissing.new <<~ERROR
-            SRI missing for #{path_with_extname(source, kwargs)}
-          ERROR
+        # integrity hash passed directly
+        if required.is_a?(String)
+          next yield(source, integrity: required, **kwargs)
+
+        # Explicit passed `true` option
+        elsif required
+          integrity = asset_integrity(source, type: type, **kwargs)
+
+          if !integrity
+            raise IntegrityMissing.new "SRI missing for #{path}"
+          end
+
+          next yield(source, integrity: integrity, **kwargs)
+
+        # No integrity option passed or `nil` default from above
+        elsif required.nil?
+          entry = ::Rails::Assets::Manifest.lookup(path)
+
+          # 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)
+          end
         end
 
-        yield(source, integrity: integrity, **kwargs)
+        yield(source, **kwargs)
       end.join.html_safe
     end
 

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

@@ -4,9 +4,20 @@ module Rails
   module Assets
     module Manifest
       class Railtie < ::Rails::Railtie
-        config.assets = ::ActiveSupport::OrderedOptions.new
+        # If this plugin is used with sprockets this option
+        # already exists and must not be overriden. Otherwise
+        # all sprockets default options are removed breaking
+        # sprockets.
+        config.assets ||= ::ActiveSupport::OrderedOptions.new
+
+        # Path where the manifest file is loaded from.
         config.assets.manifest = 'public/assets/manifest.json'
 
+        # If set to true missing assets will not raise an
+        # exception but are passed through to sprockets
+        # or rails own asset methods.
+        config.assets.passthrough = false
+
         config.after_initialize do |_|
           ActiveSupport.on_load(:action_view) do
             include Helper

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

@@ -5,7 +5,7 @@ module Rails
     module Manifest
       module VERSION
         MAJOR = 1
-        MINOR = 0
+        MINOR = 1
         PATCH = 0
         STAGE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-assets-manifest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport