quilt_rails 3.4.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a6933fd12f6ae25d25f4afab855ba022287ac3c2e353d3b1d1aa2764adb6e40
-  data.tar.gz: 88e908022a12e1ed55bcd8859bc7be736e9d844832ed7df30f81caf3f822c875
+  metadata.gz: e75a3c9179f160afc62c9d7d275913577f1d8f2e639018854e90a823451481ca
+  data.tar.gz: a5979cb7e422567a9f6ab641776fdb59fb9304dd3e6bb83b9313b482798ac427
 SHA512:
-  metadata.gz: b2e02a1233697cb16ef35ec291de7736b3e0721d516bcd566c309c88704e996fc5ce40c3ccb72abc54c6dbf1b2fbe384c41bf333a760e1e889b7ee280331f5ba
-  data.tar.gz: 506bfd185f702ad39e7f6d21713524b002bc90e45e0e1aaed0832d6aee2f5d0d998a104c46b9272ab001040fd1ed49be41a788107cc9c0fea9145697dffb10ff
+  metadata.gz: 9bf77688d4b8e9fd4503e0528318a5b4f3cf6a5fd21d6accc75673a29b65765940ef11c4cdc4896c81de44a95c1f007195229c8a4b5532a87ff53b1119a90c8a
+  data.tar.gz: e42d50020da5d75bd4d6695bcdd7580cf17e339e32d6bc15e85da67c6aa4015aec6293625bfc658781ca3d6671fd820c4a5ad20a29a442bfb483f375041a7a26

data/README.md

@@ -171,7 +171,7 @@ In some cases you may want to send basic data from Rails to your React server. Q
 
 **Note:** The data passed should be data that is unlikely or will never change over the course of the session before they render any React components.
 
-**Note:** Please note the minimal dependencies require to use this feature is listed in [CHANGELOG](./CHANGELOG.md#[1.12.0]-2020-05-07)
+**Note:** Please note the minimal dependencies require to use this feature is listed in [CHANGELOG](./CHANGELOG.md#1.12.0-2020-05-07)
 
 ```ruby
 class ReactController < ApplicationController

data/lib/quilt_rails/configuration.rb

@@ -13,6 +13,7 @@ module Quilt
       self.react_server_protocol = ENV['REACT_SERVER_PROTOCOL'] || "http"
       self.logger                = ::Logger.new($stdout)
       self.mount                 = true
+      self.allow_integration_test = false
     end
 
     def mount?

data/lib/quilt_rails/react_renderable.rb

@@ -7,7 +7,9 @@ module Quilt
     include ReverseProxy::Controller
 
     def render_react(headers: {}, data: {})
-      raise DoNotIntegrationTestError if Rails.env.test?
+      if Rails.env.test? && !Quilt.configuration.allow_integration_test
+        raise DoNotIntegrationTestError
+      end
 
       # Allow concurrent loading to prevent this thread from blocking class
       # loading in controllers called by the Node server.
@@ -20,7 +22,8 @@ module Quilt
 
     def call_proxy(headers, data)
       if defined? ShopifySecurityBase
-        ShopifySecurityBase::HTTPHostRestriction.whitelist([Quilt.configuration.react_server_host]) do
+        allowlist = ShopifySecurityBase::HTTPHostRestriction.respond_to?(:allowlist) ? :allowlist : :whitelist
+        ShopifySecurityBase::HTTPHostRestriction.send(allowlist, [Quilt.configuration.react_server_host]) do
           proxy(headers, data)
         end
       else
@@ -37,9 +40,10 @@ module Quilt
       end
 
       begin
+        data_json = JSON.generate(data.as_json, ascii_only: true)
         reverse_proxy(
           url,
-          headers: headers.merge('X-Request-ID': request.request_id, 'X-Quilt-Data': data.to_json)
+          headers: headers.merge('X-Request-ID': request.request_id, 'X-Quilt-Data': data_json)
         ) do |callbacks|
           callbacks.on_response do |status_code, _response|
             Quilt.logger.info("[ReactRenderable] #{url} returned #{status_code}")
@@ -53,8 +57,8 @@ module Quilt
     class ReactServerNoResponseError < StandardError
       def initialize(url)
         super(<<~MSG.squish)
-          Errno::ECONNREFUSED: Waiting for React server to boot up.
-          If this error persists verify that @shopify/react-server is configured on #{url}"
+          Connection refused while waiting for React server to boot up.
+          If this error persists, verify that @shopify/react-server is configured on #{url}.
         MSG
       end
     end
@@ -62,8 +66,10 @@ module Quilt
     class DoNotIntegrationTestError < StandardError
       def initialize
         super(<<~MSG.squish)
-          Do not try to use Rails integration tests on your quilt_rails app.
-          Instead use Jest and @shopify/react-testing to test your React application directly."
+          Please don't test React views with Ruby.
+          Jest and @shopify/react-testing should be used to test React components.
+
+          If you meant to query your Rails application, please check your integration test for errors.
         MSG
       end
     end

data/lib/quilt_rails/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Quilt
-  VERSION = "3.4.1"
+  VERSION = "3.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quilt_rails
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.2
 platform: ruby
 authors:
 - Mathew Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: A turn-key solution for integrating server-rendered React into your Rails