super 0.21.0 → 0.22.0

data/lib/super/form_builder_helper.rb

@@ -13,7 +13,7 @@ module Super
       ActionView::Base.field_error_proc = FormBuilder::FIELD_ERROR_PROC
 
       options[:builder] ||= FormBuilder
-      return form_for(record, options, &block)
+      form_for(record, options, &block)
     ensure
       ActionView::Base.field_error_proc = original
     end
@@ -24,7 +24,7 @@ module Super
       ActionView::Base.field_error_proc = FormBuilder::FIELD_ERROR_PROC
 
       options[:builder] ||= FormBuilder
-      return form_with(**options, &block)
+      form_with(**options, &block)
     ensure
       ActionView::Base.field_error_proc = original
     end
@@ -35,7 +35,7 @@ module Super
       ActionView::Base.field_error_proc = FormBuilder::FIELD_ERROR_PROC
 
       options[:builder] ||= FormBuilder
-      return fields_for(*args, **options, &block)
+      fields_for(*args, **options, &block)
     ensure
       ActionView::Base.field_error_proc = original
     end

data/lib/super/link.rb

@@ -26,24 +26,24 @@ module Super
       @registry ||= {}.tap do |reg|
         reg[:new] = LinkBuilder.new
           .text { |params:| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.new") }
-          .href { |params:| { controller: params[:controller], action: :new, only_path: true } }
+          .href { |params:| {controller: params[:controller], action: :new, only_path: true} }
           .freeze
         reg[:index] = LinkBuilder.new
           .text { |params:| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.index") }
-          .href { |params:| { controller: params[:controller], action: :index, only_path: true } }
+          .href { |params:| {controller: params[:controller], action: :index, only_path: true} }
           .freeze
         reg[:show] = LinkBuilder.new
           .text { |params:, **| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.show") }
-          .href { |params:, record:| { controller: params[:controller], action: :show, id: record, only_path: true } }
+          .href { |params:, record:| {controller: params[:controller], action: :show, id: record, only_path: true} }
           .freeze
         reg[:edit] = LinkBuilder.new
           .text { |params:, **| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.edit") }
-          .href { |params:, record:| { controller: params[:controller], action: :edit, id: record, only_path: true } }
+          .href { |params:, record:| {controller: params[:controller], action: :edit, id: record, only_path: true} }
           .freeze
         reg[:destroy] = LinkBuilder.new
           .text { |params:, **| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.destroy") }
-          .href { |params:, record:| { controller: params[:controller], action: :destroy, id: record, only_path: true } }
-          .options { |**| { method: :delete, data: { confirm: "Really delete?" } } }
+          .href { |params:, record:| {controller: params[:controller], action: :destroy, id: record, only_path: true} }
+          .options { |**| {method: :delete, data: {confirm: "Really delete?"}} }
           .freeze
       end
     end
@@ -91,6 +91,15 @@ module Super
       @href = Super::Compatability.polymorphic_path_container.polymorphic_path(@href)
     end
 
+    def to_link(template, local_assigns)
+      default_options = local_assigns.fetch(:default_options, {})
+      template.link_to(
+        text,
+        href,
+        default_options.deep_merge(options)
+      )
+    end
+
     def to_partial_path
       "link"
     end

data/lib/super/link_builder.rb

@@ -20,10 +20,10 @@ module Super
       raise Super::Error::IncompleteBuilder, "LinkBuilder requires that #text is set" if @text.nil?
       raise Super::Error::IncompleteBuilder, "LinkBuilder requires that #href is set" if @href.nil?
 
-      @options ||= -> (**) { {} }
-      @process_text ||= -> (t) { t }
-      @process_href ||= -> (h) { h }
-      @process_options ||= -> (o) { o }
+      @options ||= ->(**) { {} }
+      @process_text ||= ->(t) { t }
+      @process_href ||= ->(h) { h }
+      @process_options ||= ->(o) { o }
 
       Super::Link.new(
         @process_text.call(@text.call(**kwargs)),

data/lib/super/navigation.rb

@@ -4,10 +4,7 @@ module Super
   class Navigation
     def initialize
       @builder = Builder.new
-      result = yield @builder
-      if result.is_a?(Array)
-        Useful::Deprecation["0.22"].deprecation_warning("returning an array", "calling a Super::Navigation builder method defines the navigation")
-      end
+      yield @builder
     end
 
     def definition
@@ -155,10 +152,17 @@ module Super
         end
       end
 
-      def header(routes); end
-      def no_routes(routes, filter); end
-      def result; end
-      def section_title(title); end
+      def header(routes)
+      end
+
+      def no_routes(routes, filter)
+      end
+
+      def result
+      end
+
+      def section_title(title)
+      end
     end
   end
 end

data/lib/super/partial.rb

@@ -2,18 +2,6 @@
 
 module Super
   class Partial
-    def self.render(partialish, template:)
-      if partialish.respond_to?(:to_partial_path)
-        if partialish.respond_to?(:locals)
-          template.render(partialish, partialish.locals)
-        else
-          template.render(partialish)
-        end
-      else
-        partialish
-      end
-    end
-
     def initialize(path, locals: {})
       @to_partial_path = path
       @locals = locals

data/lib/super/plugin.rb

@@ -27,8 +27,8 @@ module Super
       end
 
       def classes_ordered
-        each_node = -> (&b) { @ordering.each_key(&b) }
-        each_child = -> (cb, &b) { @ordering[cb].each(&b) }
+        each_node = ->(&b) { @ordering.each_key(&b) }
+        each_child = ->(cb, &b) { @ordering[cb].each(&b) }
 
         TSort.tsort(each_node, each_child)
       end

data/lib/super/railtie.rb

@@ -14,6 +14,7 @@ module Super
     initializer "super.inclusion" do
       ActiveSupport.on_load(:action_view) do
         include Super::FormBuilderHelper
+        include Super::RenderHelper
       end
     end
 

data/lib/super/render_helper.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+# typed: false
+
+module Super::RenderHelper
+  def super_render(*args, **kwargs, &block)
+    if args.size >= 1
+      renderable = args.first
+
+      case renderable
+      when ActiveSupport::SafeBuffer
+        return renderable
+      when Super::Partial
+        return render(*args, **kwargs, &block)
+      when Super::Link
+        return renderable.to_link(self, kwargs)
+      when Super::ViewChain
+        return renderable.handle_super_render(self, kwargs)
+      end
+    end
+
+    render(*args, **kwargs, &block)
+  end
+
+  def super_resolve_renderable(renderable)
+    if renderable.is_a?(Symbol)
+      instance_variable_get(renderable)
+    else
+      renderable
+    end
+  end
+end

data/lib/super/reset.rb

@@ -10,12 +10,7 @@ module Super
       _generate_paths_by_default: true,
 
       # Defined in Super::SubstructureController
-      navigation: true,
-      page_title: true,
-
-      # Defined in Super::ApplicationController
-      current_action: true,
-      with_current_action: true,
+      page_title: true
 
       # Keep all of the ones in Super::SitewideController
     }

data/lib/super/schema/guesser.rb

@@ -21,7 +21,7 @@ module Super
       end
 
       def ignore_foreign_keys
-        @rejects.push(-> (attribute_name) { is_foreign_key[attribute_name] })
+        @rejects.push(->(attribute_name) { is_foreign_key[attribute_name] })
         self
       end
 
@@ -69,10 +69,10 @@ module Super
       def is_foreign_key
         @is_foreign_key ||=
           @model
-          .reflect_on_all_associations
-          .select { |a| a.macro == :belongs_to }
-          .map { |a| [a.foreign_key, true] }
-          .to_h
+            .reflect_on_all_associations
+            .select { |a| a.macro == :belongs_to }
+            .map { |a| [a.foreign_key, true] }
+            .to_h
       end
     end
   end

data/lib/super/schema.rb

@@ -41,7 +41,7 @@ module Super
       end
 
       def each(&block)
-        if block_given?
+        if block
           return @backing.each(&block)
         end
 
@@ -65,7 +65,7 @@ module Super
         inside = {}
         @backing = inside
         yield
-        return inside
+        inside
       ensure
         @backing = outside
         inside

data/lib/super/sort.rb

@@ -99,7 +99,7 @@ module Super
         @default.map do |attribute_name, direction|
           {
             a: attribute_name,
-            d: direction,
+            d: direction
           }
         end
       end

data/lib/super/useful/deprecations.rb

@@ -5,9 +5,7 @@ require "active_support/deprecation"
 module Super
   module Useful
     class Deprecation
-      VERSIONS = {
-        "0.22" => ActiveSupport::Deprecation.new("0.22", "Super")
-      }
+      VERSIONS = {}
       private_constant :VERSIONS
 
       def self.[](version)

data/lib/super/useful/enum.rb

@@ -24,7 +24,7 @@ module Super
         end
 
         def when(*keys, &block)
-          if !block_given?
+          if !block
             raise Error::ArgumentError, "must receive block"
           end
 

data/lib/super/useful/i19.rb

@@ -24,7 +24,7 @@ module Super
       def chain_to_i18n(chain)
         head, *tail = chain
 
-        [head, { default: tail }]
+        [head, {default: tail}]
       end
 
       def i18n_with_fallback(prefix, optional, suffix)

data/lib/super/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Super
-  VERSION = "0.21.0"
+  VERSION = "0.22.0"
 end

data/lib/super/view_chain.rb

@@ -26,6 +26,25 @@ module Super
       chain.empty?
     end
 
+    def handle_super_render(template, local_assigns, &block)
+      name, current = shift
+      current = template.super_resolve_renderable(current)
+
+      if !current
+        Rails.logger.warn do
+          "Super::ViewChain encountered a nil view: #{name.inspect}."
+        end
+      end
+
+      if empty?
+        template.super_render(current)
+      else
+        template.super_render(current) do
+          template.concat(template.super_render(self))
+        end
+      end
+    end
+
     private
 
     def chain

data/lib/super.rb

@@ -51,6 +51,7 @@ require "super/panel"
 require "super/partial"
 require "super/plugin"
 require "super/query"
+require "super/render_helper"
 require "super/reorderable_hash"
 require "super/reset"
 require "super/schema"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-05 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -212,6 +212,7 @@ files:
 - app/assets/javascripts/super/application.js
 - app/assets/stylesheets/super/application.css
 - app/controllers/super/application_controller.rb
+- app/controllers/super/foundation_controller.rb
 - app/controllers/super/sitewide_controller.rb
 - app/controllers/super/substructure_controller.rb
 - app/controllers/super/view_controller.rb
@@ -312,6 +313,7 @@ files:
 - lib/super/plugin.rb
 - lib/super/query.rb
 - lib/super/railtie.rb
+- lib/super/render_helper.rb
 - lib/super/reorderable_hash.rb
 - lib/super/reset.rb
 - lib/super/schema.rb