inertia_rails 1.11.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7912624c7ea6f1c71a896b969b704d8ff329ee41a3d1bc7277c28900b35a6516
-  data.tar.gz: 30098f0f5dd3cf41987cd40f139a12259d5501375b85685ab0d427c0e69d230e
+  metadata.gz: 168a95bf6f07afa800c4886e447a035e765a5d7247b0ba2341c9c9b700a46ef9
+  data.tar.gz: ff006c26b44dff8e5f6f2d0e0477a2af6322958d1ea55dd65da7bb19e79be14a
 SHA512:
-  metadata.gz: a97f62fa00d4489ff8364e6b4f9914161a1394905e5830526ba0baa9ae6888ee933a4e7739e18aeb6969f470989fb4aba9031cb62f57b68ed89065ff433d4e54
-  data.tar.gz: e9d7b942b9e1b7f4cdb98e9941143b0e08501586266aac08390a510126233ffeca8328e75e9b0f63aea49d1d19820d02b97e65af0fb178bb822c8bf63ad9925c
+  metadata.gz: 9d1afe94e402b67a10836b1508b55c14c18891dc132dd4cc9d548d759f5097855e685e76c733709bafb0eb42a88142fae9f282074122f820d5b44e039b952d88
+  data.tar.gz: 9c98cb05d7b30919073788cc7ee81ebd8d72b623a24e67d9c3c3e5d0d3cab71ec870e9c457fc1ce30508c72869b1182bd749cb4fa54d21470049b706cefd1ed0

data/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.12.1] - 2022-05-09
+
+* Allow inertia to take over after initial pageload when using ssr. Thanks @99monkey!
+
+## [1.12.0] - 2022-05-04
+
+* SSR!
+
+## [1.11.1] - 2021-06-27
+
+* Fixed thread safety in the middleware. Thanks @caifara!
+
 ## [1.11.0] - 2021-03-23
 
 * Fixed the install generator. `installable?` was always returning false, preventing it from actually running.

data/README.md

@@ -1,14 +1,10 @@
-# Inertia.js Rails Adapter
-
-Visit [inertiajs.com](https://inertiajs.com/) to learn more.
+![image](https://user-images.githubusercontent.com/6599653/114456558-032e2200-9bab-11eb-88bc-a19897f417ba.png)
 
-# Note to pre Rubygems release users
 
-The initial version of the gem was named `inertia`; however, that name was not available on Rubygems. 
+# Inertia.js Rails Adapter
 
-The 1.0.0 version release on Rubygems is `inertia_rails`.
+Visit [inertiajs.com](https://inertiajs.com/) for installation instructions, documentation, and to learn more.
 
-The changes required are:
+*Maintained and sponsored by the team at [bellaWatt](https://bellawatt.com/)*
 
-1. Use `gem 'inertia_rails'` in your Gemfile (or `gem install inertia_rails`)
-2. Change any `Inertia.configure` calls to `InertiaRails.configure`
+[![bellaWatt Logo](https://user-images.githubusercontent.com/6599653/114456832-5607d980-9bab-11eb-99c8-ab39867c384e.png)](https://bellawatt.com/)

data/lib/generators/inertia_rails/install/svelte/InertiaExample.svelte

@@ -0,0 +1,11 @@
+<script>
+  export let name;
+</script>
+
+<style>
+  h1 { font-family: sans-serif; text-align: center; }
+</style>
+
+<h1>
+  Hello {name}!
+</h1>

data/lib/generators/inertia_rails/install/svelte/inertia.js

@@ -0,0 +1,19 @@
+import axios from 'axios'
+
+import { createInertiaApp } from '@inertiajs/inertia-svelte'
+import { InertiaProgress } from '@inertiajs/progress'
+
+document.addEventListener('DOMContentLoaded', () => {
+  const csrfToken = document.querySelector('meta[name=csrf-token]').content
+  axios.defaults.headers.common['X-CSRF-Token'] = csrfToken
+
+  InertiaProgress.init()
+
+  createInertiaApp({
+    id: 'app',
+    resolve: name => import(`../Pages/${name}.svelte`),
+    setup({ el, App, props }) {
+      new App({ target: el, props })
+    },
+  })
+})

data/lib/generators/inertia_rails/install_generator.rb

@@ -6,6 +6,7 @@ module InertiaRails
     FRONT_END_INSTALLERS = [
       'react',
       'vue',
+      'svelte',
     ]
 
     def install
@@ -70,5 +71,14 @@ module InertiaRails
       template "vue/inertia.js", Rails.root.join("app/javascript/packs/inertia.js").to_s
       say "done!", :green
     end
+
+    def install_svelte!
+      say "Creating a Svelte page component...", :blue
+      run 'yarn add @inertiajs/inertia-svelte'
+      template "svelte/InertiaExample.svelte", Rails.root.join("app/javascript/Pages/InertiaExample.svelte").to_s
+      say "Copying inertia.js into webpacker's packs folder...", :blue
+      template "svelte/inertia.js", Rails.root.join("app/javascript/packs/inertia.js").to_s
+      say "done!", :green
+    end
   end
 end

data/lib/inertia_rails/controller.rb

@@ -1,4 +1,5 @@
 require_relative "inertia_rails"
+require_relative "helper"
 
 module InertiaRails
   module Controller
@@ -9,6 +10,7 @@ module InertiaRails
         # :inertia_errors are deleted from the session by the middleware
         InertiaRails.share(errors: session[:inertia_errors]) if session[:inertia_errors].present?
       end
+      helper ::InertiaRails::Helper
     end
 
     module ClassMethods

data/lib/inertia_rails/helper.rb

@@ -0,0 +1,7 @@
+require_relative 'inertia_rails'
+
+module InertiaRails::Helper
+  def inertia_headers
+    ::InertiaRails.html_headers.join.html_safe
+  end
+end

data/lib/inertia_rails/inertia_rails.rb

@@ -5,6 +5,7 @@ require 'inertia_rails/lazy'
 module InertiaRails
   thread_mattr_accessor :threadsafe_shared_plain_data
   thread_mattr_accessor :threadsafe_shared_blocks
+  thread_mattr_accessor :threadsafe_html_headers
 
   def self.configure
     yield(Configuration)
@@ -23,6 +24,18 @@ module InertiaRails
     Configuration.layout
   end
 
+  def self.ssr_enabled?
+    Configuration.ssr_enabled
+  end
+
+  def self.ssr_url
+    Configuration.ssr_url
+  end
+
+  def self.html_headers
+    self.threadsafe_html_headers || []
+  end
+
   # "Setters"
   def self.share(**args)
     self.shared_plain_data = self.shared_plain_data.merge(args)
@@ -32,9 +45,14 @@ module InertiaRails
     self.shared_blocks = self.shared_blocks + [block]
   end
 
+  def self.html_headers=(headers)
+    self.threadsafe_html_headers = headers
+  end
+
   def self.reset!
     self.shared_plain_data = {}
     self.shared_blocks = []
+    self.html_headers = []
   end
 
   def self.lazy(value = nil, &block)
@@ -46,6 +64,8 @@ module InertiaRails
   module Configuration
     mattr_accessor(:layout) { 'application' }
     mattr_accessor(:version) { nil }
+    mattr_accessor(:ssr_enabled) { false }
+    mattr_accessor(:ssr_url) { 'http://localhost:13714' }
 
     def self.evaluated_version
       self.version.respond_to?(:call) ? self.version.call : self.version

data/lib/inertia_rails/middleware.rb

@@ -5,79 +5,91 @@ module InertiaRails
     end
 
     def call(env)
-      @env = env
+      InertiaRailsRequest.new(@app, env)
+                         .response
+    end
 
-      status, headers, body = @app.call(env)
-      request = ActionDispatch::Request.new(env)
+    class InertiaRailsRequest
+      def initialize(app, env)
+        @app = app
+        @env = env
+      end
 
-      ::InertiaRails.reset!
+      def response
+        status, headers, body = @app.call(@env)
+        request = ActionDispatch::Request.new(@env)
 
-      # Inertia errors are added to the session via redirect_to 
-      request.session.delete(:inertia_errors) unless keep_inertia_errors?(status)
+        ::InertiaRails.reset!
 
-      status = 303 if inertia_non_post_redirect?(status)
+        # Inertia errors are added to the session via redirect_to 
+        request.session.delete(:inertia_errors) unless keep_inertia_errors?(status)
 
-      return stale_inertia_get? ? force_refresh(request) : [status, headers, body]
-    end
+        status = 303 if inertia_non_post_redirect?(status)
 
-    private
+        stale_inertia_get? ? force_refresh(request) : [status, headers, body]
+      end
 
-    def keep_inertia_errors?(status)
-      redirect_status?(status) || stale_inertia_request?
-    end
+      private
 
-    def stale_inertia_request?
-      inertia_request? && version_stale?
-    end
+      def keep_inertia_errors?(status)
+        redirect_status?(status) || stale_inertia_request?
+      end
 
-    def redirect_status?(status)
-      [301, 302].include? status
-    end
+      def stale_inertia_request?
+        inertia_request? && version_stale?
+      end
 
-    def non_get_redirectable_method?
-      ['PUT', 'PATCH', 'DELETE'].include? request_method
-    end
+      def redirect_status?(status)
+        [301, 302].include? status
+      end
 
-    def inertia_non_post_redirect?(status)
-      inertia_request? && redirect_status?(status) && non_get_redirectable_method?
-    end
+      def non_get_redirectable_method?
+        ['PUT', 'PATCH', 'DELETE'].include? request_method
+      end
 
-    def stale_inertia_get?
-      get? && stale_inertia_request?
-    end
+      def inertia_non_post_redirect?(status)
+        inertia_request? && redirect_status?(status) && non_get_redirectable_method?
+      end
 
-    def get?
-      request_method == 'GET'
-    end
+      def stale_inertia_get?
+        get? && stale_inertia_request?
+      end
 
-    def request_method
-      @env['REQUEST_METHOD']
-    end
+      def get?
+        request_method == 'GET'
+      end
 
-    def inertia_version
-      @env['HTTP_X_INERTIA_VERSION']
-    end
+      def request_method
+        @env['REQUEST_METHOD']
+      end
 
-    def inertia_request?
-      @env['HTTP_X_INERTIA'].present?
-    end
+      def inertia_version
+        @env['HTTP_X_INERTIA_VERSION']
+      end
 
-    def version_stale?
-      sent_version != saved_version
-    end
+      def inertia_request?
+        @env['HTTP_X_INERTIA'].present?
+      end
 
-    def sent_version
-      return nil if inertia_version.nil?
-      InertiaRails.version.is_a?(Numeric) ? inertia_version.to_f : inertia_version
-    end
+      def version_stale?
+        sent_version != saved_version
+      end
 
-    def saved_version
-      InertiaRails.version.is_a?(Numeric) ? InertiaRails.version.to_f : InertiaRails.version
-    end
+      def sent_version
+        return nil if inertia_version.nil?
+
+        InertiaRails.version.is_a?(Numeric) ? inertia_version.to_f : inertia_version
+      end
 
-    def force_refresh(request)
-      request.flash.keep
-      Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url}).finish
+      def saved_version
+        InertiaRails.version.is_a?(Numeric) ? InertiaRails.version.to_f : InertiaRails.version
+      end
+
+      def force_refresh(request)
+        request.flash.keep
+        Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url}).finish
+      end
     end
   end
 end
+

data/lib/inertia_rails/renderer.rb

@@ -1,3 +1,5 @@
+require 'net/http'
+require 'json'
 require_relative "inertia_rails"
 
 module InertiaRails
@@ -20,12 +22,21 @@ module InertiaRails
         @response.set_header('X-Inertia', 'true')
         @render_method.call json: page, status: @response.status, content_type: Mime[:json]
       else
+        return render_ssr if ::InertiaRails.ssr_enabled? rescue nil
         @render_method.call template: 'inertia', layout: ::InertiaRails.layout, locals: (view_data).merge({page: page})
       end
     end
 
     private
 
+    def render_ssr
+      uri = URI("#{::InertiaRails.ssr_url}/render")
+      res = JSON.parse(Net::HTTP.post(uri, page.to_json, 'Content-Type' => 'application/json').body)
+      
+      ::InertiaRails.html_headers = res['head']
+      @render_method.call html: res['body'].html_safe, layout: ::InertiaRails.layout, locals: (view_data).merge({page: page})
+    end
+
     def props
       _props = ::InertiaRails.shared_data(@controller).merge(@props).select do |key, prop|
         if rendering_partial_component?

data/lib/inertia_rails/version.rb

@@ -1,3 +1,3 @@
 module InertiaRails
-  VERSION = "1.11.0"
+  VERSION = "1.12.1"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Brian Knoles
 - Brandon Shar
 - Eugene Granovsky
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,7 +124,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - brain@bellawatt.com
 - brandon@bellawatt.com
@@ -156,12 +156,15 @@ files:
 - lib/generators/inertia_rails/install/controller.rb
 - lib/generators/inertia_rails/install/react/InertiaExample.jsx
 - lib/generators/inertia_rails/install/react/inertia.jsx
+- lib/generators/inertia_rails/install/svelte/InertiaExample.svelte
+- lib/generators/inertia_rails/install/svelte/inertia.js
 - lib/generators/inertia_rails/install/vue/InertiaExample.vue
 - lib/generators/inertia_rails/install/vue/inertia.js
 - lib/generators/inertia_rails/install_generator.rb
 - lib/inertia_rails.rb
 - lib/inertia_rails/controller.rb
 - lib/inertia_rails/engine.rb
+- lib/inertia_rails/helper.rb
 - lib/inertia_rails/inertia_rails.rb
 - lib/inertia_rails/lazy.rb
 - lib/inertia_rails/middleware.rb
@@ -182,7 +185,7 @@ 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
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,8 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Inertia adapter for Rails
 test_files: []