super 0.0.5 → 0.0.6

data/app/controllers/super/application_controller.rb

@@ -1,82 +1,75 @@
 module Super
   # Provides a default implementation for each of the resourceful actions
   class ApplicationController < ActionController::Base
+    include ClientError::Handling
     include Pluggable.new(:super_application_controller)
 
     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)
+      @pagination = controls.initialize_pagination(action: action_inquirer, records: @records, query_params: request.GET)
+      @records = controls.paginate_records(action: action_inquirer, records: @records, pagination: @pagination)
+      @display = controls.display_schema(action: action_inquirer)
     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)
     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)
     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"))
         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)
     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"))
         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
@@ -85,18 +78,14 @@ module Super
       Super::Controls.new(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/application_helper.rb

@@ -1,22 +1,6 @@
 module Super
+  # View helpers, available within views
   module ApplicationHelper
-    def super_resolve_list_for_rendering(partials, block = -> {})
-      block_result = block.call
-      if block_result.present?
-        partials = [block_result, *partials]
-      end
-
-      partials = partials.map do |partial|
-        if partial.is_a?(Symbol)
-          instance_variable_get(partial)
-        else
-          partial
-        end
-      end
-
-      partials.compact
-    end
-
     def super_render_partialish(partialish)
       if partialish.respond_to?(:to_partial_path)
         if partialish.is_a?(Super::Partial)
@@ -28,5 +12,28 @@ module Super
         partialish
       end
     end
+
+    def super_format_for_display(schema, record, column)
+      formatter = schema.fields[column]
+
+      formatted =
+        if formatter.real?
+          value = record.public_send(column)
+          formatter.present(value)
+        else
+          formatter.present
+        end
+
+      if formatted.respond_to?(:to_partial_path)
+        if formatted.respond_to?(:locals)
+          formatted.locals[:record] ||= record
+          render(formatted, formatted.locals)
+        else
+          render(formatted)
+        end
+      else
+        formatted
+      end
+    end
   end
 end

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

@@ -34,6 +34,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/_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_select.html.erb

@@ -13,7 +13,7 @@
     ) %>
     <div class="super-input-select-icon text-gray-700">
       <span class="h-4 w-4">
-        <%= render "super/feather/chevron_down.svg" %>
+        <%= render "super/feather/chevron_down" %>
       </span>
     </div>
   </div>

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_layout.resolved_headers.each do |partial| %>
   <%= super_render_partialish(partial) %>
 <% end %>
 
-<% if super_layout_asides.empty? %>
-  <% super_layout_mains.each do |partial| %>
+<% if super_layout.resolved_asides.empty? %>
+  <% super_layout.resolved_mains.each do |partial| %>
     <%= super_render_partialish(partial) %>
   <% 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_layout.resolved_mains.each do |partial| %>
         <%= super_render_partialish(partial) %>
       <% end %>
     </div>
 
     <div class="md:float-right md:w-3/12 px-2">
-      <% super_layout_asides.each do |partial| %>
+      <% super_layout.resolved_asides.each do |partial| %>
         <%= super_render_partialish(partial) %>
       <% end %>
     </div>
   </div>
 <% end %>
 
-<% super_layout_footers.each do |partial| %>
+<% super_layout.resolved_footers.each do |partial| %>
   <%= super_render_partialish(partial) %>
 <% end %>

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

@@ -1,10 +1,6 @@
-<%
-  super_panel_parts = super_resolve_list_for_rendering(super_panel.parts, Proc.new)
-%>
-
-<% if super_panel_parts.any? %>
+<% if super_panel.resolve(self, block_given? ? Proc.new : nil).resolved_parts.any? %>
   <div class="border rounded shadow border-gray-400 bg-white px-5 pt-4 pb-8 mt-6">
-    <% super_panel_parts.each do |partial| %>
+    <% super_panel.resolved_parts.each do |partial| %>
       <%= super_render_partialish(partial) %>
     <% end %>
   </div>

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

@@ -0,0 +1,5 @@
+<div>
+  <% controls.member_actions(action: action_inquirer).each do |link| %>
+    <span class="pr-2 last:pr-0"><%= link.to_s(record: record, params: params) %></span>
+  <% end %>
+</div>

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

@@ -0,0 +1,39 @@
+<div class="mt-4 overflow-x-auto">
+  <table class="w-full border-separate" cellspacing="0" cellpadding="0">
+    <thead>
+      <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"><%= column.to_s.humanize %></th>
+        <% end %>
+      </tr>
+    </thead>
+    <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| %>
+            <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 <%= Super::ViewHelper.classes(["bg-gray-100", row_index.odd?]) %>">
+              <%= super_format_for_display(super_schema_display_index, record, column) %>
+            </td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<% if @pagination.necessary? %>
+  <div class="flex justify-end mr-2">
+    <div class="mt-4">
+      <% @pagination.each do |page_query_params, is_current_page, display| %>
+        <%= link_to(
+          display,
+          polymorphic_path(
+            Super.configuration.path_parts(controls.model),
+            page_query_params
+          ),
+          class: "inline-block ml-2 text-lg #{is_current_page ? " text-gray-900" : ""}"
+        ) %>
+      <% end %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,8 @@
+<table class="max-w-full leading-loose mt-4">
+  <% super_schema_display_show.field_keys.each do |column| %>
+    <tr>
+      <th class="text-right px-4"><%= column.to_s.humanize %></th>
+      <td><%= super_format_for_display(super_schema_display_show, @record, column) %></td>
+    </tr>
+  <% end %>
+</table>

data/app/views/super/application/{_form.html.erb → _super_schema_form.html.erb}

@@ -1,8 +1,6 @@
-<% schema = controls.form_schema(action: action_inquirer) %>
-
-<%= form_for(Super.configuration.path_parts(@resource)) do |f| %>
+<%= form_for(Super.configuration.path_parts(@record), builder: Super::Form::Builder) do |f| %>
   <div class="max-w-3xl">
-    <% schema.fields.each do |field, type| %>
+    <% super_schema_form.fields.each do |field, type| %>
       <%= render(
         type,
         form: f,

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

@@ -1,6 +1,6 @@
 <%= render(
   Super::Panel.new(
-    Super::Partial.new("resource_header"),
-    Super::Partial.new("form")
+    Super::Partial.new("member_header"),
+    @form
   )
 ) %>

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

@@ -1,6 +1,6 @@
 <%= render(
   Super::Panel.new(
-    Super::Partial.new("resources_header"),
-    Super::Partial.new("index")
+    Super::Partial.new("collection_header"),
+    @display
   )
 ) %>

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

@@ -1,6 +1,6 @@
 <%= render(
   Super::Panel.new(
-    Super::Partial.new("resources_header"),
-    Super::Partial.new("form")
+    Super::Partial.new("collection_header"),
+    @form
   )
 ) %>