ultimate_turbo_modal 1.5.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b7775a51eebbcb891533ad98c37aa6399017092a1ee4218c74e8d2e552880b
-  data.tar.gz: 8eb9ede61100f91d1e0f716e0cba3a477d224431b84d70bc36fb6e1d62132bfb
+  metadata.gz: e5258352e110cc8d743f60743d8c2842daa3e925ec3b9671713c5b28cd25e59a
+  data.tar.gz: 9488206059b94dc6f3613b0725a59a1fba3cfadc8a2414e6ee3cd21f4b978f71
 SHA512:
-  metadata.gz: ebba9d4ae554dbceed25f2064b58ccb44ccfe5a98f826d57d0c15ae7d491d4b81348b9de8b4191f7eb807358b48b62a376297096c1fece1c9ab56e3331e00a11
-  data.tar.gz: b1d72d8ceba435dc770e219536a2dfbdd1613809fb4a65f10c25c1fa22829f88ef38b6b7f10442d07f8162dd4fa59aa534d095d21d9a1564f9098609bc71d490
+  metadata.gz: fdeb4c4f19c6875ea1d401427d76ac5c46b30ffc96faad82ca683dce05588b0dc720d701cdd49968d9580889a477bdd06de261b1cc25631041221c483192e947
+  data.tar.gz: 02633313f6ba5a54b023ccea29bb73162d067268e0730ea832d54d9a59e519a95c0062dc7603c233ead3f5a4c702d632c0ef3f61d0d4ca5dbe53b2cc8ccf8014

data/.tool-versions

@@ -1,2 +1,2 @@
-ruby 3.2.0
+ruby 3.3.0
 nodejs 18.9.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.6.1] - 2024-01-10
+
+- Added ability to specify data attributes for the content div within the modal. Useful to specify a Stimulus controller, for example.
+
+## [1.6.0] - 2023-12-25
+
+- Support for Ruby 3.3
+
 ## [1.5.0] - 2023-11-28
 
 - Allow whitelisting out-of-modal CSS selectors to not dismiss modal when clicked

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ultimate_turbo_modal (1.5.0)
+    ultimate_turbo_modal (1.6.1)
       phlex-rails (>= 1.0, < 2.0)
       rails (>= 7)
       stimulus-rails
@@ -130,7 +130,7 @@ GEM
     net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.4-arm64-darwin)
+    nokogiri (1.16.0-arm64-darwin)
       racc (~> 1.4)
     parallel (1.23.0)
     parser (3.2.2.4)
@@ -146,7 +146,7 @@ GEM
       zeitwerk (~> 2.6)
     psych (5.1.1.1)
       stringio
-    racc (1.7.1)
+    racc (1.7.3)
     rack (3.0.8)
     rack-session (2.0.0)
       rack (>= 3.0.0)

data/lib/phlex/deferred_render_with_main_content.rb

@@ -2,8 +2,8 @@
 
 module Phlex
   module DeferredRenderWithMainContent
-    def template(&)
-      output = capture(&)
+    def template(&block)
+      output = capture(&block)
       super { unsafe_raw(output) }
     end
   end

data/lib/ultimate_turbo_modal/base.rb

@@ -11,6 +11,7 @@ class UltimateTurboModal::Base < Phlex::HTML
   # @param header_divider [Boolean] Whether to show a divider between the header and the main content
   # @param padding [Boolean] Whether to add padding around the modal content
   # @param request [ActionDispatch::Request] The current Rails request object
+  # @param content_div_data [Hash] `data` attribute for the div where the modal content will be rendered
   # @param title [String] The title of the modal
   def initialize(
     advance: UltimateTurboModal.configuration.advance,
@@ -22,6 +23,7 @@ class UltimateTurboModal::Base < Phlex::HTML
     header: UltimateTurboModal.configuration.header,
     header_divider: UltimateTurboModal.configuration.header_divider,
     padding: UltimateTurboModal.configuration.padding,
+    content_div_data: nil,
     request: nil, title: nil
   )
     @advance = !!advance
@@ -34,6 +36,7 @@ class UltimateTurboModal::Base < Phlex::HTML
     @header = header
     @header_divider = header_divider
     @padding = padding
+    @content_div_data = content_div_data
     @request = request
     @title = title
 
@@ -70,7 +73,7 @@ class UltimateTurboModal::Base < Phlex::HTML
 
   private
 
-  attr_accessor :request, :allowed_click_outside_selector
+  attr_accessor :request, :allowed_click_outside_selector, :content_div_data
 
   def padding? = !!@padding
 
@@ -107,26 +110,26 @@ class UltimateTurboModal::Base < Phlex::HTML
 
   ## HTML components
 
-  def modal(&)
+  def modal(&block)
     outer_divs do
       div_content do
         div_header
-        div_main(&)
+        div_main(&block)
         div_footer if footer?
       end
     end
   end
 
-  def outer_divs(&)
+  def outer_divs(&block)
     div_dialog do
       div_overlay
       div_outer do
-        div_inner(&)
+        div_inner(&block)
       end
     end
   end
 
-  def div_dialog(&)
+  def div_dialog(&block)
     div(id: "modal-container",
       class: self.class::DIV_DIALOG_CLASSES,
       role: "dialog",
@@ -152,30 +155,31 @@ class UltimateTurboModal::Base < Phlex::HTML
         close_button: close_button?.to_s,
         header_divider: header_divider?.to_s,
         footer_divider: footer_divider?.to_s
-      }, &)
+      }, &block)
   end
 
   def div_overlay
     div(id: "modal-overlay", class: self.class::DIV_OVERLAY_CLASSES)
   end
 
-  def div_outer(&)
-    div(id: "modal-outer", class: self.class::DIV_OUTER_CLASSES, &)
+  def div_outer(&block)
+    div(id: "modal-outer", class: self.class::DIV_OUTER_CLASSES, &block)
   end
 
-  def div_inner(&)
-    div(id: "modal-inner", class: self.class::DIV_INNER_CLASSES, &)
+  def div_inner(&block)
+    div(id: "modal-inner", class: self.class::DIV_INNER_CLASSES, data: content_div_data, &block)
   end
 
-  def div_content(&)
-    div(id: "modal-content", class: self.class::DIV_CONTENT_CLASSES, data: {modal_target: "content"}, &)
+  def div_content(&block)
+    data = (content_div_data || {}).merge({modal_target: "content"})
+    div(id: "modal-content", class: self.class::DIV_CONTENT_CLASSES, data:, &block)
   end
 
-  def div_main(&)
-    div(id: "modal-main", class: self.class::DIV_MAIN_CLASSES, &)
+  def div_main(&block)
+    div(id: "modal-main", class: self.class::DIV_MAIN_CLASSES, &block)
   end
 
-  def div_header(&)
+  def div_header(&block)
     div(id: "modal-header", class: self.class::DIV_HEADER_CLASSES) do
       div_title
       button_close
@@ -207,13 +211,13 @@ class UltimateTurboModal::Base < Phlex::HTML
     end
   end
 
-  def close_button_tag(&)
+  def close_button_tag(&block)
     button(type: "button",
       aria: {label: "close"},
       class: self.class::CLOSE_BUTTON_TAG_CLASSES,
       data: {
         action: @close_button_data_action
-      }, &)
+      }, &block)
   end
 
   def icon_close

data/lib/ultimate_turbo_modal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UltimateTurboModal
-  VERSION = "1.5.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ultimate_turbo_modal
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Carl Mercier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: phlex-rails
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.4
 signing_key:
 specification_version: 4
 summary: UTMR aims to be the be-all and end-all of Turbo Modals.