proscenium 0.17.0-x86_64-darwin → 0.18.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cac05c7b04ae00a23bc5fdc756e2f84d0d4ab609e31ca778220a3eba54cfd70b
-  data.tar.gz: 966043dd74d150e12197bced913b99a321610e5ec83e841a0798c603965eb8a5
+  metadata.gz: fa9fefe60949e0c21e8600e4a1cb774a8481131b9c42554dbb0bba6cead0b55d
+  data.tar.gz: ada8262d355d7e821594be722bd6a3af05d5dd432030665092bb2100a65e1a0f
 SHA512:
-  metadata.gz: 185036c0585134b3552865161c064c6bfb585c6183e3563c66c865b84c98013a8cd829ea5dddc43d57980bf4c84153d38c6582b08ee32130e3cacd76a021e27d
-  data.tar.gz: 5419b3db81eb4bdbe31ea330dcb87580aa9d695b0d5bcb7f924833cf6801e1420f36bef3b0d79a548f901fc926b93ebf00861efe4c73275c46ce2a343103f740
+  metadata.gz: a716d12562730c277b619bf975ef0e2d0ff7fecda0aae4263b3e8c9f5b0dcda2252ed96e9e0121fdf225503c2886d01e8d706bd17b6a19eee2ff55fe20d1fbfb
+  data.tar.gz: 06dd69d0842e29817bb694614a46ccb2658a8e42f65064c918c38574d5d1b105a18e2b223f3aafdbcc7e8bc3a3c39057d945debcb07cc499e98739cd447fa908

data/README.md

@@ -890,7 +890,7 @@ bundle exec rake compile:local
 We have tests for both Ruby and Go. To run the Ruby tests:
 
 ```bash
-bundle exec sus
+bin/test
 ```
 
 To run the Go tests:

data/lib/proscenium/helper.rb

@@ -21,12 +21,10 @@ module Proscenium
     # /app/javascript.
     def compute_asset_path(path, options = {})
       if %i[javascript stylesheet].include?(options[:type])
-        if !path.start_with?("./", "../")
-          path.prepend DEFAULT_RAILS_ASSET_PATHS[options[:type]]
-        end
+        path.prepend DEFAULT_RAILS_ASSET_PATHS[options[:type]] unless path.start_with?('./', '../')
 
         result = Proscenium::Builder.build_to_path(path, base_url: request.base_url)
-        return result.split("::").last.delete_prefix "public"
+        return result.split('::').last.delete_prefix 'public'
       end
 
       super
@@ -61,7 +59,7 @@ module Proscenium
     end
 
     def include_stylesheets
-      '<!-- [PROSCENIUM_STYLESHEETS] -->'.html_safe
+      SideLoad::CSS_COMMENT.html_safe
     end
     alias side_load_stylesheets include_stylesheets
     deprecate side_load_stylesheets: 'Use `include_stylesheets` instead', deprecator: Deprecator.new
@@ -70,7 +68,7 @@ module Proscenium
     #
     # @return [String] the HTML tags for the javascripts.
     def include_javascripts
-      '<!-- [PROSCENIUM_LAZY_SCRIPTS] --><!-- [PROSCENIUM_JAVASCRIPTS] -->'.html_safe
+      (SideLoad::LAZY_COMMENT + SideLoad::JS_COMMENT).html_safe
     end
     alias side_load_javascripts include_javascripts
     deprecate side_load_javascripts: 'Use `include_javascripts` instead', deprecator: Deprecator.new

data/lib/proscenium/side_load.rb

@@ -2,6 +2,10 @@
 
 module Proscenium
   class SideLoad
+    JS_COMMENT = '<!-- [PROSCENIUM_JAVASCRIPTS] -->'
+    CSS_COMMENT = '<!-- [PROSCENIUM_STYLESHEETS] -->'
+    LAZY_COMMENT = '<!-- [PROSCENIUM_LAZY_SCRIPTS] -->'
+
     module Controller
       def self.included(child)
         child.class_eval do
@@ -23,7 +27,13 @@ module Proscenium
       def capture_and_replace_proscenium_stylesheets
         return if response_body.nil?
         return if response_body.first.blank? || !Proscenium::Importer.css_imported?
-        return unless response_body.first.include? '<!-- [PROSCENIUM_STYLESHEETS] -->'
+
+        included_comment = response_body.first.include?(CSS_COMMENT)
+        fragments = if (fragment_header = request.headers['X-Fragment'])
+                      fragment_header.split
+                    end
+
+        return if !fragments && !included_comment
 
         imports = Proscenium::Importer.imported.dup
         paths_to_build = []
@@ -44,12 +54,17 @@ module Proscenium
 
           import = imports[inpath]
           opts = import[:css].is_a?(Hash) ? import[:css] : {}
+          opts[:preload_links_header] = false if fragments
           opts[:data] ||= {}
           opts[:data][:original_href] = inpath
           out << helpers.stylesheet_link_tag(outpath, extname: false, **opts)
         end
 
-        response_body.first.gsub! '<!-- [PROSCENIUM_STYLESHEETS] -->', out.join.html_safe
+        if fragments
+          response_body.first.prepend out.join.html_safe
+        elsif included_comment
+          response_body.first.gsub! CSS_COMMENT, out.join.html_safe
+        end
       end
 
       def capture_and_replace_proscenium_javascripts
@@ -65,7 +80,13 @@ module Proscenium
         result = Proscenium::Builder.build_to_path(paths_to_build.join(';'),
                                                    base_url: helpers.request.base_url)
 
-        if response_body.first.include? '<!-- [PROSCENIUM_JAVASCRIPTS] -->'
+        included_js_comment = response_body.first.include?(JS_COMMENT)
+        included_lazy_comment = response_body.first.include?(LAZY_COMMENT)
+        fragments = if (fragment_header = request.headers['X-Fragment'])
+                      fragment_header.split
+                    end
+
+        if fragments || included_js_comment
           out = []
           scripts = {}
           result.split(';').each do |x|
@@ -79,14 +100,19 @@ module Proscenium
               scripts[inpath] = import.merge(outpath:)
             else
               opts = import[:js].is_a?(Hash) ? import[:js] : {}
+              opts[:preload_links_header] = false if fragments
               out << helpers.javascript_include_tag(outpath, extname: false, **opts)
             end
           end
 
-          response_body.first.gsub! '<!-- [PROSCENIUM_JAVASCRIPTS] -->', out.join.html_safe
+          if fragments
+            response_body.first.prepend out.join.html_safe
+          elsif included_js_comment
+            response_body.first.gsub! JS_COMMENT, out.join.html_safe
+          end
         end
 
-        return unless response_body.first.include? '<!-- [PROSCENIUM_LAZY_SCRIPTS] -->'
+        return if !fragments && !included_lazy_comment
 
         lazy_script = ''
         if scripts.present?
@@ -96,7 +122,11 @@ module Proscenium
           end
         end
 
-        response_body.first.gsub! '<!-- [PROSCENIUM_LAZY_SCRIPTS] -->', lazy_script
+        if fragments
+          response_body.first.prepend lazy_script
+        elsif included_lazy_comment
+          response_body.first.gsub! LAZY_COMMENT, lazy_script
+        end
       end
     end
 

data/lib/proscenium/ui/breadcrumbs/component.module.css

@@ -1,6 +1,6 @@
 @layer proscenium-ui-component {
   /*
-   * Custom properties:
+   * Properties:
    *
    *   --puiBreadcrumbs--link-color: LinkText;
    *   --puiBreadcrumbs--link-hover-color: HighlightText;

data/lib/proscenium/ui/breadcrumbs/component.rb

@@ -1,28 +1,22 @@
 # frozen_string_literal: true
 
+require 'literal'
+
 module Proscenium::UI
   class Breadcrumbs::Component < Component
+    extend Literal::Properties
     include Phlex::Rails::Helpers::URLFor
 
     # The path (route) to use as the HREF for the home segment. Defaults to `:root`.
-    option :home_path, Types::String | Types::Symbol, default: -> { :root }
+    prop :home_path, _Union(String, Symbol), default: -> { :root }
 
     # Assign false to hide the home segment.
-    option :with_home, Types::Bool, default: -> { true }
-
-    # One or more class name(s) for the base div element which will be appended to the default.
-    option :class, Types::Coercible::String | Types::Array.of(Types::Coercible::String),
-           as: :class_name, default: -> { [] }
-
-    # One or more class name(s) for the base div element which will replace the default. If both
-    # `class` and `class!` are provided, all values will be merged. Defaults to `:@base`.
-    option :class!, Types::Coercible::String | Types::Array.of(Types::Coercible::String),
-           as: :class_name_override, default: -> { :@base }
+    prop :with_home, _Boolean, default: -> { true }
 
     def view_template
-      div class: [*class_name_override, *class_name] do
+      div class: :@base do
         ol do
-          if with_home
+          if @with_home
             li do
               home_template
             end
@@ -48,7 +42,7 @@ module Proscenium::UI
     #    super { 'hello' }
     #  end
     def home_template(&block)
-      a(href: url_for(home_path)) do
+      a(href: url_for(@home_path)) do
         if block
           yield
         else

data/lib/proscenium/ui/component.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry-initializer'
-
 module Proscenium::UI
   class Component < Proscenium::Phlex
     self.abstract_class = true
-
-    extend Dry::Initializer
   end
 end

data/lib/proscenium/ui.rb

@@ -1,14 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry-types'
-
 module Proscenium::UI
   extend ActiveSupport::Autoload
 
   autoload :Component
   autoload :Breadcrumbs
-
-  module Types
-    include Dry.Types()
-  end
 end

data/lib/proscenium/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Proscenium
-  VERSION = '0.17.0'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proscenium
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: x86_64-darwin
 authors:
 - Joel Moss
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,34 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8.0'
-- !ruby/object:Gem::Dependency
-  name: dry-initializer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -73,33 +45,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.17.0
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: literal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: phlex-rails
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement