super 0.0.12 → 0.17.0

data/lib/generators/super/install/install_generator.rb

@@ -36,22 +36,6 @@ module Super
       create_file("app/controllers/#{controller_namespace}/.keep", "")
     end
 
-    def copy_cheatsheet
-      super_path = Pathname.new(Gem.loaded_specs["super"].full_gem_path).expand_path
-      super_cheat_path = super_path.join("docs", "cheat.md")
-
-      path =
-        if options["controller_namespace"].present?
-          "app/controllers/#{controller_namespace}/README.md"
-        else
-          "app/controllers/README.md"
-        end
-
-      create_file(path) do
-        super_cheat_path.read.sub(%r{<!--.*?-->}m, "").strip + "\n"
-      end
-    end
-
     def setup_sprockets4_manifest
       append_to_file "app/assets/config/manifest.js", "//= link super_manifest.js\n"
     end

data/lib/generators/super/install/templates/base_controller.rb.tt

@@ -1,10 +1,2 @@
 class <%= parent_controller_name.classify %>Controller < Super::ApplicationController
-  class <%= parent_controller_name.classify.demodulize %>Controls < Super::Controls
-  end
-
-  private
-
-  def new_controls
-    self.class::Controls.new
-  end
 end

data/lib/generators/super/resource/templates/resources_controller.rb.tt

@@ -1,9 +1,9 @@
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < <%= parent_controller_name.classify %>Controller
-  class Controls < <%= parent_controller_name.classify.demodulize %>Controls
-    def model
-      <%= class_name %>
-    end
+  private
+
+  def model
+    <%= class_name %>
   end
 end
 <% end -%>

data/lib/generators/super/webpacker/webpacker_generator.rb

@@ -5,10 +5,14 @@ module Super
     source_root File.expand_path("templates", __dir__)
 
     def copy_the_pack_file
-      template(
-        "pack_super_application.js.erb",
-        "app/javascript/packs/super/application.js.erb"
-      )
+      path =
+        if Gem::Dependency.new("webpacker", ">= 6.0.0.beta2", "!= 6.0.0.pre1", "!= 6.0.0.pre2").matching_specs.any?
+          "app/packs/entrypoints/super/application.js.erb"
+        else
+          "app/javascript/packs/super/application.js.erb"
+        end
+
+      template("pack_super_application.js.erb", path)
     end
 
     def set_asset_handler_to_webpacker
@@ -16,7 +20,7 @@ module Super
         "config/initializers/super.rb",
         "  c.javascripts = Super::Assets.use_webpacker(c.javascripts)\n" \
         "  c.stylesheets = Super::Assets.use_webpacker(c.stylesheets)\n",
-        before: /\bend\b/
+        before: /^end\b/
       )
     end
 

data/lib/super.rb

@@ -10,10 +10,10 @@ require "super/useful/enum"
 
 require "super/action_inquirer"
 require "super/assets"
+require "super/badge"
 require "super/client_error"
 require "super/compatibility"
 require "super/configuration"
-require "super/controls"
 require "super/display"
 require "super/display/guesser"
 require "super/display/schema_types"
@@ -25,18 +25,21 @@ 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/layout"
 require "super/link"
-require "super/navigation/automatic"
+require "super/link_builder"
+require "super/navigation"
 require "super/pagination"
 require "super/panel"
 require "super/partial"
 require "super/plugin"
 require "super/query/form_object"
+require "super/reset"
 require "super/schema"
 require "super/schema/guesser"
 require "super/sort"

data/lib/super/action_inquirer.rb

@@ -19,12 +19,27 @@ module Super
     #
     def self.default_for_resources
       {
-        read: %i[index show new edit],
-        write: %i[create update destroy],
-        delete: %i[destroy]
+        "read" => %w[index show new edit],
+        "write" => %w[create update destroy],
+        "delete" => %w[destroy],
       }
     end
 
+    # @return [ActionInquirer]
+    def self.index!; new(default_for_resources, "index"); end
+    # @return [ActionInquirer]
+    def self.show!; new(default_for_resources, "show"); end
+    # @return [ActionInquirer]
+    def self.new!; new(default_for_resources, "new"); end
+    # @return [ActionInquirer]
+    def self.edit!; new(default_for_resources, "edit"); end
+    # @return [ActionInquirer]
+    def self.create!; new(default_for_resources, "create"); end
+    # @return [ActionInquirer]
+    def self.update!; new(default_for_resources, "update"); end
+    # @return [ActionInquirer]
+    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)
       @actions = categories_and_their_actions.values.flatten.uniq.map(&:to_s)

data/lib/super/assets.rb

@@ -21,7 +21,7 @@ module Super
       assets.map do |asset|
         grep_matches = grep && asset === grep
         if grep_matches || !grep
-          asset.instance_variable_set(:@handler, Handler.webpacker)
+          asset.send(:handler=, Handler.webpacker)
         end
 
         asset
@@ -34,7 +34,7 @@ module Super
       assets.map do |asset|
         grep_matches = grep && asset === grep
         if grep_matches || !grep
-          asset.instance_variable_set(:@asset_handler, Handler.sprockets)
+          asset.send(:handler=, Handler.sprockets)
         end
 
         asset
@@ -52,6 +52,14 @@ module Super
       attr_reader :path
       attr_reader :arguments
 
+      def ==(other)
+        return false if handler != other.handler
+        return false if path != other.path
+        return false if arguments != other.arguments
+
+        true
+      end
+
       def ===(other)
         return true if path == other
         return true if other.is_a?(Regexp) && path.match?(other)
@@ -61,6 +69,10 @@ module Super
 
         false
       end
+
+      private
+
+      attr_writer :handler
     end
 
     def self.dist(gem_name, package_name)
@@ -74,29 +86,34 @@ module Super
     end
 
     class Handler
-      def self.auto
-        @auto ||=
-          if Gem::Dependency.new("sprockets", "~> 4.0").matching_specs.any?
-            sprockets
-          elsif Gem::Dependency.new("sprockets", "~> 3.0").matching_specs.any?
-            sprockets
-          elsif Gem::Dependency.new("sprockets", "~> 2.0").matching_specs.any?
-            sprockets
-          elsif Gem::Dependency.new("webpacker", "~> 6.0").matching_specs.any?
-            webpacker
-          elsif Gem::Dependency.new("webpacker", "~> 5.0").matching_specs.any?
-            webpacker
-          elsif Gem::Dependency.new("webpacker", "~> 4.0").matching_specs.any?
-            webpacker
-          elsif Gem::Dependency.new("webpacker", "~> 3.0").matching_specs.any?
-            webpacker
-          else
-            none
+      class << self
+        def auto
+          sprockets_spec = gem_specification("sprockets")
+          if sprockets_spec
+            major = sprockets_spec.version.segments.first
+            if major >= 2
+              return sprockets
+            end
+          end
+
+          webpacker_spec = gem_specification("webpacker")
+          if webpacker_spec
+            major = webpacker_spec.version.segments.first
+            if major >= 4
+              return webpacker
+            end
           end
-      end
 
-      def self.sprockets_available?
-        Gem::Dependency.new("sprockets").matching_specs.any? && defined?(Sprockets)
+          none
+        end
+
+        def sprockets_available?
+          !gem_specification("sprockets").nil? && defined?(Sprockets)
+        end
+
+        def gem_specification(gem_name)
+          Gem::Dependency.new(gem_name).matching_specs&.sort_by(&:version)&.first
+        end
       end
 
       def self.sprockets
@@ -115,6 +132,10 @@ module Super
         @asset_handler = asset_handler
       end
 
+      def ==(other)
+        to_sym == other.to_sym
+      end
+
       def sprockets?
         @asset_handler == :sprockets
       end

data/lib/super/badge.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Super
+  class Badge
+    STYLES = {
+      light: "bg-gray-100 text-black",
+      dark: "bg-gray-900 text-white",
+      red: "bg-red-700 text-white",
+      yellow: "bg-yellow-400 text-black",
+      green: "bg-green-700 text-white",
+      blue: "bg-blue-700 text-white",
+      purple: "bg-purple-800 text-white",
+    }
+
+    def initialize(text, styles: nil)
+      @text = text
+      @requested_styles = Array(styles.presence).flatten
+    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
+    end
+
+    def to_s
+      ActionController::Base.helpers.content_tag(
+        :span,
+        @text,
+        class: styles.join(" ")
+      )
+    end
+
+    private
+
+    COMMON_STYLES = %w[rounded px-2 py-1 text-xs leading-none font-bold]
+    private_constant :COMMON_STYLES
+
+    attr_reader :requested_styles
+  end
+end

data/lib/super/cheat.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Super
+  class Cheat
+    def controller
+      paths = %w[../../app/controllers/super/substructure_controller.rb]
+      methods =
+        paths
+        .map { |f| File.read(File.expand_path(f, __dir__)) }
+        .flat_map { |content| content.scan(/^\s+(?:helper_method )?def .*$/) }
+        .map { |method| method.strip.sub(/^(?:helper_method )?def /, "#") }
+
+      puts "== Super::ApplicationController"
+      puts methods.join("\n")
+    end
+  end
+end

data/lib/super/compatibility.rb

@@ -23,5 +23,24 @@ module Super
         ActiveRecord::Base.sanitize_sql_like(query)
       end
     end
+
+    def polymorphic_path_container
+      if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 0
+        @polymorphic_path_container ||=
+          begin
+            klass = Class.new do
+              include ActionDispatch::Routing::PolymorphicRoutes
+
+              def method_missing(method_name)
+                Rails.application.routes.url_helpers.public_send(method_name)
+              end
+            end
+
+            klass.new
+          end
+      else
+        Rails.application.routes.url_helpers
+      end
+    end
   end
 end

data/lib/super/display/guesser.rb

@@ -27,8 +27,10 @@ module Super
         case type
         when :datetime
           @type.timestamp
+        when :time
+          @type.time
         else
-          @type.text
+          @type.string
         end
       end
     end

data/lib/super/display/schema_types.rb

@@ -61,6 +61,47 @@ module Super
         end
       end
 
+      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
@@ -89,16 +130,24 @@ module Super
       end
 
       def string; real(&:to_s); end
-      alias text string
 
       def timestamp; real(&:to_s); end
+      def time; real { |value| value.strftime("%H:%M:%S") }; end
 
       def rich_text
-        real do |value|
+        computed do |value|
           Partial.new("display_rich_text", locals: { rich_text: value })
         end
       end
 
+      def badge(*builder_methods)
+        builder_methods = %i[real ignore_nil column] if builder_methods.empty?
+        builder = builder_methods.each_with_object(Builder.new) do |builder_method, builder|
+          builder.public_send(builder_method)
+        end
+        Badge.new(builder)
+      end
+
       def actions
         @actions_called = true
         Builder.new.computed.none.transform do