super 0.0.5 → 0.0.10

data/app/controllers/super/application_controller.rb

@@ -1,102 +1,94 @@
 module Super
   # Provides a default implementation for each of the resourceful actions
   class ApplicationController < ActionController::Base
-    include Pluggable.new(:super_application_controller)
+    include ClientError::Handling
 
     helper_method :action_inquirer
     helper_method :controls
 
-    rescue_from Error::ClientError do |exception|
-      code, default_message =
-        case exception
-        when Error::UnprocessableEntity
-          [422, "Unprocessable entity"]
-        when Error::NotFound
-          [404, "Not found"]
-        when Error::Forbidden
-          [403, "Forbidden"]
-        when Error::Unauthorized
-          [401, "Unauthorized"]
-        when Error::BadRequest, Error::ClientError
-          [400, "Bad request"]
-        end
-
-      flash.now.alert =
-        if exception.message == exception.class.name.to_s
-          default_message
-        else
-          exception.message
-        end
-
-      render "nothing", status: code
-    end
-
+    # Displays a list of records to the user
     def index
-      @resources = Step.load_resources(controls, params, action_inquirer)
-      @pagination = Step.initialize_pagination(@resources, request.GET)
-      @resources = Step.paginate_resources(@resources, @pagination)
+      @records = controls.load_records(action: action_inquirer, params: params)
+      @display = controls.display_schema(action: action_inquirer)
+      @view = controls.build_index_view
     end
 
+    # Displays a specific record to the user
     def show
-      @resource = Step.load_resource(controls, params, action_inquirer)
+      @record = controls.load_record(action: action_inquirer, params: params)
+      @display = controls.display_schema(action: action_inquirer)
+      @view = controls.build_show_view
     end
 
+    # Displays a form to allow the user to create a new record
     def new
-      @resource = Step.build_resource(controls, action_inquirer)
+      @record = controls.build_record(action: action_inquirer)
+      @form = controls.form_schema(action: action_inquirer)
+      @view = controls.build_new_view
     end
 
+    # Creates a record, or shows the validation errors
     def create
-      @resource = Step.build_resource_with_params(controls, action_inquirer, create_permitted_params)
+      @record = controls.build_record_with_params(action: action_inquirer, params: params)
 
-      if @resource.save
-        redirect_to polymorphic_path(Super.configuration.path_parts(@resource))
+      if controls.save_record(action: action_inquirer, record: @record, params: params)
+        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
       else
+        @form = controls.form_schema(action: action_inquirer_for("new"))
+        @view = controls.build_new_view
         render :new, status: :bad_request
       end
     end
 
+    # Displays a form to allow the user to update an existing record
     def edit
-      @resource = Step.load_resource(controls, params, action_inquirer)
+      @record = controls.load_record(action: action_inquirer, params: params)
+      @form = controls.form_schema(action: action_inquirer)
+      @view = controls.build_edit_view
     end
 
+    # Updates a record, or shows validation errors
     def update
-      @resource = Step.load_resource(controls, params, action_inquirer)
+      @record = controls.load_record(action: action_inquirer, params: params)
 
-      if @resource.update(update_permitted_params)
-        redirect_to polymorphic_path(Super.configuration.path_parts(@resource))
+      if controls.update_record(action: action_inquirer, record: @record, params: params)
+        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
       else
+        @form = controls.form_schema(action: action_inquirer_for("edit"))
+        @view = controls.build_edit_view
         render :edit, status: :bad_request
       end
     end
 
+    # Deletes a record, or shows validation errors
     def destroy
-      @resource = Step.load_resource(controls, params, action_inquirer)
+      @record = controls.load_record(action: action_inquirer, params: params)
 
-      if @resource.destroy
+      if controls.destroy_record(action: action_inquirer, record: @record, params: params)
         redirect_to polymorphic_path(Super.configuration.path_parts(controls.model))
       else
-        redirect_to polymorphic_path(Super.configuration.path_parts(@resource))
+        flash.alert = "Couldn't delete record"
+        redirect_to polymorphic_path(Super.configuration.path_parts(@record))
       end
+    rescue ActiveRecord::InvalidForeignKey => e
+      flash.alert = "Couldn't delete record: #{e.class}"
+      redirect_to polymorphic_path(Super.configuration.path_parts(@record))
     end
 
     private
 
     def controls
-      Super::Controls.new(new_controls)
+      @controls ||= new_controls
     end
 
-    def create_permitted_params
-      controls.permitted_params(params, action: action_inquirer)
-    end
-
-    def update_permitted_params
-      controls.permitted_params(params, action: action_inquirer)
+    def action_inquirer
+      @action_inquirer ||= action_inquirer_for(params[:action])
     end
 
-    def action_inquirer
-      @action_inquirer ||= ActionInquirer.new(
-        ActionInquirer.default_resources,
-        params[:action]
+    def action_inquirer_for(action)
+      ActionInquirer.new(
+        ActionInquirer.default_for_resources,
+        action
       )
     end
   end

data/app/helpers/super/form_builder_helper.rb

@@ -0,0 +1,23 @@
+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>
 
@@ -34,6 +50,10 @@
       <div class="pt-4"></div>
 
       <%= yield %>
+
+      <div class="pt-8 text-sm text-gray-800">
+        <%= t("super.layout.powered_by", env: Rails.env.capitalize, version: Super::VERSION) %>
+      </div>
     </div>
   </body>
 </html>

data/app/views/super/application/{_resources_header.html.erb → _collection_header.html.erb}

@@ -3,13 +3,12 @@
     <%= controls.title %>
   </h1>
   <div>
-    <% controls.resources_actions(params: params, action: action_inquirer).each do |link| %>
-      <%= link_to(
-        link.text,
-        link.href,
-        link.options.reverse_merge(
+    <% controls.collection_actions(action: action_inquirer).each do |link| %>
+      <%= link.to_s(
+        default_options: {
           class: "super-button super-button--border-blue super-button-sm inline-block ml-2"
-        )
+        },
+        params: params
       ) %>
     <% end %>
   </div>

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

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

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

@@ -0,0 +1,14 @@
+<%= render(Super::Panel.new) do %>
+  <h1 class="text-xl">Filters</h1>
+  <%= super_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.super.submit "Filter", class: "super-button--border-gray mt-6" %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,18 @@
+<div class="super-field-group">
+  <%= 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="relative inline-block">
+      <%= form_field.super.select(
+        :op,
+        filter_type_select.operators,
+        { include_blank: false },
+      ) %>
+    </div>
+    <div class="mt-3">
+      <%= form_field.super.select(
+        :q,
+        filter_type_select.field_type.collection,
+      ) %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,16 @@
+<div class="super-field-group">
+  <%= 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.super.select(
+        :op,
+        filter_type_text.operators,
+        { include_blank: false }
+      ) %>
+    </div>
+    <%= form_field.super.text_field(
+      :q,
+      class: "mt-3"
+    ) %>
+  <% end %>
+</div>

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

@@ -0,0 +1,23 @@
+<div class="super-field-group">
+  <%= 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.super.select(
+        :op,
+        filter_type_timestamp.operators,
+        { include_blank: false}
+      ) %>
+    </div>
+    <div class="flex items-center mt-3">
+      <div class="flex-initial">
+        <%= form_field.super.text_field(:q0) %>
+      </div>
+      <div class="flex-initial px-2">
+        &ndash;
+      </div>
+      <div class="flex-initial">
+        <%= form_field.super.text_field(:q1) %>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -1,17 +1,17 @@
-<%
-  colors = {
+<% if flash.any? %>
+  <% colors = {
     "notice" => { bg: "bg-blue-100", fg: "text-blue-400", border: "border-blue-600" },
     "alert" => { bg: "bg-red-100", fg: "text-red-400", border: "border-red-600" },
-  }
-%>
+  } %>
 
-<div data-flash="anchor">
-  <% flash.each do |level, messages| %>
-    <% Array(messages).each do |message| %>
-      <% color = colors[level.to_s] || colors["notice"] %>
-      <div class="<%= "%<bg>s %<fg>s border-l-4 %<border>s p-4 mt-2" % color %>">
-        <%= message %>
-      </div>
+  <div class="mt-8">
+    <% flash.each do |level, messages| %>
+      <% Array(messages).each do |message| %>
+        <% color = colors[level.to_s] || colors["notice"] %>
+        <div class="<%= "%<bg>s %<fg>s border-l-4 %<border>s p-4 mt-2" % color %>">
+          <%= message %>
+        </div>
+      <% end %>
     <% end %>
-  <% end %>
-</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.svg" %>
-      </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/_form_has_many.html.erb

@@ -10,7 +10,7 @@
       child_index: "TEMPLATEINDEX"
     ) do |ff|
   %>
-    <template data-target="apply-template.template">
+    <template data-apply-template-target="template">
       <%= render "form_fieldset", form_fieldset: form_has_many, form: ff %>
     </template>
   <% end %>

data/app/views/super/application/{_resource_header.html.erb → _member_header.html.erb}

@@ -3,13 +3,13 @@
     <%= controls.title %>
   </h1>
   <div>
-    <% controls.resource_actions(@resource, params: params, action: action_inquirer).each do |link| %>
-      <%= link_to(
-        link.text,
-        link.href,
-        link.options.reverse_merge(
+    <% controls.member_actions(action: action_inquirer).each do |link| %>
+      <%= link.to_s(
+        default_options: {
           class: "super-button super-button--border-blue super-button-sm inline-block ml-2"
-        )
+        },
+        record: @record,
+        params: params
       ) %>
     <% end %>
   </div>

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

@@ -1,34 +1,29 @@
-<%
-  super_layout_headers = super_resolve_list_for_rendering(super_layout.headers)
-  super_layout_asides = super_resolve_list_for_rendering(super_layout.asides)
-  super_layout_mains = super_resolve_list_for_rendering(super_layout.mains)
-  super_layout_footers = super_resolve_list_for_rendering(super_layout.footers)
-%>
+<% super_layout.resolve(self) %>
 
-<% super_layout_headers.each do |partial| %>
-  <%= super_render_partialish(partial) %>
+<% super_layout.resolved_headers.each do |partial| %>
+  <%= Super::Partial.render(partial, template: self) %>
 <% end %>
 
-<% if super_layout_asides.empty? %>
-  <% super_layout_mains.each do |partial| %>
-    <%= super_render_partialish(partial) %>
+<% if super_layout.resolved_asides.empty? %>
+  <% super_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_mains.each do |partial| %>
-        <%= super_render_partialish(partial) %>
+      <% super_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_asides.each do |partial| %>
-        <%= super_render_partialish(partial) %>
+      <% super_layout.resolved_asides.each do |partial| %>
+        <%= Super::Partial.render(partial, template: self) %>
       <% end %>
     </div>
   </div>
 <% end %>
 
-<% super_layout_footers.each do |partial| %>
-  <%= super_render_partialish(partial) %>
+<% super_layout.resolved_footers.each do |partial| %>
+  <%= Super::Partial.render(partial, template: self) %>
 <% end %>