rails-assets-manifest 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf7f05873e248861f8c1e82511a9a2006336acceaed1446555cc0ee9e4262228
-  data.tar.gz: cdfac3bf315ea70fd619c095f156b346e8f0fef8e4710db98e262ad25c080f11
+  metadata.gz: 31f22a9a97254698d652e6724a019c23db31f7a3550c31cd8b69dc1697103cd8
+  data.tar.gz: a4bc81e134d549c8cb8001403281fa4b4c535b44e1598a77d2a7c10b74851c6f
 SHA512:
-  metadata.gz: 8ac084087c8b7315975722241c18eef100a4148f10e70fa5f23ca515d26ede428bb222cae792c2cc116abe0873633d726f4dc23807f47622e0228ffbb203f519
-  data.tar.gz: e915fe0abf63b0c369aca79a5199b29f2d2e25927c4fbcd75d8c87adeb9f0e5634f50662d8090de96b69b638ba657e0e7fc4ba1b5be4ca3a81aab8719a31b0ba
+  metadata.gz: 6abbeff6a818cbe8ceff2f5737c564c336baded7d58df41508a0ae0e28b32021e1bfadd0fef206c6c6df30acc709002a343ebe1d1e2afdf70d3708f6caef9fb4
+  data.tar.gz: 6ac071032f401ac1aae354a4de86189e665918be1060104fa3a83a8dfeb645fb345a70b24b7455c4bce1074315232e70425df9e837c01d54f9e187bb401c1a67

data/CHANGELOG.md

@@ -17,6 +17,18 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
 ### Breaks
 
 
+## 2.0.0 - (2019-08-08)
+---
+
+### New
+* Accept glob patterns for `manifests` option
+
+
+### 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

@@ -44,13 +44,19 @@ gem 'rails-assets-manifest'
 The manifest path can be configured e.g. in an environment:
 
 ```ruby
-  config.assets.manifest = "public/.asset-manifest.json"
+  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.
 
 Assets included with `integrity: true` will raise an error if the integrity option is missing in the manifest.
 
+Multiple manifests can be loaded by specifying multiple files. Glob patterns are supported:
+
+```ruby
+  config.assets.manifests = %w(public/.manifest.*.json lib/manifest.json)
+```
+
 ## TODO
 
 * Override/Join with `asset_host` URL?

data/lib/rails/assets/manifest.rb

@@ -25,7 +25,7 @@ module Rails
             config = Rails.application.config
 
             Manifest.new \
-              path: config.assets.manifest,
+              files: config.assets.manifests,
               cache: config.cache_classes
           end
         end

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

@@ -4,8 +4,8 @@ module Rails::Assets::Manifest
   class Manifest
     attr_reader :path
 
-    def initialize(path:, cache: true)
-      @path = path.to_s.freeze
+    def initialize(files:, cache: true)
+      @files = Array(files).flatten.each(&:freeze).freeze
       @cache = cache
 
       data if cache?
@@ -22,12 +22,16 @@ module Rails::Assets::Manifest
     def lookup!(name)
       lookup(name) || begin
         raise EntryMissing.new <<~ERROR
-          Can't find #{name} in #{path}. Your manifest contains:
+          Can't find #{name} in #{path}. Your manifests contain:
           #{JSON.pretty_generate(data.keys)}
         ERROR
       end
     end
 
+    def key?(name)
+      data.key?(name.to_s)
+    end
+
     private
 
     Entry = Struct.new(:src, :integrity) do
@@ -44,14 +48,20 @@ module Rails::Assets::Manifest
       end
     end
 
+    def files
+      @files.map {|path| Dir.glob(path) }.flatten
+    end
+
     def load
-      JSON.parse(File.read(path)).transform_values do |entry|
-        if entry.is_a?(String)
-          Entry.new(entry, nil)
-        elsif entry.is_a?(Hash)
-          Entry.new(entry.fetch('src'), entry['integrity'])
-        else
-          raise "Invalid entry: #{entry.inspect}"
+      files.each_with_object({}) do |file, entries|
+        JSON.parse(File.read(file)).each_pair do |key, entry|
+          if entry.is_a?(String)
+            entries[key] = Entry.new(entry, nil)
+          elsif entry.is_a?(Hash) && entry.key?('src')
+            entries[key] = Entry.new(entry['src'], entry['integrity'])
+          else
+            raise "Invalid manifest entry: #{entry.inspect}"
+          end
         end
       end
     rescue Errno::ENOENT => e

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

@@ -10,8 +10,8 @@ module Rails
         # sprockets.
         config.assets ||= ::ActiveSupport::OrderedOptions.new
 
-        # Path where the manifest file is loaded from.
-        config.assets.manifest = 'public/assets/manifest.json'
+        # Path where the manifest files are loaded from.
+        config.assets.manifests = ['public/assets/manifest.json']
 
         # If set to true missing assets will not raise an
         # exception but are passed through to sprockets

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

@@ -4,8 +4,8 @@ module Rails
   module Assets
     module Manifest
       module VERSION
-        MAJOR = 1
-        MINOR = 1
+        MAJOR = 2
+        MINOR = 0
         PATCH = 0
         STAGE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-assets-manifest
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan Graichen