super 0.19.0 → 0.20.0

data/lib/super/link_builder.rb

@@ -2,53 +2,34 @@
 
 module Super
   class LinkBuilder
-    def initialize(text, href, **options)
-      @text = text
-      @href = href
-      @options = options
-      @requirements = []
-      @requirements += gather_requirements(text)
-      @requirements += gather_requirements(href)
-      @requirements += gather_requirements(options)
-
-      unknown_arguments = @requirements - known_requirements
-      if unknown_arguments.any?
-        raise Error::ArgumentError, "Unknown arguments: #{unknown_arguments.join(", ")}"
-      end
+    %i[text href options].each do |method_name|
+      class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+        def #{method_name}(&block)
+          @#{method_name} = block
+          self
+        end
+
+        def process_#{method_name}(&block)
+          @process_#{method_name} = block
+          self
+        end
+      RUBY
     end
 
-    attr_reader :requirements
-
     def resolve(**kwargs)
-      Link.new(
-        into_value(@text, kwargs),
-        into_value(@href, kwargs),
-        **into_value(@options, kwargs),
+      raise Super::Error::IncompleteBuilder, "LinkBuilder requires that #text is set" if @text.nil?
+      raise Super::Error::IncompleteBuilder, "LinkBuilder requires that #href is set" if @href.nil?
+
+      @options ||= -> (**) { {} }
+      @process_text ||= -> (t) { t }
+      @process_href ||= -> (h) { h }
+      @process_options ||= -> (o) { o }
+
+      Super::Link.new(
+        @process_text.call(@text.call(**kwargs)),
+        @process_href.call(@href.call(**kwargs)),
+        **@process_options.call(@options.call(**kwargs))
       )
     end
-
-    private
-
-    def known_requirements
-      %i[params record].freeze
-    end
-
-    def gather_requirements(value_or_proc)
-      return [] if !value_or_proc.is_a?(Proc)
-
-      requirements =
-        value_or_proc
-          .parameters
-          .select { |(kind, name)| kind = :keyreq }
-          .map(&:last)
-    end
-
-    def into_value(value_or_proc, kwargs)
-      if value_or_proc.kind_of?(Proc)
-        value_or_proc.call(**kwargs)
-      else
-        value_or_proc
-      end
-    end
   end
 end

data/lib/super/useful/i19.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Super
+  module Useful
+    module I19
+      module_function
+
+      def build_chain(prefix, optional, suffix)
+        prefix = Array(prefix)
+        optional = Array(optional)
+        suffix = Array(suffix)
+
+        result = []
+
+        (optional.size + 1).times do
+          lookup = [prefix, optional, suffix].flatten.join(".").to_sym
+          result.push(lookup)
+          optional.pop
+        end
+
+        result
+      end
+
+      def chain_to_i18n(chain)
+        head, *tail = chain
+
+        [head, { default: tail }]
+      end
+
+      def i18n_with_fallback(prefix, optional, suffix)
+        chain_to_i18n(build_chain(prefix, optional, suffix))
+      end
+    end
+  end
+end

data/lib/super/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Super
-  VERSION = "0.19.0"
+  VERSION = "0.20.0"
 end

data/lib/super.rb

@@ -7,6 +7,7 @@ require "rails/engine"
 require "super/schema/common"
 require "super/useful/builder"
 require "super/useful/enum"
+require "super/useful/i19"
 
 require "super/action_inquirer"
 require "super/assets"
@@ -24,12 +25,16 @@ require "super/filter/guesser"
 require "super/filter/operator"
 require "super/filter/schema_types"
 require "super/form"
-require "super/form/builder"
 require "super/form/field_transcript"
 require "super/form/guesser"
 require "super/form/inline_errors"
 require "super/form/schema_types"
 require "super/form/strong_params"
+require "super/form_builder"
+require "super/form_builder/action_text_methods"
+require "super/form_builder/base_methods"
+require "super/form_builder/flatpickr_methods"
+require "super/form_builder/option_methods"
 require "super/layout"
 require "super/link"
 require "super/link_builder"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-14 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -332,12 +332,16 @@ files:
 - lib/super/filter/operator.rb
 - lib/super/filter/schema_types.rb
 - lib/super/form.rb
-- lib/super/form/builder.rb
 - lib/super/form/field_transcript.rb
 - lib/super/form/guesser.rb
 - lib/super/form/inline_errors.rb
 - lib/super/form/schema_types.rb
 - lib/super/form/strong_params.rb
+- lib/super/form_builder.rb
+- lib/super/form_builder/action_text_methods.rb
+- lib/super/form_builder/base_methods.rb
+- lib/super/form_builder/flatpickr_methods.rb
+- lib/super/form_builder/option_methods.rb
 - lib/super/layout.rb
 - lib/super/link.rb
 - lib/super/link_builder.rb
@@ -357,6 +361,7 @@ files:
 - lib/super/sort.rb
 - lib/super/useful/builder.rb
 - lib/super/useful/enum.rb
+- lib/super/useful/i19.rb
 - lib/super/version.rb
 - lib/super/view_chain.rb
 - lib/super/view_helper.rb
@@ -365,11 +370,11 @@ homepage:
 licenses:
 - LGPL-3.0-only
 metadata:
-  bug_tracker_uri: https://github.com/zachahn/super/issues
-  changelog_uri: https://github.com/zachahn/super/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/superadministration/super/issues
+  changelog_uri: https://github.com/superadministration/super/blob/main/CHANGELOG.md
   documentation_uri: https://superadministration.github.io/
-  homepage_uri: https://github.com/zachahn/super
-  source_code_uri: https://github.com/zachahn/super
+  homepage_uri: https://github.com/superadministration/super
+  source_code_uri: https://github.com/superadministration/super
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -385,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: A simple, powerful, zero dependency Rails admin framework

data/lib/super/form/builder.rb

@@ -1,289 +0,0 @@
-# frozen_string_literal: true
-
-module Super
-  class Form
-    # Example
-    #
-    # ```ruby
-    # super_form_for([:admin, @member]) do |f|
-    #   # the long way
-    #   f.super.label :name
-    #   f.super.text_field :name
-    #   f.super.inline_errors :name
-    #
-    #   # the short way (slightly different from the long way, for alignment)
-    #   f.super.text_field! :position
-    # end
-    # ```
-    #
-    # Refer to the Rails docs:
-    # https://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html
-    class Builder < ActionView::Helpers::FormBuilder
-      FIELD_ERROR_PROC = proc { |html_tag, instance| html_tag }
-      FORM_BUILDER_DEFAULTS = { builder: self }.freeze
-
-      def super(**options)
-        @super_wrappers ||= Wrappers.new(self, @template)
-      end
-
-      class Wrappers
-        def initialize(builder, template)
-          @builder = builder
-          @template = template
-        end
-
-        def inline_errors(attribute)
-          if @builder.object
-            messages = InlineErrors.error_messages(@builder.object, attribute).map do |msg|
-              error_content_tag(msg)
-            end
-
-            @template.safe_join(messages)
-          else
-            error_content_tag(<<~MSG.html_safe)
-              This form doesn't have an object, so something is probably wrong.
-              Maybe <code>accepts_nested_attributes_for</code> isn't set up?
-            MSG
-          end
-        end
-
-        def label(attribute, text = nil, options = {}, &block)
-          options, defaults = split_defaults(options, class: "block")
-          options[:class] = join_classes(defaults[:class], options[:class])
-
-          @builder.label(attribute, text, options, &block)
-        end
-
-        def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0")
-          @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])
-
-          @builder.password_field(attribute, options)
-        end
-
-        def rich_text_area(attribute, options = {})
-          options, defaults = split_defaults(options, class: "trix-content super-input w-full")
-          options[:class] = join_classes(defaults[:class], options[:class])
-
-          @builder.rich_text_area(attribute, options)
-        end
-
-        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")
-          html_options[:class] = join_classes(html_defaults[:class], html_options[:class])
-
-          @builder.select(attribute, choices, options, html_options, &block)
-        end
-
-        def submit(value = nil, options = {})
-          value, options = nil, value if value.is_a?(Hash)
-          options, defaults = split_defaults(options, class: "super-button")
-          options[:class] = join_classes(defaults[:class], options[:class])
-
-          @builder.submit(value, options)
-        end
-
-        def text_field(attribute, options = {})
-          options, defaults = split_defaults(options, class: "super-input w-full")
-          options[:class] = join_classes(defaults[:class], options[:class])
-
-          @builder.text_field(attribute, options)
-        end
-
-        def container(&block)
-          @template.content_tag(:div, class: "super-field-group", &block)
-        end
-
-        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, label_text, label),
-              "</div>".html_safe,
-              show_errors && inline_errors(attribute),
-            ])
-          end
-        end
-
-        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_text, label),
-              %(<div class="mt-1">).html_safe,
-              public_send(:password_field, attribute, field),
-              show_errors && inline_errors(attribute),
-              %(</div>).html_safe,
-            ])
-          end
-        end
-
-        def rich_text_area!(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(:rich_text_area, attribute, field),
-              show_errors && inline_errors(attribute),
-              %(</div>).html_safe,
-            ])
-          end
-        end
-
-        def select!(attribute, collection, 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(:select, attribute, collection, field),
-              show_errors && inline_errors(attribute),
-              %(</div>).html_safe,
-            ])
-          end
-        end
-
-        def text_field!(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(:text_field, attribute, field),
-              show_errors && inline_errors(attribute),
-              %(</div>).html_safe,
-            ])
-          end
-        end
-
-        private
-
-        def split_defaults(options, **internal_defaults)
-          defaults = options.delete(:super) || {}
-          # prefer options set in `defaults`, since they are user overrides
-          defaults = internal_defaults.merge(defaults)
-
-          [options, defaults]
-        end
-
-        def join_classes(*class_lists)
-          class_lists.flatten.map(&:presence).compact
-        end
-
-        def error_content_tag(content)
-          @template.content_tag(:p, content, class: "text-red-400 text-xs italic pt-1")
-        end
-
-        def compact_join(*parts)
-          @template.safe_join(
-            parts.flatten.map(&:presence).compact
-          )
-        end
-      end
-    end
-  end
-end