bun_bun_bundle 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1acf2b909cdf00c5e5533943ad600811ee2cdd0fcd53885ca3e007f94b12db91
-  data.tar.gz: ee34bf6fd021e4470a9cb9f14ea7436f8b8eaf312229ad59724e4bb14a30afc1
+  metadata.gz: c51a065b214293e85467dfdd10f2c84bf763f65fe27d0b549b175ea7448563bf
+  data.tar.gz: f2d86b5d3650797b617fa3ecee6d3dac119d97850749bc830172bfa12cb83dfe
 SHA512:
-  metadata.gz: 3ee9e73c7e1de4a56d70411f8ba49d755a09b7c4148fa220eeef75a2dd460f141ea57fe194c29df26f2bc68cbd9d11339941f62f130bfeb7fbf22f8e0c80994f
-  data.tar.gz: 835bcd2d1b8203f6497931e3d92ca23a2d428fe84c750bc86eb508364805b4cae738b0fe32c30362be8a35e4dcdabea891f43b098f48de496f9585e8d9d06917
+  metadata.gz: c87530160b4f6829e32f7fc82c4f0d9180aa13b03089011fdb237d8daa4973453bd9cd074bd0402736f7fcab49e7d40c98f9b7fbb1a094aa07f718cd94ca9ac4
+  data.tar.gz: 0cbad61b7eff7af29f38cab146f09941a8f3dbd9354a1c470d36a35f94bbb36484543f7a06ef27e4810f2a1f51becb00026c7206de30e6b0049334cd224127fd

data/README.md

@@ -87,21 +87,16 @@ stale asset caching.
    # config/app.rb
 
    require 'bun_bun_bundle/hanami'
-   ```
-
-2. Optionally add the dev cache middleware:
-
-   ```ruby
-   # config/app.rb
 
    module MyApp
      class App < Hanami::App
+       BunBunBundle.setup(root: root)
        config.middleware.use BunBunBundle::DevCacheMiddleware if Hanami.env?(:development)
      end
    end
    ```
 
-3. Include the helpers in your views:
+2. Include the helpers in your views:
 
    ```ruby
    # app/views/helpers.rb
@@ -129,9 +124,7 @@ stale asset caching.
 ```ruby
 require 'bun_bun_bundle'
 
-# Configure manually
-BunBunBundle.config = BunBunBundle::Config.load(root: __dir__)
-BunBunBundle.manifest = BunBunBundle::Manifest.load(root: __dir__)
+BunBunBundle.setup(root: __dir__)
 
 # Optionally set a CDN host
 BunBunBundle.asset_host = 'https://cdn.example.com'

data/lib/bun_bun_bundle/hanami.rb

@@ -5,10 +5,11 @@ module BunBunBundle
   #
   # Add to your Hanami app's config/app.rb:
   #
-  #   require "bun_bun_bundle/hanami"
+  #   require 'bun_bun_bundle/hanami'
   #
   #   module MyApp
   #     class App < Hanami::App
+  #       BunBunBundle.setup(root: root)
   #       config.middleware.use BunBunBundle::DevCacheMiddleware if Hanami.env?(:development)
   #     end
   #   end
@@ -25,22 +26,4 @@ module BunBunBundle
   #     end
   #   end
   #
-  module HanamiIntegration
-    def self.setup(root: Dir.pwd)
-      BunBunBundle.config = Config.load(root: root)
-
-      BunBunBundle.manifest = if BunBunBundle.development?
-                                Manifest.load(root: root)
-                              else
-                                Manifest.load(root: root, retries: 1, delay: 0)
-                              end
-    end
-  end
-end
-
-# Auto-setup when loaded in a Hanami app.
-if defined?(Hanami)
-  Hanami::App.after :configure do
-    BunBunBundle::HanamiIntegration.setup(root: root.to_s)
-  end
 end

data/lib/bun_bun_bundle/helpers.rb

@@ -13,6 +13,8 @@ module BunBunBundle
   #   <%= bun_css_tag("css/app.css") %>
   #
   module Helpers
+    include SafeHtml
+
     # Returns the public path to an asset from the manifest.
     #
     # Prepends the configured public_path and asset_host:
@@ -33,7 +35,7 @@ module BunBunBundle
     def bun_js_tag(source, **options)
       src = bun_asset(source)
       attrs = { type: 'text/javascript' }.merge(options).merge(src: src)
-      %(<script #{_bun_html_attrs(attrs)}></script>)
+      _bun_safe(%(<script #{_bun_html_attrs(attrs)}></script>))
     end
 
     # Generates a <link> tag for a CSS entry point.
@@ -44,7 +46,7 @@ module BunBunBundle
     def bun_css_tag(source, **options)
       href = bun_asset(source)
       attrs = { type: 'text/css', rel: 'stylesheet' }.merge(options).merge(href: href)
-      %(<link #{_bun_html_attrs(attrs)}>)
+      _bun_safe(%(<link #{_bun_html_attrs(attrs)}>))
     end
 
     # Generates an <img> tag for an image asset.
@@ -56,7 +58,7 @@ module BunBunBundle
       src = bun_asset(source)
       alt = options.delete(:alt) || File.basename(source, '.*').tr('-_', ' ').capitalize
       attrs = { alt: alt }.merge(options).merge(src: src)
-      %(<img #{_bun_html_attrs(attrs)}>)
+      _bun_safe(%(<img #{_bun_html_attrs(attrs)}>))
     end
 
     private

data/lib/bun_bun_bundle/railtie.rb

@@ -13,13 +13,7 @@ module BunBunBundle
 
     initializer 'bun_bun_bundle.manifest' do |app|
       config.after_initialize do
-        BunBunBundle.config = Config.load(root: app.root.to_s)
-
-        BunBunBundle.manifest = if BunBunBundle.development?
-                                  Manifest.load(root: app.root.to_s)
-                                else
-                                  Manifest.load(root: app.root.to_s, retries: 1, delay: 0)
-                                end
+        BunBunBundle.setup(root: app.root)
       end
     end
 

data/lib/bun_bun_bundle/reload_tag.rb

@@ -10,6 +10,8 @@ module BunBunBundle
   # Only outputs content when BunBunBundle.development? is true.
   #
   module ReloadTag
+    include SafeHtml
+
     # Returns the live reload <script> tag, or an empty string in production.
     #
     # Example (ERB):
@@ -24,7 +26,7 @@ module BunBunBundle
         "#{config.public_path}/#{key}"
       end
 
-      <<~HTML
+      html = <<~HTML
         <script>
         (() => {
           const cssPaths = #{css_paths.to_json};
@@ -56,6 +58,7 @@ module BunBunBundle
         })()
         </script>
       HTML
+      _bun_safe(html)
     end
   end
 end

data/lib/bun_bun_bundle/safe_html.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module BunBunBundle
+  module SafeHtml
+    private
+
+    if String.method_defined?(:html_safe)
+      def _bun_safe(html) = html.html_safe
+    else
+      def _bun_safe(html) = html
+    end
+  end
+end

data/lib/bun_bun_bundle/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BunBunBundle
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/lib/bun_bun_bundle.rb

@@ -3,6 +3,7 @@
 require_relative 'bun_bun_bundle/version'
 require_relative 'bun_bun_bundle/config'
 require_relative 'bun_bun_bundle/manifest'
+require_relative 'bun_bun_bundle/safe_html'
 require_relative 'bun_bun_bundle/helpers'
 require_relative 'bun_bun_bundle/reload_tag'
 require_relative 'bun_bun_bundle/dev_cache_middleware'
@@ -35,6 +36,14 @@ module BunBunBundle
       environment == 'production'
     end
 
+    # Loads config and manifest. Call this from Hanami's config/app.rb or
+    # any Rack app's startup.
+    def setup(root: Dir.pwd)
+      self.config = Config.load(root: root.to_s)
+      options = development? ? {} : { retries: 1, delay: 0 }
+      self.manifest = Manifest.load(root: root.to_s, **options)
+    end
+
     # Returns the path to the bundled JS files shipped with the gem.
     def bun_path
       File.expand_path('bun', __dir__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bun_bun_bundle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Wout Fierens
@@ -48,6 +48,7 @@ files:
 - lib/bun_bun_bundle/manifest.rb
 - lib/bun_bun_bundle/railtie.rb
 - lib/bun_bun_bundle/reload_tag.rb
+- lib/bun_bun_bundle/safe_html.rb
 - lib/bun_bun_bundle/version.rb
 homepage: https://codeberg.org/w0u7/bun_bun_bundle
 licenses: