super 0.17.0 → 0.20.0

data/lib/super/link.rb

@@ -9,75 +9,43 @@ module Super
     end
 
     def self.find(link)
-      if link.kind_of?(self)
-        return link
-      end
-
       if registry.key?(link)
-        return registry[link]
+        found = registry[link]
+
+        if found.is_a?(LinkBuilder)
+          return found.dup
+        else
+          return found
+        end
       end
 
       raise Error::LinkNotRegistered, "Unknown link `#{link}`"
     end
 
     def self.registry
-      @registry ||= {
-        new: LinkBuilder.new(
-          "New",
-          -> (params:) {
-            {
-              controller: params[:controller],
-              action: :new,
-              only_path: true
-            }
-          }
-        ),
-        index: LinkBuilder.new(
-          "Index",
-          -> (params:) {
-            {
-              controller: params[:controller],
-              action: :index,
-              only_path: true
-            }
-          }
-        ),
-        show: LinkBuilder.new(
-          "View",
-          -> (record:, params:) {
-            {
-              controller: params[:controller],
-              action: :show,
-              id: record,
-              only_path: true
-            }
-          }
-        ),
-        edit: LinkBuilder.new(
-          "Edit",
-          -> (record:, params:) {
-            {
-              controller: params[:controller],
-              action: :edit,
-              id: record,
-              only_path: true
-            }
-          }
-        ),
-        destroy: LinkBuilder.new(
-          "Delete",
-          -> (record:, params:) {
-            {
-              controller: params[:controller],
-              action: :destroy,
-              id: record,
-              only_path: true
-            }
-          },
-          method: :delete,
-          data: { confirm: "Really delete?" }
-        ),
-      }
+      @registry ||= {}.tap do |reg|
+        reg[:new] = LinkBuilder.new
+          .text { |params:| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.new") }
+          .href { |params:| { controller: params[:controller], action: :new, only_path: true } }
+          .freeze
+        reg[:index] = LinkBuilder.new
+          .text { |params:| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.index") }
+          .href { |params:| { controller: params[:controller], action: :index, only_path: true } }
+          .freeze
+        reg[:show] = LinkBuilder.new
+          .text { |params:, **| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.show") }
+          .href { |params:, record:| { controller: params[:controller], action: :show, id: record, only_path: true } }
+          .freeze
+        reg[:edit] = LinkBuilder.new
+          .text { |params:, **| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.edit") }
+          .href { |params:, record:| { controller: params[:controller], action: :edit, id: record, only_path: true } }
+          .freeze
+        reg[:destroy] = LinkBuilder.new
+          .text { |params:, **| Super::Useful::I19.i18n_with_fallback("super", params[:controller].split("/"), "actions.destroy") }
+          .href { |params:, record:| { controller: params[:controller], action: :destroy, id: record, only_path: true } }
+          .options { |**| { method: :delete, data: { confirm: "Really delete?" } } }
+          .freeze
+      end
     end
 
     def self.polymorphic_parts(*parts_tail)
@@ -85,15 +53,31 @@ module Super
       parts_head.map { |part| part.is_a?(String) ? part.to_sym : part } + parts_tail
     end
 
+    # The first argument should be the text of the link. If it's an array,
+    # it'll send it directly into `I18n.t`
     def initialize(text, href, **options)
       @text = text
       @href = href
       @options = options
     end
 
-    attr_reader :text
     attr_reader :options
 
+    def text
+      if @text.is_a?(Array)
+        *head, tail = @text
+        if !tail.is_a?(Hash)
+          head.push(tail)
+          tail = {}
+        end
+
+        @text = I18n.t(*head, **tail)
+        return @text
+      end
+
+      @text
+    end
+
     def href
       if @href.is_a?(String)
         return @href
@@ -107,13 +91,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

@@ -2,57 +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
-    end
-
-    attr_reader :requirements
-
-    def to_s(default_options: nil, **kwargs)
-      resolve(**kwargs).to_s(default_options: default_options)
+    %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
 
     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/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/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.17.0"
+  VERSION = "0.20.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

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,26 +25,33 @@ 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"
 require "super/navigation"
+require "super/packaged_asset"
 require "super/pagination"
 require "super/panel"
 require "super/partial"
 require "super/plugin"
 require "super/query/form_object"
+require "super/reorderable_hash"
 require "super/reset"
 require "super/schema"
 require "super/schema/guesser"
 require "super/sort"
 require "super/version"
+require "super/view_chain"
 require "super/view_helper"
 
 require "super/engine"