manifester 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1e937b503930933967e434a8456c8abfd1f288396645e2caa6d7b40865623cd
-  data.tar.gz: 7d95cf05e9d381728a0ebc751163f9769f5b7aafacab4c55e96a912af6f612ce
+  metadata.gz: 4bf42ad927b127e72debfa126bd7c4117f7f794fcb87d61266ba1241c7fd2e26
+  data.tar.gz: 91c7da5020d971a9fe82e5b35d30f02015cb6920ee9638b513fad9c783b461e2
 SHA512:
-  metadata.gz: 512c0e43eb71410ea9a48b15bd2501c94489343bbc157a9d3169297b100b4db5d877170554016bff190fc4ebbc2e5a06962c94252528dbc2e40ca754f71e6336
-  data.tar.gz: 2114f8172d336d440c096640ec45bb2f9c5e031ac4dcdfa01b01b59a401f772247d56aa92f0daf7780df3e581ad83a766548fe7c363d4542832055f6ff16d9b2
+  metadata.gz: c03ae21fa18927df9bf59a83a23d1eca5508f22ed19e71c41dac582d83b09d7a3bb9bf592959e3b14c87817defcdd21a0c85010dd09b00c70fa96c72b4e768de
+  data.tar.gz: 8147999a1e4af9be730f39a1e54f0d1523b3902a41118850bda307a5d6fbf7396b42249a176b510c1fea7d11feca9f72b38ea12dc39c8820d7f9993bcff6867f

data/app/helpers/manifester/application_helper.rb

@@ -12,6 +12,8 @@ module Manifester
     #
     #   <%= asset_manifest_path 'calendar.css' %> # => "/packs/calendar-1016838bab065ae1e122.css"
     def asset_manifest_path(name, **options)
+      return asset_pack_path(name, **options) if fallback_to_webpacker?
+
       path_to_asset(current_manifester_instance.manifest.lookup!(name), options)
     end
 
@@ -23,6 +25,8 @@ module Manifester
     #
     #   <%= asset_manifest_url 'calendar.css' %> # => "http://example.com/packs/calendar-1016838bab065ae1e122.css"
     def asset_manifest_url(name, **options)
+      return asset_pack_url(name, **options) if fallback_to_webpacker?
+
       url_to_asset(current_manifester_instance.manifest.lookup!(name), options)
     end
 
@@ -30,6 +34,8 @@ module Manifester
     # Returns the relative path using manifest.json and passes it to path_to_asset helper.
     # This will use path_to_asset internally, so most of their behaviors will be the same.
     def image_manifest_path(name, **options)
+      return image_pack_path(name, **options) if fallback_to_webpacker?
+
       resolve_path_to_image(name, **options)
     end
 
@@ -38,6 +44,8 @@ module Manifester
     # and passes it to path_to_asset helper. This will use path_to_asset internally,
     # so most of their behaviors will be the same.
     def image_manifest_url(name, **options)
+      return image_pack_url(name, **options) if fallback_to_webpacker?
+
       resolve_path_to_image(name, **options.merge(protocol: :request))
     end
 
@@ -51,6 +59,8 @@ module Manifester
     #  <%= image_manifest_tag 'picture.png', srcset: { 'picture-2x.png' => '2x' } %>
     #  <img srcset= "/packs/picture-2x-7cca48e6cae66ec07b8e.png 2x" src="/packs/picture-c38deda30895059837cf.png" >
     def image_manifest_tag(name, **options)
+      return image_pack_tag(name, **options) if fallback_to_webpacker?
+
       if options[:srcset] && !options[:srcset].is_a?(String)
         options[:srcset] = options[:srcset].map do |src_name, size|
           "#{resolve_path_to_image(src_name)} #{size}"
@@ -67,6 +77,8 @@ module Manifester
     #  <%= favicon_manifest_tag 'mb-icon.png', rel: 'apple-touch-icon', type: 'image/png' %>
     #  <link href="/packs/mb-icon-k344a6d59eef8632c9d1.png" rel="apple-touch-icon" type="image/png" />
     def favicon_manifest_tag(name, **options)
+      return favicon_pack_tag(name, **options) if fallback_to_webpacker?
+
       favicon_link_tag(resolve_path_to_image(name), options)
     end
 
@@ -94,6 +106,8 @@ module Manifester
     #   <%= javascript_manifest_tag 'calendar' %>
     #   <%= javascript_manifest_tag 'map' %>
     def javascript_manifest_tag(*names, **options)
+      return javascript_pack_tag(*names, **options) if fallback_to_webpacker?
+
       javascript_include_tag(*sources_from_manifest_entrypoints(names, type: :javascript), **options)
     end
 
@@ -106,6 +120,8 @@ module Manifester
     #   <%= preload_manifest_asset 'fonts/fa-regular-400.woff2' %> # =>
     #   <link rel="preload" href="/packs/fonts/fa-regular-400-944fb546bd7018b07190a32244f67dc9.woff2" as="font" type="font/woff2" crossorigin="anonymous">
     def preload_manifest_asset(name, **options)
+      return preload_pack_asset(name, **options) if fallback_to_webpacker?
+
       if self.class.method_defined?(:preload_link_tag)
         preload_link_tag(current_manifester_instance.manifest.lookup!(name), options)
       else
@@ -135,6 +151,8 @@ module Manifester
     #   <%= stylesheet_manifest_tag 'calendar' %>
     #   <%= stylesheet_manifest_tag 'map' %>
     def stylesheet_manifest_tag(*names, **options)
+      return stylesheet_pack_tag(*names, **options) if fallback_to_webpacker?
+
       stylesheet_link_tag(*sources_from_manifest_entrypoints(names, type: :stylesheet), **options)
     end
 
@@ -150,5 +168,9 @@ module Manifester
       rescue
         path_to_asset(current_manifester_instance.manifest.lookup!(name), options)
       end
+
+      def fallback_to_webpacker?
+        current_manifester_instance.config.fallback_to_webpacker?
+      end
   end
 end

data/lib/manifester.rb

@@ -6,7 +6,6 @@ loader.push_dir("#{__dir__}/manifester", namespace: Manifester)
 loader.setup
 
 require "manifester/instance"
-require "manifester/env"
 require "manifester/configuration"
 require "manifester/manifest"
 

data/lib/manifester/configuration.rb

@@ -1,22 +1,24 @@
-require "yaml"
-require "active_support/core_ext/hash/keys"
-require "active_support/core_ext/hash/indifferent_access"
-
 class Manifester::Configuration
-  attr_reader :root_path, :config_path, :env
+  attr_reader :root_path
+  attr_reader :public_root_dir
+  attr_reader :public_output_dir
+  attr_reader :cache_manifest
+  attr_reader :fallback_to_webpacker
 
-  def initialize(root_path:, config_path:, env:)
+  def initialize(root_path:, public_root_dir:, public_output_dir:, cache_manifest:, fallback_to_webpacker:)
     @root_path = root_path
-    @config_path = config_path
-    @env = env
+    @public_root_dir = public_root_dir
+    @public_output_dir = public_output_dir
+    @cache_manifest = cache_manifest
+    @fallback_to_webpacker = fallback_to_webpacker
   end
 
   def public_path
-    root_path.join(fetch(:public_root_path))
+    root_path.join(@public_root_dir)
   end
 
   def public_output_path
-    public_path.join(fetch(:public_output_path))
+    public_path.join(@public_output_dir)
   end
 
   def public_manifest_path
@@ -24,34 +26,10 @@ class Manifester::Configuration
   end
 
   def cache_manifest?
-    fetch(:cache_manifest)
+    @cache_manifest
   end
 
-  private
-    def fetch(key)
-      data.fetch(key, defaults[key])
-    end
-
-    def data
-      @data ||= load
-    end
-
-    def load
-      YAML.load(config_path.read)[env].deep_symbolize_keys
-
-    rescue Errno::ENOENT => e
-      raise "Manifester configuration file not found #{config_path}. " \
-            "Please run rails manifester:install " \
-            "Error: #{e.message}"
-
-    rescue Psych::SyntaxError => e
-      raise "YAML syntax error occurred while parsing #{config_path}. " \
-            "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
-            "Error: #{e.message}"
-    end
-
-    def defaults
-      @defaults ||= \
-        HashWithIndifferentAccess.new(YAML.load_file(File.expand_path("../../install/config/manifester.yml", __FILE__))[env])
-    end
+  def fallback_to_webpacker?
+    fallback_to_webpacker.call
+  end
 end

data/lib/manifester/instance.rb

@@ -1,21 +1,19 @@
 class Manifester::Instance
   cattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
 
-  attr_reader :root_path, :config_path
+  attr_reader :root_path
 
-  def initialize(root_path: Rails.root, config_path: Rails.root.join("config/manifester.yml"))
-    @root_path, @config_path = root_path, config_path
-  end
-
-  def env
-    @env ||= Manifester::Env.inquire self
+  def initialize(root_path: Rails.root, public_root_dir: "public", public_output_dir: "packs", cache_manifest: false, fallback_to_webpacker: -> {})
+    @root_path, @public_root_dir, @public_output_dir, @cache_manifest, @fallback_to_webpacker = root_path, public_root_dir, public_output_dir, cache_manifest, fallback_to_webpacker
   end
 
   def config
     @config ||= Manifester::Configuration.new(
-      root_path: root_path,
-      config_path: config_path,
-      env: env
+      root_path: @root_path,
+      public_root_dir: @public_root_dir,
+      public_output_dir: @public_output_dir,
+      cache_manifest: @cache_manifest,
+      fallback_to_webpacker: @fallback_to_webpacker
     )
   end
 

data/lib/manifester/version.rb

@@ -1,3 +1,3 @@
 module Manifester
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manifester
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Adrian Marin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,7 +62,6 @@ files:
 - lib/manifester.rb
 - lib/manifester/configuration.rb
 - lib/manifester/engine.rb
-- lib/manifester/env.rb
 - lib/manifester/instance.rb
 - lib/manifester/manifest.rb
 - lib/manifester/version.rb

data/lib/manifester/env.rb

@@ -1,39 +0,0 @@
-class Manifester::Env
-  DEFAULT = "production".freeze
-
-  delegate :config_path, :logger, to: :@manifester
-
-  def self.inquire(manifester)
-    new(manifester).inquire
-  end
-
-  def initialize(manifester)
-    @manifester = manifester
-  end
-
-  def inquire
-    fallback_env_warning if config_path.exist? && !current
-    current || DEFAULT.inquiry
-  end
-
-  private
-    def current
-      Rails.env.presence_in(available_environments)
-    end
-
-    def fallback_env_warning
-      logger.info "RAILS_ENV=#{Rails.env} environment is not defined in config/manifester.yml, falling back to #{DEFAULT} environment"
-    end
-
-    def available_environments
-      if config_path.exist?
-        YAML.load(config_path.read).keys
-      else
-        [].freeze
-      end
-    rescue Psych::SyntaxError => e
-      raise "YAML syntax error occurred while parsing #{config_path}. " \
-            "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
-            "Error: #{e.message}"
-    end
-end