super 0.0.11 → 0.0.16

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

@@ -9,6 +9,12 @@ module Super
     class_option :route_namespace, type: :string, default: "admin",
       banner: "Specifies the route namespace for admin controllers"
 
+    def assert_not_controller_namespace_not_super
+      if controller_namespace == "super"
+        raise Super::Error::ArgumentError, "controller_namespace can not be `super`"
+      end
+    end
+
     def create_initializer
       template("initializer.rb", "config/initializers/super.rb")
     end
@@ -16,8 +22,7 @@ module Super
     def create_base_admin_controller
       template(
         "base_controller.rb",
-        "app/controllers/#{controller_namespace}_controller.rb",
-        controller_namespace: controller_namespace
+        "app/controllers/#{parent_controller_name}_controller.rb"
       )
     end
 
@@ -31,34 +36,22 @@ 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
 
     private
 
+    def route_namespace
+      options[:route_namespace].strip.gsub(%r{\A/+}, "").gsub(%r{/+\z}, "").strip.underscore
+    end
+
     def controller_namespace
-      if options["controller_namespace"].blank?
-        "admin"
-      else
-        options["controller_namespace"]
-      end
+      options["controller_namespace"].strip.gsub(%r{\A/+}, "").gsub(%r{/+\z}, "").strip.underscore
+    end
+
+    def parent_controller_name
+      controller_namespace.presence || "admin"
     end
   end
 end

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

@@ -1,2 +1,2 @@
-class <%= config[:controller_namespace].classify %>Controller < Super::ApplicationController
+class <%= parent_controller_name.classify %>Controller < Super::ApplicationController
 end

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

@@ -1,5 +1,12 @@
 Super.configuration do |c|
   c.title = "My Admin Site"
-  c.controller_namespace = "<%= options["controller_namespace"] %>"
-  c.route_namespace = "<%= options["route_namespace"] %>"
+<% if route_namespace != "admin" -%>
+  c.path = "/<%= route_namespace %>"
+<% end -%>
+<% if route_namespace != "admin" -%>
+  c.generator_as = "<%= route_namespace.gsub(%r{/}, "_") %>"
+<% end -%>
+<% if controller_namespace != "admin" -%>
+  c.generator_module = "<%= controller_namespace %>"
+<% end -%>
 end

data/lib/generators/super/resource/resource_generator.rb

@@ -1,54 +1,129 @@
 # frozen_string_literal: true
 
+require "rails/generators/resource_helpers"
+
 module Super
   class ResourceGenerator < Rails::Generators::NamedBase
+    include Rails::Generators::ResourceHelpers
     source_root File.expand_path("templates", __dir__)
 
-    def create_controller
-      controller_subdir =
-        if Super.configuration.controller_namespace.present?
-          "#{Super.configuration.controller_namespace}/"
-        else
-          ""
-        end
+    check_class_collision suffix: "Controller"
+
+    class_option :skip_routes, type: :boolean, desc: "Don't add routes to config/routes.rb."
+
+    def initialize(*)
+      super
+
+      controller_namespace = Super.configuration.generator_module
+      if controller_namespace.present?
+        controller_name =
+          if controller_namespace.include?("/")
+            "#{controller_namespace}/#{name}"
+          else
+            "#{controller_namespace}::#{name}"
+          end
+        self.options = options.dup
+        options[:model_name] = name
+        options.freeze
+        assign_names!(name)
+        assign_controller_names!(controller_name.pluralize)
+      else
+        assign_names!(name)
+        assign_controller_names!(name.pluralize)
+      end
+    end
 
+    def create_controller
       template(
         "resources_controller.rb",
-        "app/controllers/#{controller_subdir}#{file_path.pluralize}_controller.rb"
+        File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
       )
     end
 
-    private
+    def create_route_namespace
+      data = route_scope
+      return if data.nil?
+      return if File.read(File.join(destination_root, "config", "routes.rb")).include?(data)
 
-    def wrap_with_configured_module(&block)
-      indentation_amount =
-        if Super.configuration.controller_namespace.present?
-          2
-        else
-          0
-        end
+      inject_into_file(
+        "config/routes.rb",
+        "#{data}\nend\n".indent(2),
+        after: /^Rails\.application\.routes\.draw\b.*$\r?\n\r?/,
+        verbose: true,
+        force: false
+      )
+    end
 
-      inner = capture(&block)
-      inner = indent(inner, indentation_amount).chomp
+    def add_admin_route
+      data = route_scope
 
-      if Super.configuration.controller_namespace.present?
-        concat("module #{Super.configuration.controller_namespace.camelize}\n")
+      if data.nil?
+        route("resources :#{file_name.pluralize}")
+      else
+        inject_into_file(
+          "config/routes.rb",
+          "resources :#{file_name.pluralize}\n".indent(4),
+          after: /#{data}.*$\r?\n\r?/,
+          verbose: true,
+          force: false
+        )
       end
+    end
 
-      concat(inner)
-      concat("\n")
+    private
 
-      if Super.configuration.controller_namespace.present?
-        concat("end\n")
-      end
+    def parent_controller_name
+      controller_namespace.presence || "admin"
     end
 
-    def parent_controller_name
-      if Super.configuration.controller_namespace.present?
-        "#{Super.configuration.controller_namespace.camelize}Controller"
-      else
-        "AdminController"
+    def controller_namespace
+      Super.configuration.generator_module.strip.gsub(%r{\A/+}, "").gsub(%r{/+\z}, "").strip.underscore
+    end
+
+    def route_scope
+      return nil if no_scope?
+
+      if use_scope?
+        kwargs = []
+        kwargs.push(%(path: "/#{g_path}")) if g_path.present?
+        kwargs.push(%(module: "#{g_module}")) if g_module.present?
+        kwargs.push(%(as: "#{g_as}")) if g_as.present?
+        return %(scope #{kwargs.join(", ")} do)
       end
+
+      %(namespace :#{g_module} do)
+    end
+
+    def use_scope?
+      return true if !same?
+      return true if g_module.include?("/")
+      return true if g_path.include?("/")
+
+      false
+    end
+
+    def no_scope?
+      g_module.blank? && g_path.blank? && g_as.blank?
+    end
+
+    def same?
+      g_module == g_path && g_path == g_as
+    end
+
+    def g_module
+      normalized_scope_part(Super.configuration.generator_module || "")
+    end
+
+    def g_path
+      normalized_scope_part(Super.configuration.path || "")
+    end
+
+    def g_as
+      normalized_scope_part(Super.configuration.generator_as || "")
+    end
+
+    def normalized_scope_part(part)
+      part.strip.gsub(%r{\A/+}, "").gsub(%r{/+\z}, "").strip
     end
   end
 end

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

@@ -1,15 +1,9 @@
-<% wrap_with_configured_module do -%>
-class <%= class_name.pluralize %>Controller < <%= parent_controller_name %>
+<% module_namespacing do -%>
+class <%= controller_class_name %>Controller < <%= parent_controller_name.classify %>Controller
   private
 
-  def new_controls
-    Controls.new
-  end
-
-  class Controls < Super::Controls
-    def model
-      <%= class_name %>
-    end
+  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

@@ -5,13 +5,15 @@ require "tsort"
 require "rails/engine"
 
 require "super/schema/common"
+require "super/useful/builder"
+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"
@@ -29,12 +31,14 @@ 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