super 0.0.7 → 0.0.12

data/app/controllers/super/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # Provides a default implementation for each of the resourceful actions
   class ApplicationController < ActionController::Base
@@ -9,22 +11,26 @@ module Super
     # Displays a list of records to the user
     def index
       @records = controls.load_records(action: action_inquirer, params: params)
-      @display = controls.display_schema(action: action_inquirer)
-      @view = controls.build_index_view
+      @display = controls.display_schema(action: action_inquirer).apply(action: action_inquirer)
+      @view = controls.index_view
+      @query_form = controls.initialize_query_form(params: params, current_path: request.path)
+      controls.initialize_filter_form(query_form: @query_form)
+      controls.initialize_sort_form(query_form: @query_form)
+      @records = controls.apply_queries(query_form: @query_form, records: @records)
     end
 
     # Displays a specific record to the user
     def show
       @record = controls.load_record(action: action_inquirer, params: params)
-      @display = controls.display_schema(action: action_inquirer)
-      @view = controls.build_show_view
+      @display = controls.display_schema(action: action_inquirer).apply(action: action_inquirer)
+      @view = controls.show_view
     end
 
     # Displays a form to allow the user to create a new record
     def new
       @record = controls.build_record(action: action_inquirer)
       @form = controls.form_schema(action: action_inquirer)
-      @view = controls.build_new_view
+      @view = controls.new_view
     end
 
     # Creates a record, or shows the validation errors
@@ -32,10 +38,10 @@ module Super
       @record = controls.build_record_with_params(action: action_inquirer, params: params)
 
       if controls.save_record(action: action_inquirer, record: @record, params: params)
-        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
+        redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       else
         @form = controls.form_schema(action: action_inquirer_for("new"))
-        @view = controls.build_new_view
+        @view = controls.new_view
         render :new, status: :bad_request
       end
     end
@@ -44,7 +50,7 @@ module Super
     def edit
       @record = controls.load_record(action: action_inquirer, params: params)
       @form = controls.form_schema(action: action_inquirer)
-      @view = controls.build_edit_view
+      @view = controls.edit_view
     end
 
     # Updates a record, or shows validation errors
@@ -52,10 +58,10 @@ module Super
       @record = controls.load_record(action: action_inquirer, params: params)
 
       if controls.update_record(action: action_inquirer, record: @record, params: params)
-        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
+        redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       else
         @form = controls.form_schema(action: action_inquirer_for("edit"))
-        @view = controls.build_edit_view
+        @view = controls.edit_view
         render :edit, status: :bad_request
       end
     end
@@ -65,20 +71,20 @@ module Super
       @record = controls.load_record(action: action_inquirer, params: params)
 
       if controls.destroy_record(action: action_inquirer, record: @record, params: params)
-        redirect_to polymorphic_path(Super.configuration.path_parts(controls.model))
+        redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       else
         flash.alert = "Couldn't delete record"
-        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
+        redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
       end
     rescue ActiveRecord::InvalidForeignKey => e
       flash.alert = "Couldn't delete record: #{e.class}"
-      redirect_to polymorphic_path(Super.configuration.path_parts(@record))
+      redirect_to polymorphic_path(Super::Link.polymorphic_parts(@record))
     end
 
     private
 
     def controls
-      Super::Controls.new(new_controls)
+      @controls ||= new_controls
     end
 
     def action_inquirer

data/app/helpers/super/form_builder_helper.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Super
+  module FormBuilderHelper
+    def super_form_for(record, options = {}, &block)
+      original = ActionView::Base.field_error_proc
+      ActionView::Base.field_error_proc = Form::Builder::FIELD_ERROR_PROC
+
+      options[:builder] ||= Form::Builder
+      return form_for(record, options, &block)
+    ensure
+      ActionView::Base.field_error_proc = original
+    end
+
+    def super_form_with(**options, &block)
+      original = ActionView::Base.field_error_proc
+      ActionView::Base.field_error_proc = Form::Builder::FIELD_ERROR_PROC
+
+      options[:builder] ||= Form::Builder
+      return form_with(**options, &block)
+    ensure
+      ActionView::Base.field_error_proc = original
+    end
+  end
+end

data/app/views/layouts/super/application.html.erb

@@ -9,12 +9,28 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <% if Super.configuration.asset_handler.sprockets? %>
-      <%= stylesheet_link_tag "super/application", media: "all" %>
-      <%= javascript_include_tag "super/application" %>
-    <% elsif Super.configuration.asset_handler.webpacker? %>
-      <%= stylesheet_pack_tag "super/application", media: "all" %>
-      <%= javascript_pack_tag "super/application" %>
+    <% Super.configuration.stylesheets.each do |stylesheet| %>
+      <% if stylesheet.handler.sprockets? %>
+        <%= stylesheet_link_tag(stylesheet.path, **stylesheet.arguments) %>
+      <% elsif stylesheet.handler.webpacker? %>
+        <% if Gem::Dependency.new("webpacker", "> 5.99", "< 7").matching_specs.any? %>
+          <%= stylesheet_packs_with_chunks_tag(stylesheet.path) %>
+        <% else %>
+          <%= stylesheet_pack_tag(stylesheet.path, **stylesheet.arguments) %>
+        <% end %>
+      <% end %>
+    <% end %>
+
+    <% Super.configuration.javascripts.each do |javascript| %>
+      <% if javascript.handler.sprockets? %>
+        <%= javascript_include_tag(javascript.path) %>
+      <% elsif javascript.handler.webpacker? %>
+        <% if Gem::Dependency.new("webpacker", "> 5.99", "< 7").matching_specs.any? %>
+          <%= javascript_packs_with_chunks_tag(javascript.path) %>
+        <% else %>
+          <%= javascript_pack_tag(javascript.path) %>
+        <% end %>
+      <% end %>
     <% end %>
   </head>
 
@@ -22,9 +38,7 @@
     <div class="px-4">
       <header class="pt-4">
         <h1 class="text-lg font-bold mr-6 mb-1"><%= Super.configuration.title %></h1>
-        <%
-        route_namespace = Super.configuration.route_namespace.map(&:to_s).join("/")
-        Super::Navigation::Automatic.new(route_namespace: route_namespace).each do |text, href| %>
+        <% Super::Navigation::Automatic.new.each do |text, href| %>
           <%= link_to(text, href, class: "inline-block mr-6") %>
         <% end %>
       </header>

data/app/views/super/application/{_super_schema_display_index.html.erb → _display_index.html.erb}

@@ -1,10 +1,10 @@
-<div class="mt-4 overflow-x-auto lg:overflow-x-visible">
+<div class="mt-4 overflow-x-auto">
   <table class="w-full border-separate relative" cellspacing="0" cellpadding="0">
     <thead class="">
       <tr class="">
-        <% super_schema_display_index.field_keys.each do |column| %>
-          <th class="p-2 first:pl-6 border-b border-b-2 border-gray-400 text-gray-600 text-left text-sm font-normal bg-white sticky top-0 z-10">
-            <%= controls.model.human_attribute_name(column) %>
+        <% display_index.each_attribute_name do |attribute_name| %>
+          <th class="p-2 first:pl-6 border-b border-b-2 border-gray-400 text-gray-600 text-left text-sm font-normal bg-white top-0 z-10">
+            <%= controls.model.human_attribute_name(attribute_name) %>
           </th>
         <% end %>
       </tr>
@@ -12,9 +12,9 @@
     <tbody class="">
       <% @records.each.with_index do |record, row_index| %>
         <tr id="record-pk-<%= record.id %>" class="group">
-          <% super_schema_display_index.field_keys.each do |column| %>
+          <% display_index.each_attribute_name do |attribute_name| %>
             <td class="py-1 px-2 first:pl-5 border-transparent border-t border-b group-hover:bg-blue-200 first:border-l first:rounded-l-lg last:border-r last:rounded-r-lg bg-white <%= Super::ViewHelper.classes(["bg-gray-100", row_index.odd?]) %>">
-              <%= super_schema_display_index.schema_type.render_field(template: self, record: record, column: column) %>
+              <%= display_index.render_attribute(template: self, record: record, column: attribute_name) %>
             </td>
           <% end %>
         </tr>

data/app/views/super/application/_display_rich_text.html.erb

@@ -0,0 +1 @@
+<%= rich_text %>

data/app/views/super/application/_display_show.html.erb

@@ -0,0 +1,8 @@
+<table class="max-w-full mt-4">
+  <% display_show.each_attribute_name do |attribute_name| %>
+    <tr>
+      <th class="py-1 align-baseline text-right px-4"><%= controls.model.human_attribute_name(attribute_name) %></th>
+      <td class="py-1 align-baseline"><%= display_show.render_attribute(template: self, record: @record, column: attribute_name) %></td>
+    </tr>
+  <% end %>
+</table>

data/app/views/super/application/_filter.html.erb

@@ -1,14 +1,6 @@
-<%= render(Super::Panel.new) do %>
-  <h1 class="text-xl">Filters</h1>
-  <%= form_for(filter, url: filter.url, method: :get, as: :q, html: { class: "mt-4" }) do |form| %>
-    <% filter.each_field do |filter_field| %>
-      <div class="mt-4">
-        <%= render(filter_field, form: form) %>
-      </div>
-    <% end %>
-
-    <div>
-      <%= form.submit "Filter", class: "super-button super-button--border-gray mt-6" %>
-    </div>
-  <% end %>
+<h1 class="text-lg">Filter</h1>
+<% filter.each_field do |filter_field| %>
+  <div class="mt-4">
+    <%= render(filter_field, form: form) %>
+  </div>
 <% end %>

data/app/views/super/application/_filter_type_select.html.erb

@@ -1,31 +1,21 @@
-<div class="super-field-group">
+<div class="super-field-group" data-controller="clean-filter-param">
   <%= form.fields_for(filter_type_select.field_name, filter_type_select) do |form_field| %>
     <%= form_field.label(:q, filter_type_select.humanized_field_name) %>
-    <div class="super-input-select inline-block">
-      <%= form_field.select(
+    <div class="relative inline-block">
+      <%= form_field.super.select(
         :op,
         filter_type_select.operators,
-        {},
-        { class: "super-input super-input-select-field" }
+        { include_blank: false },
+        data: { clean_filter_param_target: "candidate" }
       ) %>
-      <div class="super-input-select-icon text-gray-700">
-        <span class="h-4 w-4">
-          <%= render "super/feather/chevron_down" %>
-        </span>
-      </div>
     </div>
-    <div class="super-input-select mt-3">
-      <%= form_field.select(
+    <div class="mt-3">
+      <%= form_field.super.select(
         :q,
         filter_type_select.field_type.collection,
-        { include_blank: true },
-        { class: "super-input super-input-select-field" }
+        {},
+        data: { clean_filter_param_target: "control candidate" }
       ) %>
-      <div class="super-input-select-icon text-gray-700">
-        <span class="h-4 w-4">
-          <%= render "super/feather/chevron_down" %>
-        </span>
-      </div>
     </div>
   <% end %>
 </div>

data/app/views/super/application/_filter_type_text.html.erb

@@ -1,22 +1,18 @@
-<div class="super-field-group">
+<div class="super-field-group" data-controller="clean-filter-param">
   <%= form.fields_for(filter_type_text.field_name, filter_type_text) do |form_field| %>
     <%= form_field.label(:q, filter_type_text.humanized_field_name) %>
     <div class="relative inline-block">
-      <%= form_field.select(
+      <%= form_field.super.select(
         :op,
         filter_type_text.operators,
-        {},
-        { class: "super-input super-input-select-field" }
+        { include_blank: false },
+        data: { clean_filter_param_target: "candidate" }
       ) %>
-      <div class="super-input-select-icon text-gray-700">
-        <span class="h-4 w-4">
-          <%= render "super/feather/chevron_down" %>
-        </span>
-      </div>
     </div>
-    <%= form_field.text_field(
+    <%= form_field.super.text_field(
       :q,
-      class: "super-input w-full mt-3"
+      class: "mt-3",
+      data: { clean_filter_param_target: "control candidate" }
     ) %>
   <% end %>
 </div>

data/app/views/super/application/_filter_type_timestamp.html.erb

@@ -1,34 +1,23 @@
-<div class="super-field-group">
+<div class="super-field-group" data-controller="clean-filter-param">
   <%= form.fields_for(filter_type_timestamp.field_name, filter_type_timestamp) do |form_field| %>
     <%= form_field.label(:q0, filter_type_timestamp.humanized_field_name) %>
     <div class="relative inline-block mt-2">
-      <%= form_field.select(
+      <%= form_field.super.select(
         :op,
         filter_type_timestamp.operators,
-        {},
-        { class: "super-input super-input-select-field" }
+        { include_blank: false },
+        data: { clean_filter_param_target: "candidate" }
       ) %>
-      <div class="super-input-select-icon text-gray-700">
-        <span class="h-4 w-4">
-          <%= render "super/feather/chevron_down" %>
-        </span>
-      </div>
     </div>
     <div class="flex items-center mt-3">
       <div class="flex-initial">
-        <%= form_field.text_field(
-          :q0,
-          class: "super-input w-full"
-        ) %>
+        <%= form_field.super.text_field(:q0, data: { clean_filter_param_target: "control candidate" }) %>
       </div>
       <div class="flex-initial px-2">
         &ndash;
       </div>
       <div class="flex-initial">
-        <%= form_field.text_field(
-          :q1,
-          class: "super-input w-full"
-        ) %>
+        <%= form_field.super.text_field(:q1, data: { clean_filter_param_target: "control candidate" }) %>
       </div>
     </div>
   <% end %>

data/app/views/super/application/_form.html.erb

@@ -0,0 +1,15 @@
+<%= super_form_for(Super::Link.polymorphic_parts(@record), builder: Super::Form::Builder) do |f| %>
+  <div class="max-w-3xl">
+    <% form.each_attribute do |field, type| %>
+      <%= render(
+        type,
+        form: f,
+        column: field
+      ) %>
+    <% end %>
+
+    <div>
+      <%= f.super.submit class: "super-button--fill-blue mt-2" %>
+    </div>
+  </div>
+<% end %>

data/app/views/super/application/_form_field__destroy.html.erb

@@ -1,9 +1 @@
-<% if !local_assigns[:ungrouped] %>
-  <div class="super-field-group">
-<% end %>
-  <%= form.check_box(column, data: { action: "toggle-pending-destruction#call" }) %>
-  <%= form.label(column) %>
-  <%= render "form_inline_errors", form: form, column: column %>
-<% if !local_assigns[:ungrouped] %>
-  </div>
-<% end %>
+<%= form.super.check_box!(column, field: { data: { action: "toggle-pending-destruction#call" } }) %>

data/app/views/super/application/_form_field_checkbox.html.erb

@@ -0,0 +1 @@
+<%= form.super.check_box!(column) %>

data/app/views/super/application/_form_field_rich_text_area.html.erb

@@ -0,0 +1 @@
+<%= form.super.rich_text_area!(column) %>

data/app/views/super/application/_form_field_select.html.erb

@@ -1,23 +1 @@
-<% if !local_assigns[:ungrouped] %>
-  <div class="super-field-group">
-<% end %>
-  <% if !local_assigns[:hide_label] %>
-    <%= form.label(column, class: "block") %>
-  <% end %>
-  <div class="<%= Super::ViewHelper.classes("super-input-select", ["mt-1", !local_assigns[:hide_label]]) %>">
-    <%= form.select(
-      column,
-      form_field_select[:collection],
-      { include_blank: true }.merge(form_field_select[:options] || {}),
-      { class: "super-input super-input-select-field" }
-    ) %>
-    <div class="super-input-select-icon text-gray-700">
-      <span class="h-4 w-4">
-        <%= render "super/feather/chevron_down" %>
-      </span>
-    </div>
-  </div>
-  <%= render "form_inline_errors", form: form, column: column %>
-<% if !local_assigns[:ungrouped] %>
-  </div>
-<% end %>
+<%= form.super.select!(column, form_field_select[:collection]) %>

data/app/views/super/application/_form_field_text.html.erb

@@ -1,13 +1 @@
-<% if !local_assigns[:ungrouped] %>
-  <div class="super-field-group">
-<% end %>
-  <% if !local_assigns[:hide_label] %>
-    <%= form.label(column, class: "block") %>
-  <% end %>
-  <div class="<%= Super::ViewHelper.classes(["mt-1", !local_assigns[:hide_label]]) %>">
-    <%= form.text_field(column, class: "super-input w-full") %>
-    <%= render "form_inline_errors", form: form, column: column %>
-  </div>
-<% if !local_assigns[:ungrouped] %>
-  </div>
-<% end %>
+<%= form.super.text_field!(column) %>

data/app/views/super/application/{_super_layout.html.erb → _layout.html.erb}

@@ -1,29 +1,29 @@
-<% super_layout.resolve(self) %>
+<% layout.resolve(self) %>
 
-<% super_layout.resolved_headers.each do |partial| %>
+<% layout.resolved_headers.each do |partial| %>
   <%= Super::Partial.render(partial, template: self) %>
 <% end %>
 
-<% if super_layout.resolved_asides.empty? %>
-  <% super_layout.resolved_mains.each do |partial| %>
+<% if layout.resolved_asides.empty? %>
+  <% layout.resolved_mains.each do |partial| %>
     <%= Super::Partial.render(partial, template: self) %>
   <% end %>
 <% else %>
   <div class="clearfix -mx-2">
     <div class="md:float-left md:w-9/12 px-2">
-      <% super_layout.resolved_mains.each do |partial| %>
+      <% layout.resolved_mains.each do |partial| %>
         <%= Super::Partial.render(partial, template: self) %>
       <% end %>
     </div>
 
     <div class="md:float-right md:w-3/12 px-2">
-      <% super_layout.resolved_asides.each do |partial| %>
+      <% layout.resolved_asides.each do |partial| %>
         <%= Super::Partial.render(partial, template: self) %>
       <% end %>
     </div>
   </div>
 <% end %>
 
-<% super_layout.resolved_footers.each do |partial| %>
+<% layout.resolved_footers.each do |partial| %>
   <%= Super::Partial.render(partial, template: self) %>
 <% end %>