inertia_rails 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef2ef33ca24036a92d67ec557bab99829468a7f9546422b68a703624bd52489d
-  data.tar.gz: 6beb16df6b7511813b62e42e91fbb7d0a251264b2e802e0e0345b04bd08700ac
+  metadata.gz: 9cd358fa9c397d7899a6d5856840c8a2d3f9d375ebfb080cc8255a7c8fdeb9e6
+  data.tar.gz: 7fbc5d37523fda2f27781b6d39765319d8bb5cba876fd0b5a02af7ea7ece80f5
 SHA512:
-  metadata.gz: 5e2d7527c48047f950207b163fa539b6b4735655d501a573035a782cb623f5973a74789574be6722bbf7bd4088835c5a486d9a8962df02d17473c4c2d42a0012
-  data.tar.gz: 96d8302e0fd851874d14ef2cee34c013278924c9e619d7302a2a66ae2a3c5dbd7c3a5e3a7ee2e01f8849adfbd0f54e65b1661cfeeb27320e8f94b415d8ca5567
+  metadata.gz: d22c0fa1f8ce6f8f069e9dc72705f46f9a4ea7cf02540967aed17dbd8f548e11e096ed85c8f0cd3dd1b0ff28071c18c1687f22b8ec7cc847be355fbbe588930b
+  data.tar.gz: a7bb964c860efa67cd9c3647a38eb981eba239facea5578c6250b3c611ccb727c1691baeefd7357392f81300166d2a475cbda21cf2fa955238ede06ee1bdaa06

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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

data/inertia_rails.gemspec

@@ -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", "~> 13.0"
   spec.add_development_dependency "rspec-rails", "~> 4.0"
-  spec.add_development_dependency "rails"
   spec.add_development_dependency "rails-controller-testing"
   spec.add_development_dependency "sqlite3"
 end

data/lib/inertia_rails/inertia_rails.rb

@@ -1,3 +1,6 @@
+# Needed for `thread_mattr_accessor`
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
+
 module InertiaRails
   thread_mattr_accessor :threadsafe_shared_plain_data
   thread_mattr_accessor :threadsafe_shared_blocks
@@ -36,28 +39,12 @@ module InertiaRails
   private
 
   module Configuration
-    thread_mattr_accessor :threadsafe_layout
-    thread_mattr_accessor :threadsafe_version
+    mattr_accessor(:layout) { 'application' }
+    mattr_accessor(:version) { nil }
 
     def self.evaluated_version
       self.version.respond_to?(:call) ? self.version.call : self.version
     end
-
-    def self.layout
-      self.threadsafe_layout || 'application'
-    end
-
-    def self.layout=(val)
-      self.threadsafe_layout = val
-    end
-
-    def self.version
-      self.threadsafe_version
-    end
-
-    def self.version=(val)
-      self.threadsafe_version = val
-    end
   end
 
   # Getters and setters to provide default values for the threadsafe attributes

data/lib/inertia_rails/version.rb

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

data/lib/patches/debug_exceptions.rb

@@ -11,13 +11,7 @@ if defined?(ActionDispatch::DebugExceptions)
     require 'patches/debug_exceptions/patch-5-1'
   elsif ActionPack.version.to_s >= '5.0'
     require 'patches/debug_exceptions/patch-5-0'
-  elsif ActionPack.version.to_s >= '4.2'
-    require 'patches/debug_exceptions/patch-4-2'
-  elsif ActionPack.version.to_s >= '4.1'
-    require 'patches/debug_exceptions/patch-4-1'
   else
-    # No patch required, because text rendering for
-    # XHR requests was introduced with Rails 4.1:
-    # https://github.com/rails/rails/pull/11960
+    # This gem supports Rails 5 or later
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Brian Knoles
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -54,20 +68,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -128,8 +128,6 @@ files:
 - lib/inertia_rails/version.rb
 - lib/patches/better_errors.rb
 - lib/patches/debug_exceptions.rb
-- lib/patches/debug_exceptions/patch-4-1.rb
-- lib/patches/debug_exceptions/patch-4-2.rb
 - lib/patches/debug_exceptions/patch-5-0.rb
 - lib/patches/debug_exceptions/patch-5-1.rb
 - lib/patches/request.rb

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

@@ -1,41 +0,0 @@
-# Patch ActionDispatch::DebugExceptions to render HTML for Inertia requests
-#
-# Original source:
-# https://github.com/rails/rails/blob/4-1-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
-#
-
-ActionDispatch::DebugExceptions.class_eval do
-  prepend(InertiaDebugExceptions = Module.new do
-    def render_exception(env, exception)
-      wrapper = ExceptionWrapper.new(env, exception)
-      log_error(env, wrapper)
-
-      if env['action_dispatch.show_detailed_exceptions']
-        request = Request.new(env)
-        template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
-          request: request,
-          exception: wrapper.exception,
-          application_trace: wrapper.application_trace,
-          framework_trace: wrapper.framework_trace,
-          full_trace: wrapper.full_trace,
-          routes_inspector: routes_inspector(exception),
-          source_extract: wrapper.source_extract,
-          line_number: wrapper.line_number,
-          file: wrapper.file
-        )
-        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)
-      else
-        raise exception
-      end
-    end
-  end)
-end

data/lib/patches/debug_exceptions/patch-4-2.rb

@@ -1,52 +0,0 @@
-# Patch ActionDispatch::DebugExceptions to render HTML for Inertia requests
-#
-# Original source:
-# https://github.com/rails/rails/blob/4-2-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
-#
-
-ActionDispatch::DebugExceptions.class_eval do
-  prepend(InertiaDebugExceptions = Module.new do
-    def render_exception(env, exception)
-      wrapper = ExceptionWrapper.new(env, exception)
-      log_error(env, wrapper)
-
-      if env['action_dispatch.show_detailed_exceptions']
-        request = Request.new(env)
-        traces = wrapper.traces
-
-        trace_to_show = 'Application Trace'
-        if traces[trace_to_show].empty? && wrapper.rescue_template != 'routing_error'
-          trace_to_show = 'Full Trace'
-        end
-
-        if source_to_show = traces[trace_to_show].first
-          source_to_show_id = source_to_show[:id]
-        end
-
-        template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
-          request: request,
-          exception: wrapper.exception,
-          traces: traces,
-          show_source_idx: source_to_show_id,
-          trace_to_show: trace_to_show,
-          routes_inspector: routes_inspector(exception),
-          source_extracts: wrapper.source_extracts,
-          line_number: wrapper.line_number,
-          file: wrapper.file
-        )
-        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)
-      else
-        raise exception
-      end
-    end
-  end)
-end