turbo_form 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e93adb63b8efad18d18aa5009294ecf46dff732a835677016787a498a359fe
-  data.tar.gz: 8058b55a07707691cd9bb2770339f2685ca4c13f104cd97db01aeeef184326bd
+  metadata.gz: fc9794957819ec051bc06e1b0169a5584a2f183d46532a062ad1ddd056b43a3d
+  data.tar.gz: 3cd694c43cb2cdd452b7a0e1a134699b162c7efc2853af9c17c053a40e658c74
 SHA512:
-  metadata.gz: 641956f04889ecb24a6744d65f9a397e75dfa97ac5fcf57847dab4c41c06bf641268b0e620f4b9e8e1cdf865e23eaf97606a286b7db8eabc1d27d31a02707381
-  data.tar.gz: 36036dda2b7c129b9a4d704695d849049bcafbe4f5fec2b3690b2709e2e98dcaaaf2ffab4ce8c438712df1b6ea78bec0d29b08d25a9024c56ccd9d98c299d18e
+  metadata.gz: 25d42edc3636bf6be5cd766461242a9723b1f1bbf591aaa9e347ca415598846ccabee52dd8ebcfe13ae6d72fb7ee5b7a0d08a185d0a47347cf334e5e93417d19
+  data.tar.gz: f6ddefa9a45e55fe4e1cab8f13768773d649d1174d802aaa12ac8a8dd9b1673730f23d88c2dbc48bfcc1838e4e76dcd98bd0fdbc63165bdf0b25a5a4b6278501

data/lib/turbo_form/engine.rb

@@ -1,6 +1,7 @@
 require 'turbo-rails'
 require 'turbo_form/form_helper'
 require 'turbo_form/form_builder'
+require 'turbo_form/select_renderer'
 require 'turbo_form/routes'
 require 'turbo_form/controller'
 
@@ -59,6 +60,7 @@ module TurboForm
 
       ActionView::Helpers::FormHelper.prepend(TurboForm::FormHelper)
       ActionView::Helpers::FormBuilder.prepend(TurboForm::FormBuilder)
+      ActionView::Helpers::Tags::SelectRenderer.prepend(TurboForm::SelectRenderer)
     end
   end
 end

data/lib/turbo_form/form_builder.rb

@@ -78,9 +78,11 @@ module TurboForm
       [ options.except(*DYNAMIC_OPTIONS), absorb_trigger(html_options.merge(options.slice(*DYNAMIC_OPTIONS))) ]
     end
 
+    def absorb_trigger(attributes) = FormBuilder.absorb_trigger(attributes, @template)
+
     # `dynamic_action:` makes a trigger of its own, on the default event unless
     # `dynamic_trigger:` names one. It takes whatever `url_for` does.
-    def absorb_trigger(attributes)
+    def self.absorb_trigger(attributes, template)
       return attributes unless attributes.keys.intersect?(DYNAMIC_OPTIONS)
 
       trigger, action = attributes.values_at(*DYNAMIC_OPTIONS)
@@ -88,12 +90,12 @@ module TurboForm
       trigger ||= action.present?
       return attributes unless trigger
 
-      attributes.merge(data: { **attributes[:data].to_h, turbo_form_trigger: trigger_event(trigger), turbo_form_action: (@template.url_for(action) if action) })
+      attributes.merge(data: { **attributes[:data].to_h, turbo_form_trigger: trigger_event(trigger), turbo_form_action: (template.url_for(action) if action) })
     end
 
     # Left blank for `true`, which the script reads as the element's own
     # default: `change` for a select, `input` for a text field, `click` for a
     # button.
-    def trigger_event(trigger) = trigger == true ? '' : trigger.to_s
+    def self.trigger_event(trigger) = trigger == true ? '' : trigger.to_s
   end
 end

data/lib/turbo_form/select_renderer.rb

@@ -0,0 +1,11 @@
+module TurboForm
+  # Prepended onto ActionView::Helpers::Tags::SelectRenderer, which every select
+  # tag renders through -- including those of builder methods other gems add,
+  # like country_select's, which hand their html_options straight to the tag.
+  module SelectRenderer
+    private
+    def select_content_tag(option_tags, options, html_options)
+      super(option_tags, options, FormBuilder.absorb_trigger(html_options.symbolize_keys, @template_object))
+    end
+  end
+end

data/lib/turbo_form/system_test_helper.rb

@@ -1,13 +1,14 @@
 module TurboForm::SystemTestHelper
-  # Waits for a dynamic form to finish reloading the page.
+  # Waits for a dynamic form to finish reloading the page. Reads <html> from the
+  # document, so it works inside `within` too.
   #
   #   expect_dynamic_form_request { select "Bourbon", from: "Category" }
   #   select "Barrel Aged", from: "Flavor"
   def expect_dynamic_form_request
-    completed = page.find('html')['data-turbo-form-visits'].to_i + 1
+    completed = page.document.find('html')['data-turbo-form-visits'].to_i + 1
 
     yield
 
-    page.assert_selector "html[data-turbo-form-visits='#{completed}']"
+    page.document.assert_selector "html[data-turbo-form-visits='#{completed}']"
   end
 end

data/lib/turbo_form/version.rb

@@ -1,3 +1,3 @@
 module TurboForm
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo_form
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Andy Cohen
@@ -85,6 +85,7 @@ files:
 - lib/turbo_form/form_builder.rb
 - lib/turbo_form/form_helper.rb
 - lib/turbo_form/routes.rb
+- lib/turbo_form/select_renderer.rb
 - lib/turbo_form/system_test_helper.rb
 - lib/turbo_form/version.rb
 homepage: https://github.com/outlawandy/turbo_form