superglue 0.41.0 → 0.50.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e7f46b274beaffe44eb96b704678e4eb2ebb43c85607a6b4170974525db452
-  data.tar.gz: 4e4280233e4e9ed82664aafb9fde2f176471c605142bba3af3326282431e0278
+  metadata.gz: 44a42cb747cff210dd1550dae3f9ddf280e72a2b38ff26b72fa5f2eea2eeadfe
+  data.tar.gz: f52f207c4be16d576a51c09f0e821c08d9af68b8150bf52d5b007f59e912d936
 SHA512:
-  metadata.gz: ba6cd0dabf868452a22e88533df3b2d76f324078e7d7559917a1b5d5aa181cf3e060ceee6f1ea9271f8a8478fde127636639493914eb38ba6eba583026edeabd
-  data.tar.gz: 7ebb6ade8ba3a240013f9c55f2b6527423773d8655be5292aedab05e01af089884f8e6f7e93bbb0e45f27c785aebd20c4153e20e93796da3c88e3f0804bb775a
+  metadata.gz: 57a0e0bbfd2fdcc815af7922f3b97042d016fe6f68be3389a83bcb77a5de2e1e68423a172878482533f25b69464c09d0395a116c4e8179a48ffce1d7a681dcd7
+  data.tar.gz: d8f034124031b598ee70394fd4900e4daab38126458db85f25afb96e9074bb07196d1f01e9975e960768676da469772d7be044ca3ce0915de95f2e129fdc78d7

data/lib/generators/rails/scaffold_controller_generator.rb

@@ -1,10 +1,10 @@
-require 'rails/generators'
-require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+require "rails/generators"
+require "rails/generators/rails/scaffold_controller/scaffold_controller_generator"
 
 module Rails
   module Generators
     class ScaffoldControllerGenerator
-      source_paths << File.expand_path('../templates', __FILE__)
+      source_paths << File.expand_path("../templates", __FILE__)
 
       hook_for :superglue, type: :boolean, default: true
     end

data/lib/generators/rails/superglue_generator.rb

@@ -1,109 +1,98 @@
-require 'rails/generators/named_base'
-require 'rails/generators/resource_helpers'
-require 'rails/version'
+require "rails/generators/named_base"
+require "rails/generators/resource_helpers"
 
 module Rails
   module Generators
     class SuperglueGenerator < NamedBase
       include Rails::Generators::ResourceHelpers
 
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path("../templates", __FILE__)
 
-      argument :attributes, type: :array, default: [], banner: 'field:type field:type'
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
       def create_root_folder
-        path = File.join('app/views', controller_file_path)
+        path = File.join("app/views", controller_file_path)
         empty_directory path unless File.directory?(path)
       end
 
       def copy_view_files
-        %w(index show new edit).each do |view|
+        %w[index show new edit].each do |view|
           @action_name = view
           filename = filename_with_extensions(view)
-          template filename, File.join('app/views', controller_file_path, filename)
+          template filename, File.join("app/views", controller_file_path, filename)
         end
-        template '_form.json.props', File.join('app/views', controller_file_path, '_form.json.props')
+        template "_form.json.props", File.join("app/views", controller_file_path, "_form.json.props")
 
-        %w(index show new edit).each do |view|
+        %w[index show new edit].each do |view|
           @action_name = view
           filename = filename_with_js_extensions(view)
-          template 'web/' + filename, File.join('app/views', controller_file_path, filename)
+          template "web/" + filename, File.join("app/views", controller_file_path, filename)
         end
 
-        %w(index show new edit).each do |view|
+        %w[index show new edit].each do |view|
           @action_name = view
           filename = filename_with_html_extensions(view)
-          template 'web/' + filename, File.join('app/views', controller_file_path, filename)
+          template "web/" + filename, File.join("app/views", controller_file_path, filename)
         end
 
-        %w(index show new edit).each do |view|
+        %w[index show new edit].each do |view|
           append_mapping(view)
         end
       end
 
-
       protected
-        def view_path
-          if Rails.version >= "7"
-            "../views"
-          else
-            "../../views"
-          end
-        end
 
-        def app_js_path
-          if Rails.version >= "7"
-            "app/javascript/"
-          else
-            "app/javascript/packs"
-          end
-        end
+      def view_path
+        "../views"
+      end
 
-        def append_mapping(action)
-          app_js = "#{app_js_path}/application.js"
+      def app_js_path
+        "app/javascript/"
+      end
 
-          component_name = [plural_table_name, action].map(&:camelcase).join
+      def append_mapping(action)
+        app_js = "#{app_js_path}/page_to_page_mapping.js"
 
-          inject_into_file app_js, after: "from '@thoughtbot/superglue'" do
-            "\nimport #{component_name} from '#{view_path}/#{controller_file_path}/#{action}'"
-          end
+        component_name = [plural_table_name, action].map(&:camelcase).join
 
-          inject_into_file app_js, after: 'identifierToComponentMapping = {' do
-            "\n      '#{[controller_file_path, action].join('/')}': #{component_name},"
-          end
+        prepend_to_file app_js do
+          "\nimport #{component_name} from '#{view_path}/#{controller_file_path}/#{action}'"
         end
 
-        def action_name
-          @action_name
+        inject_into_file app_js, after: "pageIdentifierToPageComponent = {" do
+          "\n  '#{[controller_file_path, action].join("/")}': #{component_name},"
         end
+      end
 
-        def attributes_names
-          [:id] + super
-        end
+      attr_reader :action_name
 
-        def filename_with_extensions(name)
-          [name, :json, :props] * '.'
-        end
+      def attributes_names
+        [:id] + super
+      end
 
-        def filename_with_js_extensions(name)
-          [name, :js] * '.'
-        end
+      def filename_with_extensions(name)
+        [name, :json, :props].join(".")
+      end
 
-        def filename_with_html_extensions(name)
-          [name, :html, :erb] * '.'
-        end
+      def filename_with_js_extensions(name)
+        [name, :js].join(".")
+      end
 
-        def attributes_list_with_timestamps
-          attributes_list(attributes_names + %w(created_at updated_at))
-        end
+      def filename_with_html_extensions(name)
+        [name, :html, :erb].join(".")
+      end
 
-        def attributes_list(attributes = attributes_names)
-          if self.attributes.any? {|attr| attr.name == 'password' && attr.type == :digest}
-            attributes = attributes.reject {|name| %w(password password_confirmation).include? name}
-          end
+      def attributes_list_with_timestamps
+        attributes_list(attributes_names + %w[created_at updated_at])
+      end
 
-          attributes
+      def attributes_list(attributes = attributes_names)
+        if self.attributes.any? { |attr| attr.name == "password" && attr.type == :digest }
+          attributes = attributes.reject { |name| %w[password password_confirmation].include? name }
         end
+
+        attributes
+      end
     end
   end
 end

data/lib/generators/rails/templates/_form.json.props

@@ -1,13 +1,6 @@
-html = form_with(model: @<%= model_resource_name %>, local: true) do |form|
-  inner = "".html_safe
-
+form_props(model: @<%= model_resource_name %>) do |f|
 <%- attributes.each do |attr| -%>
-  inner << form.label(:<%= attr.column_name %>)
-  inner << form.<%= attr.field_type %>(:<%= attr.column_name %>)
+  f.<%= attr.field_type %>(:<%= attr.column_name %>)
 <%- end -%>
-  inner << form.submit
-
-  inner
+  f.submit
 end
-
-json.html html

data/lib/generators/rails/templates/index.json.props

@@ -5,7 +5,9 @@ json.<%= plural_table_name %> do
     <%- end -%>
     json.edit_<%=singular_table_name%>_path edit_<%=singular_table_name%>_path(<%=singular_table_name%>)
     json.<%=singular_table_name%>_path <%=singular_table_name%>_path(<%=singular_table_name%>)
-    json.delete_<%=singular_table_name%>_path <%=singular_table_name%>_path(<%=singular_table_name%>)
+    json.delete_form do
+      form_props(model: <%=singular_table_name%>, method: :delete)
+    end
   end
 end
 

data/lib/generators/rails/templates/web/edit.js

@@ -1,5 +1,4 @@
 import React from 'react'
-import RailsTag from '@thoughtbot/superglue/components/RailsTag'
 // import * as actionCreators from 'javascript/packs/action_creators'
 // import {useDispatch} from 'react-redux'
 
@@ -23,7 +22,15 @@ export default function <%= plural_table_name.camelize %>Edit ({
   return (
     <div>
       {messagesEl}
-      <RailsTag {...form} data-sg-visit={true}/>
+      <form {...form.props} data-sg-visit={true}>
+        {Object.values(form.extras).map((hiddenProps) => (<input {...hiddenProps} key={hiddenProps.id} type="hidden"/>))}
+        <%- attributes.each do |attr| -%>
+        <input {...form.inputs.<%= attr.column_name %>} type="text"/>
+        <label htmlFor={form.inputs.<%= attr.column_name %>.id}><%= attr.column_name %></label>
+        <%- end -%>
+        <button {...form.inputs.submit} type="submit"> {...form.inputs.submit.text} </button>
+      </form>
+
       <a href={<%= singular_table_name.camelize(:lower) %>Path} data-sg-visit={true}>Show</a>
       <a href={<%= plural_table_name.camelize(:lower) %>Path}  data-sg-visit={true}>Back</a>
     </div>

data/lib/generators/rails/templates/web/index.js

@@ -10,6 +10,8 @@ export default function <%= plural_table_name.camelize %>Index({
   <%= plural_table_name.camelize(:lower) %> = [],
 }) {
   const <%= singular_table_name.camelize(:lower) %>Items = <%= plural_table_name.camelize(:lower) %>.map((<%= singular_table_name.camelize(:lower) %>, key) => {
+    const deleteForm = <%=singular_table_name.camelize(:lower)%>.deleteForm;
+
     return (
       <tr key={<%= singular_table_name.camelize(:lower) %>.id}>
         <%- attributes_list.select{|attr| attr != :id }.each do |attr| -%>
@@ -17,7 +19,12 @@ export default function <%= plural_table_name.camelize %>Index({
         <%- end -%>
         <td><a href={ <%=singular_table_name%>.<%=singular_table_name.camelize(:lower)%>Path } data-sg-visit={true}>Show</a></td>
         <td><a href={ <%=singular_table_name%>.edit<%=singular_table_name.camelize%>Path } data-sg-visit={true}>Edit</a></td>
-        <td><a href={ <%=singular_table_name%>.delete<%=singular_table_name.camelize%>Path }data-sg-visit={true} data-sg-method={"DELETE"}>Delete</a></td>
+        <td>
+          <form {...deleteForm.props} data-sg-visit={true}>
+            {Object.values(deleteForm.extras).map((hiddenProps) => (<input {...hiddenProps} key={hiddenProps.id} type="hidden"/>))}
+            <button type="submit">Delete</button>
+          </form>
+        </td>
       </tr>
     )
   })

data/lib/generators/rails/templates/web/new.js

@@ -1,5 +1,4 @@
 import React from 'react'
-import RailsTag from '@thoughtbot/superglue/components/RailsTag'
 // import * as actionCreators from 'javascript/packs/action_creators'
 // import { useDispatch } from 'react-redux'
 
@@ -22,7 +21,15 @@ export default function <%= plural_table_name.camelize %>New({
   return (
     <div>
       {messagesEl}
-      <RailsTag {...form} data-sg-visit={true}/>
+      <form {...form.props} data-sg-visit={true}>
+        {Object.values(form.extras).map((hiddenProps) => (<input {...hiddenProps} key={hiddenProps.id} type="hidden"/>))}
+        <%- attributes.each do |attr| -%>
+        <input {...form.inputs.<%= attr.column_name %>} type="text"/>
+        <label htmlFor={form.inputs.<%= attr.column_name %>.id}><%= attr.column_name %></label>
+        <%- end -%>
+        <button {...form.inputs.submit} type="submit"> {...form.inputs.submit.text} </button>
+      </form>
+
       <a href={<%= plural_table_name.camelize(:lower) %>Path} data-sg-visit={true}>Back</a>
     </div>
   )

data/lib/install/templates/web/application.js

@@ -7,43 +7,11 @@ import { render } from 'react-dom';
 import { ApplicationBase, fragmentMiddleware } from '@thoughtbot/superglue';
 import { applicationRootReducer, applicationPagesReducer } from './reducer';
 import { buildVisitAndRemote } from './application_visit';
+import { pageIdentifierToPageComponent } from './page_to_page_mapping';
 
-// Mapping between your props template to Component, you must add to this
-// to register any new page level component you create. If you are using the
-// scaffold, it will auto append the identifers for you.
-//
-// e.g {'posts/new': PostNew}
-const identifierToComponentMapping = {
-};
-
-if (typeof window !== "undefined") {
-  document.addEventListener("DOMContentLoaded", function () {
-    const appEl = document.getElementById("app");
-    const location = window.location;
-
-    if (appEl) {
-      render(
-        <Application
-          appEl={appEl}
-          // The base url prefixed to all calls made by the `visit`
-          // and `remote` thunks.
-          baseUrl={location.origin}
-          // The global var SUPERGLUE_INITIAL_PAGE_STATE is set by your erb
-          // template, e.g., index.html.erb
-          initialPage={window.SUPERGLUE_INITIAL_PAGE_STATE}
-          // The initial path of the page, e.g., /foobar
-          path={location.pathname + location.search + location.hash}
-          buildVisitAndRemote={buildVisitAndRemote}
-        />,
-        appEl
-      );
-    }
-  });
-}
-
-export default class Application extends ApplicationBase {
+class Application extends ApplicationBase {
   mapping() {
-    return identifierToComponentMapping;
+    return pageIdentifierToPageComponent;
   }
 
   visitAndRemote(navRef, store) {
@@ -73,3 +41,29 @@ export default class Application extends ApplicationBase {
     return store;
   }
 }
+
+if (typeof window !== "undefined") {
+  document.addEventListener("DOMContentLoaded", function () {
+    const appEl = document.getElementById("app");
+    const location = window.location;
+
+    if (appEl) {
+      render(
+        <Application
+          appEl={appEl}
+          // The base url prefixed to all calls made by the `visit`
+          // and `remote` thunks.
+          baseUrl={location.origin}
+          // The global var SUPERGLUE_INITIAL_PAGE_STATE is set by your erb
+          // template, e.g., index.html.erb
+          initialPage={window.SUPERGLUE_INITIAL_PAGE_STATE}
+          // The initial path of the page, e.g., /foobar
+          path={location.pathname + location.search + location.hash}
+          buildVisitAndRemote={buildVisitAndRemote}
+        />,
+        appEl
+      );
+    }
+  });
+}
+

data/lib/install/templates/web/application.json.props

@@ -7,11 +7,7 @@ end
 json.component_identifier local_assigns[:virtual_path_of_template]
 json.defers json.deferred!
 json.fragments json.fragments!
-json.assets [
-  # Uncomment for webpacker support
-  # asset_pack_path('application.js'),
-  asset_path('application.css')
-]
+json.assets [ asset_path('application.js') ]
 
 if protect_against_forgery?
   json.csrf_token form_authenticity_token

data/lib/install/templates/web/initializer.rb

@@ -1 +1 @@
-require 'props_template/core_ext'
+require "props_template/core_ext"

data/lib/install/templates/web/page_to_page_mapping.js

@@ -0,0 +1,12 @@
+// import your page component
+// e.g import PostsEdit from '../views/posts/edit'
+
+
+// Mapping between your props template to Component, you must add to this
+// to register any new page level component you create. If you are using the
+// scaffold, it will auto append the identifers for you.
+//
+// e.g {'posts/new': PostNew}
+export const pageIdentifierToPageComponent = {
+};
+

data/lib/install/web.rb

@@ -1,5 +1,3 @@
-require "rails/version"
-
 def add_member_methods
   inject_into_file "app/models/application_record.rb", after: "class ApplicationRecord < ActiveRecord::Base\n" do
     <<-RUBY
@@ -15,16 +13,15 @@ def add_member_methods
 end
 
 def app_js_path
-  if Rails.version >= "7"
-    "app/javascript/"
-  else
-    "app/javascript/packs"
-  end
+  "app/javascript/"
 end
 
 say "Copying application.js file to #{app_js_path}"
 copy_file "#{__dir__}/templates/web/application.js", "#{app_js_path}/application.js"
 
+say "Copying page_to_page_mapping.js file to #{app_js_path}"
+copy_file "#{__dir__}/templates/web/page_to_page_mapping.js", "#{app_js_path}/page_to_page_mapping.js"
+
 say "Copying reducer.js file to #{app_js_path}"
 copy_file "#{__dir__}/templates/web/reducer.js", "#{app_js_path}/reducer.js"
 
@@ -46,14 +43,10 @@ copy_file "#{__dir__}/templates/web/application.json.props", "app/views/layouts/
 say "Adding required member methods to ApplicationRecord"
 add_member_methods
 
-say "Installing React, Redux, and Superglue"
-run "yarn add history html-react-parser react-redux redux-thunk redux reduce-reducers immer @thoughtbot/superglue --save"
+say "Installing FormProps"
+run "bundle add form_props"
 
-if Rails.version < "7"
-  # For newer webpacker
-  insert_into_file Webpacker.config.config_path, "'app/views', 'app/components'", after: /additional_paths: \[/
-  # For older webpacker
-  insert_into_file Webpacker.config.config_path, "'app/views', 'app/components'", after: /resolved_paths: \[/
-end
+say "Installing React, Redux, and Superglue"
+run "yarn add history react-redux redux-thunk redux reduce-reducers immer @thoughtbot/superglue --save"
 
 say "Superglue is Installed! 🎉", :green

data/lib/superglue/helpers.rb

@@ -1,493 +1,5 @@
 module Superglue
   module Helpers
-    POSSIBLE_STANDARD_NAMES = {
-      # HTML
-      accept: 'accept',
-      acceptcharset: 'acceptCharset',
-      'accept-charset': 'acceptCharset',
-      accesskey: 'accessKey',
-      action: 'action',
-      allowfullscreen: 'allowFullScreen',
-      alt: 'alt',
-      as: 'as',
-      async: 'async',
-      autocapitalize: 'autoCapitalize',
-      autocomplete: 'autoComplete',
-      autocorrect: 'autoCorrect',
-      autofocus: 'autoFocus',
-      autoplay: 'autoPlay',
-      autosave: 'autoSave',
-      capture: 'capture',
-      cellpadding: 'cellPadding',
-      cellspacing: 'cellSpacing',
-      challenge: 'challenge',
-      charset: 'charSet',
-      checked: 'checked',
-      children: 'children',
-      cite: 'cite',
-      class: 'className',
-      classid: 'classID',
-      classname: 'className',
-      cols: 'cols',
-      colspan: 'colSpan',
-      content: 'content',
-      contenteditable: 'contentEditable',
-      contextmenu: 'contextMenu',
-      controls: 'controls',
-      controlslist: 'controlsList',
-      coords: 'coords',
-      crossorigin: 'crossOrigin',
-      dangerouslysetinnerhtml: 'dangerouslySetInnerHTML',
-      data: 'data',
-      datetime: 'dateTime',
-      default: 'default',
-      defaultchecked: 'defaultChecked',
-      defaultvalue: 'defaultValue',
-      defer: 'defer',
-      dir: 'dir',
-      disabled: 'disabled',
-      disablepictureinpicture: 'disablePictureInPicture',
-      disableremoteplayback: 'disableRemotePlayback',
-      download: 'download',
-      draggable: 'draggable',
-      enctype: 'encType',
-      for: 'htmlFor',
-      form: 'form',
-      formmethod: 'formMethod',
-      formaction: 'formAction',
-      formenctype: 'formEncType',
-      formnovalidate: 'formNoValidate',
-      formtarget: 'formTarget',
-      frameborder: 'frameBorder',
-      headers: 'headers',
-      height: 'height',
-      hidden: 'hidden',
-      high: 'high',
-      href: 'href',
-      hreflang: 'hrefLang',
-      htmlfor: 'htmlFor',
-      httpequiv: 'httpEquiv',
-      'http-equiv': 'httpEquiv',
-      icon: 'icon',
-      id: 'id',
-      innerhtml: 'innerHTML',
-      inputmode: 'inputMode',
-      integrity: 'integrity',
-      is: 'is',
-      itemid: 'itemID',
-      itemprop: 'itemProp',
-      itemref: 'itemRef',
-      itemscope: 'itemScope',
-      itemtype: 'itemType',
-      keyparams: 'keyParams',
-      keytype: 'keyType',
-      kind: 'kind',
-      label: 'label',
-      lang: 'lang',
-      list: 'list',
-      loop: 'loop',
-      low: 'low',
-      manifest: 'manifest',
-      marginwidth: 'marginWidth',
-      marginheight: 'marginHeight',
-      max: 'max',
-      maxlength: 'maxLength',
-      media: 'media',
-      mediagroup: 'mediaGroup',
-      method: 'method',
-      min: 'min',
-      minlength: 'minLength',
-      multiple: 'multiple',
-      muted: 'muted',
-      name: 'name',
-      nomodule: 'noModule',
-      nonce: 'nonce',
-      novalidate: 'noValidate',
-      open: 'open',
-      optimum: 'optimum',
-      pattern: 'pattern',
-      placeholder: 'placeholder',
-      playsinline: 'playsInline',
-      poster: 'poster',
-      preload: 'preload',
-      profile: 'profile',
-      radiogroup: 'radioGroup',
-      readonly: 'readOnly',
-      referrerpolicy: 'referrerPolicy',
-      rel: 'rel',
-      required: 'required',
-      reversed: 'reversed',
-      role: 'role',
-      rows: 'rows',
-      rowspan: 'rowSpan',
-      sandbox: 'sandbox',
-      scope: 'scope',
-      scoped: 'scoped',
-      scrolling: 'scrolling',
-      seamless: 'seamless',
-      selected: 'selected',
-      shape: 'shape',
-      size: 'size',
-      sizes: 'sizes',
-      span: 'span',
-      spellcheck: 'spellCheck',
-      src: 'src',
-      srcdoc: 'srcDoc',
-      srclang: 'srcLang',
-      srcset: 'srcSet',
-      start: 'start',
-      step: 'step',
-      style: 'style',
-      summary: 'summary',
-      tabindex: 'tabIndex',
-      target: 'target',
-      title: 'title',
-      type: 'type',
-      usemap: 'useMap',
-      value: 'value',
-      width: 'width',
-      wmode: 'wmode',
-      wrap: 'wrap',
-
-      # SVG
-      about: 'about',
-      accentheight: 'accentHeight',
-      'accent-height': 'accentHeight',
-      accumulate: 'accumulate',
-      additive: 'additive',
-      alignmentbaseline: 'alignmentBaseline',
-      'alignment-baseline': 'alignmentBaseline',
-      allowreorder: 'allowReorder',
-      alphabetic: 'alphabetic',
-      amplitude: 'amplitude',
-      arabicform: 'arabicForm',
-      'arabic-form': 'arabicForm',
-      ascent: 'ascent',
-      attributename: 'attributeName',
-      attributetype: 'attributeType',
-      autoreverse: 'autoReverse',
-      azimuth: 'azimuth',
-      basefrequency: 'baseFrequency',
-      baselineshift: 'baselineShift',
-      'baseline-shift': 'baselineShift',
-      baseprofile: 'baseProfile',
-      bbox: 'bbox',
-      begin: 'begin',
-      bias: 'bias',
-      by: 'by',
-      calcmode: 'calcMode',
-      capheight: 'capHeight',
-      'cap-height': 'capHeight',
-      clip: 'clip',
-      clippath: 'clipPath',
-      'clip-path': 'clipPath',
-      clippathunits: 'clipPathUnits',
-      cliprule: 'clipRule',
-      'clip-rule': 'clipRule',
-      color: 'color',
-      colorinterpolation: 'colorInterpolation',
-      'color-interpolation': 'colorInterpolation',
-      colorinterpolationfilters: 'colorInterpolationFilters',
-      'color-interpolation-filters': 'colorInterpolationFilters',
-      colorprofile: 'colorProfile',
-      'color-profile': 'colorProfile',
-      colorrendering: 'colorRendering',
-      'color-rendering': 'colorRendering',
-      contentscripttype: 'contentScriptType',
-      contentstyletype: 'contentStyleType',
-      cursor: 'cursor',
-      cx: 'cx',
-      cy: 'cy',
-      d: 'd',
-      datatype: 'datatype',
-      decelerate: 'decelerate',
-      descent: 'descent',
-      diffuseconstant: 'diffuseConstant',
-      direction: 'direction',
-      display: 'display',
-      divisor: 'divisor',
-      dominantbaseline: 'dominantBaseline',
-      'dominant-baseline': 'dominantBaseline',
-      dur: 'dur',
-      dx: 'dx',
-      dy: 'dy',
-      edgemode: 'edgeMode',
-      elevation: 'elevation',
-      enablebackground: 'enableBackground',
-      'enable-background': 'enableBackground',
-      end: 'end',
-      exponent: 'exponent',
-      externalresourcesrequired: 'externalResourcesRequired',
-      fill: 'fill',
-      fillopacity: 'fillOpacity',
-      'fill-opacity': 'fillOpacity',
-      fillrule: 'fillRule',
-      'fill-rule': 'fillRule',
-      filter: 'filter',
-      filterres: 'filterRes',
-      filterunits: 'filterUnits',
-      floodopacity: 'floodOpacity',
-      'flood-opacity': 'floodOpacity',
-      floodcolor: 'floodColor',
-      'flood-color': 'floodColor',
-      focusable: 'focusable',
-      fontfamily: 'fontFamily',
-      'font-family': 'fontFamily',
-      fontsize: 'fontSize',
-      'font-size': 'fontSize',
-      fontsizeadjust: 'fontSizeAdjust',
-      'font-size-adjust': 'fontSizeAdjust',
-      fontstretch: 'fontStretch',
-      'font-stretch': 'fontStretch',
-      fontstyle: 'fontStyle',
-      'font-style': 'fontStyle',
-      fontvariant: 'fontVariant',
-      'font-variant': 'fontVariant',
-      fontweight: 'fontWeight',
-      'font-weight': 'fontWeight',
-      format: 'format',
-      from: 'from',
-      fx: 'fx',
-      fy: 'fy',
-      g1: 'g1',
-      g2: 'g2',
-      glyphname: 'glyphName',
-      'glyph-name': 'glyphName',
-      glyphorientationhorizontal: 'glyphOrientationHorizontal',
-      'glyph-orientation-horizontal': 'glyphOrientationHorizontal',
-      glyphorientationvertical: 'glyphOrientationVertical',
-      'glyph-orientation-vertical': 'glyphOrientationVertical',
-      glyphref: 'glyphRef',
-      gradienttransform: 'gradientTransform',
-      gradientunits: 'gradientUnits',
-      hanging: 'hanging',
-      horizadvx: 'horizAdvX',
-      'horiz-adv-x': 'horizAdvX',
-      horizoriginx: 'horizOriginX',
-      'horiz-origin-x': 'horizOriginX',
-      ideographic: 'ideographic',
-      imagerendering: 'imageRendering',
-      'image-rendering': 'imageRendering',
-      in2: 'in2',
-      in: 'in',
-      inlist: 'inlist',
-      intercept: 'intercept',
-      k1: 'k1',
-      k2: 'k2',
-      k3: 'k3',
-      k4: 'k4',
-      k: 'k',
-      kernelmatrix: 'kernelMatrix',
-      kernelunitlength: 'kernelUnitLength',
-      kerning: 'kerning',
-      keypoints: 'keyPoints',
-      keysplines: 'keySplines',
-      keytimes: 'keyTimes',
-      lengthadjust: 'lengthAdjust',
-      letterspacing: 'letterSpacing',
-      'letter-spacing': 'letterSpacing',
-      lightingcolor: 'lightingColor',
-      'lighting-color': 'lightingColor',
-      limitingconeangle: 'limitingConeAngle',
-      local: 'local',
-      markerend: 'markerEnd',
-      'marker-end': 'markerEnd',
-      markerheight: 'markerHeight',
-      markermid: 'markerMid',
-      'marker-mid': 'markerMid',
-      markerstart: 'markerStart',
-      'marker-start': 'markerStart',
-      markerunits: 'markerUnits',
-      markerwidth: 'markerWidth',
-      mask: 'mask',
-      maskcontentunits: 'maskContentUnits',
-      maskunits: 'maskUnits',
-      mathematical: 'mathematical',
-      mode: 'mode',
-      numoctaves: 'numOctaves',
-      offset: 'offset',
-      opacity: 'opacity',
-      operator: 'operator',
-      order: 'order',
-      orient: 'orient',
-      orientation: 'orientation',
-      origin: 'origin',
-      overflow: 'overflow',
-      overlineposition: 'overlinePosition',
-      'overline-position': 'overlinePosition',
-      overlinethickness: 'overlineThickness',
-      'overline-thickness': 'overlineThickness',
-      paintorder: 'paintOrder',
-      'paint-order': 'paintOrder',
-      panose1: 'panose1',
-      'panose-1': 'panose1',
-      pathlength: 'pathLength',
-      patterncontentunits: 'patternContentUnits',
-      patterntransform: 'patternTransform',
-      patternunits: 'patternUnits',
-      pointerevents: 'pointerEvents',
-      'pointer-events': 'pointerEvents',
-      points: 'points',
-      pointsatx: 'pointsAtX',
-      pointsaty: 'pointsAtY',
-      pointsatz: 'pointsAtZ',
-      prefix: 'prefix',
-      preservealpha: 'preserveAlpha',
-      preserveaspectratio: 'preserveAspectRatio',
-      primitiveunits: 'primitiveUnits',
-      property: 'property',
-      r: 'r',
-      radius: 'radius',
-      refx: 'refX',
-      refy: 'refY',
-      renderingintent: 'renderingIntent',
-      'rendering-intent': 'renderingIntent',
-      repeatcount: 'repeatCount',
-      repeatdur: 'repeatDur',
-      requiredextensions: 'requiredExtensions',
-      requiredfeatures: 'requiredFeatures',
-      resource: 'resource',
-      restart: 'restart',
-      result: 'result',
-      results: 'results',
-      rotate: 'rotate',
-      rx: 'rx',
-      ry: 'ry',
-      scale: 'scale',
-      security: 'security',
-      seed: 'seed',
-      shaperendering: 'shapeRendering',
-      'shape-rendering': 'shapeRendering',
-      slope: 'slope',
-      spacing: 'spacing',
-      specularconstant: 'specularConstant',
-      specularexponent: 'specularExponent',
-      speed: 'speed',
-      spreadmethod: 'spreadMethod',
-      startoffset: 'startOffset',
-      stddeviation: 'stdDeviation',
-      stemh: 'stemh',
-      stemv: 'stemv',
-      stitchtiles: 'stitchTiles',
-      stopcolor: 'stopColor',
-      'stop-color': 'stopColor',
-      stopopacity: 'stopOpacity',
-      'stop-opacity': 'stopOpacity',
-      strikethroughposition: 'strikethroughPosition',
-      'strikethrough-position': 'strikethroughPosition',
-      strikethroughthickness: 'strikethroughThickness',
-      'strikethrough-thickness': 'strikethroughThickness',
-      string: 'string',
-      stroke: 'stroke',
-      strokedasharray: 'strokeDasharray',
-      'stroke-dasharray': 'strokeDasharray',
-      strokedashoffset: 'strokeDashoffset',
-      'stroke-dashoffset': 'strokeDashoffset',
-      strokelinecap: 'strokeLinecap',
-      'stroke-linecap': 'strokeLinecap',
-      strokelinejoin: 'strokeLinejoin',
-      'stroke-linejoin': 'strokeLinejoin',
-      strokemiterlimit: 'strokeMiterlimit',
-      'stroke-miterlimit': 'strokeMiterlimit',
-      strokewidth: 'strokeWidth',
-      'stroke-width': 'strokeWidth',
-      strokeopacity: 'strokeOpacity',
-      'stroke-opacity': 'strokeOpacity',
-      suppresscontenteditablewarning: 'suppressContentEditableWarning',
-      suppresshydrationwarning: 'suppressHydrationWarning',
-      surfacescale: 'surfaceScale',
-      systemlanguage: 'systemLanguage',
-      tablevalues: 'tableValues',
-      targetx: 'targetX',
-      targety: 'targetY',
-      textanchor: 'textAnchor',
-      'text-anchor': 'textAnchor',
-      textdecoration: 'textDecoration',
-      'text-decoration': 'textDecoration',
-      textlength: 'textLength',
-      textrendering: 'textRendering',
-      'text-rendering': 'textRendering',
-      to: 'to',
-      transform: 'transform',
-      typeof: 'typeof',
-      u1: 'u1',
-      u2: 'u2',
-      underlineposition: 'underlinePosition',
-      'underline-position': 'underlinePosition',
-      underlinethickness: 'underlineThickness',
-      'underline-thickness': 'underlineThickness',
-      unicode: 'unicode',
-      unicodebidi: 'unicodeBidi',
-      'unicode-bidi': 'unicodeBidi',
-      unicoderange: 'unicodeRange',
-      'unicode-range': 'unicodeRange',
-      unitsperem: 'unitsPerEm',
-      'units-per-em': 'unitsPerEm',
-      unselectable: 'unselectable',
-      valphabetic: 'vAlphabetic',
-      'v-alphabetic': 'vAlphabetic',
-      values: 'values',
-      vectoreffect: 'vectorEffect',
-      'vector-effect': 'vectorEffect',
-      version: 'version',
-      vertadvy: 'vertAdvY',
-      'vert-adv-y': 'vertAdvY',
-      vertoriginx: 'vertOriginX',
-      'vert-origin-x': 'vertOriginX',
-      vertoriginy: 'vertOriginY',
-      'vert-origin-y': 'vertOriginY',
-      vhanging: 'vHanging',
-      'v-hanging': 'vHanging',
-      videographic: 'vIdeographic',
-      'v-ideographic': 'vIdeographic',
-      viewbox: 'viewBox',
-      viewtarget: 'viewTarget',
-      visibility: 'visibility',
-      vmathematical: 'vMathematical',
-      'v-mathematical': 'vMathematical',
-      vocab: 'vocab',
-      widths: 'widths',
-      wordspacing: 'wordSpacing',
-      'word-spacing': 'wordSpacing',
-      writingmode: 'writingMode',
-      'writing-mode': 'writingMode',
-      x1: 'x1',
-      x2: 'x2',
-      x: 'x',
-      xchannelselector: 'xChannelSelector',
-      xheight: 'xHeight',
-      'x-height': 'xHeight',
-      xlinkactuate: 'xlinkActuate',
-      'xlink:actuate': 'xlinkActuate',
-      xlinkarcrole: 'xlinkArcrole',
-      'xlink:arcrole': 'xlinkArcrole',
-      xlinkhref: 'xlinkHref',
-      'xlink:href': 'xlinkHref',
-      xlinkrole: 'xlinkRole',
-      'xlink:role': 'xlinkRole',
-      xlinkshow: 'xlinkShow',
-      'xlink:show': 'xlinkShow',
-      xlinktitle: 'xlinkTitle',
-      'xlink:title': 'xlinkTitle',
-      xlinktype: 'xlinkType',
-      'xlink:type': 'xlinkType',
-      xmlbase: 'xmlBase',
-      'xml:base': 'xmlBase',
-      xmllang: 'xmlLang',
-      'xml:lang': 'xmlLang',
-      xmlns: 'xmlns',
-      'xml:space': 'xmlSpace',
-      xmlnsxlink: 'xmlnsXlink',
-      'xmlns:xlink': 'xmlnsXlink',
-      xmlspace: 'xmlSpace',
-      y1: 'y1',
-      y2: 'y2',
-      y: 'y',
-      ychannelselector: 'yChannelSelector',
-      z: 'z',
-      zoomandpan: 'zoomAndPan'
-    }
-
     def redirect_back_with_props_at(opts)
       if request.referrer && params[:props_at]
         referrer_url = URI.parse(request.referrer)
@@ -502,34 +14,12 @@ module Superglue
       end
     end
 
-    def props_from_form_with(model: nil, scope: nil, url: nil, format: nil, **options)
-      options[:allow_method_names_outside_object] = true
-      options[:skip_default_ids] = !helpers.send(:form_with_generates_ids)
-
-      if model
-        url ||= helpers.send(:polymorphic_path, model, format: format)
-
-        model   = model.last if model.is_a?(Array)
-        scope ||= helpers.send(:model_name_from_record_or_class, model).param_key
-      end
-
-      html_options = helpers.send(:html_options_for_form_with, url, model, options)
-      html_options.delete("authenticity_token")
-      html_options.delete("enforce_utf8")
-
-      key_vals = html_options.map { |k, v|
-        [POSSIBLE_STANDARD_NAMES[k.to_sym] || k.camelize(:lower), v]
-      }
-      Hash[key_vals]
-    end
-
     def param_to_search_path(param)
       if param
-        param.gsub(/[^\da-zA-Z\_\=\.]+/, '')
-          .gsub(/\.+/, '.')
-          .split('.')
+        param.gsub(/[^\da-zA-Z_=.]+/, "").squeeze(".")
+          .split(".")
           .map do |part|
-            if part =~ /^-?[0-9]+$/
+            if /^-?[0-9]+$/.match?(part)
               part.to_i
             else
               part
@@ -540,13 +30,13 @@ module Superglue
 
     def search_path_to_camelized_param(path)
       path.map do |part|
-        if part.include? '='
-          key, rest = part.split('=')
-          [key.camelize(:lower), rest].join('=')
+        if part.include? "="
+          key, rest = part.split("=")
+          [key.camelize(:lower), rest].join("=")
         else
           part.camelize(:lower)
         end
-      end.join('.')
+      end.join(".")
     end
   end
 end

data/lib/superglue/redirection.rb

@@ -3,7 +3,7 @@ module Superglue
     def _compute_redirect_to_location(request, options)
       computed_location = URI.parse(super)
       next_param = Rack::Utils
-          .parse_nested_query(computed_location.query)
+        .parse_nested_query(computed_location.query)
 
       if request.params[:__] == "0"
         computed_location.query = next_param.merge({__: "0"}).to_query
@@ -27,4 +27,3 @@ module Superglue
     end
   end
 end
-

data/lib/superglue.rb

@@ -1,15 +1,15 @@
-require 'superglue/helpers'
-require 'superglue/redirection'
-require 'props_template'
+require "superglue/helpers"
+require "superglue/redirection"
+require "props_template"
 
 module Superglue
   module Controller
-    include Helpers, Redirection
+    include Redirection
+    include Helpers
 
     def self.included(base)
       if base.respond_to?(:helper_method)
         base.helper_method :param_to_search_path
-        base.helper_method :props_from_form_with
         base.helper_method :search_path_to_camelized_param
       end
     end
@@ -22,7 +22,7 @@ module Superglue
     generators do |app|
       Rails::Generators.configure! app.config.generators
       Rails::Generators.hidden_namespaces.uniq!
-      require 'generators/rails/scaffold_controller_generator'
+      require "generators/rails/scaffold_controller_generator"
     end
 
     initializer :superglue do |app|

data/lib/tasks/install.rake

@@ -3,18 +3,17 @@ namespace :superglue do
   task :verify_react do
     package_json = JSON.parse(File.read(Rails.root.join("package.json")))
 
-    if package_json['dependencies']['react'].nil?
-      $stderr.puts "React not installed. Did you install React? https://github.com/rails/webpacker#react"
-      $stderr.puts "Exiting!" && exit!
+    if package_json["dependencies"]["react"].nil?
+      warn "React not installed. Did you install React? https://github.com/rails/webpacker#react"
+      warn "Exiting!" && exit!
     end
   end
 
   namespace :install do
     desc "Install everything needed for superglue web"
-    task 'web' => ["superglue:verify_react"] do
+    task "web" => ["superglue:verify_react"] do
       template = File.expand_path("../install/web.rb", __dir__)
       exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{template}"
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superglue
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.50.0.beta1
 platform: ruby
 authors:
 - Johny Ho
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-14 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
-  name: webpacker
+  name: form_props
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -178,21 +178,18 @@ files:
 - lib/install/templates/web/application.json.props
 - lib/install/templates/web/application_visit.js
 - lib/install/templates/web/initializer.rb
+- lib/install/templates/web/page_to_page_mapping.js
 - lib/install/templates/web/reducer.js
 - lib/install/web.rb
 - lib/superglue.rb
 - lib/superglue/helpers.rb
 - lib/superglue/redirection.rb
 - lib/tasks/install.rake
-- test/engine_test.rb
-- test/helpers_test.rb
-- test/render_test.rb
-- test/test_helper.rb
 homepage: https://github.com/thoughtbot/superglue/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -203,16 +200,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: Rails integration for SuperglueJS
-test_files:
-- test/render_test.rb
-- test/helpers_test.rb
-- test/engine_test.rb
-- test/test_helper.rb
+test_files: []

data/test/engine_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class EngineTest < ActiveSupport::TestCase
-  test "does not include itself in action controller base when superglue auto include is false" do
-    refute ActionController::Base.included_modules.any? { |m| m.name && m.name.include?('Superglue') }
-  end
-end

data/test/helpers_test.rb

@@ -1,23 +0,0 @@
-require 'test_helper'
-
-class HelpersTest < ActiveSupport::TestCase
-  include Superglue::Helpers
-
-  test 'clean_props_at returns nil if qry is nil' do
-    qry = nil
-
-    assert_nil param_to_search_path(qry)
-  end
-
-  test 'clean_props_at returns a refined qry' do
-    qry = 'foo...bar/?)()-'
-
-    assert_equal param_to_search_path(qry), ['foo', 'bar']
-  end
-
-  test 'camelize_path' do
-    path = ['foo_bar', 'foo_bar=1', 'foo_baz_roo']
-
-    assert_equal search_path_to_camelized_param(path), 'fooBar.fooBar=1.fooBazRoo'
-  end
-end

data/test/render_test.rb

@@ -1,81 +0,0 @@
-require 'test_helper'
-
-class RenderController < TestController
-  require 'action_view/testing/resolvers'
-
-  append_view_path(ActionView::FixtureResolver.new(
-    'render/simple_render_with_superglue.json.props' => 'json.author "john smith"',
-    'render/simple_render_with_superglue_with_bad_layout.json.props' => 'json.author "john smith"',
-    'layouts/application.json.props' => 'json.data {yield json}',
-    'layouts/does_not_exist.html.erb' => '',
-    'layouts/application.html.erb' => <<~HTML
-      <html>
-        <head>
-          <script><%= @initial_state.strip.html_safe %></script>
-        </head>
-        <body><%=yield%></body>
-      </html>
-    HTML
-  ))
-
-  layout 'application'
-
-  def render_action
-    render :action
-  end
-
-  def simple_render_with_superglue
-    @initial_state = render_to_string(formats: [:json], layout: true)
-    render inline: '', layout: true
-  end
-
-  def simple_render_with_superglue_with_bad_layout
-    @initial_state = render_to_string(formats: [:json], layout: 'does_not_exist')
-    render inline: '', layout: true
-  end
-
-  def form_authenticity_token
-    "secret"
-  end
-end
-
-class RenderTest < ActionController::TestCase
-  tests RenderController
-
-
-  setup do
-    if Rails.version >= '6'
-      # In rails 6, the fixture orders the templates based on their appearance in the handler
-      # This doesn't happen IRL, so I'm going to explicitly set the handler here.
-      #
-      # Note that the original is the following
-      # @controller.lookup_context.handlers = [:raw, :superglue, :erb, :js, :html, :builder, :ruby]
-      @controller.lookup_context.handlers = [:props, :erb]
-    end
-  end
-
-  test "simple render with superglue" do
-    get :simple_render_with_superglue
-
-    assert_response 200
-    rendered = <<~HTML
-      <html>
-        <head>
-          <script>{"data":{"author":"john smith"}}</script>
-        </head>
-        <body></body>
-      </html>
-    HTML
-
-    assert_equal rendered, @response.body
-    assert_equal 'text/html', @response.media_type
-  end
-
-  test "simple render when the layout doesn't exist" do
-    err = assert_raise ActionView::MissingTemplate do |e|
-      get :simple_render_with_superglue_with_bad_layout
-    end
-
-    assert_equal(true, err.message.starts_with?('Missing template layouts/does_not_exist with {:locale=>[:en], :formats=>[:json], :variants=>[], :handlers=>[:props, :erb]}.'))
-  end
-end

data/test/test_helper.rb

@@ -1,20 +0,0 @@
-require 'rails'
-require 'abstract_controller'
-require 'abstract_controller/railties/routes_helpers'
-require 'action_controller'
-require 'superglue'
-require "active_support"
-require 'active_record'
-require 'active_support/testing/autorun'
-require 'active_support/test_case'
-
-require 'props_template'
-
-ActiveSupport::TestCase.test_order = :random if ActiveSupport::TestCase.respond_to?(:test_order=)
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
-Rails.cache = ActiveSupport::Cache::MemoryStore.new
-
-load File.dirname(__FILE__) + '/support/schema.rb'
-require 'support/models'
-require 'support/test_application'
-