super 0.21.0 → 0.22.0

data/lib/super/action_inquirer.rb

@@ -24,24 +24,44 @@ module Super
         "delete" => %w[destroy],
 
         "collection" => %w[index new create],
-        "member" => %w[show edit update destroy],
+        "member" => %w[show edit update destroy]
       }
     end
 
     # @return [ActionInquirer]
-    def self.index!; new(default_for_resources, "index"); end
+    def self.index!
+      new(default_for_resources, "index")
+    end
+
     # @return [ActionInquirer]
-    def self.show!; new(default_for_resources, "show"); end
+    def self.show!
+      new(default_for_resources, "show")
+    end
+
     # @return [ActionInquirer]
-    def self.new!; new(default_for_resources, "new"); end
+    def self.new!
+      new(default_for_resources, "new")
+    end
+
     # @return [ActionInquirer]
-    def self.edit!; new(default_for_resources, "edit"); end
+    def self.edit!
+      new(default_for_resources, "edit")
+    end
+
     # @return [ActionInquirer]
-    def self.create!; new(default_for_resources, "create"); end
+    def self.create!
+      new(default_for_resources, "create")
+    end
+
     # @return [ActionInquirer]
-    def self.update!; new(default_for_resources, "update"); end
+    def self.update!
+      new(default_for_resources, "update")
+    end
+
     # @return [ActionInquirer]
-    def self.destroy!; new(default_for_resources, "destroy"); end
+    def self.destroy!
+      new(default_for_resources, "destroy")
+    end
 
     def initialize(categories_and_their_actions, action)
       @categories = categories_and_their_actions.keys.map(&:to_s)

data/lib/super/assets.rb

@@ -16,7 +16,7 @@ module Super
     end
 
     def self.use_webpacker(assets, grep: nil)
-      assets = [assets] if !assets.kind_of?(Array)
+      assets = [assets] if !assets.is_a?(Array)
 
       assets.map do |asset|
         grep_matches = grep && asset === grep
@@ -29,7 +29,7 @@ module Super
     end
 
     def self.use_sprockets(assets, grep: nil)
-      assets = [assets] if !assets.kind_of?(Array)
+      assets = [assets] if !assets.is_a?(Array)
 
       assets.map do |asset|
         grep_matches = grep && asset === grep

data/lib/super/badge.rb

@@ -9,46 +9,22 @@ module Super
       yellow: "bg-yellow-400 text-black",
       green: "bg-green-700 text-white",
       blue: "bg-blue-700 text-white",
-      purple: "bg-purple-800 text-white",
+      purple: "bg-purple-800 text-white"
     }
 
-    def initialize(text, style: nil, styles: nil)
-      @text = text
-      if styles.present?
-        Super::Useful::Deprecation["0.22"].deprecation_warning("styles:", "use `style:` with a single style")
-      end
-      @requested_styles = Array(styles.presence).flatten + Array(style.presence).flatten
-      if @requested_styles.any? { |s| s.is_a?(String) }
-        Super::Useful::Deprecation["0.22"].warn("Super::Badge.new(text, style:) accepts exactly one Symbol style from this list #{STYLES.keys.inspect}")
-      end
-      if @requested_styles.size != 1
-        Super::Useful::Deprecation["0.22"].warn("Super::Badge.new(text, style:) accepts exactly one style, but it received #{@requested_styles.size}")
+    def initialize(text, style:)
+      if !STYLES.key?(style)
+        raise Super::Error::Initialization, "`style:` must be one of #{STYLES.keys.inspect}"
       end
+
+      @text = text
+      @style = style
     end
 
     def styles
       return @styles if instance_variable_defined?(:@styles)
-      @styles =
-        if requested_styles.delete(:reset)
-          []
-        else
-          COMMON_STYLES
-        end
-
-      if requested_styles.empty?
-        @styles += [STYLES[:light]]
-      else
-        requested_styles.each do |style|
-          @styles +=
-            if STYLES.key?(style)
-              [STYLES[style]]
-            else
-              [style]
-            end
-        end
-      end
 
-      @styles
+      @styles = COMMON_STYLES + [STYLES.fetch(@style)]
     end
 
     def to_s

data/lib/super/cheat.rb

@@ -5,16 +5,17 @@ module Super
     def controller
       paths = %w[
         ../../app/controllers/super/application_controller.rb
-        ../../app/controllers/super/substructure_controller.rb
         ../../app/controllers/super/view_controller.rb
         ../../app/controllers/super/sitewide_controller.rb
+        ../../app/controllers/super/substructure_controller.rb
+        ../../app/controllers/super/foundation_controller.rb
       ]
       methods =
         paths
-        .map { |f| File.read(File.expand_path(f, __dir__)) }
-        .flat_map { |content| content.scan(/^\s+(?:helper_method )?def .*$/) }
-        .reject { |method| method =~ /\bdef self\./ }
-        .map { |method| method.strip.sub(/^(?:helper_method )?def /, "#") }
+          .map { |f| File.read(File.expand_path(f, __dir__)) }
+          .flat_map { |content| content.scan(/^\s+(?:helper_method )?def .*$/) }
+          .reject { |method| method =~ /\bdef self\./ }
+          .map { |method| method.strip.sub(/^(?:helper_method )?def /, "#") }
 
       puts "== Super::ApplicationController"
       puts methods.join("\n")

data/lib/super/client_error.rb

@@ -6,9 +6,13 @@ module Super
   # See also `Super::Error`
   class ClientError < StandardError
     class BadRequest < ClientError; end
+
     class Unauthorized < ClientError; end
+
     class Forbidden < ClientError; end
+
     class NotFound < ClientError; end
+
     class UnprocessableEntity < ClientError; end
 
     module Handling

data/lib/super/compatibility.rb

@@ -34,6 +34,10 @@ module Super
               def method_missing(method_name)
                 Rails.application.routes.url_helpers.public_send(method_name)
               end
+
+              def respond_to_missing?(*args, **kwargs)
+                Rails.application.routes.url_helpers.respond_to?(*args, **kwargs)
+              end
             end
 
             klass.new

data/lib/super/configuration.rb

@@ -24,6 +24,9 @@ module Super
     include ActiveSupport::Configurable
 
     config_accessor(:title) { "Super Admin" }
+
+    # @!attribute [rw] index_records_per_page
+    #   @return [Integer]
     config_accessor(:index_records_per_page) { 100 }
     config_accessor(:javascripts) do
       [Super::Assets.auto("super/application")]

data/lib/super/display/schema_types.rb

@@ -12,21 +12,30 @@ module Super
           @transform_block = block
         end
 
-        builder def real; @real = true; end
-        builder def computed; @real = false; end
+        builder def real
+          @real = true
+        end
+        builder def computed
+          @real = false
+        end
 
-        # @deprecated Prefer {#attribute}
-        builder def column
-          Useful::Deprecation["0.22"].deprecation_warning(":column", "use :attribute instead")
+        builder def attribute
           @type = :attribute
         end
-        builder def attribute; @type = :attribute; end
-        builder def record; @type = :record; end
-        builder def none; @type = :none; end
+        builder def record
+          @type = :record
+        end
+        builder def none
+          @type = :none
+        end
 
-        builder def ignore_nil; @ignore_nil = true; end
+        builder def ignore_nil
+          @ignore_nil = true
+        end
 
-        builder def attribute_name(name); @attribute_name = name; end
+        builder def attribute_name(name) # standard:disable Style/TrivialAccessors
+          @attribute_name = name
+        end
 
         def build
           Built.new(
@@ -48,7 +57,9 @@ module Super
           @transform_block = transform_block
         end
 
-        def real?; @real; end
+        def real?
+          @real
+        end
         attr_reader :type
         attr_reader :attribute_name
 
@@ -71,78 +82,26 @@ module Super
         end
       end
 
-      # @deprecated
-      class Badge
-        extend Useful::Builder
-
-        def initialize(builder)
-          @builder = builder
-          @whens = {}
-          format_for_lookup(&:itself)
-          format_for_display(&:itself)
-        end
-
-        builder_with_block def when(*patterns, &block)
-          patterns.each do |pattern|
-            @whens[pattern] = block
-          end
-        end
-
-        builder_with_block def else(&block)
-          @else = block
-        end
-
-        builder_with_block def format_for_lookup(&block)
-          @format_for_lookup = block
-        end
-
-        builder_with_block def format_for_display(&block)
-          @format_for_display = block
-        end
-
-        def build
-          @builder.transform do |value|
-            lookup_value = @format_for_lookup.call(value)
-            block = @whens[lookup_value] || @else
-            Super::Badge.new(
-              @format_for_display.call(value),
-              styles: block&.call
-            )
-          end
-          @builder.build
-        end
-      end
-
       def initialize(fields:)
         @actions_called = false
         @fields = fields
       end
 
       def real(type = :attribute, &transform_block)
-        if type == :column
-          Useful::Deprecation["0.22"].deprecation_warning(":column", "use :attribute instead")
-          type = :attribute
-        end
-
         TYPES
           .case(type)
           .when(:attribute) { Builder.new.real.ignore_nil.attribute.transform(&transform_block) }
-          .when(:record)    { Builder.new.real.ignore_nil.record.transform(&transform_block) }
-          .when(:none)      { Builder.new.real.ignore_nil.none.transform(&transform_block) }
+          .when(:record) { Builder.new.real.ignore_nil.record.transform(&transform_block) }
+          .when(:none) { Builder.new.real.ignore_nil.none.transform(&transform_block) }
           .result
       end
 
       def computed(type = :attribute, &transform_block)
-        if type == :column
-          Useful::Deprecation["0.22"].deprecation_warning(":column", "use :attribute instead")
-          type = :attribute
-        end
-
         TYPES
           .case(type)
           .when(:attribute) { Builder.new.computed.ignore_nil.attribute.transform(&transform_block) }
-          .when(:record)    { Builder.new.computed.ignore_nil.record.transform(&transform_block) }
-          .when(:none)      { Builder.new.computed.ignore_nil.none.transform(&transform_block) }
+          .when(:record) { Builder.new.computed.ignore_nil.record.transform(&transform_block) }
+          .when(:none) { Builder.new.computed.ignore_nil.none.transform(&transform_block) }
           .result
       end
 
@@ -152,29 +111,26 @@ module Super
 
       def batch
         real do |value|
-          Partial.new("batch_checkbox", locals: { value: value })
+          Partial.new("batch_checkbox", locals: {value: value})
         end
       end
 
-      def string; real(&:to_s); end
+      def string
+        real(&:to_s)
+      end
 
-      def timestamp; real(&:to_s); end
-      def time; real { |value| value.strftime("%H:%M:%S") }; end
+      def timestamp
+        real(&:to_s)
+      end
 
-      def rich_text
-        computed do |value|
-          Partial.new("display_rich_text", locals: { rich_text: value })
-        end
+      def time
+        real { |value| value.strftime("%H:%M:%S") }
       end
 
-      # @deprecated Use {#real} or {#computed} instead, and return an instance of {Super::Badge}
-      def badge(*builder_methods)
-        Useful::Deprecation["0.22"].deprecation_warning("#badge", "use #real or #computed instead, and return an instance of Super::Badge")
-        builder_methods = %i[real ignore_nil attribute] if builder_methods.empty?
-        builder = builder_methods.each_with_object(Builder.new) do |builder_method, builder|
-          builder.public_send(builder_method)
+      def rich_text
+        computed do |value|
+          Partial.new("display_rich_text", locals: {rich_text: value})
         end
-        Badge.new(builder)
       end
 
       def actions

data/lib/super/display.rb

@@ -27,7 +27,7 @@ module Super
 
     def initialize
       @fields = Super::Schema::Fields.new(
-        transform_value_on_set: -> (val) { if val.respond_to?(:build) then val.build else val end }
+        transform_value_on_set: ->(val) { val.respond_to?(:build) ? val.build : val }
       )
       @schema_types = SchemaTypes.new(fields: @fields)
 
@@ -62,18 +62,18 @@ module Super
 
       formatted =
         SchemaTypes::TYPES
-        .case(formatter.type)
-        .when(:record) do
-          formatter.present(column, record)
-        end
-        .when(:attribute) do
-          value = record.public_send(column)
-          formatter.present(column, value)
-        end
-        .when(:none) do
-          formatter.present(column)
-        end
-        .result
+          .case(formatter.type)
+          .when(:record) do
+            formatter.present(column, record)
+          end
+          .when(:attribute) do
+            value = record.public_send(column)
+            formatter.present(column, value)
+          end
+          .when(:none) do
+            formatter.present(column)
+          end
+          .result
 
       if formatted.respond_to?(:to_partial_path)
         if formatted.respond_to?(:locals)

data/lib/super/error.rb

@@ -7,14 +7,19 @@ module Super
   class Error < StandardError
     # Error raised when some configuration is not set
     class UnconfiguredConfiguration < Error; end
+
     # Error raised when a configuration is set to a invalid value
     class InvalidConfiguration < Error; end
+
     # Error raised on problematic plugins, see `Super::Plugin`
     class InvalidPluginArgument < Error; end
+
     # Error raised on problematic ActionInquirer settings, see `Super::ActionInquirer`
     class ActionInquirerError < Error; end
+
     # Error raised when a `Super::Link` couldn't be found
     class LinkNotRegistered < Error; end
+
     # Error raised when rendering if `@view` wasn't set by the controller
     class NothingToRender < Error
       def initialize(basename)
@@ -24,23 +29,32 @@ module Super
         )
       end
     end
+
     # Error raised when something wasn't initialized correctly, and if there isn't
     # a more specific error
     class Initialization < Error; end
+
     class ArgumentError < Error; end
+
     class AlreadyRegistered < Error; end
+
     class AlreadyTranscribed < Error; end
+
     class NotImplementedError < Error; end
+
     class IncompleteBuilder < Error; end
 
     class Enum < Error
       class ImpossibleValue < Enum; end
+
       class ArgumentError < Enum; end
+
       class UndefinedCase < Enum; end
     end
 
     class ReorderableHash < Error
       class DuplicateKey < ReorderableHash; end
+
       class KeyError < ReorderableHash; end
     end
 

data/lib/super/filter/form_object.rb

@@ -44,8 +44,8 @@ module Super
           query_parameter_keys = [NULLARY] if query_parameter_keys.empty?
           @specified_values =
             query_parameter_keys
-            .map { |key| [key, @params[key].presence&.strip] }
-            .to_h
+              .map { |key| [key, @params[key].presence&.strip] }
+              .to_h
 
           @specified_values.each do |key, value|
             define_singleton_method(key) { value }

data/lib/super/filter/operator.rb

@@ -57,7 +57,7 @@ module Super
       attr_reader :humanized_operator_name
 
       def behavior(&block)
-        self.behavior = block if block_given?
+        self.behavior = block if block
         @behavior
       end
 

data/lib/super/filter/schema_types.rb

@@ -28,7 +28,7 @@ module Super
           nil
         end
 
-        alias add push
+        alias_method :add, :push
 
         def each
           return enum_for(:each) if !block_given?

data/lib/super/form/field_transcript.rb

@@ -38,6 +38,10 @@ module Super
         @kwargs = kwargs
         @method_name
       end
+
+      def respond_to_missing?(*, **)
+        true
+      end
     end
   end
 end

data/lib/super/form/schema_types.rb

@@ -79,7 +79,7 @@ module Super
           end
 
           if @extras.key?(:reader)
-            return @extras[:reader].to_s.singularize.humanize
+            @extras[:reader].to_s.singularize.humanize
           end
         end
 
@@ -142,7 +142,7 @@ module Super
       end
 
       def self.define_schema_type_for(method_name)
-        class_eval(<<~RUBY)
+        class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
           def #{method_name}(*args, **kwargs)
             Direct.new(super_builder: true, method_name: :#{method_name}!, args: args, kwargs: kwargs)
           end

data/lib/super/form/strong_params.rb

@@ -20,7 +20,7 @@ module Super
       def unfurl(responds_to_each_attribute)
         responds_to_each_attribute.each_attribute.map do |name, type|
           if type.nested_fields&.any?
-            { name => [:id, *unfurl(type)] }
+            {name => [:id, *unfurl(type)]}
           else
             name
           end

data/lib/super/form_builder/base_methods.rb

@@ -3,7 +3,7 @@
 module Super
   class FormBuilder
     class Wrappers
-      skipped_field_helpers = [:label, :check_box, :radio_button, :fields_for, :fields, :hidden_field, :file_field]
+      skipped_field_helpers = [:label, :check_box, :radio_button, :fields_for, :fields, :hidden_field]
       (ActionView::Helpers::FormBuilder.field_helpers - skipped_field_helpers).each do |builder_method_name|
         class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
           def #{builder_method_name}(attribute, options = {})
@@ -30,26 +30,20 @@ module Super
 
       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])
+        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),
+            show_errors && inline_errors(attribute)
           ])
         end
       end
 
       ::Super::Form::SchemaTypes.define_schema_type_for(:check_box)
 
-      # def file_field(attribute, options = {})
-      # end
-
-      # def file_field!(attribute, label_text: nil, label: {}, field: {}, show_errors: true)
-      # end
-
       def hidden_field(attribute, options = {})
         @builder.hidden_field(attribute, options)
       end

data/lib/super/form_builder/flatpickr_methods.rb

@@ -10,7 +10,7 @@ module Super
           data: {
             controller: "flatpickr",
             flatpickr_options_value: {
-              dateFormat: "Y-m-d",
+              dateFormat: "Y-m-d"
             }
           }
         )
@@ -33,7 +33,7 @@ module Super
             flatpickr_options_value: {
               enableSeconds: true,
               enableTime: true,
-              dateFormat: "Z",
+              dateFormat: "Z"
             }
           }
         )
@@ -57,7 +57,7 @@ module Super
               enableSeconds: true,
               enableTime: true,
               noCalendar: true,
-              dateFormat: "H:i:S",
+              dateFormat: "H:i:S"
             }
           }
         )

data/lib/super/form_builder.rb

@@ -19,7 +19,7 @@ module Super
   # https://api.rubyonrails.org/classes/ActionView/Helpers/FormBuilder.html
   class FormBuilder < ActionView::Helpers::FormBuilder
     FIELD_ERROR_PROC = proc { |html_tag, instance| html_tag }
-    FORM_BUILDER_DEFAULTS = { builder: self }.freeze
+    FORM_BUILDER_DEFAULTS = {builder: self}.freeze
 
     def super(**options)
       @super_wrappers ||= Wrappers.new(self, @template)
@@ -68,29 +68,27 @@ module Super
           elsif type == :block
             definition_last.push("&#{name}")
             call_last.push("&#{name}")
-          else
-            if type == :req
-              definition.push(name.to_s)
+          elsif type == :req
+            definition.push(name.to_s)
+            call.push(name.to_s)
+          elsif type == :opt || type == :key
+            if !optionals.key?(name)
+              raise Super::Error::ArgumentError, "Form bang method has optional argument, but doesn't know the default value: #{name}"
+            end
+
+            default_value = optionals[name]
+
+            if type == :opt
+              definition.push("#{name} = #{default_value}")
               call.push(name.to_s)
-            elsif type == :opt || type == :key
-              if !optionals.key?(name)
-                raise Super::Error::ArgumentError, "Form bang method has optional argument, but doesn't know the default value: #{name}"
-              end
-
-              default_value = optionals[name]
-
-              if type == :opt
-                definition.push("#{name} = #{default_value}")
-                call.push(name.to_s)
-              elsif type == :key
-                definition.push("#{name}: #{default_value}")
-                call.push("#{name}: #{name}")
-              else
-                raise Super::Error::ArgumentError, "Form bang method has a unprocessable argument with name #{name}"
-              end
+            elsif type == :key
+              definition.push("#{name}: #{default_value}")
+              call.push("#{name}: #{name}")
             else
-              raise Super::Error::ArgumentError, "Form bang method has keyword argument type #{type} and name #{name}"
+              raise Super::Error::ArgumentError, "Form bang method has a unprocessable argument with name #{name}"
             end
+          else
+            raise Super::Error::ArgumentError, "Form bang method has keyword argument type #{type} and name #{name}"
           end
         end