turbo_power 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe460f5963de71ca3deae0ec792bda57273a54a0e938d13c0da62887c76a014
-  data.tar.gz: 934234dfb39b37bc81b62388f332a1782d18e18b383ad53dabfe22f41cc29e4d
+  metadata.gz: 2c3c5109aee34813e0acbc4bdd7ba21524ca309276e560ad89ee24fce35fd07d
+  data.tar.gz: 5e1c135349707f5b7e6652c338e584f2429c2a83eca55bda25e2dadd06b2dd83
 SHA512:
-  metadata.gz: b1d2a5b0554a5e85cb1b9de0f9102733b6b07d37a0f3d16055b3d89637bd31ec07f21eeb3b178e737934f0fb6cbdd7ab022b78fb61976deb23c950db1b55f0a0
-  data.tar.gz: 2c1b293a1aabd7bd591201b357302192352bccc8a75bab05a626beb9556beaecb45a93096d6dcfb5746235b279e2b91643dd64d68dd2009b7121a883d3c34253
+  metadata.gz: 2fba91776a38ef860065753b6d47e7f9cf8eb565052caf8a431120c6de3626949c7666cea47e5781663fac9faa622815423fbd139b440537fd6129e5e1ff642a
+  data.tar.gz: 139289591c37ca8707dcb090a035e383732e5d0e18d1570f7b78288fcb32d31f06b3e85c22b02c4575899aaa591b9e465b4f072139a4784b0d82c6c985fee860

data/Gemfile.lock

@@ -1,85 +1,39 @@
 PATH
   remote: .
   specs:
-    turbo_power (0.2.0)
-      turbo-rails (~> 1.3.0)
-      turbo_ready
+    turbo_power (0.3.1)
+      turbo-rails (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionpack (7.0.4.2)
+      actionview (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4)
-      actionpack (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.4.2)
+      activesupport (= 7.0.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
+    activejob (7.0.4.2)
+      activesupport (= 7.0.4.2)
       globalid (>= 0.3.6)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activestorage (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activesupport (= 7.0.4)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.4)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    date (3.3.3)
     erubi (1.12.0)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
@@ -87,56 +41,26 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.8.0)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.1.2)
-    minitest (5.16.3)
-    net-imap (0.3.4)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.1)
-      timeout
-    net-smtp (0.3.3)
-      net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.13.10-x86_64-darwin)
+    mini_portile2 (2.8.1)
+    minitest (5.17.0)
+    nokogiri (1.14.2-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.3.0)
       ast (~> 2.4.1)
     racc (1.6.2)
-    rack (2.2.5)
+    rack (2.2.6.2)
     rack-test (2.0.2)
       rack (>= 1.3)
-    rails (7.0.4)
-      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.4)
-      actionpack (= 7.0.4)
-      actiontext (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activemodel (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
-      bundler (>= 1.15.0)
-      railties (= 7.0.4)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    railties (7.0.4.2)
+      actionpack (= 7.0.4.2)
+      activesupport (= 7.0.4.2)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -165,23 +89,17 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.4-x86_64-darwin)
+    sqlite3 (1.5.4)
+      mini_portile2 (~> 2.8.0)
     thor (1.2.1)
-    timeout (0.3.1)
-    turbo-rails (1.3.2)
+    turbo-rails (1.3.3)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
-    turbo_ready (0.1.4)
-      rails (>= 6.1)
-      turbo-rails (>= 1.1)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   x86_64-darwin-19

data/README.md

@@ -83,26 +83,18 @@ import 'controllers'
 **Note:** These modifications will continue to work when upgrading Turbo via the [turbo-rails](https://github.com/hotwired/turbo-rails) gem. You can [read more](https://github.com/marcoroth/turbo_power-rails/issues/2) for the reasoning behind these adjustments.
 
 
-## Usage
-
-### Actions from `turbo_ready`
-
-* [`turbo_stream.invoke(method, *args, selector: nil, camelize: true, id: nil)`](https://github.com/hopsoft/turbo_ready)
-
-### Actions from `turbo-morph`
-
-* [`turbo_stream.morph(target, html = nil, **attributes, &block)`](https://github.com/marcoroth/turbo-morph)
+## Custom Actions
 
 ### DOM Actions
 
 * `turbo_stream.graft(target, parent, **attributes)`
+* [`turbo_stream.morph(target, html = nil, **attributes, &block)`](https://github.com/marcoroth/turbo-morph)
 * `turbo_stream.inner_html(target, html = nil, **attributes, &block)`
 * `turbo_stream.insert_adjacent_html(target, html = nil, position: 'beforeend', **attributes, &block)`
 * `turbo_stream.insert_adjacent_text(target, text, position: 'beforebegin', **attributes)`
-* `turbo_stream.morph(target, html = nil, **attribtues, &block)`
 * `turbo_stream.outer_html(target, html = nil, **attributes, &block)`
 * `turbo_stream.text_content(target, text, **attributes)`
-* `turbo_stream.set_meta(name, content, **attributes)`
+* `turbo_stream.set_meta(name, content)`
 
 
 ### Attribute Actions
@@ -112,7 +104,7 @@ import 'controllers'
 * `turbo_stream.remove_css_class(target, classes, **attributes)`
 * `turbo_stream.set_attribute(target, attribute, value, **attributes)`
 * `turbo_stream.set_dataset_attribute(target, attribute, value, **attributes)`
-* `turbo_stream.set_property(target, name, value, **attributes)`
+* `turbo_stream.set_property(target, property, value, **attributes)`
 * `turbo_stream.set_style(target, name, value, **attributes)`
 * `turbo_stream.set_styles(target, styles, **attributes)`
 * `turbo_stream.set_value(target, value, **attributes)`
@@ -144,13 +136,17 @@ import 'controllers'
 ### Browser Actions
 
 * `turbo_stream.reload(**attributes)`
-* `turbo_stream.scroll_into_view(target, inline = "nearest", **attributes)`
-* `turbo_stream.set_cookie(cookie, **attributes)`
-* `turbo_stream.set_cookie_item(key, value, **attributes)`
+* `turbo_stream.scroll_into_view(target, inline = "nearest")`
 * `turbo_stream.set_focus(target, **attributes)`
 * `turbo_stream.set_title(title, **attributes)`
 
 
+### Document Actions
+
+* `turbo_stream.set_cookie(cookie, **attributes)`
+* `turbo_stream.set_cookie_item(key, value, **attributes)`
+
+
 ### Browser History Actions
 
 * `turbo_stream.history_go(delta, **attributes)`
@@ -160,25 +156,32 @@ import 'controllers'
 
 ### Debug Actions
 
-* `turbo_stream.console_log(message, level = 'log', **attributes)`
-* `turbo_stream.console_table(data, columns, **attributes)`
+* `turbo_stream.console_log(message, level = :log)`
+* `turbo_stream.console_table(data, columns)`
 
 
 ### Notification Actions
 
-* `turbo_stream.notification(title, options, **attributes)`
+* `turbo_stream.notification(title, **options)`
 
 
-### Turbo Frame Actions
+### Turbo Actions
 
-* `turbo_stream.turbo_frame_reload(frame_id, **attributes)`
-* `turbo_stream.turbo_frame_set_src(frame_id, src, **attributes)`
+* `turbo_stream.redirect_to(url, turbo_action = nil, **attributes)`
+* `turbo_stream.turbo_clear_cache()`
 
 
-### Turbo Actions
+### Turbo Progress Bar Actions
 
-* `turbo_stream.redirect_to(url, turbo_action = "advance", **attributes)`
-* `turbo_stream.turbo_clear_cache()`
+* `turbo_stream.turbo_progress_bar_show()`
+* `turbo_stream.turbo_progress_bar_hide()`
+* `turbo_stream.turbo_progress_bar_set_value(value)`
+
+
+### Turbo Frame Actions
+
+* `turbo_stream.turbo_frame_reload(frame_id)`
+* `turbo_stream.turbo_frame_set_src(frame_id, src)`
 
 
 ## Development

data/lib/turbo_power/attribute_transformations.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module TurboPower
+  module AttributeTransformations
+    private
+
+    def transform_attributes(attributes)
+      attributes
+        .transform_keys { |key| transform_key(key) }
+        .transform_values { |value| transform_value(value) }
+    end
+
+    def transform_key(key)
+      key.to_s.underscore.dasherize.to_sym
+    end
+
+    def transform_value(value)
+      case value
+      when String
+        value
+      when Symbol
+        value.to_s
+      when NilClass
+        ""
+      else
+        value.to_json
+      end
+    end
+  end
+end

data/lib/turbo_power/stream_helper.rb

@@ -2,17 +2,19 @@
 
 module TurboPower
   module StreamHelper
+    include ::TurboPower::AttributeTransformations
+
     # Custom Action Helpers
 
     ## Also see:
     ## => https://github.com/hotwired/turbo-rails/pull/374
 
     def custom_action(name, target: nil, content: nil, attributes: {})
-      turbo_stream_action_tag name, target: target, template: content, **attributes
+      turbo_stream_action_tag name, target: target, template: content, **transform_attributes(attributes)
     end
 
     def custom_action_all(name, targets: nil, content: nil, attributes: {})
-      turbo_stream_action_tag name, targets: targets, template: content, **attributes
+      turbo_stream_action_tag name, targets: targets, template: content, **transform_attributes(attributes)
     end
 
     # DOM Actions
@@ -139,10 +141,6 @@ module TurboPower
 
     # Browser Actions
 
-    def redirect_to(url, turbo_action = "advance", **attributes)
-      custom_action :redirect_to, attributes: attributes.merge(url: url, turbo_action: turbo_action)
-    end
-
     def reload(**attributes)
       custom_action :reload, attributes: attributes
     end
@@ -155,8 +153,8 @@ module TurboPower
       custom_action :set_cookie, attributes: attributes.merge(cookie: cookie)
     end
 
-    def set_cookie_item(key, value, **attributes)
-      custom_action :set_cookie_item, attributes: attributes.merge(key: key, value: value)
+    def set_cookie_item(key = nil, value = nil, **attributes)
+      custom_action :set_cookie_item, attributes: { key: key, value: value }.merge(attributes)
     end
 
     def set_focus(target, **attributes)
@@ -167,10 +165,6 @@ module TurboPower
       custom_action :set_title, attributes: attributes.merge(title: title)
     end
 
-    def turbo_clear_cache(**attributes)
-      custom_action :turbo_clear_cache, attributes: attributes
-    end
-
     # Browser History Actions
 
     def history_go(delta, **attributes)
@@ -187,8 +181,8 @@ module TurboPower
 
     # Debug Actions
 
-    def console_log(message, level = :log, **attributes)
-      custom_action :console_log, attributes: attributes.merge(message: message, level: level)
+    def console_log(message = nil, level = :log, **attributes)
+      custom_action :console_log, attributes: attributes.reverse_merge(message: message, level: level)
     end
 
     def console_table(data, columns, **attributes)
@@ -197,8 +191,32 @@ module TurboPower
 
     # Notification Actions
 
-    def notification(title, options, **attributes)
-      custom_action :notification, attributes: attributes.merge(title: title, options: options)
+    def notification(title = nil, **attributes)
+      custom_action :notification, attributes: { title: title }.merge(attributes)
+    end
+
+    # Turbo Actions
+
+    def redirect_to(url = nil, turbo_action = "advance", **attributes)
+      custom_action :redirect_to, attributes: { url: url, turbo_action: turbo_action }.merge(attributes)
+    end
+
+    def turbo_clear_cache(**attributes)
+      custom_action :turbo_clear_cache, attributes: attributes
+    end
+
+    # Turbo Progress Bar Actions
+
+    def turbo_progress_bar_show(**attributes)
+      custom_action :turbo_progress_bar_show, attributes: attributes
+    end
+
+    def turbo_progress_bar_hide(**attributes)
+      custom_action :turbo_progress_bar_hide, attributes: attributes
+    end
+
+    def turbo_progress_bar_set_value(value, **attributes)
+      custom_action :turbo_progress_bar_set_value, attributes: attributes.merge(value: value)
     end
 
     # Turbo Frame Actions

data/lib/turbo_power/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TurboPower
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/turbo_power.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require "turbo-rails"
-require "turbo_ready"
 
 require_relative "turbo_power/version"
 require_relative "turbo_power/engine"
+require_relative "turbo_power/attribute_transformations"
 require_relative "turbo_power/stream_helper"
 
 module TurboPower

data/turbo_power.gemspec

@@ -27,6 +27,5 @@ Gem::Specification.new do |spec|
     "[A-Z]*"
   ]
 
-  spec.add_dependency "turbo-rails", "~> 1.3.0"
-  spec.add_dependency "turbo_ready"
+  spec.add_dependency "turbo-rails", "~> 1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo_power
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Marco Roth
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: turbo-rails
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: turbo_ready
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: Power-pack for Turbo Streams
 email:
 - marco.roth@hey.com
@@ -55,8 +41,8 @@ files:
 - bin/console
 - bin/setup
 - lib/turbo_power.rb
+- lib/turbo_power/attribute_transformations.rb
 - lib/turbo_power/engine.rb
-- lib/turbo_power/patches/broadcastable.rb
 - lib/turbo_power/stream_helper.rb
 - lib/turbo_power/version.rb
 - turbo_power.gemspec
@@ -83,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Power-pack for Turbo Streams

data/lib/turbo_power/patches/broadcastable.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-# Patch for Turbo::Broadcastable which is mixed into ActiveRecord
-# SEE: https://github.com/hotwired/turbo-rails/blob/main/app/models/concerns/turbo/broadcastable.rb
-module TurboBoost::Streams::Patches::Broadcastable
-  def broadcast_invoke_to(*streamables, method, **kwargs)
-    Turbo::StreamsChannel.broadcast_invoke_to(*streamables, method, **kwargs)
-  end
-
-  def broadcast_invoke_later_to(*streamables, method, **kwargs)
-    Turbo::StreamsChannel.broadcast_invoke_later_to(*streamables, method, **kwargs)
-  end
-
-  def broadcast_set_title(method, **kwargs)
-    broadcast_invoke_to(self, method, **kwargs)
-  end
-
-  def broadcast_invoke_later(method, **kwargs)
-    broadcast_invoke_later_to(self, method, **kwargs)
-  end
-end