minipack 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8949f9e9776f0a6e534121def90526240429d8d12f3609459b48b8ed630182ff
-  data.tar.gz: e8ac86674922149eb2f98208ea514d579bfd7147afad838641d8eeeda7c190dd
+  metadata.gz: bc8eca1d1f23c89720efbc82ceaa6afe4b914295e42be8edd661a22bdedafe43
+  data.tar.gz: b8fa5684228e7d29882f98c1cff298414f48cb8df94929ee215560b081e355a3
 SHA512:
-  metadata.gz: 10380141c2cfb30be94fb8e4daa3221696080f103526b4a54496fff0c87c53a8d2f47f2a93b306b169a08ba0bcecb3067b6c8debb84dc8a104bef38c32af0210
-  data.tar.gz: 7fd05ca76d124c9fc52ef3a2f79a16470b47444d17621ab0f20ddcbde08bd0231669c318336d6ec26fdd346989590e6e79fc006ef643813528af6d79e98da2dd
+  metadata.gz: ccd21785cac03e000600d35917f51f5a263b01c356ad07cb74ed6c26a9fc8fdee2620856416769405560308c3b8a5f4d501827399ebde570b0444c71868fe642
+  data.tar.gz: 90f9e18cdf3b56ce4d102ad7603579799398cbd44496e673950a717c7af5d7fa5db0211df571bb09edf44da3dbfe4d4fa13db6ba0a3b9ce203e1fe67aebf282a

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.3.3 / 2019-09-12
+
+## Enhancements:
+
+* Support manifest files that have integrity hashes in them (#24) by @HellRok
+
+## Breaking changes(internal apis only)
+
+* Return value of `Minipack::Manifest#lookup!` and `Minipack::Manifest#find`, now changed from String to `Minipack::Manifest::Entry`.
+
 # 0.3.2 / 2019-07-22
 
 ## Enhancements:

data/lib/minipack/helper.rb

@@ -9,7 +9,7 @@ module Minipack::Helper
   #   <%= asset_bundle_path 'icon/favicon.ico' %> # => "/assets/web/pack/icon/favicon-1016838bab065ae1e122.ico"
   def asset_bundle_path(name, manifest: nil, **options)
     manifest = get_manifest_by_key(manifest)
-    asset_path(manifest.lookup!(name.to_s), **options)
+    asset_path(manifest.lookup!(name.to_s).path, **options)
   end
 
   # Example:
@@ -20,7 +20,9 @@ module Minipack::Helper
   #   <%= javascript_bundle_tag 'orders/app'  %> # =>
   #   <script src="/assets/web/pack/orders/app-1016838bab065ae1e314.js"></script>
   def javascript_bundle_tag(*names, manifest: nil, **options)
-    javascript_include_tag(*sources_from_manifest(names, 'js', key: manifest), **options)
+    entries_from_manifest(names, 'js', key: manifest).map { |entry|
+      javascript_include_tag(entry.path, **options_for(entry, options))
+    }.join("\n").html_safe
   end
 
   # Creates script tags that references the js chunks from entrypoints when using split chunks API.
@@ -53,7 +55,9 @@ module Minipack::Helper
   #    href="/assets/web/pack/orders/style-1016838bab065ae1e122.css" />
   def stylesheet_bundle_tag(*names, manifest: nil, **options)
     if Minipack.configuration.extract_css?
-      stylesheet_link_tag(*sources_from_manifest(names, 'css', key: manifest), **options)
+      entries_from_manifest(names, 'css', key: manifest).map { |entry|
+        stylesheet_link_tag(entry.path, **options_for(entry, options))
+      }.join("\n").html_safe
     end
   end
 
@@ -85,23 +89,30 @@ module Minipack::Helper
   #   <img src="/assets/pack/icon-1016838bab065ae1e314.png" width="16" height="10" alt="Edit Entry" />
   def image_bundle_tag(name, manifest: nil, **options)
     manifest = get_manifest_by_key(manifest)
-    image_tag(manifest.lookup!(name.to_s), **options)
+    image_tag(manifest.lookup!(name.to_s).path, **options)
   end
 
   private
 
-  def sources_from_manifest(names, ext, key: nil)
+  def entries_from_manifest(names, ext, key: nil)
     manifest = get_manifest_by_key(key)
     names.map { |name| manifest.lookup!(name.to_s + '.' + ext) }
   end
 
   def sources_from_manifest_entrypoints(names, type, key: nil)
     manifest = get_manifest_by_key(key)
-    names.map { |name| manifest.lookup_pack_with_chunks!(name, type: type) }.flatten.uniq
+    names.map { |name| manifest.lookup_pack_with_chunks!(name, type: type).entries.map(&:path) }.flatten.uniq
   end
 
   def get_manifest_by_key(key = nil)
     repository = Minipack.configuration.manifests
     key.nil? ? repository.default : repository.get(key)
   end
+
+  # @param [Minipack::Manifest::Entry] entry
+  # @param [Hash] options
+  def options_for(entry, options)
+    return options unless entry.integrity
+    options.merge(integrity: entry.integrity)
+  end
 end

data/lib/minipack/manifest.rb

@@ -6,6 +6,36 @@ require 'uri'
 
 module Minipack
   class Manifest
+    # A class that represents a single entry in a manifest
+    class Entry
+      attr_reader :path, :integrity
+
+      # @param [String] path single path of a single entry
+      # @param [String,nil] integrity optional value for subresource integrity of script tags
+      def initialize(path, integrity: nil)
+        @path = path
+        @integrity = integrity
+      end
+
+      def ==(other)
+        @path == other.path && @integrity == other.integrity
+      end
+    end
+
+    # A class that represents a group of chunked entries in a manifest
+    class ChunkGroup
+      attr_reader :entries
+
+      # @param [Array<Minipack::Manifest::Entry>] entries paths of chunked group
+      def initialize(entries)
+        @entries = Array(entries).map { |entry| entry.is_a?(String) ? Entry.new(entry) : entry }
+      end
+
+      def ==(other)
+        @entries == other.entries
+      end
+    end
+
     class MissingEntryError < StandardError; end
     class FileNotFoundError < StandardError; end
 
@@ -20,15 +50,25 @@ module Minipack
     def lookup_pack_with_chunks!(name, type: nil)
       manifest_pack_type = manifest_type(name, type)
       manifest_pack_name = manifest_name(name, manifest_pack_type)
-      find('entrypoints')&.dig(manifest_pack_name, manifest_pack_type) || handle_missing_entry(name)
+      paths = data['entrypoints']&.dig(manifest_pack_name, manifest_pack_type) || handle_missing_entry(name)
+      ChunkGroup.new(paths)
     end
 
     def lookup!(name)
       find(name) || handle_missing_entry(name)
     end
 
+    # Find an entry by it's name
+    #
+    # @param [Symbol] name entry name
+    # @return [Minipack::Entry]
     def find(name)
-      data[name.to_s]
+      path = data[name.to_s] || return
+      if path.is_a? Hash
+        integrity = path['integrity']
+        path = path['src']
+      end
+      Entry.new(path, integrity: integrity)
     end
 
     def assets

data/lib/minipack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Minipack
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minipack
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview