super 0.0.10 → 0.0.15

data/lib/super/display/guesser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Display
     class Guesser
@@ -25,6 +27,8 @@ module Super
         case type
         when :datetime
           @type.timestamp
+        when :time
+          @type.time
         else
           @type.text
         end

data/lib/super/display/schema_types.rb

@@ -1,35 +1,104 @@
+# frozen_string_literal: true
+
 module Super
   class Display
     class SchemaTypes
-      class Dynamic
-        def initialize(ignore_nil: true, &transform_block)
-          @transform_block = transform_block
+      TYPES = Useful::Enum.new(:column, :record, :none)
+
+      class Builder
+        extend Useful::Builder
+
+        builder_with_block def transform(&block)
+          @transform_block = block
+        end
+
+        builder def real; @real = true; end
+        builder def computed; @real = false; end
+
+        builder def column; @type = :column; end
+        builder def record; @type = :record; end
+        builder def none; @type = :none; end
+
+        builder def ignore_nil; @ignore_nil = true; end
+
+        def build
+          Built.new(
+            real: @real,
+            type: @type,
+            ignore_nil: !!@ignore_nil,
+            &@transform_block
+          )
+        end
+      end
+
+      class Built
+        def initialize(real:, type:, ignore_nil:, &transform_block)
+          @real = real
+          @type = type
           @ignore_nil = ignore_nil
+          @transform_block = transform_block
         end
 
-        def present(value)
+        def real?; @real; end
+        attr_reader :type
+
+        def present(attribute_name, value = nil)
+          if @transform_block.nil?
+            if attribute_name
+              raise Error::ArgumentError, "Transformation block is not set for column: #{attribute_name}"
+            else
+              raise Error::ArgumentError, "Transformation block is not set!"
+            end
+          end
+
           return nil if value.nil? && @ignore_nil
 
-          @transform_block.call(value)
+          if @type == :none
+            @transform_block.call
+          else
+            @transform_block.call(value)
+          end
         end
+      end
+
+      class Badge
+        extend Useful::Builder
 
-        def real?
-          true
+        def initialize(builder)
+          @builder = builder
+          @whens = {}
+          format_for_lookup(&:itself)
+          format_for_display(&:itself)
         end
-      end
 
-      class Bypass
-        def initialize(partial:, real:)
-          @partial = partial
-          @real = real
+        builder_with_block def when(*patterns, &block)
+          patterns.each do |pattern|
+            @whens[pattern] = block
+          end
         end
 
-        def present
-          Partial.new(@partial)
+        builder_with_block def else(&block)
+          @else = block
         end
 
-        def real?
-          @real
+        builder_with_block def format_for_lookup(&block)
+          @format_for_lookup = block
+        end
+
+        builder_with_block def format_for_display(&block)
+          @format_for_display = block
+        end
+
+        def build
+          @builder.transform do |value|
+            lookup_value = @format_for_lookup.call(value)
+            block = @whens[lookup_value] || @else
+            Super::Badge.new(
+              @format_for_display.call(value),
+              styles: block&.call
+            )
+          end
+          @builder.build
         end
       end
 
@@ -38,33 +107,53 @@ module Super
         @fields = fields
       end
 
-      def string
-        Dynamic.new(&:to_s)
+      def real(type = :column, &transform_block)
+        TYPES
+          .case(type)
+          .when(:column) { Builder.new.real.ignore_nil.column.transform(&transform_block) }
+          .when(:record) { Builder.new.real.ignore_nil.record.transform(&transform_block) }
+          .when(:none)   { Builder.new.real.ignore_nil.none.transform(&transform_block) }
+          .result
       end
 
-      alias text string
+      def computed(type = :column, &transform_block)
+        TYPES
+          .case(type)
+          .when(:column) { Builder.new.computed.ignore_nil.column.transform(&transform_block) }
+          .when(:record) { Builder.new.computed.ignore_nil.record.transform(&transform_block) }
+          .when(:none)   { Builder.new.computed.ignore_nil.none.transform(&transform_block) }
+          .result
+      end
 
-      def timestamp
-        Dynamic.new(&:iso8601)
+      def manual(&transform_block)
+        real(:column, &transform_block)
       end
 
+      def string; real(&:to_s); end
+      alias text string
+
+      def timestamp; real(&:to_s); end
+      def time; real { |value| value.strftime("%H:%M:%S") }; end
+
       def rich_text
-        Dynamic.new do |value|
+        computed do |value|
           Partial.new("display_rich_text", locals: { rich_text: value })
         end
       end
 
-      def manual(&transform_block)
-        Dynamic.new(&transform_block)
-      end
-
-      def dynamic(&transform_block)
-        Dynamic.new(&transform_block)
+      def badge(*builder_methods)
+        builder_methods = %i[real ignore_nil column] if builder_methods.empty?
+        builder = builder_methods.each_with_object(Builder.new) do |builder_method, builder|
+          builder.public_send(builder_method)
+        end
+        Badge.new(builder)
       end
 
       def actions
         @actions_called = true
-        Bypass.new(partial: "super_schema_display_actions", real: false)
+        Builder.new.computed.none.transform do
+          Partial.new("display_actions")
+        end
       end
 
       # @private

data/lib/super/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # Configures the host Rails app to work with Super
   class Engine < ::Rails::Engine

data/lib/super/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # A container class for all internal errors thrown by this library
   #
@@ -22,5 +24,15 @@ module Super
         )
       end
     end
+    # Error raised when something wasn't initalized correctly, and if there isn't
+    # a more specific error
+    class Initalization < Error; end
+    class ArgumentError < Error; end
+
+    class Enum < Error
+      class ImpossibleValue < Enum; end
+      class ArgumentError < Enum; end
+      class UndefinedCase < Enum; end
+    end
   end
 end

data/lib/super/filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Filter
     def initialize

data/lib/super/filter/form_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Filter
     class FormObject
@@ -42,11 +44,10 @@ module Super
         end
       end
 
-      def initialize(model:, url:, schema:, params:)
+      def initialize(model:, params:, schema:)
         @model = model
-        @url = url
-        @schema = schema
         @params = params
+        @schema = schema
 
         @form_fields = {}
       end
@@ -57,15 +58,11 @@ module Super
         end
       end
 
-      def url
-        @url
-      end
-
       def to_partial_path
         "filter"
       end
 
-      def to_search_query(relation)
+      def apply_changes(relation)
         each_field do |form_field|
           next if form_field.specified_values.values.map(&:to_s).map(&:strip).all? { |specified_value| specified_value == "" }
           next if !Super::Filter::Operator.registry.key?(form_field.op)

data/lib/super/filter/guesser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Filter
     class Guesser

data/lib/super/filter/operator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Filter
     module Operator

data/lib/super/filter/schema_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Filter
     # This schema type is used to configure the filtering form on your +#index+

data/lib/super/form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # This schema type is used on your +#edit+ and +#new+ forms
   #
@@ -29,7 +31,7 @@ module Super
     end
 
     def to_partial_path
-      "super_schema_form"
+      "form"
     end
   end
 end

data/lib/super/form/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Form
     # Example
@@ -56,6 +58,65 @@ module Super
           @builder.check_box(attribute, options, checked_value, unchecked_value)
         end
 
+        def date_flatpickr(attribute, options = {})
+          options, defaults = split_defaults(
+            options,
+            class: "super-input w-full",
+            data: {
+              controller: "flatpickr",
+              flatpickr_options_value: {
+                dateFormat: "Y-m-d",
+              }
+            }
+          )
+          options[:class] = join_classes(defaults[:class], options[:class])
+          options[:data] = defaults[:data].deep_merge(options[:data] || {})
+          options[:value] = @builder.object.public_send(attribute).presence&.iso8601
+
+          @builder.text_field(attribute, options)
+        end
+
+        def datetime_flatpickr(attribute, options = {})
+          options, defaults = split_defaults(
+            options,
+            class: "super-input w-full",
+            data: {
+              controller: "flatpickr",
+              flatpickr_options_value: {
+                enableSeconds: true,
+                enableTime: true,
+                dateFormat: "Z",
+              }
+            }
+          )
+          options[:class] = join_classes(defaults[:class], options[:class])
+          options[:data] = defaults[:data].deep_merge(options[:data] || {})
+          options[:value] = @builder.object.public_send(attribute).presence&.iso8601
+
+          @builder.text_field(attribute, options)
+        end
+
+        def time_flatpickr(attribute, options = {})
+          options, defaults = split_defaults(
+            options,
+            class: "super-input w-full",
+            data: {
+              controller: "flatpickr",
+              flatpickr_options_value: {
+                enableSeconds: true,
+                enableTime: true,
+                noCalendar: true,
+                dateFormat: "H:i:S",
+              }
+            }
+          )
+          options[:class] = join_classes(defaults[:class], options[:class])
+          options[:data] = defaults[:data].deep_merge(options[:data] || {})
+          options[:value] = @builder.object.public_send(attribute).presence&.strftime("%H:%M:%S")
+
+          @builder.text_field(attribute, options)
+        end
+
         def password_field(attribute, options = {})
           options, defaults = split_defaults(options, class: "super-input w-full")
           options[:class] = join_classes(defaults[:class], options[:class])
@@ -73,25 +134,10 @@ module Super
         def select(attribute, choices, options = {}, html_options = {}, &block)
           options, defaults = split_defaults(options, include_blank: true)
           options = defaults.merge(options)
-          html_options, html_defaults = split_defaults(html_options, class: "super-input super-input-select-field")
+          html_options, html_defaults = split_defaults(html_options, class: "super-input super-input-select")
           html_options[:class] = join_classes(html_defaults[:class], html_options[:class])
 
-          parts = [
-            %(<div class="super-input-select">).html_safe,
-            @builder.select(attribute, choices, options, html_options, &block),
-            <<~HTML.html_safe,
-              <div class="super-input-select-icon text-blue-700">
-                <span class="h-4 w-4">
-            HTML
-            @template.render("super/feather/chevron_down"),
-            <<~HTML.html_safe,
-                </span>
-              </div>
-            HTML
-            %(</div>).html_safe,
-          ]
-
-          @template.safe_join(parts)
+          @builder.select(attribute, choices, options, html_options, &block)
         end
 
         def submit(value = nil, options = {})
@@ -113,24 +159,60 @@ module Super
           @template.content_tag(:div, class: "super-field-group", &block)
         end
 
-        def check_box!(attribute, checked_value = "1", unchecked_value = "0", label: {}, field: {}, show_errors: true)
+        def check_box!(attribute, checked_value: "1", unchecked_value: "0", label_text: nil, label: {}, field: {}, show_errors: true)
           label[:super] ||= {}
           label[:super] = { class: "select-none ml-1" }.merge(label[:super])
           container do
             compact_join([
               "<div>".html_safe,
               public_send(:check_box, attribute, field, checked_value, unchecked_value),
-              public_send(:label, attribute, nil, label),
+              public_send(:label, attribute, label_text, label),
               "</div>".html_safe,
               show_errors && inline_errors(attribute),
             ])
           end
         end
 
-        def password_field!(attribute, label: {}, field: {}, show_errors: true)
+        def date_flatpickr!(attribute, label_text: nil, label: {}, field: {}, show_errors: true)
+          container do
+            compact_join([
+              public_send(:label, attribute, label_text, label),
+              %(<div class="mt-1">).html_safe,
+              public_send(:date_flatpickr, attribute, field),
+              show_errors && inline_errors(attribute),
+              %(</div>).html_safe,
+            ])
+          end
+        end
+
+        def datetime_flatpickr!(attribute, label_text: nil, label: {}, field: {}, show_errors: true)
+          container do
+            compact_join([
+              public_send(:label, attribute, label_text, label),
+              %(<div class="mt-1">).html_safe,
+              public_send(:datetime_flatpickr, attribute, field),
+              show_errors && inline_errors(attribute),
+              %(</div>).html_safe,
+            ])
+          end
+        end
+
+        def time_flatpickr!(attribute, label_text: nil, label: {}, field: {}, show_errors: true)
+          container do
+            compact_join([
+              public_send(:label, attribute, label_text, label),
+              %(<div class="mt-1">).html_safe,
+              public_send(:time_flatpickr, attribute, field),
+              show_errors && inline_errors(attribute),
+              %(</div>).html_safe,
+            ])
+          end
+        end
+
+        def password_field!(attribute, label_text: nil, label: {}, field: {}, show_errors: true)
           container do
             compact_join([
-              public_send(:label, attribute, label),
+              public_send(:label, attribute, label_text, label),
               %(<div class="mt-1">).html_safe,
               public_send(:password_field, attribute, field),
               show_errors && inline_errors(attribute),
@@ -139,10 +221,10 @@ module Super
           end
         end
 
-        def rich_text_area!(attribute, label: {}, field: {}, show_errors: true)
+        def rich_text_area!(attribute, label_text: nil, label: {}, field: {}, show_errors: true)
           container do
             compact_join([
-              public_send(:label, attribute, label),
+              public_send(:label, attribute, label_text, label),
               %(<div class="mt-1">).html_safe,
               public_send(:rich_text_area, attribute, field),
               show_errors && inline_errors(attribute),
@@ -151,10 +233,10 @@ module Super
           end
         end
 
-        def select!(attribute, collection, label: {}, field: {}, show_errors: true)
+        def select!(attribute, collection, label_text: nil, label: {}, field: {}, show_errors: true)
           container do
             compact_join([
-              public_send(:label, attribute, label),
+              public_send(:label, attribute, label_text, label),
               %(<div class="mt-1">).html_safe,
               public_send(:select, attribute, collection, field),
               show_errors && inline_errors(attribute),
@@ -163,10 +245,10 @@ module Super
           end
         end
 
-        def text_field!(attribute, label: {}, field: {}, show_errors: true)
+        def text_field!(attribute, label_text: nil, label: {}, field: {}, show_errors: true)
           container do
             compact_join([
-              public_send(:label, attribute, label),
+              public_send(:label, attribute, label_text, label),
               %(<div class="mt-1">).html_safe,
               public_send(:text_field, attribute, field),
               show_errors && inline_errors(attribute),