super 0.0.16 → 0.19.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/filter.rb

@@ -3,7 +3,7 @@
 module Super
   class Filter
     def initialize
-      @schema_type = Filter::SchemaTypes.new
+      @schema_type = SchemaTypes.new
       @fields = Schema::Fields.new
 
       yield(@fields, @schema_type)

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/layout.rb

@@ -6,44 +6,20 @@ module Super
   class Layout
     include Super::Partial::Resolving
 
-    def initialize(headers: nil, asides: nil, mains: nil, footers: nil)
-      @headers = Array(headers).compact
-      @asides = Array(asides).compact
-      @mains = Array(mains).compact
-      @footers = Array(footers).compact
+    def initialize(header: nil, aside: nil, main: nil, footer: nil)
+      @header = header
+      @aside = aside
+      @main = main
+      @footer = footer
     end
 
-    attr_reader :headers
-    attr_reader :asides
-    attr_reader :mains
-    attr_reader :footers
+    attr_reader :header
+    attr_reader :aside
+    attr_reader :main
+    attr_reader :footer
 
     def to_partial_path
       "layout"
     end
-
-    def resolve(template)
-      @resolved_headers = resolve_for_rendering(template, headers, nil)
-      @resolved_asides = resolve_for_rendering(template, asides, nil)
-      @resolved_mains = resolve_for_rendering(template, mains, nil)
-      @resolved_footers = resolve_for_rendering(template, footers, nil)
-      self
-    end
-
-    def resolved_headers
-      @resolved_headers || []
-    end
-
-    def resolved_asides
-      @resolved_asides || []
-    end
-
-    def resolved_mains
-      @resolved_mains || []
-    end
-
-    def resolved_footers
-      @resolved_footers || []
-    end
   end
 end

data/lib/super/link.rb

@@ -107,13 +107,8 @@ module Super
       @href = Super::Compatability.polymorphic_path_container.polymorphic_path(@href)
     end
 
-    def to_s(default_options: nil)
-      default_options ||= {}
-      ActionController::Base.helpers.link_to(
-        text,
-        href,
-        default_options.deep_merge(options)
-      )
+    def to_partial_path
+      "link"
     end
 
     def ==(other)

data/lib/super/link_builder.rb

@@ -19,10 +19,6 @@ module Super
 
     attr_reader :requirements
 
-    def to_s(default_options: nil, **kwargs)
-      resolve(**kwargs).to_s(default_options: default_options)
-    end
-
     def resolve(**kwargs)
       Link.new(
         into_value(@text, kwargs),

data/lib/super/packaged_asset.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Super
+  class PackagedAsset
+    VERSION_BEGINNING = /\A\d+\.\d+.\d+/.freeze
+
+    class << self
+      attr_accessor :warning_message
+    end
+
+    def self.comparable_super_version
+      ::Super::VERSION[VERSION_BEGINNING]
+    end
+
+    def self.version_matches_gem?(package_json_path)
+      return true if ENV.key?("SUPER_IGNORE_PACKAGE_JSON_VERSION")
+
+      asset = new(package_json_path)
+
+      return true if !asset.comparable_version
+
+      asset.comparable_version == comparable_super_version
+    end
+
+    def initialize(package_json_path)
+      @package_json_path = package_json_path
+    end
+
+    def full_version
+      if instance_variable_defined?(:@full_version)
+        return @full_version
+      end
+
+      @full_version = JSON.parse(@package_json_path.read).dig("dependencies", "@superadministration/super")
+    rescue
+      @full_version = nil
+    end
+
+    def comparable_version
+      if instance_variable_defined?(:@asset_version)
+        return @asset_version
+      end
+
+      @asset_version = full_version[VERSION_BEGINNING]
+    rescue
+      @asset_version = nil
+    end
+  end
+end

data/lib/super/pagination.rb

@@ -76,9 +76,10 @@ module Super
     module ControllerMethods
       def index
         super
+        return if !@records
         @pagination = initialize_pagination
         @records = paginate_records
-        @view.mains.first.parts.push(:@pagination)
+        @view.main.insert(:pagination, @pagination, before: :main)
       end
     end
   end

data/lib/super/reorderable_hash.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Super
+  class ReorderableHash
+    include TSort
+    include Enumerable
+
+    UNDEFINED = BasicObject.new
+
+    def initialize(data = {})
+      @data = data
+      @ordering = {}
+      keys = @data.keys
+      dependencies = []
+      keys.each do |key|
+        @ordering[key] = dependencies.dup
+        dependencies.push(key)
+      end
+    end
+
+    def insert(key, value, before: UNDEFINED, after: UNDEFINED)
+      if @ordering.key?(key) || @data.key?(key)
+        raise Super::Error::ReorderableHash::DuplicateKey, "Duplicate key: #{key}"
+      end
+      @ordering[key] = []
+      @data[key] = value
+
+      order(key, before: before, after: after)
+
+      nil
+    end
+
+    def order(key, before: UNDEFINED, after: UNDEFINED)
+      if before != UNDEFINED
+        if !@ordering.key?(before)
+          raise KeyError, "Before key not found. Have: #{@data.keys} Requested: #{before}"
+        end
+        @ordering[before].push(key)
+      end
+
+      if after != UNDEFINED
+        if !@ordering.key?(after)
+          raise KeyError, "After key not found. Have: #{@data.keys} Requested: #{after}"
+        end
+        @ordering[key].push(after)
+      end
+    end
+
+    def tsort_each_node(&block)
+      @ordering.each_key(&block)
+    end
+
+    def tsort_each_child(node, &block)
+      dependencies = @ordering.fetch(node) { [] }
+      dependencies.each(&block)
+    end
+
+    def []=(key, where, value)
+      insert(key, value, **where)
+    end
+
+    def keys
+      tsort
+    end
+
+    def values
+      keys.each_with_object([]) do |key, array|
+        array.push(@data[key])
+      end
+    end
+
+    def to_h
+      keys.each_with_object({}) do |key, hash|
+        hash[key] = @data[key]
+      end
+    end
+
+    def each
+      if !block_given?
+        return enum_for(:each)
+      end
+
+      tsort_each do |key|
+        yield key, @data[key]
+      end
+    end
+  end
+end

data/lib/super/reset.rb

@@ -4,6 +4,20 @@ module Super
   module Reset
     extend ActiveSupport::Concern
 
+    KEEP = {
+      # Defined by Rails
+      _layout: true,
+      _generate_paths_by_default: true,
+
+      # Defined in Super::SubstructureController
+      navigation: true,
+      page_title: true,
+
+      # Defined in Super::ApplicationController
+      current_action: true,
+      with_current_action: true,
+    }
+
     included do
       undef_method :index
       undef_method :show
@@ -14,7 +28,12 @@ module Super
       undef_method :destroy
 
       Super::SubstructureController.private_instance_methods(false).each do |imethod|
-        next if imethod == :navigation
+        next if KEEP.key?(imethod)
+        undef_method imethod
+      end
+
+      Super::ApplicationController.private_instance_methods(false).each do |imethod|
+        next if KEEP.key?(imethod)
         undef_method imethod
       end
     end

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.19.0"
 end

data/lib/super/view_chain.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Super
+  class ViewChain
+    def initialize(chain)
+      @data = ReorderableHash.new(chain)
+    end
+
+    def chain
+      @chain ||= @data.values
+    end
+
+    def insert(*args, **kwargs)
+      if instance_variable_defined?(:@chain)
+        raise Error::ViewChain::ChainAlreadyStarted
+      end
+
+      @data.insert(*args, **kwargs)
+    end
+
+    def to_partial_path
+      "view_chain"
+    end
+  end
+end