quilt_rails 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 368430de6c7c02cfc1a3c569997ca045cbd08afe6a463143740adf0c3d8c3989
-  data.tar.gz: c0e39d8dd544865e466ea919fe3414c722411c0d0f91757a82abac333fb17f2a
+  metadata.gz: 16eb5798cc8dd719437110f06bb5cff4dc1bea6c79e1a9a49eedbba0b0ebd303
+  data.tar.gz: d2c9d7ab124b18b6535b57888f3fa5319913554a812e6f074a92eab962cd2f6d
 SHA512:
-  metadata.gz: 65fec4f054fd578870567e4528ebd6b5e335877db8096d6af27775869a2fd7ecce8547ed6f0104c6e542cc58bb00ed98a2148a915198d4512f5eb769f2d023f8
-  data.tar.gz: c17031bff1b39d21b771e062dbdc5745e78b937a21989b444ca46d68cee1d6ead8b7b00e8b2c0131b6f0d656fa8fed962a37241e3c244f05716e7a19b4eb1c36
+  metadata.gz: 0a032e43ca617b448cc77f7676a287a19259fed5a41fc4e2ccefa8730c5210f878bdb9bc59183fc0200df1593a42d63147158dedf1683a4db215af739ec18c11
+  data.tar.gz: 3d94f79c24568c45075d658e79428acd08c8fd7f15ccb1efd979767fdff97a1adedd637c4e04b50a31615934642d2d118093ee6f7ce8d32d1fba033a13b7a4af

data/Rakefile

@@ -24,3 +24,5 @@ Rake::TestTask.new do |t|
   t.name = 'test:unit'
   t.pattern = 'test/quilt_rails/**/*_test.rb'
 end
+
+task(default: %i(test))

data/app/controllers/quilt/performance_report_controller.rb

@@ -8,9 +8,9 @@ module Quilt
     def create
       process_report
 
-      render json: { result: 'success' }, status: 200
+      render(json: { result: 'success' }, status: 200)
     rescue ActionController::ParameterMissing => error
-      render json: { error: error.message, status: 422 }
+      render(json: { error: error.message, status: 422 })
     end
   end
 end

data/lib/generators/quilt/rails_setup/rails_setup_generator.rb

@@ -12,7 +12,7 @@ module Quilt
       if File.exist?(procfile_path)
         append_file(procfile_path, File.read(File.expand_path(find_in_source_paths(procfile_path))))
       else
-        copy_file procfile_path
+        copy_file(procfile_path)
       end
     end
 
@@ -20,12 +20,12 @@ module Quilt
       routes_path = "config/routes.rb"
 
       if File.exist?(routes_path)
-        route "mount Quilt::Engine, at: '/'"
+        route("mount Quilt::Engine, at: '/'")
       else
-        copy_file "routes.rb", routes_path
+        copy_file("routes.rb", routes_path)
       end
 
-      say "Added Quilt engine mount"
+      say("Added Quilt engine mount")
     end
   end
 end

data/lib/generators/quilt/react_setup/react_setup_generator.rb

@@ -10,7 +10,7 @@ module Quilt
     def install_js_dependencies
       return if options.skip_yarn?
 
-      say "Installing react and types dependencies"
+      say("Installing react and types dependencies")
       system("yarn add "\
         "typescript@~3.8.0 "\
         "react@~16.11.0 "\

data/lib/quilt_rails.rb

@@ -3,11 +3,12 @@ module Quilt
 end
 
 require "quilt_rails/version"
-require "quilt_rails/engine"
 require "quilt_rails/logger"
 require "quilt_rails/configuration"
 require "quilt_rails/react_renderable"
 require "quilt_rails/performance"
 require "quilt_rails/trusted_ui_server_csrf_strategy"
 require "quilt_rails/header_csrf_strategy"
+
+require "quilt_rails/engine"
 require "quilt_rails/monkey_patches/active_support_reloader" if Rails.env.development?

data/lib/quilt_rails/configuration.rb

@@ -1,15 +1,21 @@
 # frozen_string_literal: true
 
-module Quilt
-  class Configuration
-    attr_accessor :react_server_host, :react_server_protocol
+require "active_support/ordered_options"
 
+module Quilt
+  class Configuration < ActiveSupport::OrderedOptions
     def initialize
-      ip = ENV['REACT_SERVER_IP'] || 'localhost'
-      port = ENV['REACT_SERVER_PORT'] || 8081
+      super
+      react_server_ip   = ENV['REACT_SERVER_IP'] || "localhost"
+      react_server_port = ENV['REACT_SERVER_PORT'] || 8081
+
+      self.react_server_host     = "#{react_server_ip}:#{react_server_port}"
+      self.react_server_protocol = ENV['REACT_SERVER_PROTOCOL'] || "http"
+      self.mount                 = true
+    end
 
-      @react_server_host = "#{ip}:#{port}"
-      @react_server_protocol = ENV['REACT_SERVER_PROTOCOL'] || 'http'
+    def mount?
+      mount
     end
   end
 

data/lib/quilt_rails/engine.rb

@@ -4,9 +4,13 @@ module Quilt
   class Engine < ::Rails::Engine
     isolate_namespace Quilt
 
+    config.quilt = Quilt.configuration
+
     initializer(:mount_quilt, before: :add_builtin_route) do |app|
-      app.routes.append do
-        mount(Quilt::Engine, at: '/') unless has_named_route?(:quilt)
+      if config.quilt.mount?
+        app.routes.append do
+          mount(Quilt::Engine, at: '/') unless has_named_route?(:quilt)
+        end
       end
     end
   end

data/lib/quilt_rails/header_csrf_strategy.rb

@@ -25,9 +25,10 @@ module Quilt
 
     class NoSameSiteHeaderError < StandardError
       def initialize
-        # rubocop:disable LineLength
-        super "CSRF verification failed. This request is missing the `x-shopify-react-xhr` header, or it does not have the expected value."
-        # rubocop:enable LineLength
+        super(<<~MSG.squish)
+          CSRF verification failed. This request is missing the
+          `x-shopify-react-xhr` header, or it does not have the expected value.
+        MSG
       end
     end
   end

data/lib/quilt_rails/performance/report.rb

@@ -7,25 +7,39 @@ module Quilt
       attr_accessor :navigations
       attr_accessor :connection
 
-      def self.from_params(params)
-        params.transform_keys! { |key| key.underscore.to_sym }
-        params[:connection] = { effectiveType: 'unknown' } if params[:connection].blank?
+      class << self
+        def from_params(params)
+          params.transform_keys! { |key| key.underscore.to_sym }
+          params[:connection] = { effectiveType: 'unknown' } if params[:connection].blank?
 
-        connection = Connection.from_params(params[:connection])
+          connection = Connection.from_params(params[:connection])
 
-        Report.new(
-          connection: connection,
-          navigations: (params[:navigations] || []).map do |navigation|
+          Report.new(
+            connection: connection,
+            navigations: build_navigations(params[:navigations], connection: connection),
+            events: build_events(params[:events], connection: connection),
+          )
+        end
+
+        private
+
+        def build_navigations(navigations_params, connection:)
+          navigations_params ||= []
+          navigations_params.map do |navigation|
             navigation = Navigation.from_params(navigation)
             navigation.connection = connection
             navigation
-          end,
-          events: (params[:events] || []).map do |event|
+          end
+        end
+
+        def build_events(events_params, connection:)
+          events_params ||= []
+          events_params.map do |event|
             event = Event.from_params(event)
             event.connection = connection
             event
-          end,
-        )
+          end
+        end
       end
 
       def initialize(events:, navigations:, connection:)

data/lib/quilt_rails/react_renderable.rb

@@ -52,17 +52,19 @@ module Quilt
 
     class ReactServerNoResponseError < StandardError
       def initialize(url)
-        # rubocop:disable LineLength
-        super "Errno::ECONNREFUSED: Waiting for React server to boot up. If this error persists verify that @shopify/react-server is configured on #{url}"
-        # rubocop:enable LineLength
+        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}"
+        MSG
       end
     end
 
     class DoNotIntegrationTestError < StandardError
       def initialize
-        # rubocop:disable LineLength
-        super "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."
-        # rubocop:enable LineLength
+        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."
+        MSG
       end
     end
   end

data/lib/quilt_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quilt_rails
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Mathew Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties