turbo-rails 0.7.7 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f96104fa6d1282a5f3845a119e748b04a819078840d3750604ebebeac081871
-  data.tar.gz: 0fdbf552964ff5ada90d746a32ec5575181c010471f4dcd921c2b443bfc732af
+  metadata.gz: 0fe3ad5cd094491982825ff80d21c619aab81bbcbe7e07168e467beeb3daa493
+  data.tar.gz: 757f2faa9d39389014fc277ef75d3c806c9864b1deb87f6efae5118c604cf89b
 SHA512:
-  metadata.gz: 662af2c0c6187537aafc70747ed3f66215bc65bde320475d12d10aeb30d2aca17ed1a3fa1403033a73f51323969782e3e482d5c145a3d0382921045eff22f2cb
-  data.tar.gz: 23a86030ac88022ba35c3b9369e1cf73bc2803e3c6106abb22ac9b179bb170b78e732fbab873eb56698f7a4c262298f2ab962f89359bd2369ac71820205df513
+  metadata.gz: e38bd507e3eaeeccd3e8e570e3341cdc8ae27074ba03d3e509605a13f3df4188bd54250bbbb8f6161e3d3e261e5ae6edd928d3fb2aac7fd8d9ede9e7c1810717
+  data.tar.gz: 77f0a351ce8ab0cca1bc69413a508d6d8b790f61e18623ae16aad7d929536baa4f8c75b6407e6752d5301d022f0b49472c4376506181d1ffd31ed91b033459a2

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:
 

data/app/assets/javascripts/turbo.js

@@ -1650,7 +1650,7 @@ class BrowserAdapter {
   visitRequestStarted(visit) {
     this.progressBar.setValue(0);
     if (visit.hasCachedSnapshot() || visit.action != "restore") {
-      this.showProgressBarAfterDelay();
+      this.showVisitProgressBarAfterDelay();
     } else {
       this.showProgressBar();
     }
@@ -1671,7 +1671,7 @@ class BrowserAdapter {
   }
   visitRequestFinished(visit) {
     this.progressBar.setValue(1);
-    this.hideProgressBar();
+    this.hideVisitProgressBar();
   }
   visitCompleted(visit) {}
   pageInvalidated() {
@@ -1681,20 +1681,32 @@ class BrowserAdapter {
   visitRendered(visit) {}
   formSubmissionStarted(formSubmission) {
     this.progressBar.setValue(0);
-    this.showProgressBarAfterDelay();
+    this.showFormProgressBarAfterDelay();
   }
   formSubmissionFinished(formSubmission) {
     this.progressBar.setValue(1);
-    this.hideProgressBar();
+    this.hideFormProgressBar();
   }
-  showProgressBarAfterDelay() {
-    this.progressBarTimeout = window.setTimeout(this.showProgressBar, this.session.progressBarDelay);
+  showVisitProgressBarAfterDelay() {
+    this.visitProgressBarTimeout = window.setTimeout(this.showProgressBar, this.session.progressBarDelay);
   }
-  hideProgressBar() {
+  hideVisitProgressBar() {
     this.progressBar.hide();
-    if (this.progressBarTimeout != null) {
-      window.clearTimeout(this.progressBarTimeout);
-      delete this.progressBarTimeout;
+    if (this.visitProgressBarTimeout != null) {
+      window.clearTimeout(this.visitProgressBarTimeout);
+      delete this.visitProgressBarTimeout;
+    }
+  }
+  showFormProgressBarAfterDelay() {
+    if (this.formProgressBarTimeout == null) {
+      this.formProgressBarTimeout = window.setTimeout(this.showProgressBar, this.session.progressBarDelay);
+    }
+  }
+  hideFormProgressBar() {
+    this.progressBar.hide();
+    if (this.formProgressBarTimeout != null) {
+      window.clearTimeout(this.formProgressBarTimeout);
+      delete this.formProgressBarTimeout;
     }
   }
   reload() {
@@ -1785,6 +1797,7 @@ class FrameRedirector {
   linkClickIntercepted(element, url) {
     const frame = this.findFrameElement(element);
     if (frame) {
+      frame.setAttribute("reloadable", "");
       frame.src = url;
     }
   }
@@ -1794,6 +1807,7 @@ class FrameRedirector {
   formSubmissionIntercepted(element, submitter) {
     const frame = this.findFrameElement(element);
     if (frame) {
+      frame.removeAttribute("reloadable");
       frame.delegate.formSubmissionIntercepted(element, submitter);
     }
   }

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.7"
+  VERSION = "0.7.11"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.11
 platform: ruby
 authors:
 - Sam Stephenson
 - Javan Mahkmali
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,7 +26,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-description:
+description: 
 email: david@loudthinking.com
 executables: []
 extensions: []
@@ -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
@@ -68,7 +68,7 @@ homepage: https://github.com/hotwired/turbo-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: The speed of a single-page web application without having to write any JavaScript.
 test_files: []

data/lib/install/turbo_with_asset_pipeline.rb

@@ -1,23 +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"
-  insert_into_file \
-    importmap_path.to_s, 
-    %(  pin "@hotwired/turbo-rails", to: "turbo.js"\n\n),
-    after: "Rails.application.config.importmap.draw do\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"