requestjs-rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9916bd029b2135b5211b19d728b8f046ac451c69796b25aaf97e5cf003a90ca
-  data.tar.gz: 6ff947cb98c9692d7da177fcb99a3c2b5cc9804c7cb34b78265a1bd532077345
+  metadata.gz: 7197ad0ee10519041959da9d8bb15c46ca0cf8d9beaecfab20c622860f958986
+  data.tar.gz: cc9609ff3a0a1a734ca9e5fc730f8817827340cbefbe7fb3173377fd651e540e
 SHA512:
-  metadata.gz: 986c4734b1ce9a324dace368d029a4bb5dea55dfe9a00265cdb0ffd29aa0a53b235cf4d0b37a3110bee1795b4116aa3667cb5ffe47354bc46ee25f44496e1983
-  data.tar.gz: 96238d856e7b6ae9c1c27495a1ab842ca51115642dedef49895e9d87fa46376c0892daa05f79b412f202332774b7ead4bdae2a729505d618eef75e18ac7b38da
+  metadata.gz: 24cd14d2019382171aa3b90432ce64b1eae3b480c185971ba5ed296c3e13ad83e2e2204ee0295dacfe3ff0662cf46c8e041ae8611ef1db388f36611a41a077a4
+  data.tar.gz: db70051cd27a70fc4267e120c3856ec867c0a0d7be59036cec43384d89238a899dbd21ab9a86c1f04bfd43b2311c7578d8f399c943e089e6bb086ca121629b3f

data/README.md

@@ -10,7 +10,7 @@
 
 If using the asset pipeline to manage JavaScript, the last command will:
 
-- Append import "@rails/request.js" to your app/assets/javascripts/application.js entrypoint.
+- Append `import "@rails/request.js"` to your `app/assets/javascripts/application.js` entrypoint.
 
 Make sure you've already installed `importmap-rails` and that it's referenced before `requestjs-rails` in your Gemfile.
 
@@ -24,4 +24,4 @@ With the installation done check the documentation in the [Rails Request.JS](htt
 
 ## License
 
-Request.JS for Rails is released under the [MIT License](https://opensource.org/licenses/MIT).
+Request.JS for Rails is released under the [MIT License](https://opensource.org/licenses/MIT).

data/app/assets/javascripts/requestjs.js

@@ -14,6 +14,9 @@ class FetchResponse {
   get unauthenticated() {
     return this.statusCode === 401;
   }
+  get unprocessableEntity() {
+    return this.statusCode === 422;
+  }
   get authenticationURL() {
     return this.response.headers.get("WWW-Authenticate");
   }
@@ -31,7 +34,7 @@ class FetchResponse {
     return Promise.reject(new Error(`Expected an HTML response but got "${this.contentType}" instead`));
   }
   get json() {
-    if (this.contentType.match(/^application\/json/)) {
+    if (this.contentType.match(/^application\/.*json$/)) {
       return this.responseJson || (this.responseJson = this.response.json());
     }
     return Promise.reject(new Error(`Expected a JSON response but got "${this.contentType}" instead`));
@@ -45,7 +48,7 @@ class FetchResponse {
   async renderTurboStream() {
     if (this.isTurboStream) {
       if (window.Turbo) {
-        window.Turbo.renderStreamMessage(await this.text);
+        await window.Turbo.renderStreamMessage(await this.text);
       } else {
         console.warn("You must set `window.Turbo = Turbo` to automatically process Turbo Stream events with request.js");
       }
@@ -115,7 +118,7 @@ class FetchRequest {
   constructor(method, url, options = {}) {
     this.method = method;
     this.options = options;
-    this.originalUrl = url;
+    this.originalUrl = url.toString();
   }
   async perform() {
     try {
@@ -131,7 +134,7 @@ class FetchRequest {
       return Promise.reject(window.location.href = response.authenticationURL);
     }
     if (response.ok && response.isTurboStream) {
-      response.renderTurboStream();
+      await response.renderTurboStream();
     }
     return response;
   }
@@ -180,7 +183,7 @@ class FetchRequest {
       return "text/vnd.turbo-stream.html, text/html, application/xhtml+xml";
 
      case "json":
-      return "application/json";
+      return "application/json, application/vnd.api+json";
 
      default:
       return "*/*";
@@ -205,7 +208,7 @@ class FetchRequest {
     return query.length > 0 ? `?${query}` : "";
   }
   get url() {
-    return this.originalUrl.split("?")[0] + this.query;
+    return this.originalUrl.split("?")[0].split("#")[0] + this.query;
   }
   get responseKind() {
     return this.options.responseKind || "html";

data/lib/install/requestjs_with_asset_pipeline.rb

@@ -1,4 +1,7 @@
 APP_JS_ROOT = Rails.root.join("app/assets/javascripts")
+APP_JS_PATH = APP_JS_ROOT.exist? ? APP_JS_ROOT : Rails.root.join("app/javascript")
 
-say "Import Request.JS in existing app/assets/javascripts/application.js"
-append_to_file APP_JS_ROOT.join("application.js"), %(import "@rails/request.js"\n)
+create_file Rails.root.join("app/javascript/application.js") unless APP_JS_PATH.exist?
+
+say "Import Request.JS in existing #{APP_JS_PATH}"
+append_to_file APP_JS_PATH.join("application.js"), %(import "@rails/request.js"\n)

data/lib/requestjs/engine.rb

@@ -7,9 +7,9 @@ module Requestjs
     end
 
     initializer "requestjs.importmap" do
-      if Rails.application.config.respond_to?(:importmap)
-        Rails.application.config.importmap.paths.tap do |paths|
-          paths.asset "@rails/request.js", path: "rails-requestjs"
+      if Rails.application.respond_to?(:importmap)
+        Rails.application.importmap.draw do
+          pin "@rails/request.js", to: "rails-requestjs"
         end
       end
     end

data/lib/requestjs/version.rb

@@ -1,3 +1,3 @@
 module Requestjs
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requestjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Marcelo Lauxen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails