super 0.0.12 → 0.17.0

data/lib/super/form/builder.rb

@@ -58,6 +58,68 @@ 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
+          options[:value] = options[:value].iso8601 if options[:value].respond_to?(: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
+          options[:value] = options[:value].iso8601 if options[:value].respond_to?(: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
+          options[:value] = options[:value].strftime("%H:%M:%S") if options[:value].respond_to?(:strftime)
+
+          @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])
@@ -75,25 +137,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 = {})
@@ -115,24 +162,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),
@@ -141,10 +224,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),
@@ -153,10 +236,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),
@@ -165,10 +248,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),

data/lib/super/form/field_transcript.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Super
+  class Form
+    # Holds a recording of a form field definition
+    class FieldTranscript
+      def initialize
+        @super = false
+      end
+
+      attr_reader :method_name
+      attr_reader :args
+      attr_reader :kwargs
+
+      def super
+        @super = true
+        self
+      end
+
+      def super?
+        @super
+      end
+
+      def method_missing(new_method_name, *args, **kwargs)
+        if @method_name.present?
+          method_chain =
+            if super?
+              "super.#{@method_name}"
+            else
+              @method_name.to_s
+            end
+
+          raise Error::AlreadyTranscribed, "This instance already holds a transcription for: #{method_chain}"
+        end
+
+        @method_name = new_method_name
+        @args = args
+        @kwargs = kwargs
+        @method_name
+      end
+    end
+  end
+end

data/lib/super/form/guesser.rb

@@ -22,7 +22,16 @@ module Super
       private
 
       def attribute_type_for(attribute_name)
-        @type.string
+        case @model.type_for_attribute(attribute_name).type
+        when :datetime
+          @type.datetime_flatpickr
+        when :time
+          @type.time_flatpickr
+        when :date
+          @type.date_flatpickr
+        else
+          @type.text_field
+        end
       end
     end
   end

data/lib/super/form/schema_types.rb

@@ -3,6 +3,38 @@
 module Super
   class Form
     class SchemaTypes
+      class Direct
+        def initialize(super_builder:, method_name:, args:, kwargs:)
+          @super_builder = super_builder
+          @method_name = method_name
+          @args = args
+          @kwargs = kwargs
+        end
+
+        attr_reader :super_builder
+        attr_reader :method_name
+        attr_reader :args
+        attr_reader :kwargs
+
+        def nested_fields
+          {}
+        end
+
+        def to_partial_path
+          "form_field"
+        end
+
+        def ==(other)
+          return false if other.class != self.class
+          return false if other.super_builder != super_builder
+          return false if other.method_name != method_name
+          return false if other.args != args
+          return false if other.kwargs != kwargs
+
+          true
+        end
+      end
+
       class Generic
         def initialize(partial_path:, extras:, nested:)
           @partial_path = partial_path
@@ -11,6 +43,7 @@ module Super
         end
 
         attr_reader :nested_fields
+        attr_reader :extras
 
         def each_attribute
           if block_given?
@@ -64,49 +97,73 @@ module Super
         @fields = fields
       end
 
-      def generic(partial_path, **extras)
+      def partial(partial_path, **extras)
         Generic.new(partial_path: partial_path, extras: extras, nested: {})
       end
 
-      def select(**extras)
-        Generic.new(partial_path: "form_field_select", extras: extras, nested: {})
+      def direct(method_name, *args, super_builder: true, **kwargs)
+        Direct.new(super_builder: super_builder, method_name: method_name, args: args, kwargs: kwargs)
+      end
+
+      def select(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :select!, args: args, kwargs: kwargs)
       end
 
-      def string(**extras)
-        Generic.new(partial_path: "form_field_text", extras: extras, nested: {})
+      def text_field(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :text_field!, args: args, kwargs: kwargs)
       end
 
-      alias text string
+      def rich_text_area(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :rich_text_area!, args: args, kwargs: kwargs)
+      end
+
+      def check_box(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :check_box!, args: args, kwargs: kwargs)
+      end
+
+      def date_flatpickr(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :date_flatpickr!, args: args, kwargs: kwargs)
+      end
+
+      def datetime_flatpickr(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :datetime_flatpickr!, args: args, kwargs: kwargs)
+      end
+
+      def hidden_field(*args, **kwargs)
+        Direct.new(super_builder: false, method_name: :hidden_field, args: args, kwargs: kwargs)
+      end
 
-      def rich_text_area(**extras)
-        Generic.new(partial_path: "form_field_rich_text_area", extras: extras, nested: {})
+      def password_field(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :password_field!, args: args, kwargs: kwargs)
       end
 
-      def checkbox(**extras)
-        Generic.new(partial_path: "form_field_checkbox", extras: extras, nested: {})
+      def time_flatpickr(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :time_flatpickr!, args: args, kwargs: kwargs)
       end
 
       def has_many(reader, **extras)
-        nested = @fields.nested do
-          yield
+        subfields = Schema::Fields.new
+        @fields.nested do
+          yield subfields
         end
 
         Generic.new(
           partial_path: "form_has_many",
           extras: extras.merge(reader: reader),
-          nested: nested
+          nested: subfields.to_h
         )
       end
 
       def has_one(reader, **extras)
-        nested = @fields.nested do
-          yield
+        subfields = Schema::Fields.new
+        @fields.nested do
+          yield subfields
         end
 
         Generic.new(
           partial_path: "form_has_one",
           extras: extras.merge(reader: reader),
-          nested: nested
+          nested: subfields.to_h
         )
       end
 

data/lib/super/link.rb

@@ -22,57 +22,57 @@ module Super
 
     def self.registry
       @registry ||= {
-        new: new(
+        new: LinkBuilder.new(
           "New",
           -> (params:) {
-            Rails.application.routes.url_for(
+            {
               controller: params[:controller],
               action: :new,
               only_path: true
-            )
+            }
           }
         ),
-        index: new(
+        index: LinkBuilder.new(
           "Index",
           -> (params:) {
-            Rails.application.routes.url_for(
+            {
               controller: params[:controller],
               action: :index,
               only_path: true
-            )
+            }
           }
         ),
-        show: new(
+        show: LinkBuilder.new(
           "View",
           -> (record:, params:) {
-            Rails.application.routes.url_for(
+            {
               controller: params[:controller],
               action: :show,
               id: record,
               only_path: true
-            )
+            }
           }
         ),
-        edit: new(
+        edit: LinkBuilder.new(
           "Edit",
           -> (record:, params:) {
-            Rails.application.routes.url_for(
+            {
               controller: params[:controller],
               action: :edit,
               id: record,
               only_path: true
-            )
+            }
           }
         ),
-        destroy: new(
+        destroy: LinkBuilder.new(
           "Delete",
           -> (record:, params:) {
-            Rails.application.routes.url_for(
+            {
               controller: params[:controller],
               action: :destroy,
               id: record,
               only_path: true
-            )
+            }
           },
           method: :delete,
           data: { confirm: "Really delete?" }
@@ -82,7 +82,7 @@ module Super
 
     def self.polymorphic_parts(*parts_tail)
       parts_head = Super.configuration.path.strip.gsub(%r{\A/+}, "").gsub(%r{/+\z}, "").strip.split("/")
-      parts_head + parts_tail
+      parts_head.map { |part| part.is_a?(String) ? part.to_sym : part } + parts_tail
     end
 
     def initialize(text, href, **options)
@@ -91,27 +91,33 @@ module Super
       @options = options
     end
 
-    def to_s(default_options: nil, **proc_arguments)
+    attr_reader :text
+    attr_reader :options
+
+    def href
+      if @href.is_a?(String)
+        return @href
+      end
+
+      if @href.is_a?(Hash)
+        @href = Rails.application.routes.url_for(**@href)
+        return @href
+      end
+
+      @href = Super::Compatability.polymorphic_path_container.polymorphic_path(@href)
+    end
+
+    def to_s(default_options: nil, **)
       default_options ||= {}
       ActionController::Base.helpers.link_to(
-        value(text, proc_arguments),
-        value(href, proc_arguments),
-        default_options.deep_merge(value(options, proc_arguments))
+        text,
+        href,
+        default_options.deep_merge(options)
       )
     end
 
-    private
-
-    attr_reader :text
-    attr_reader :href
-    attr_reader :options
-
-    def value(proc_or_value, proc_arguments)
-      if proc_or_value.kind_of?(Proc)
-        proc_or_value.call(**proc_arguments)
-      else
-        proc_or_value
-      end
+    def ==(other)
+      self.class == other.class && text == other.text && href == other.href && options == other.options
     end
   end
 end