ultimate_turbo_modal 2.0.0 → 2.0.2

data/lib/phlex/deferred_render_with_main_content.rb

@@ -4,7 +4,7 @@ module Phlex
   module DeferredRenderWithMainContent
     def view_template(&block)
       output = capture(&block)
-      super { unsafe_raw(output) }
+      super { respond_to?(:unsafe_raw) ? unsafe_raw(output) : raw(output) }
     end
   end
 end

data/lib/ultimate_turbo_modal/base.rb

@@ -123,7 +123,8 @@ class UltimateTurboModal::Base < Phlex::HTML
 
   def styles
     style do
-      unsafe_raw("html:has(dialog[open]) {overflow: hidden;} html {scrollbar-gutter: stable;}".html_safe)
+      str = "html:has(dialog[open]) {overflow: hidden;} html {scrollbar-gutter: stable;}".html_safe
+      respond_to?(:unsafe_raw) ? unsafe_raw(str) : raw(str)
     end
   end
 
@@ -137,32 +138,38 @@ class UltimateTurboModal::Base < Phlex::HTML
   end
 
   def div_dialog(&block)
+    data_attributes = {
+      controller: "modal",
+      modal_target: "container",
+      modal_advance_url_value: advance_url,
+      modal_allowed_click_outside_selector_value: allowed_click_outside_selector,
+      action: "turbo:submit-end->modal#submitEnd keyup@window->modal#closeWithKeyboard click@window->modal#outsideModalClicked click->modal#outsideModalClicked",
+      transition_enter: "ease-out duration-100",
+      transition_enter_start: "opacity-0",
+      transition_enter_end: "opacity-100",
+      transition_leave: "ease-in duration-50",
+      transition_leave_start: "opacity-100",
+      transition_leave_end: "opacity-0",
+      padding: padding?.to_s,
+      title: title?.to_s,
+      header: header?.to_s,
+      close_button: close_button?.to_s,
+      header_divider: header_divider?.to_s,
+      footer_divider: footer_divider?.to_s
+    }
+
+    if defined?(Rails) && (Rails.env.development? || Rails.env.test?)
+      data_attributes[:utmr_version] = UltimateTurboModal::VERSION
+    end
+
     div(id: "modal-container",
       class: self.class::DIV_DIALOG_CLASSES,
       role: "dialog",
       aria: {
-        labeled_by: "modal-title-h",
-        modal: true
+        modal: true,
+        labelledby: "modal-title-h"
       },
-      data: {
-        controller: "modal",
-        modal_target: "container",
-        modal_advance_url_value: advance_url,
-        modal_allowed_click_outside_selector_value: allowed_click_outside_selector,
-        action: "turbo:submit-end->modal#submitEnd keyup@window->modal#closeWithKeyboard click@window->modal#outsideModalClicked click->modal#outsideModalClicked",
-        transition_enter: "ease-out duration-100",
-        transition_enter_start: "opacity-0",
-        transition_enter_end: "opacity-100",
-        transition_leave: "ease-in duration-50",
-        transition_leave_start: "opacity-100",
-        transition_leave_end: "opacity-0",
-        padding: padding?.to_s,
-        title: title?.to_s,
-        header: header?.to_s,
-        close_button: close_button?.to_s,
-        header_divider: header_divider?.to_s,
-        footer_divider: footer_divider?.to_s
-      }, &block)
+      data: data_attributes, &block)
   end
 
   def div_overlay

data/script/build_and_release.sh

@@ -2,21 +2,47 @@
 set -e
 cd $(dirname $0)/..
 
+if [ "$1" == "--help" ]; then
+  echo "Usage: $0 [--skip-gem] [--skip-js]"
+  echo ""
+  echo "Options:"
+  echo "  --skip-gem   Skip building and releasing the gem."
+  echo "  --skip-js    Skip building and releasing the JavaScript."
+  echo "  --help       Show this help message."
+  exit 0
+fi
+
 # Check for uncommitted changes
-echo "Checking for uncommitted changes..."
 if ! git diff --quiet; then
   echo "There are uncommitted changes. Aborting."
   exit 1
 fi
-echo "No uncommitted changes found."
 
-echo "Building and releasing gem..."
-bundle exec rake build
-bundle exec rake release
 
-echo "Building JavaScript..."
-cd javascript
-./scripts/release-npm.sh
+if [ "$1" != "--skip-gem" ]; then
+  echo "Building and releasing gem..."
+  bundle exec rake build
+
+  # Check if Gemfile.lock is git dirty
+  if ! git diff --quiet Gemfile.lock; then
+    echo "Gemfile.lock is dirty. Adding, committing, and pushing."
+    git add Gemfile.lock
+    git commit -m "Update Gemfile.lock"
+    bundle exec rake build
+  fi
+
+  bundle exec rake release
+else
+  echo "Skipping gem build and release..."
+fi
+
+if [ "$1" != "--skip-js" ]; then
+  echo "Building JavaScript..."
+  cd javascript
+  ./scripts/release-npm.sh
+else
+  echo "Skipping JavaScript build..."
+fi
 
 echo "Done!"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ultimate_turbo_modal
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Carl Mercier
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex-rails
@@ -86,6 +86,7 @@ files:
 - VERSION
 - javascript/index.js
 - javascript/modal_controller.js
+- javascript/package-lock.json
 - javascript/package.json
 - javascript/rollup.config.js
 - javascript/scripts/release-npm.sh