turbo-rails 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b0552458511ec8ad34c4b0b3978d2a9ffb88485b844f60f6bc283287e0eecdd
-  data.tar.gz: eccd64955e5db2682efe9b503c24feeb6cbf50c1e542d7bcef0416ded95026fb
+  metadata.gz: 3d7e1db921a74088b68618665ff1df3ae7e3216fff065c2236c4bc8fd3c94812
+  data.tar.gz: e3b2ab5358a0c5b333c32401650f3c78325342e9e0e3eac47c1da4ab05621b13
 SHA512:
-  metadata.gz: 950a8abe637775b61e610d9c99a61f22fa514704a2a3d4453a0e53854c2c4dfe4e4c65f342cd534869d9d1edd83c513590a70744632a6981df52265b20ca142e
-  data.tar.gz: 5d97247505d6934b2bda932a53b0ca3b19d69fe7000a269001cd50ecc9f38bba090e26f50a3d489073699a93ccc50093f218465f45b054969d10c10026052100
+  metadata.gz: c28d47c9a443718f9737b040b30d91964b1a02fb6f68fd3c9913b13ba7467ecbdb8e9a4bef4df711ad7aa99b8eb1d5a1005cc805b535a0fd21c41ff2f6ac279b
+  data.tar.gz: a20b70fa8892752160064a79ede46b553a1d04f84e91200d3f62092e973aa49c2627f6cc2e866b43c2452c5f8143ca5bc103c1807c3cf0f80499d2ae12be14b0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    turbo-rails (0.5.1)
+    turbo-rails (0.5.2)
       rails (>= 6.0.0)
 
 GEM
@@ -73,7 +73,7 @@ GEM
     erubi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.5)
+    i18n (1.8.6)
       concurrent-ruby (~> 1.0)
     loofah (2.8.0)
       crass (~> 1.0.2)
@@ -144,4 +144,4 @@ DEPENDENCIES
   turbo-rails!
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/README.md

@@ -48,6 +48,15 @@ If you're using Webpack and need to use either the cable consumer or the Turbo i
 You can watch [the video introduction to Hotwire](https://hotwire.dev/#screencast), which focuses extensively on demonstration Turbo in a Rails demo. Then you should familiarize yourself with [Turbo handbook](https://turbo.hotwire.dev/handbook/introduction) to understand Drive, Frames, and Streams in-depth. Finally, dive into the code documentation by starting with [`Turbo::FramesHelper`](https://github.com/hotwired/turbo-rails/blob/main/app/helpers/turbo/frames_helper.rb), [`Turbo::StreamsHelper`](https://github.com/hotwired/turbo-rails/blob/main/app/helpers/turbo/streams_helper.rb), [`Turbo::Streams::TagBuilder`](https://github.com/hotwired/turbo-rails/blob/main/app/models/turbo/streams/tag_builder.rb), and [`Turbo::Broadcastable`](https://github.com/hotwired/turbo-rails/blob/main/app/models/concerns/turbo/broadcastable.rb).
 
 
+## Compatibility with Rails UJS
+
+Rails UJS includes helpers for sending links and forms over XMLHttpRequest, so you can respond with Ajax. Turbo supersedes this functionality, so you should ensure that you're either running Rails 6.1 with the defaults that turn this off for forms, or that you add `config.action_view.form_with_generates_remote_forms = false` to your `config/application.rb`.
+
+Note that the helpers that turn `link_to` into remote invocations will _not_ currently work with Turbo. Links that have been made remote will not stick within frames nor will they allow you to respond with turbo stream actions. The recommendation is to replace these links with styled `button_to`, so you'll flow through a regular form, and you'll be better off with a11y compliance.
+
+You can still use the `data-confirm` and `data-disable-with`.
+
+
 ## Development
 
 * To run the Rails tests: `bundle exec rake`.

data/app/assets/javascripts/turbo.js

@@ -19,7 +19,7 @@ const submittersByForm = new WeakMap;
 function findSubmitterFromClickTarget(target) {
   const element = target instanceof Element ? target : target instanceof Node ? target.parentElement : null;
   const candidate = element ? element.closest("input, button") : null;
-  return (candidate === null || candidate === void 0 ? void 0 : candidate.getAttribute("type")) == "submit" ? candidate : null;
+  return (candidate === null || candidate === void 0 ? void 0 : candidate.type) == "submit" ? candidate : null;
 }
 
 function clickCaptured(event) {
@@ -129,6 +129,12 @@ class FetchResponse {
   get failed() {
     return !this.succeeded;
   }
+  get clientError() {
+    return this.statusCode >= 400 && this.statusCode <= 499;
+  }
+  get serverError() {
+    return this.statusCode >= 500 && this.statusCode <= 599;
+  }
   get redirected() {
     return this.response.redirected;
   }
@@ -377,7 +383,7 @@ class FormSubmission {
   }
   get method() {
     var _a;
-    const method = ((_a = this.submitter) === null || _a === void 0 ? void 0 : _a.getAttribute("formmethod")) || this.formElement.method;
+    const method = ((_a = this.submitter) === null || _a === void 0 ? void 0 : _a.getAttribute("formmethod")) || this.formElement.getAttribute("method") || "";
     return fetchMethodFromString(method.toLowerCase()) || FetchMethod.get;
   }
   get action() {
@@ -429,7 +435,9 @@ class FormSubmission {
     };
   }
   requestSucceededWithResponse(request, response) {
-    if (this.requestMustRedirect(request) && !response.redirected) {
+    if (response.clientError || response.serverError) {
+      this.delegate.formSubmissionFailedWithResponse(this, response);
+    } else if (this.requestMustRedirect(request) && !response.redirected) {
       const error = new Error("Form responses must redirect to another location");
       this.delegate.formSubmissionErrored(this, error);
     } else {
@@ -614,7 +622,9 @@ class FrameController {
     const frame = this.findFrameElement(formSubmission.formElement);
     frame.controller.loadResponse(response);
   }
-  formSubmissionFailedWithResponse(formSubmission, fetchResponse) {}
+  formSubmissionFailedWithResponse(formSubmission, fetchResponse) {
+    this.element.controller.loadResponse(fetchResponse);
+  }
   formSubmissionErrored(formSubmission, error) {}
   formSubmissionFinished(formSubmission) {}
   navigateFrame(element, url) {
@@ -1570,7 +1580,8 @@ class FormSubmitObserver {
         const form = event.target instanceof HTMLFormElement ? event.target : undefined;
         const submitter = event.submitter || undefined;
         if (form) {
-          if (this.delegate.willSubmitForm(form, submitter)) {
+          const method = (submitter === null || submitter === void 0 ? void 0 : submitter.getAttribute("formmethod")) || form.method;
+          if (method != "dialog" && this.delegate.willSubmitForm(form, submitter)) {
             event.preventDefault();
             this.delegate.formSubmitted(form, submitter);
           }
@@ -1803,12 +1814,10 @@ class Navigator {
   }
   formSubmissionStarted(formSubmission) {}
   async formSubmissionSucceededWithResponse(formSubmission, fetchResponse) {
-    console.log("Form submission succeeded", formSubmission);
     if (formSubmission == this.formSubmission) {
       const responseHTML = await fetchResponse.responseHTML;
       if (responseHTML) {
         if (formSubmission.method != FetchMethod.get) {
-          console.log("Clearing snapshot cache after successful form submission");
           this.view.clearSnapshotCache();
         }
         const {statusCode: statusCode} = fetchResponse;
@@ -1818,17 +1827,21 @@ class Navigator {
             responseHTML: responseHTML
           }
         };
-        console.log("Visiting", fetchResponse.location, visitOptions);
         this.proposeVisit(fetchResponse.location, visitOptions);
       }
     }
   }
-  formSubmissionFailedWithResponse(formSubmission, fetchResponse) {
-    console.error("Form submission failed", formSubmission, fetchResponse);
-  }
-  formSubmissionErrored(formSubmission, error) {
-    console.error("Form submission failed", formSubmission, error);
+  async formSubmissionFailedWithResponse(formSubmission, fetchResponse) {
+    const responseHTML = await fetchResponse.responseHTML;
+    if (responseHTML) {
+      const snapshot = Snapshot.fromHTMLString(responseHTML);
+      this.view.render({
+        snapshot: snapshot
+      }, (() => {}));
+      this.view.clearSnapshotCache();
+    }
   }
+  formSubmissionErrored(formSubmission, error) {}
   formSubmissionFinished(formSubmission) {}
   visitStarted(visit) {
     this.delegate.visitStarted(visit);
@@ -2475,7 +2488,7 @@ class Session {
     });
   }
   willFollowLinkToLocation(link, location) {
-    return this.linkIsVisitable(link) && this.locationIsVisitable(location) && this.applicationAllowsFollowingLinkToLocation(link, location);
+    return this.elementIsNavigable(link) && this.locationIsVisitable(location) && this.applicationAllowsFollowingLinkToLocation(link, location);
   }
   followedLinkToLocation(link, location) {
     const action = this.getActionForLink(link);
@@ -2496,7 +2509,7 @@ class Session {
     this.notifyApplicationAfterPageLoad(visit.getTimingMetrics());
   }
   willSubmitForm(form, submitter) {
-    return true;
+    return this.elementIsNavigable(form) && this.elementIsNavigable(submitter);
   }
   formSubmitted(form, submitter) {
     this.navigator.submitForm(form, submitter);
@@ -2582,8 +2595,8 @@ class Session {
     const action = link.getAttribute("data-turbo-action");
     return isAction(action) ? action : "advance";
   }
-  linkIsVisitable(link) {
-    const container = link.closest("[data-turbo]");
+  elementIsNavigable(element) {
+    const container = element === null || element === void 0 ? void 0 : element.closest("[data-turbo]");
     if (container) {
       return container.getAttribute("data-turbo") != "false";
     } else {

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

@@ -8,7 +8,7 @@ module Turbo::Streams::ActionHelper
   #   # => <turbo-stream action="replace" target="message_1"><template><div id="message_1">Hello!</div></template></turbo-stream>
   def turbo_stream_action_tag(action, target:, template: nil)
     target   = convert_to_turbo_stream_dom_id(target)
-    template = template ? "<template>#{template}</template>" : ""
+    template = action.to_sym == :remove ? "" : "<template>#{template}</template>"
 
     %(<turbo-stream action="#{action}" target="#{target}">#{template}</turbo-stream>).html_safe
   end

data/app/helpers/turbo/streams_helper.rb

@@ -34,11 +34,11 @@ module Turbo::StreamsHelper
   #
   #   # app/views/entries/index.html.erb
   #   <%= turbo_stream_from Current.account, :entries %>
-  #   <div id="entries">New entries will be appended to this container</div>
+  #   <div id="entries">New entries will be appended to this target</div>
   #
   # The example above will process all turbo streams sent to a stream name like <tt>account:5:entries</tt>
   # (when Current.account.id = 5). Updates to this stream can be sent like
-  # <tt>entry.broadcast_append_to entry.account, :entries, container: "entries"</tt>.
+  # <tt>entry.broadcast_append_to entry.account, :entries, target: "entries"</tt>.
   def turbo_stream_from(*streamables)
     tag.turbo_cable_stream_source channel: "Turbo::StreamsChannel", "signed-stream-name": Turbo::StreamsChannel.signed_stream_name(streamables)
   end

data/lib/turbo/version.rb

@@ -1,3 +1,3 @@
 module Turbo
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotwired/turbo-rails",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.3",
   "description": "The speed of a single-page web application without having to write any JavaScript",
   "module": "app/javascript/turbo/index.js",
   "main": "app/assets/javascripts/turbo.js",
@@ -13,7 +13,7 @@
     "release": "npm publish && git commit -am \"$npm_package_name v$npm_package_version\" && git push"
   },
   "dependencies": {
-    "@hotwired/turbo": "^7.0.0-beta.1",
+    "@hotwired/turbo": "^7.0.0-beta.2",
     "@rails/actioncable": "^6.1.0"
   },
   "devDependencies": {

data/test/streams/streams_channel_test.rb

@@ -33,6 +33,12 @@ class Turbo::StreamsChannelTest < ActionCable::Channel::TestCase
     end
   end
 
+  test "broadcasting append now with empty template" do
+    assert_broadcast_on "stream", %(<turbo-stream action="append" target="message_1"><template></template></turbo-stream>) do
+      Turbo::StreamsChannel.broadcast_append_to "stream", target: "message_1", content: ""
+    end
+  end
+
   test "broadcasting prepend now" do
     assert_broadcast_on "stream", turbo_stream_action_tag("prepend", target: "messages", template: "<p>hello!</p>") do
       Turbo::StreamsChannel.broadcast_prepend_to "stream", target: "messages", partial: "messages/message", locals: { message: "hello!" }

data/yarn.lock

@@ -23,10 +23,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@hotwired/turbo@^7.0.0-beta.1":
-  version "7.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.0.0-beta.1.tgz#0111db8a80a7bb308c4cfdd2720112d06bf25c33"
-  integrity sha512-V7hhELbDkYUGaHw/Yw4tu9pDUT1WE4t3A7tRs7Zh0Uwtk2vaJnmykNZ2uq20BnLjofufA1+MLJZ6AXJ3B/Il5A==
+"@hotwired/turbo@^7.0.0-beta.2":
+  version "7.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.0.0-beta.2.tgz#0f20c1f5b67fe07472a5f1eda2e3f79146324512"
+  integrity sha512-3YyWDaImtkU8MJ+//qV8nmV8KeFInN/nptqwJo1Bl5UjROmixPr3w9tPHyA499Mo1mBJOur8jiXVowbX6VWLUg==
 
 "@rails/actioncable@^6.1.0":
   version "6.1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-30 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails