hanami-assets 2.1.0.rc2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71f6b2236cb6f96e86f9bbf25453b179685db554ef87faa5c64a09457aaefea3
-  data.tar.gz: 513533d8e23d48cc02dbaad76188724c934ddc4bf51bcd31b706fa61ef611a35
+  metadata.gz: 1a0f74ce24868eb7966c76d648440874d7379feec8a0dcf54cc2b2ec041b1e68
+  data.tar.gz: 70224e7d218a8ce723f33a6472e45864c49867816e96faf73efdeb0ae5693bd5
 SHA512:
-  metadata.gz: b47ce4c26181b7f0bb21ec64522162fd212ba33ab9284bdbfafd7c8b96bb983ca90a220266f1a5608dd0b990ca4ed40dd0a130445aab6de60f824ca018423347
-  data.tar.gz: 4df3a64885b684132af03c206ae224ad1f3855180aac4b6f15fb323dba8199f5195a4a0c5f6123854427888e96ff2b3201d037a6035b5a396b5561f9c2a5d26a
+  metadata.gz: 3843017a4e9ba13f467858ec0bc697ac89ee414c709a5a33cbd7f5b6d6a977b07d84961cb611983b4e2d0175e393354907de10d1191df396b64806913eee27ce
+  data.tar.gz: 4c60284918e679b1be855867bbcecc3b31901e3acf98c515cbda4c2d2cdd378c15ec988d43ce4346e03372966cc2bad7204b932a83027d7749bbacaa3729bdb9

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Hanami::Assets
 Assets management for Ruby web applications
 
+## v2.1.0 - 2024-02-27
+
+## v2.1.0.rc3 - 2024-02-16
+### Changed
+- [Tim Riley] Require a `root:` argument when initializing `Hanami::Assets`. This should be the directory containing the compiled assets and their `assets.json` manifest file.
+- [Tim Riley] Removed `manifest_path` setting; the manifest path is no longer user-configurable.
+- [Tim Riley] Replaced `package_manager_run_command` setting with `node_command` setting.
+- [Tim Riley] Removed unused `sources`, `entry_point_patterns` and `destination` settings.
+- [Tim Riley] Removed `bin/hanami-assets` executable.
+
 ## v2.1.0.rc2 - 2023-11-08
 
 ## v2.1.0.rc1 - 2023-11-01

data/lib/hanami/assets/base_url.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "uri"
+
 module Hanami
   class Assets
     # Base URL
@@ -7,11 +9,6 @@ module Hanami
     # @since 2.1.0
     # @api private
     class BaseUrl
-      # @since 2.1.0
-      # @api private
-      SEPARATOR = "/"
-      private_constant :SEPARATOR
-
       # @since 2.1.0
       # @api private
       attr_reader :url

data/lib/hanami/assets/config.rb

@@ -17,12 +17,12 @@ module Hanami
       BASE_URL = ""
       private_constant :BASE_URL
 
-      # @!attribute [rw] package_manager_run_command
+      # @!attribute [rw] node_command
       #   @return [String]
       #
       #   @api public
       #   @since 2.1.0
-      setting :package_manager_run_command, default: "npm run --silent"
+      setting :node_command, default: "node"
 
       # @!attribute [rw] path_prefix
       #   @return [String]
@@ -51,13 +51,6 @@ module Hanami
       #   @since 2.1.0
       setting :base_url, constructor: -> url { BaseUrl.new(url.to_s) }
 
-      # @!attribute [rw] manifest_path
-      #   @return [String, nil]
-      #
-      #   @api public
-      #   @since 2.1.0
-      setting :manifest_path
-
       # @api public
       # @since 2.1.0
       def initialize(**values)

data/lib/hanami/assets/errors.rb

@@ -9,13 +9,6 @@ module Hanami
     class Error < ::StandardError
     end
 
-    # Error raised when assets config is not valid.
-    #
-    # @api public
-    # @since 2.1.0
-    class ConfigError < Error
-    end
-
     # Error returned when the assets manifest file is missing.
     #
     # @api public

data/lib/hanami/assets/version.rb

@@ -5,6 +5,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = "2.1.0.rc2"
+    VERSION = "2.1.0"
   end
 end

data/lib/hanami/assets.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "pathname"
 require "zeitwerk"
 
 module Hanami
@@ -28,19 +29,38 @@ module Hanami
     require_relative "assets/version"
     require_relative "assets/errors"
 
+    # Returns the directory (under `public/assets/`) to be used for storing a slice's compiled
+    # assets.
+    #
+    # This is shared logic used by both Hanami (for the assets provider) and Hanami::CLI (for the
+    # assets commands).
+    #
+    # @since 2.1.0
+    # @api private
+    def self.public_assets_dir(slice)
+      return nil if slice.app.eql?(slice)
+
+      slice.slice_name.to_s.split("/").map { |name| "_#{name}" }.join("/")
+    end
+
     # @api private
     # @since 2.1.0
-    SEPARATOR = "/"
-    private_constant :SEPARATOR
+    MANIFEST_PATH = "assets.json"
+    private_constant :MANIFEST_PATH
 
     # @api private
     # @since 2.1.0
     attr_reader :config
 
+    # @api private
+    # @since 2.1.0
+    attr_reader :root
+
     # @api public
     # @since 2.1.0
-    def initialize(config:)
+    def initialize(config:, root:)
       @config = config
+      @root = Pathname(root)
     end
 
     # Returns the asset at the given path.
@@ -92,15 +112,13 @@ module Hanami
     def manifest
       return @manifest if instance_variable_defined?(:@manifest)
 
-      unless config.manifest_path
-        raise ConfigError, "no manifest_path configured"
-      end
+      full_manifest_path = root.join(MANIFEST_PATH)
 
-      unless File.exist?(config.manifest_path)
-        raise ManifestMissingError.new(config.manifest_path)
+      unless full_manifest_path.exist?
+        raise ManifestMissingError.new(full_manifest_path.to_s)
       end
 
-      @manifest = JSON.parse(File.read(config.manifest_path))
+      @manifest = JSON.parse(File.read(full_manifest_path))
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-assets
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc2
+  version: 2.1.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -145,15 +145,13 @@ dependencies:
 description: Assets management for Ruby web applications
 email:
 - me@lucaguidi.com
-executables:
-- hanami-assets
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE.md
 - README.md
-- bin/hanami-assets
 - hanami-assets.gemspec
 - lib/hanami-assets.rb
 - lib/hanami/assets.rb
@@ -178,11 +176,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Assets management

data/bin/hanami-assets

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "optparse"
-require "pathname"
-
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: hanami-assets --config=path/to/config.rb"
-
-  opts.on("-c", "--config FILE", "Path to config") do |c|
-    options[:config] = c
-  end
-end.parse!
-
-config = options.fetch(:config) { raise ArgumentError.new("You must specify a configuration file") }
-config = Pathname.new(config)
-config.exist? or raise ArgumentError.new("Cannot find configuration file: #{config}")
-
-require "hanami/assets"
-load config
-
-Hanami::Assets.deploy