turbo_boost-commands 0.0.9 → 0.0.11

data/app/javascript/drivers/index.js

@@ -12,7 +12,8 @@ function src (element, frame) {
 }
 
 function find (element) {
-  let frame = elements.findClosestFrame(element)
+  let frame = elements.findClosestFrameWithSource(element)
+
   const { turboFrame, turboMethod } = element.dataset
 
   if (element.tagName.toLowerCase() === 'form')

data/app/javascript/elements.js

@@ -5,8 +5,12 @@ function findClosestCommand (element) {
   return element.closest(`[${schema.commandAttribute}]`)
 }
 
-function findClosestFrame (element) {
-  return element.closest('turbo-frame')
+function findClosestFrameWithSource (element) {
+  return (
+    element.closest('turbo-frame[src]') ||
+    element.closest('turbo-frame[data-turbo-frame-src]') ||
+    element.closest('turbo-frame')
+  )
 }
 
 function assignElementValueToPayload (element, payload = {}) {
@@ -47,5 +51,5 @@ function buildAttributePayload (element) {
 export default {
   buildAttributePayload,
   findClosestCommand,
-  findClosestFrame
+  findClosestFrameWithSource
 }

data/app/javascript/index.js

@@ -19,7 +19,7 @@ function buildCommandPayload (id, element) {
     name: element.getAttribute(schema.commandAttribute),
     elementId: element.id.length > 0 ? element.id : null,
     elementAttributes: elements.buildAttributePayload(element),
-    startedAt: new Date().getTime()
+    startedAt: Date.now()
   }
 }
 

data/app/javascript/lifecycle.js

@@ -2,7 +2,7 @@ import activity from './activity'
 import { dispatch, commandEvents } from './events'
 
 function finish (event) {
-  event.detail.endedAt = new Date().getTime()
+  event.detail.endedAt = Date.now()
   event.detail.milliseconds = event.detail.endedAt - event.detail.startedAt
   setTimeout(
     () =>
@@ -11,6 +11,7 @@ function finish (event) {
   )
 }
 
+// TODO: forward source event to finish (error or success)
 addEventListener(commandEvents.serverError, finish)
 addEventListener(commandEvents.success, finish)
 addEventListener(

data/lib/turbo_boost/commands/attribute_hydration.rb

@@ -24,6 +24,12 @@ module TurboBoost::Commands::AttributeHydration
     value
   end
 
+  # RULE: If an attribute value is a Hash
+  #       (not the `aria` or `data` key because those are handled by Rails)
+  #       and the Hash does not contain an object that implements GlobalID,
+  #       then the developer must convert the Hash to a JSON string manually.
+  #
+  # SOLUTION: All data that's not a scalar/primitive value should live in `data` or `aria`.
   def dehydrate(value)
     return value unless has_sgid?(value)
     case value

data/lib/turbo_boost/commands/command_callbacks.rb

@@ -92,6 +92,10 @@ module TurboBoost::Commands::CommandCallbacks
     !!@errored
   end
 
+  def performing?
+    !!@performing_method_name
+  end
+
   def performed?
     !!@performed
   end

data/lib/turbo_boost/commands/controller_pack.rb

@@ -12,6 +12,7 @@ class TurboBoost::Commands::ControllerPack
   delegate(
     :command_aborted?,
     :command_errored?,
+    :command_performing?,
     :command_performed?,
     :command_requested?,
     :command_succeeded?,

data/lib/turbo_boost/commands/runner.rb

@@ -93,6 +93,10 @@ class TurboBoost::Commands::Runner
     !!command_instance&.errored?
   end
 
+  def command_performing?
+    !!command_instance&.performing?
+  end
+
   def command_performed?
     !!command_instance&.performed?
   end
@@ -114,6 +118,7 @@ class TurboBoost::Commands::Runner
     return unless command_valid?
     return if command_aborted?
     return if command_errored?
+    return if command_performing?
     return if command_performed?
     command_instance.perform_with_callbacks command_method_name
   rescue => error
@@ -236,8 +241,7 @@ class TurboBoost::Commands::Runner
   end
 
   def append_streams_to_response_body
-    return unless command_instance.turbo_streams.present?
-    append_to_response_body command_instance.turbo_streams.map(&:to_s).join.html_safe
+    command_instance.turbo_streams.each { |stream| append_to_response_body stream }
   end
 
   def append_meta_tag_to_response_body
@@ -267,11 +271,18 @@ class TurboBoost::Commands::Runner
     append_to_response_body event
   end
 
+  def appended_content
+    @appended_content ||= {}
+  end
+
   def append_to_response_body(content)
     return unless controller.response.media_type == "text/html"
-    sanitized_content = content_sanitizer.sanitize(content).html_safe
+    sanitized_content = content_sanitizer.sanitize(content.to_s).html_safe
     return if sanitized_content.blank?
 
+    return if appended_content[sanitized_content]
+    appended_content[sanitized_content] = true
+
     html = case response_type
     when :body
       match = controller.response.body.match(/<\/\s*body/i).to_s

data/lib/turbo_boost/commands/version.rb

@@ -2,6 +2,6 @@
 
 module TurboBoost
   module Commands
-    VERSION = "0.0.9"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo_boost-commands
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Nate Hopkins (hopsoft)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cuprite
+  name: capybara-playwright-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -422,7 +422,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="