turbo-rails 0.7.9 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55602f24631c11bc8034e778f706fe6866caca4ff1907b7217c7d4150cf26acd
-  data.tar.gz: bfe2afe2a79b5659a66e44bf43d959ee17cc091e18c925207c56a3a7beb71443
+  metadata.gz: 580519d63f8208480ca58ba6a406d3b8d012365af8e96768a447ad1848576d0d
+  data.tar.gz: e12f497a997e28c2850a8bb2d2731717a97d82d3e46fea0d3b35829190b3fd4e
 SHA512:
-  metadata.gz: 2049be5687158e196102d4a89f1ca1f1e4a5c6f90987b8bc6884f5e8689ef7725853f9d562bc066e4267c06bd7b82c885494d9c35184aca752036377bcdb7fbf
-  data.tar.gz: 384956d8e415c8461021b9ef5d4fbec379f81f3b5e6964c08a9b502c8141060187e9838bf1e6aabe973fff1419968ea234534752373c698446da272b28e57ed8
+  metadata.gz: b8c233bab026cd81eaeebe394e92cd19d217e08f2dce28e0cfbc3f6490c8536e833bdb70db2f3056da82f3a61253d97da13881dc82de48dfe23e106eb48cb7dc
+  data.tar.gz: 67df314bd48116ff91f246f212ca3775361a9a18cce54842e5f19d00f465eadee3f500269288d49c200ed6414b83873d53ff32eb46d0cb8a99dd12c658716923

data/README.md

@@ -50,7 +50,7 @@ The JavaScript for Turbo can either be run through the asset pipeline, which is
 
 Running `turbo:install` will install through NPM if Webpacker is installed in the application. Otherwise the asset pipeline version is used. To use the asset pipeline version, you must have `importmap-rails` installed first and listed higher in the Gemfile.
 
-If you're using Webpack and need to use the cable consumer, you can import [`cable`](https://github.com/hotwired/turbo-rails/blob/main/app/javascript/turbo/cable.js) (`import { cable } from "@hotwired/turbo-rails"`), but ensure that your application actually *uses* the members it `import`s when using this style (see [turbo-rails#48](https://github.com/hotwired/turbo-rails/issues/48)).
+If you're using node and need to use the cable consumer, you can import [`cable`](https://github.com/hotwired/turbo-rails/blob/main/app/javascript/turbo/cable.js) (`import { cable } from "@hotwired/turbo-rails"`), but ensure that your application actually *uses* the members it `import`s when using this style (see [turbo-rails#48](https://github.com/hotwired/turbo-rails/issues/48)).
 
 The `Turbo` instance is automatically assigned to `window.Turbo` upon import:
 
@@ -71,10 +71,7 @@ Turbo can coexist with Rails UJS, but you need to take a series of upgrade steps
 
 ## Development
 
-* To run the Rails tests: `bundle exec rake`.
-  * To install dependencies: `bundle install`
-  * To prepare the test database: `cd test/dummy; RAILS_ENV=test ./bin/rails db:migrate`
-* To compile the JavaScript for the asset pipeline: `yarn build`
+Run the tests with `./bin/test`.
 
 
 ## License

data/app/assets/javascripts/turbo.js

@@ -31,6 +31,7 @@ function clickCaptured(event) {
 
 (function() {
   if ("SubmitEvent" in window) return;
+  if ("submitter" in Event.prototype) return;
   addEventListener("click", clickCaptured, true);
   Object.defineProperty(Event.prototype, "submitter", {
     get() {
@@ -226,11 +227,11 @@ class FetchResponse {
     return this.header("Content-Type");
   }
   get responseText() {
-    return this.response.text();
+    return this.response.clone().text();
   }
   get responseHTML() {
     if (this.isHTML) {
-      return this.response.text();
+      return this.response.clone().text();
     } else {
       return Promise.resolve(undefined);
     }
@@ -326,7 +327,7 @@ function fetchMethodFromString(method) {
 }
 
 class FetchRequest {
-  constructor(delegate, method, location, body = new URLSearchParams) {
+  constructor(delegate, method, location, body = new URLSearchParams, target = null) {
     this.abortController = new AbortController;
     this.resolveRequestPromise = value => {};
     this.delegate = delegate;
@@ -338,6 +339,7 @@ class FetchRequest {
       this.body = body;
       this.url = location;
     }
+    this.target = target;
   }
   get location() {
     return this.url;
@@ -375,7 +377,8 @@ class FetchRequest {
       cancelable: true,
       detail: {
         fetchResponse: fetchResponse
-      }
+      },
+      target: this.target
     });
     if (event.defaultPrevented) {
       this.delegate.requestPreventedHandlingResponse(this, fetchResponse);
@@ -417,7 +420,8 @@ class FetchRequest {
         fetchOptions: fetchOptions,
         url: this.url.href,
         resume: this.resolveRequestPromise
-      }
+      },
+      target: this.target
     });
     if (event.defaultPrevented) await requestInterception;
   }
@@ -538,7 +542,7 @@ class FormSubmission {
     this.formElement = formElement;
     this.submitter = submitter;
     this.formData = buildFormData(formElement, submitter);
-    this.fetchRequest = new FetchRequest(this, this.method, this.location, this.body);
+    this.fetchRequest = new FetchRequest(this, this.method, this.location, this.body, this.formElement);
     this.mustRedirect = mustRedirect;
   }
   get method() {
@@ -1173,7 +1177,7 @@ ProgressBar.animationDuration = 300;
 class HeadSnapshot extends Snapshot {
   constructor() {
     super(...arguments);
-    this.detailsByOuterHTML = this.children.filter((element => !elementIsNoscript(element))).reduce(((result, element) => {
+    this.detailsByOuterHTML = this.children.filter((element => !elementIsNoscript(element))).map((element => elementWithoutNonce(element))).reduce(((result, element) => {
       const {outerHTML: outerHTML} = element;
       const details = outerHTML in result ? result[outerHTML] : {
         type: elementType(element),
@@ -1255,6 +1259,13 @@ function elementIsMetaElementWithName(element, name) {
   return tagName == "meta" && element.getAttribute("name") == name;
 }
 
+function elementWithoutNonce(element) {
+  if (element.hasAttribute("nonce")) {
+    element.setAttribute("nonce", "");
+  }
+  return element;
+}
+
 class PageSnapshot extends Snapshot {
   constructor(element, headSnapshot) {
     super(element);
@@ -1805,18 +1816,18 @@ class FrameRedirector {
     return this.shouldRedirect(element, submitter);
   }
   formSubmissionIntercepted(element, submitter) {
-    const frame = this.findFrameElement(element);
+    const frame = this.findFrameElement(element, submitter);
     if (frame) {
       frame.removeAttribute("reloadable");
       frame.delegate.formSubmissionIntercepted(element, submitter);
     }
   }
   shouldRedirect(element, submitter) {
-    const frame = this.findFrameElement(element);
+    const frame = this.findFrameElement(element, submitter);
     return frame ? frame != element.closest("turbo-frame") : false;
   }
-  findFrameElement(element) {
-    const id = element.getAttribute("data-turbo-frame");
+  findFrameElement(element, submitter) {
+    const id = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("data-turbo-frame")) || element.getAttribute("data-turbo-frame");
     if (id && id != "_top") {
       const frame = this.element.querySelector(`#${id}:not([disabled])`);
       if (frame instanceof FrameElement) {
@@ -2539,12 +2550,13 @@ class Session {
     });
   }
   convertLinkWithMethodClickToFormSubmission(link) {
+    var _a;
     const linkMethod = link.getAttribute("data-turbo-method");
     if (linkMethod) {
       const form = document.createElement("form");
       form.method = linkMethod;
       form.action = link.getAttribute("href") || "undefined";
-      document.body.appendChild(form);
+      (_a = link.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(form, link);
       return dispatch("submit", {
         cancelable: true,
         target: form
@@ -2896,7 +2908,7 @@ class FrameController {
     this.reloadable = false;
     this.formSubmission = new FormSubmission(this, element, submitter);
     if (this.formSubmission.fetchRequest.isIdempotent) {
-      this.navigateFrame(element, this.formSubmission.fetchRequest.url.href);
+      this.navigateFrame(element, this.formSubmission.fetchRequest.url.href, submitter);
     } else {
       const {fetchRequest: fetchRequest} = this.formSubmission;
       this.prepareHeadersForRequest(fetchRequest.headers, fetchRequest);
@@ -2932,7 +2944,7 @@ class FrameController {
     frame.setAttribute("busy", "");
   }
   formSubmissionSucceededWithResponse(formSubmission, response) {
-    const frame = this.findFrameElement(formSubmission.formElement);
+    const frame = this.findFrameElement(formSubmission.formElement, formSubmission.submitter);
     frame.delegate.loadResponse(response);
   }
   formSubmissionFailedWithResponse(formSubmission, fetchResponse) {
@@ -2951,7 +2963,7 @@ class FrameController {
   viewRenderedSnapshot(snapshot, isPreview) {}
   viewInvalidated() {}
   async visit(url) {
-    const request = new FetchRequest(this, FetchMethod.get, expandURL(url));
+    const request = new FetchRequest(this, FetchMethod.get, expandURL(url), undefined, this.element);
     return new Promise((resolve => {
       this.resolveVisitPromise = () => {
         this.resolveVisitPromise = () => {};
@@ -2960,13 +2972,14 @@ class FrameController {
       request.perform();
     }));
   }
-  navigateFrame(element, url) {
-    const frame = this.findFrameElement(element);
+  navigateFrame(element, url, submitter) {
+    const frame = this.findFrameElement(element, submitter);
+    frame.setAttribute("reloadable", "");
     frame.src = url;
   }
-  findFrameElement(element) {
+  findFrameElement(element, submitter) {
     var _a;
-    const id = element.getAttribute("data-turbo-frame") || this.element.getAttribute("target");
+    const id = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("data-turbo-frame")) || element.getAttribute("data-turbo-frame") || this.element.getAttribute("target");
     return (_a = getFrameElementById(id)) !== null && _a !== void 0 ? _a : this.element;
   }
   async extractForeignFrameElement(container) {
@@ -2987,7 +3000,7 @@ class FrameController {
     return new FrameElement;
   }
   shouldInterceptNavigation(element, submitter) {
-    const id = element.getAttribute("data-turbo-frame") || this.element.getAttribute("target");
+    const id = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("data-turbo-frame")) || element.getAttribute("data-turbo-frame") || this.element.getAttribute("target");
     if (!this.enabled || id == "_top") {
       return false;
     }

data/app/channels/turbo/streams/broadcasts.rb

@@ -6,61 +6,61 @@ module Turbo::Streams::Broadcasts
   include Turbo::Streams::ActionHelper
 
   def broadcast_remove_to(*streamables, **opts)
-    broadcast_action_to *streamables, action: :remove, **opts
+    broadcast_action_to(*streamables, action: :remove, **opts)
   end
 
   def broadcast_replace_to(*streamables, **opts)
-    broadcast_action_to *streamables, action: :replace, **opts
+    broadcast_action_to(*streamables, action: :replace, **opts)
   end
 
   def broadcast_update_to(*streamables, **opts)
-    broadcast_action_to *streamables, action: :update, **opts
+    broadcast_action_to(*streamables, action: :update, **opts)
   end
 
   def broadcast_before_to(*streamables, **opts)
-    broadcast_action_to *streamables, action: :before, **opts
+    broadcast_action_to(*streamables, action: :before, **opts)
   end
 
   def broadcast_after_to(*streamables, **opts)
-    broadcast_action_to *streamables, action: :after, **opts
+    broadcast_action_to(*streamables, action: :after, **opts)
   end
 
   def broadcast_append_to(*streamables, **opts)
-    broadcast_action_to *streamables, action: :append, **opts
+    broadcast_action_to(*streamables, action: :append, **opts)
   end
 
   def broadcast_prepend_to(*streamables, **opts)
-    broadcast_action_to *streamables, action: :prepend, **opts
+    broadcast_action_to(*streamables, action: :prepend, **opts)
   end
 
   def broadcast_action_to(*streamables, action:, target: nil, targets: nil, **rendering)
-    broadcast_stream_to *streamables, content: turbo_stream_action_tag(action, target: target, targets: targets, template:
+    broadcast_stream_to(*streamables, content: turbo_stream_action_tag(action, target: target, targets: targets, template:
       rendering.delete(:content) || (rendering.any? ? render_format(:html, **rendering) : nil)
-    )
+    ))
   end
 
   def broadcast_replace_later_to(*streamables, **opts)
-    broadcast_action_later_to *streamables, action: :replace, **opts
+    broadcast_action_later_to(*streamables, action: :replace, **opts)
   end
 
   def broadcast_update_later_to(*streamables, **opts)
-    broadcast_action_later_to *streamables, action: :update, **opts
+    broadcast_action_later_to(*streamables, action: :update, **opts)
   end
 
   def broadcast_before_later_to(*streamables, **opts)
-    broadcast_action_later_to *streamables, action: :before, **opts
+    broadcast_action_later_to(*streamables, action: :before, **opts)
   end
 
   def broadcast_after_later_to(*streamables, **opts)
-    broadcast_action_later_to *streamables, action: :after, **opts
+    broadcast_action_later_to(*streamables, action: :after, **opts)
   end
 
   def broadcast_append_later_to(*streamables, **opts)
-    broadcast_action_later_to *streamables, action: :append, **opts
+    broadcast_action_later_to(*streamables, action: :append, **opts)
   end
 
   def broadcast_prepend_later_to(*streamables, **opts)
-    broadcast_action_later_to *streamables, action: :prepend, **opts
+    broadcast_action_later_to(*streamables, action: :prepend, **opts)
   end
 
   def broadcast_action_later_to(*streamables, action:, target: nil, targets: nil, **rendering)
@@ -69,7 +69,7 @@ module Turbo::Streams::Broadcasts
   end
 
   def broadcast_render_to(*streamables, **rendering)
-    broadcast_stream_to *streamables, content: render_format(:turbo_stream, **rendering)
+    broadcast_stream_to(*streamables, content: render_format(:turbo_stream, **rendering))
   end
 
   def broadcast_render_later_to(*streamables, **rendering)

data/app/helpers/turbo/streams/action_helper.rb

@@ -14,7 +14,7 @@ module Turbo::Streams::ActionHelper
 
     if target = convert_to_turbo_stream_dom_id(target)
       %(<turbo-stream action="#{action}" target="#{target}">#{template}</turbo-stream>).html_safe
-    elsif targets = convert_to_turbo_stream_dom_id(targets)
+    elsif targets = convert_to_turbo_stream_dom_id(targets, include_selector: true)
       %(<turbo-stream action="#{action}" targets="#{targets}">#{template}</turbo-stream>).html_safe
     else
       raise ArgumentError, "target or targets must be supplied"
@@ -22,7 +22,11 @@ module Turbo::Streams::ActionHelper
   end
 
   private
-    def convert_to_turbo_stream_dom_id(target)
-      target.respond_to?(:to_key) ? ActionView::RecordIdentifier.dom_id(target) : target
+    def convert_to_turbo_stream_dom_id(target, include_selector: false)
+      if target.respond_to?(:to_key)
+        [ ("#" if include_selector), ActionView::RecordIdentifier.dom_id(target) ].compact.join
+      else
+        target
+      end
     end
 end

data/app/models/concerns/turbo/broadcastable.rb

@@ -76,7 +76,7 @@ module Turbo::Broadcastable
   #   # Sends <turbo-stream action="remove" target="clearance_5"></turbo-stream> to the stream named "identity:2:clearances"
   #   clearance.broadcast_remove_to examiner.identity, :clearances
   def broadcast_remove_to(*streamables, target: self)
-    Turbo::StreamsChannel.broadcast_remove_to *streamables, target: target
+    Turbo::StreamsChannel.broadcast_remove_to(*streamables, target: target)
   end
 
   # Same as <tt>#broadcast_remove_to</tt>, but the designated stream is automatically set to the current model.
@@ -95,7 +95,7 @@ module Turbo::Broadcastable
   #   # to the stream named "identity:2:clearances"
   #   clearance.broadcast_replace_to examiner.identity, :clearances, partial: "clearances/other_partial", locals: { a: 1 }
   def broadcast_replace_to(*streamables, **rendering)
-    Turbo::StreamsChannel.broadcast_replace_to *streamables, target: self, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_replace_to(*streamables, target: self, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Same as <tt>#broadcast_replace_to</tt>, but the designated stream is automatically set to the current model.
@@ -114,7 +114,7 @@ module Turbo::Broadcastable
   #   # to the stream named "identity:2:clearances"
   #   clearance.broadcast_update_to examiner.identity, :clearances, partial: "clearances/other_partial", locals: { a: 1 }
   def broadcast_update_to(*streamables, **rendering)
-    Turbo::StreamsChannel.broadcast_update_to *streamables, target: self, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_update_to(*streamables, target: self, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Same as <tt>#broadcast_update_to</tt>, but the designated stream is automatically set to the current model.
@@ -135,7 +135,7 @@ module Turbo::Broadcastable
   #   clearance.broadcast_before_to examiner.identity, :clearances, target: "clearance_5",
   #     partial: "clearances/other_partial", locals: { a: 1 }
   def broadcast_before_to(*streamables, target:, **rendering)
-    Turbo::StreamsChannel.broadcast_before_to *streamables, target: target, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_before_to(*streamables, target: target, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Insert a rendering of this broadcastable model after the target identified by it's dom id passed as <tt>target</tt>
@@ -151,7 +151,7 @@ module Turbo::Broadcastable
   #   clearance.broadcast_after_to examiner.identity, :clearances, target: "clearance_5",
   #     partial: "clearances/other_partial", locals: { a: 1 }
   def broadcast_after_to(*streamables, target:, **rendering)
-    Turbo::StreamsChannel.broadcast_after_to *streamables, target: target, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_after_to(*streamables, target: target, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Append a rendering of this broadcastable model to the target identified by it's dom id passed as <tt>target</tt>
@@ -167,7 +167,7 @@ module Turbo::Broadcastable
   #   clearance.broadcast_append_to examiner.identity, :clearances, target: "clearances",
   #     partial: "clearances/other_partial", locals: { a: 1 }
   def broadcast_append_to(*streamables, target: broadcast_target_default, **rendering)
-    Turbo::StreamsChannel.broadcast_append_to *streamables, target: target, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_append_to(*streamables, target: target, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Same as <tt>#broadcast_append_to</tt>, but the designated stream is automatically set to the current model.
@@ -188,7 +188,7 @@ module Turbo::Broadcastable
   #   clearance.broadcast_prepend_to examiner.identity, :clearances, target: "clearances",
   #     partial: "clearances/other_partial", locals: { a: 1 }
   def broadcast_prepend_to(*streamables, target: broadcast_target_default, **rendering)
-    Turbo::StreamsChannel.broadcast_prepend_to *streamables, target: target, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_prepend_to(*streamables, target: target, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Same as <tt>#broadcast_prepend_to</tt>, but the designated stream is automatically set to the current model.
@@ -213,7 +213,7 @@ module Turbo::Broadcastable
 
   # Same as <tt>broadcast_replace_to</tt> but run asynchronously via a <tt>Turbo::Streams::BroadcastJob</tt>.
   def broadcast_replace_later_to(*streamables, **rendering)
-    Turbo::StreamsChannel.broadcast_replace_later_to *streamables, target: self, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_replace_later_to(*streamables, target: self, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Same as <tt>#broadcast_replace_later_to</tt>, but the designated stream is automatically set to the current model.
@@ -223,7 +223,7 @@ module Turbo::Broadcastable
 
   # Same as <tt>broadcast_update_to</tt> but run asynchronously via a <tt>Turbo::Streams::BroadcastJob</tt>.
   def broadcast_update_later_to(*streamables, **rendering)
-    Turbo::StreamsChannel.broadcast_update_later_to *streamables, target: self, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_update_later_to(*streamables, target: self, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Same as <tt>#broadcast_update_later_to</tt>, but the designated stream is automatically set to the current model.
@@ -233,7 +233,7 @@ module Turbo::Broadcastable
 
   # Same as <tt>broadcast_append_to</tt> but run asynchronously via a <tt>Turbo::Streams::BroadcastJob</tt>.
   def broadcast_append_later_to(*streamables, target: broadcast_target_default, **rendering)
-    Turbo::StreamsChannel.broadcast_append_later_to *streamables, target: target, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_append_later_to(*streamables, target: target, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Same as <tt>#broadcast_append_later_to</tt>, but the designated stream is automatically set to the current model.
@@ -243,7 +243,7 @@ module Turbo::Broadcastable
 
   # Same as <tt>broadcast_prepend_to</tt> but run asynchronously via a <tt>Turbo::Streams::BroadcastJob</tt>.
   def broadcast_prepend_later_to(*streamables, target: broadcast_target_default, **rendering)
-    Turbo::StreamsChannel.broadcast_prepend_later_to *streamables, target: target, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_prepend_later_to(*streamables, target: target, **broadcast_rendering_with_defaults(rendering))
   end
 
   # Same as <tt>#broadcast_prepend_later_to</tt>, but the designated stream is automatically set to the current model.
@@ -283,7 +283,7 @@ module Turbo::Broadcastable
   # Same as <tt>broadcast_render_later</tt> but run with the added option of naming the stream using the passed
   # <tt>streamables</tt>.
   def broadcast_render_later_to(*streamables, **rendering)
-    Turbo::StreamsChannel.broadcast_render_later_to *streamables, **broadcast_rendering_with_defaults(rendering)
+    Turbo::StreamsChannel.broadcast_render_later_to(*streamables, **broadcast_rendering_with_defaults(rendering))
   end
 
 

data/lib/install/turbo_needs_redis.rb

@@ -1,6 +1,6 @@
 if (cable_config_path = Rails.root.join("config/cable.yml")).exist?
   say "Enable redis in bundle"
-  uncomment_lines "Gemfile", %(gem 'redis')
+  uncomment_lines "Gemfile", /gem ['"]redis['"]/
 
   say "Switch development cable to use redis"
   gsub_file cable_config_path.to_s, /development:\n\s+adapter: async/, "development:\n  adapter: redis\n  url: redis://localhost:6379/1"

data/lib/install/turbo_with_importmap.rb

@@ -0,0 +1,5 @@
+say "Import Turbo"
+append_to_file "app/javascript/application.js", %(import "@hotwired/turbo-rails"\n)
+
+say "Pin Turbo"
+append_to_file "config/importmap.rb", %(pin "@hotwired/turbo-rails", to: "turbo.js"\n)

data/lib/install/turbo_with_node.rb

@@ -0,0 +1,9 @@
+if (js_entrypoint_path = Rails.root.join("app/javascript/application.js")).exist?
+  say "Import Turbo"
+  append_to_file "app/javascript/application.js", %(import "@hotwired/turbo-rails"\n)
+else
+  say "You must import @hotwired/turbo-rails in your JavaScript entrypoint file", :red
+end
+
+say "Install Turbo"
+run "yarn add @hotwired/turbo-rails"

data/lib/tasks/turbo_tasks.rake

@@ -1,24 +1,42 @@
-def run_turbo_install_template(path) system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../install/#{path}.rb",  __dir__)}" end
+def run_turbo_install_template(path)
+  system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../install/#{path}.rb",  __dir__)}"
+end
+
+def redis_installed?
+  system('which redis-server')
+end
+
+def switch_on_redis_if_available
+  if redis_installed?
+    Rake::Task["turbo:install:redis"].invoke
+  else
+    puts "Run turbo:install:redis to switch on Redis and use it in development for turbo streams"
+  end
+end
 
 namespace :turbo do
   desc "Install Turbo into the app"
   task :install do
-    if defined?(Webpacker::Engine)
-      Rake::Task["turbo:install:webpacker"].invoke
+    if Rails.root.join("config/importmap.rb").exist?
+      Rake::Task["turbo:install:importmap"].invoke
+    elsif Rails.root.join("package.json").exist?
+      Rake::Task["turbo:install:node"].invoke
     else
-      Rake::Task["turbo:install:asset_pipeline"].invoke
+      puts "You must either be running with node (package.json) or importmap-rails (config/importmap.rb) to use this gem."
     end
   end
 
   namespace :install do
     desc "Install Turbo into the app with asset pipeline"
-    task :asset_pipeline do
-      run_turbo_install_template "turbo_with_asset_pipeline"
+    task :importmap do
+      run_turbo_install_template "turbo_with_importmap"
+      switch_on_redis_if_available
     end
 
     desc "Install Turbo into the app with webpacker"
-    task :webpacker do
-      run_turbo_install_template "turbo_with_webpacker"
+    task :node do
+      run_turbo_install_template "turbo_with_node"
+      switch_on_redis_if_available
     end
 
     desc "Switch on Redis and use it in development"

data/lib/turbo/version.rb

@@ -1,3 +1,3 @@
 module Turbo
-  VERSION = "0.7.9"
+  VERSION = "0.7.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.13
 platform: ruby
 authors:
 - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,8 +57,8 @@ files:
 - app/models/turbo/streams/tag_builder.rb
 - config/routes.rb
 - lib/install/turbo_needs_redis.rb
-- lib/install/turbo_with_asset_pipeline.rb
-- lib/install/turbo_with_webpacker.rb
+- lib/install/turbo_with_importmap.rb
+- lib/install/turbo_with_node.rb
 - lib/tasks/turbo_tasks.rake
 - lib/turbo-rails.rb
 - lib/turbo/engine.rb

data/lib/install/turbo_with_asset_pipeline.rb

@@ -1,20 +0,0 @@
-if (app_js_path = Rails.root.join("app/javascript/application.js")).exist?
-  say "Import turbo-rails in existing app/javascript/application.js"
-  append_to_file app_js_path, %(import "@hotwired/turbo-rails"\n)
-else
-  say <<~INSTRUCTIONS, :red
-    You must import @hotwired/turbo-rails in your application.js.
-  INSTRUCTIONS
-end
-
-if (importmap_path = Rails.root.join("config/importmap.rb")).exist?
-  say "Pin @hotwired/turbo-rails in config/importmap.rb"
-  append_to_file importmap_path.to_s, %(pin "@hotwired/turbo-rails", to: "turbo.js"\n)
-else
-  say <<~INSTRUCTIONS, :red
-    You must add @hotwired/turbo-rails to your importmap to reference them via ESM.
-    Example: pin "@hotwired/turbo-rails", to: "turbo.js"
-  INSTRUCTIONS
-end
-
-say "Run turbo:install:redis to switch on Redis and use it in development for turbo streams", :red

data/lib/install/turbo_with_webpacker.rb

@@ -1,7 +0,0 @@
-say "Appending Turbo setup code to #{Webpacker.config.source_entry_path}/application.js"
-append_to_file "#{Webpacker.config.source_entry_path}/application.js", %(\nimport "@hotwired/turbo-rails"\n)
-
-say "Install Turbo"
-run "yarn add @hotwired/turbo-rails"
-
-say "Run turbo:install:redis to switch on Redis and use it in development for turbo streams"