inertia_rails 1.2.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85021602526f07e26abfe34c9fec6e2a6e7dfd30723c5a95691c5973a28960cc
-  data.tar.gz: 8e57db120b7b33f1205b06793baf7c6dfce435f006b70ab8b6f9a9a3b6d48921
+  metadata.gz: 9cd358fa9c397d7899a6d5856840c8a2d3f9d375ebfb080cc8255a7c8fdeb9e6
+  data.tar.gz: 7fbc5d37523fda2f27781b6d39765319d8bb5cba876fd0b5a02af7ea7ece80f5
 SHA512:
-  metadata.gz: 7f4c8715da18542911ef0dea66e97935b8c3322d28d497c655ef62b2372394f4c4eb392dbdafafd5212c0e6fb2e92eb8980e444223de84f888673e32057780a7
-  data.tar.gz: c23988c55e8ce4b454bfdfe77b8c7f6e31e0fa6fe0260aa11f73e8051f5e0673828ff4b91ce26184b85b85891698d0bfbd067433a9e0e062f95fe2a43a1ff4dd
+  metadata.gz: d22c0fa1f8ce6f8f069e9dc72705f46f9a4ea7cf02540967aed17dbd8f548e11e096ed85c8f0cd3dd1b0ff28071c18c1687f22b8ec7cc847be355fbbe588930b
+  data.tar.gz: a7bb964c860efa67cd9c3647a38eb981eba239facea5578c6250b3c611ccb727c1691baeefd7357392f81300166d2a475cbda21cf2fa955238ede06ee1bdaa06

data/.github/workflows/push.yml

@@ -1,21 +1,27 @@
 name: Testing
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.6, 2.7]
+
     runs-on: ubuntu-latest
+    name: Test against Ruby ${{ matrix.ruby }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Setup System
         run: sudo apt-get install libsqlite3-dev
 
-      - name: Set up Ruby 2.6
-        uses: actions/setup-ruby@v1
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
+          ruby-version: ${{ matrix.ruby }}
 
       - name: Install gems
         run: |

data/CHANGELOG.md

@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.1] - 2020-08-06
+
+* Fixed a bug involving threadsafe versions and layouts
+
+## [1.4.0] - 2020-07-09
+
+* Fixed Ruby 2.7 deprecation warnings
+* Added `inertia_partial?` method
+* Fixed homepage in the gemspec
+* Make the InertiaRails module data threadsafe
+
+## [1.3.1] - 2020-02-20
+
+* Fix a typo in the README (inertia only has 1 t!)
+
+## [1.3.0] - 2020-01-28
+
+### Added
+
+* Added request.inertia? method
+
+## [1.2.2] - 2020-01-21
+
+### Fixed
+
+* Added patches to allow Rails errors to show properly in the inertia modal
+* Fixed a middleware issue caused by a breaking change in Rack v2.1.*
+
 ## [1.2.1] - 2019-12-6
 
 ### Fixed

data/README.md

@@ -6,7 +6,7 @@ Visit [inertiajs.com](https://inertiajs.com/) to learn more.
 
 The initial version of the gem was named `inertia`; however, that name was not available on Rubygems. 
 
-The 1.0.0 version release on Rubygems is `intertia_rails`.
+The 1.0.0 version release on Rubygems is `inertia_rails`.
 
 The changes required are:
 

data/inertia_rails.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["brain@bellawatt.com", "brandon@bellawatt.com", "eugene@bellawatt.com"]
 
   spec.summary       = %q{Inertia adapter for Rails}
-  spec.homepage      = "https://github.com/inertiajs/inertia-rails/"
+  spec.homepage      = "https://github.com/inertiajs/inertia-rails"
   spec.license       = "MIT"
 
   spec.metadata["homepage_uri"] = spec.homepage
@@ -25,10 +25,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "rails", '>= 5'
+
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec-rails", "~> 3.0"
-  spec.add_development_dependency "rails"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec-rails", "~> 4.0"
   spec.add_development_dependency "rails-controller-testing"
   spec.add_development_dependency "sqlite3"
 end

data/lib/inertia_rails.rb

@@ -1,6 +1,10 @@
 require 'inertia_rails/renderer'
 require 'inertia_rails/engine'
 
+require 'patches/debug_exceptions'
+require 'patches/better_errors'
+require 'patches/request'
+
 ActionController::Renderers.add :inertia do |component, options|
   InertiaRails::Renderer.new(
     component,

data/lib/inertia_rails/controller.rb

@@ -7,7 +7,7 @@ module InertiaRails
     module ClassMethods
       def inertia_share(**args, &block)
         before_action do
-          InertiaRails.share(args) if args
+          InertiaRails.share(**args) if args
           InertiaRails.share_block(block) if block
         end
       end

data/lib/inertia_rails/inertia_rails.rb

@@ -1,6 +1,9 @@
+# Needed for `thread_mattr_accessor`
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
+
 module InertiaRails
-  mattr_accessor(:shared_plain_data) { Hash.new }
-  mattr_accessor(:shared_blocks) { [] }
+  thread_mattr_accessor :threadsafe_shared_plain_data
+  thread_mattr_accessor :threadsafe_shared_blocks
 
   def self.configure
     yield(Configuration)
@@ -21,11 +24,11 @@ module InertiaRails
 
   # "Setters"
   def self.share(**args)
-    shared_plain_data.merge!(args)
+    self.shared_plain_data = self.shared_plain_data.merge(args)
   end
 
   def self.share_block(block)
-    shared_blocks.push(block)
+    self.shared_blocks = self.shared_blocks + [block]
   end
 
   def self.reset!
@@ -44,6 +47,23 @@ module InertiaRails
     end
   end
 
+  # Getters and setters to provide default values for the threadsafe attributes
+  def self.shared_plain_data
+    self.threadsafe_shared_plain_data || {}
+  end
+
+  def self.shared_plain_data=(val)
+    self.threadsafe_shared_plain_data = val
+  end
+
+  def self.shared_blocks
+    self.threadsafe_shared_blocks || []
+  end
+
+  def self.shared_blocks=(val)
+    self.threadsafe_shared_blocks = val
+  end
+
   def self.evaluated_blocks(controller,  blocks)
     blocks.flat_map { |block| controller.instance_exec(&block) }.reduce(&:merge) || {}
   end

data/lib/inertia_rails/middleware.rb

@@ -40,7 +40,7 @@ module InertiaRails
   
     def force_refresh(request)
       request.flash.keep
-      Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url})
+      Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url}).finish
     end
   end
 end

data/lib/inertia_rails/rspec.rb

@@ -61,7 +61,7 @@ RSpec.configure do |config|
   config.before(:each, inertia: true) do
     new_renderer = InertiaRails::Renderer.method(:new)
     allow(InertiaRails::Renderer).to receive(:new) do |component, controller, request, response, render, named_args|
-      new_renderer.call(component, controller, request, response, inertia_wrap_render(render), named_args)
+      new_renderer.call(component, controller, request, response, inertia_wrap_render(render), **named_args)
     end
   end
 end

data/lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "1.2.1"
+  VERSION = "1.4.1"
 end

data/lib/patches/better_errors.rb

@@ -0,0 +1,17 @@
+# Patch BetterErrors::Middleware to render HTML for Inertia requests
+#
+# Original source:
+# https://github.com/BetterErrors/better_errors/blob/v2.5.1/lib/better_errors/middleware.rb
+#
+
+if defined?(BetterErrors)
+  BetterErrors::Middleware.class_eval do
+    prepend(InertiaBetterErrors = Module.new do
+      def text?(env)
+        return false if env["HTTP_X_INERTIA"]
+
+        super
+      end
+    end)
+  end
+end

data/lib/patches/debug_exceptions.rb

@@ -0,0 +1,17 @@
+# Patch ActionDispatch::DebugExceptions to render HTML for Inertia requests
+#
+# Rails has introduced text rendering for XHR requests with Rails 4.1 and
+# changed the implementation in 4.2, 5.0 and 5.1 (unchanged since then).
+#
+# The original source needs to be patched, so that Inertia requests are
+# NOT responded with plain text, but with HTML.
+
+if defined?(ActionDispatch::DebugExceptions)
+  if ActionPack.version.to_s >= '5.1'
+    require 'patches/debug_exceptions/patch-5-1'
+  elsif ActionPack.version.to_s >= '5.0'
+    require 'patches/debug_exceptions/patch-5-0'
+  else
+    # This gem supports Rails 5 or later
+  end
+end

data/lib/patches/debug_exceptions/patch-5-0.rb

@@ -0,0 +1,23 @@
+# Patch ActionDispatch::DebugExceptions to render HTML for Inertia requests
+#
+# Original source:
+# https://github.com/rails/rails/blob/5-0-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+#
+
+ActionDispatch::DebugExceptions.class_eval do
+  prepend(InertiaDebugExceptions = Module.new do
+    def render_for_default_application(request, wrapper)
+      template = create_template(request, wrapper)
+      file = "rescues/#{wrapper.rescue_template}"
+
+      if request.xhr? && !request.headers['X-Inertia'] # <<<< this line is changed only
+        body = template.render(template: file, layout: false, formats: [:text])
+        format = "text/plain"
+      else
+        body = template.render(template: file, layout: 'rescues/layout')
+        format = "text/html"
+      end
+      render(wrapper.status_code, body, format)
+    end
+  end)
+end

data/lib/patches/debug_exceptions/patch-5-1.rb

@@ -0,0 +1,26 @@
+# Patch ActionDispatch::DebugExceptions to render HTML for Inertia requests
+#
+# Original source (unchanged since Rails 5.1):
+# https://github.com/rails/rails/blob/5-1-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+# https://github.com/rails/rails/blob/5-2-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+# https://github.com/rails/rails/blob/6-0-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+#
+
+ActionDispatch::DebugExceptions.class_eval do
+  prepend(InertiaDebugExceptions = Module.new do
+    def render_for_browser_request(request, wrapper)
+      template = create_template(request, wrapper)
+      file = "rescues/#{wrapper.rescue_template}"
+
+      if request.xhr? && !request.headers['X-Inertia'] # <<<< this line is changed only
+        body = template.render(template: file, layout: false, formats: [:text])
+        format = "text/plain"
+      else
+        body = template.render(template: file, layout: "rescues/layout")
+        format = "text/html"
+      end
+
+      render(wrapper.status_code, body, format)
+    end
+  end)
+end

data/lib/patches/request.rb

@@ -0,0 +1,9 @@
+ActionDispatch::Request.class_eval do
+  def inertia?
+    key? 'HTTP_X_INERTIA'
+  end
+
+  def inertia_partial?
+    key? 'HTTP_X_INERTIA_PARTIAL_DATA'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Brian Knoles
@@ -10,64 +10,64 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -126,13 +126,18 @@ files:
 - lib/inertia_rails/renderer.rb
 - lib/inertia_rails/rspec.rb
 - lib/inertia_rails/version.rb
-homepage: https://github.com/inertiajs/inertia-rails/
+- lib/patches/better_errors.rb
+- lib/patches/debug_exceptions.rb
+- lib/patches/debug_exceptions/patch-5-0.rb
+- lib/patches/debug_exceptions/patch-5-1.rb
+- lib/patches/request.rb
+homepage: https://github.com/inertiajs/inertia-rails
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/inertiajs/inertia-rails/
-  source_code_uri: https://github.com/inertiajs/inertia-rails/
-  changelog_uri: https://github.com/inertiajs/inertia-rails//CHANGELOG.md
+  homepage_uri: https://github.com/inertiajs/inertia-rails
+  source_code_uri: https://github.com/inertiajs/inertia-rails
+  changelog_uri: https://github.com/inertiajs/inertia-rails/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: