superglue 0.40.0 → 0.50.0.beta1

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

@@ -1,42 +1,19 @@
 namespace :superglue do
-  desc "Verifies if any version of Yarn is installed"
-  task :verify_yarn do
-    begin
-      yarn_version = `yarn --version`
-      raise Errno::ENOENT if yarn_version.blank?
-    rescue Errno::ENOENT
-      $stderr.puts "Yarn not installed. Please download and install Yarn from https://yarnpkg.com/lang/en/docs/install/"
-      $stderr.puts "Exiting!" && exit!
-    end
-  end
-
   desc "Verifies if any version of react is in package.json"
   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!
-    end
-  end
-
-  desc "Verifies webpacker has been installed"
-  task "verify_webpacker" do
-    begin
-      require "webpacker/configuration"
-    rescue LoadError
-      $stderr.puts "Superglue's web install requires webpacker!"
-      $stderr.puts "https://github.com/rails/webpacker#installation"
-      $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_webpacker", "webpacker:verify_install", "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
-