super 0.0.16 → 0.17.0

data/lib/super/filter/schema_types.rb

@@ -2,112 +2,95 @@
 
 module Super
   class Filter
-    # This schema type is used to configure the filtering form on your +#index+
-    # action.
-    #
-    # The +operators:+ keyword argument can be left out in each case. There is
-    # a default set of operators that are provided.
-    #
     # Note: The constants under "Defined Under Namespace" are considered
     # private.
-    #
-    #   class MemberDashboard
-    #     # ...
-    #
-    #     def filter_schema
-    #       Super::Filter.new do |fields, type|
-    #         fields[:name] = type.text(operators: [
-    #           Super::Filter::Operator.eq,
-    #           Super::Filter::Operator.contain,
-    #           Super::Filter::Operator.ncontain,
-    #           Super::Filter::Operator.start,
-    #           Super::Filter::Operator.end,
-    #         ])
-    #         fields[:rank] = type.select(collection: Member.ranks.values)
-    #         fields[:position] = type.text(operators: [
-    #           Super::Filter::Operator.eq,
-    #           Super::Filter::Operator.neq,
-    #           Super::Filter::Operator.contain,
-    #           Super::Filter::Operator.ncontain,
-    #         ])
-    #         fields[:ship_id] = type.select(
-    #           collection: Ship.all.map { |s| ["#{s.name} (Ship ##{s.id})", s.id] },
-    #         )
-    #         fields[:created_at] = type.timestamp
-    #         fields[:updated_at] = type.timestamp
-    #       end
-    #     end
-    #
-    #     # ...
-    #   end
     class SchemaTypes
-      class Text
-        def initialize(partial_path:, operators:)
-          @partial_path = partial_path
-          @operators = operators
-        end
+      class OperatorList
+        include Enumerable
 
-        attr_reader :operators
+        def initialize(*new_operators)
+          @operators = {}
+          @operator_transcript = {}
+          @fallback_transcript = nil
 
-        def to_partial_path
-          @partial_path
+          push(*new_operators)
         end
 
-        def q
-          [:q]
-        end
-      end
+        def push(*new_operators)
+          new_operators.flatten.map(&:dup).each do |new_operator|
+            new_identifier = new_operator.identifier.to_s
+
+            raise Error::AlreadyRegistered if @operators.key?(new_identifier)
 
-      class Select
-        def initialize(collection:, operators:)
-          @collection = collection
-          @operators = operators
+            @operators[new_identifier] = new_operator
+          end
+
+          nil
         end
 
-        attr_reader :collection
-        attr_reader :operators
+        alias add push
+
+        def each
+          return enum_for(:each) if !block_given?
 
-        def to_partial_path
-          "filter_type_select"
+          @operators.each do |identifier, operator|
+            yield(
+              OperatorWithFieldTranscript.new(
+                operator,
+                @operator_transcript[identifier] || @fallback_transcript
+              )
+            )
+          end
         end
 
-        def q
-          [:q]
+        def transcribe(operator_identifier = nil)
+          transcript = Form::FieldTranscript.new
+          yield transcript
+
+          if operator_identifier.nil?
+            @fallback_transcript = transcript
+          else
+            @operator_transcript[operator_identifier.to_s] = transcript
+          end
+
+          self
         end
       end
 
-      class Timestamp
-        def initialize(operators:)
-          @operators = operators
+      class OperatorWithFieldTranscript
+        def initialize(operator, field_transcript)
+          @operator = operator
+          @field_transcript = field_transcript
         end
 
-        attr_reader :operators
-
-        def to_partial_path
-          "filter_type_timestamp"
+        Super::Filter::Operator.instance_methods(false).each do |name|
+          delegate name, to: :@operator
         end
 
-        def q
-          [:q0, :q1]
-        end
+        attr_reader :field_transcript
+      end
+
+      def use(*identifiers)
+        found_operators = identifiers.flatten.map { |id| Operator[id] }
+        OperatorList.new(*found_operators)
+      end
+
+      def select(collection)
+        use("eq", "null", "nnull")
+          .transcribe { |f| f.super.select(collection) }
       end
 
-      def select(collection:, operators: Filter::Operator.select_defaults)
-        Select.new(
-          collection: collection,
-          operators: operators
-        )
+      def text
+        use("contain", "ncontain", "blank", "nblank")
       end
 
-      def text(operators: Filter::Operator.text_defaults)
-        Text.new(
-          partial_path: "filter_type_text",
-          operators: operators
-        )
+      def timestamp
+        use("between", "null", "nnull")
+          .transcribe { |f| f.super.datetime_flatpickr }
       end
 
-      def timestamp(operators: Filter::Operator.range_defaults)
-        Timestamp.new(operators: operators)
+      def boolean
+        use("true", "false", "null", "nnull")
       end
     end
   end

data/lib/super/form/builder.rb

@@ -71,7 +71,8 @@ module Super
           )
           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
+          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
@@ -91,7 +92,8 @@ module Super
           )
           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
+          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
@@ -112,7 +114,8 @@ module Super
           )
           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")
+          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

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

@@ -30,7 +30,7 @@ module Super
         when :date
           @type.date_flatpickr
         else
-          @type.string
+          @type.text_field
         end
       end
     end

data/lib/super/form/schema_types.rb

@@ -97,7 +97,7 @@ 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
 
@@ -105,17 +105,14 @@ module Super
         Direct.new(super_builder: super_builder, method_name: method_name, args: args, kwargs: kwargs)
       end
 
-      def select(**extras)
-        Generic.new(partial_path: "form_field_select", extras: extras, nested: {})
+      def select(*args, **kwargs)
+        Direct.new(super_builder: true, method_name: :select!, args: args, kwargs: kwargs)
       end
 
       def text_field(*args, **kwargs)
         Direct.new(super_builder: true, method_name: :text_field!, args: args, kwargs: kwargs)
       end
 
-      alias string text_field
-      alias text text_field
-
       def rich_text_area(*args, **kwargs)
         Direct.new(super_builder: true, method_name: :rich_text_area!, args: args, kwargs: kwargs)
       end
@@ -124,20 +121,14 @@ module Super
         Direct.new(super_builder: true, method_name: :check_box!, args: args, kwargs: kwargs)
       end
 
-      alias checkbox check_box
-
       def date_flatpickr(*args, **kwargs)
         Direct.new(super_builder: true, method_name: :date_flatpickr!, args: args, kwargs: kwargs)
       end
 
-      alias flatpickr_date date_flatpickr
-
       def datetime_flatpickr(*args, **kwargs)
         Direct.new(super_builder: true, method_name: :datetime_flatpickr!, args: args, kwargs: kwargs)
       end
 
-      alias flatpickr_datetime datetime_flatpickr
-
       def hidden_field(*args, **kwargs)
         Direct.new(super_builder: false, method_name: :hidden_field, args: args, kwargs: kwargs)
       end
@@ -150,29 +141,29 @@ module Super
         Direct.new(super_builder: true, method_name: :time_flatpickr!, args: args, kwargs: kwargs)
       end
 
-      alias flatpickr_time time_flatpickr
-
       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

@@ -107,7 +107,7 @@ module Super
       @href = Super::Compatability.polymorphic_path_container.polymorphic_path(@href)
     end
 
-    def to_s(default_options: nil)
+    def to_s(default_options: nil, **)
       default_options ||= {}
       ActionController::Base.helpers.link_to(
         text,

data/lib/super/schema.rb

@@ -42,6 +42,10 @@ module Super
         enum_for(:each)
       end
 
+      def delete(key)
+        @backing.delete(key)
+      end
+
       def replace(other)
         @backing = other
       end

data/lib/super/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.17.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -235,14 +235,10 @@ files:
 - app/views/super/application/_display_rich_text.html.erb
 - app/views/super/application/_display_show.html.erb
 - app/views/super/application/_filter.html.erb
-- app/views/super/application/_filter_type_select.html.erb
-- app/views/super/application/_filter_type_text.html.erb
-- app/views/super/application/_filter_type_timestamp.html.erb
 - app/views/super/application/_flash.html.erb
 - app/views/super/application/_form.html.erb
 - app/views/super/application/_form_field.html.erb
 - app/views/super/application/_form_field__destroy.html.erb
-- app/views/super/application/_form_field_select.html.erb
 - app/views/super/application/_form_fieldset.html.erb
 - app/views/super/application/_form_has_many.html.erb
 - app/views/super/application/_form_has_one.html.erb
@@ -300,6 +296,7 @@ files:
 - 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
@@ -348,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.0.3.1
 signing_key:
 specification_version: 4
 summary: A simple, powerful, zero dependency Rails admin framework

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

@@ -1,21 +0,0 @@
-<div class="super-field-group" data-controller="clean-filter-param">
-  <%= 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="inline-block">
-      <%= form_field.super.select(
-        :op,
-        filter_type_select.operators,
-        { include_blank: false },
-        data: { clean_filter_param_target: "candidate" }
-      ) %>
-    </div>
-    <div class="mt-3">
-      <%= form_field.super.select(
-        :q,
-        filter_type_select.field_type.collection,
-        {},
-        data: { clean_filter_param_target: "control candidate" }
-      ) %>
-    </div>
-  <% end %>
-</div>