super 0.0.8 → 0.0.13

data/lib/generators/super/action_text/USAGE

@@ -0,0 +1,23 @@
+Description:
+    Creates the necessary files for Super to support ActionText
+
+    Prerequisites:
+
+        * Webpacker must be installed on your Rails app
+            * Run: bundle exec rails webpacker:install
+
+        * ActionText must be installed on your Rails app
+            * Run: bundle exec rails action_text:install
+
+    Note that Super does NOT need to be configured to use Webpacker. But if you
+    do use Super with Webpacker, you can merge `action_text.js` into
+    `application.js.erb` file.
+
+Example:
+    bin/rails webpacker:install             # if you haven't already
+    bin/rails action_text:install           # if you haven't already
+    bin/rails generate super:action_text
+
+    This will:
+        Create app/javascript/packs/super/action_text.js
+        Modify config/initializers/super.rb

data/lib/generators/super/action_text/action_text_generator.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Super
+  class ActionTextGenerator < Rails::Generators::Base
+    source_root File.expand_path("templates", __dir__)
+
+    def copy_the_pack_files
+      template(
+        "pack_super_action_text.js",
+        "app/javascript/packs/super/action_text.js"
+      )
+      template(
+        "pack_super_action_text.css",
+        "app/javascript/packs/super/action_text.css"
+      )
+    end
+
+    def add_action_text_assets_to_config
+      insert_into_file(
+        "config/initializers/super.rb",
+        "  c.javascripts.push(Super::Assets.webpacker(\"super/action_text\"))\n" \
+        "  c.stylesheets.push(Super::Assets.webpacker(\"super/action_text\"))\n",
+        before: /\bend\b/
+      )
+    end
+
+    def remind_about_webpacker
+      say "Make sure Webpacker is set up on your application!", :bold
+      say "Run if needed: bundle exec rails webpacker:install"
+    end
+  end
+end

data/lib/generators/super/action_text/templates/pack_super_action_text.css

@@ -0,0 +1,23 @@
+@import "trix/dist/trix";
+
+/* This is the SCSS that the ActionText installation generator adds, compiled to CSS */
+.trix-content .attachment-gallery > action-text-attachment,
+.trix-content .attachment-gallery > .attachment {
+  flex: 1 0 33%;
+  padding: 0 0.5em;
+  max-width: 33%; }
+.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--2 > .attachment,
+.trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment,
+.trix-content .attachment-gallery.attachment-gallery--4 > .attachment {
+  flex-basis: 50%;
+  max-width: 50%; }
+.trix-content action-text-attachment .attachment {
+  padding: 0 !important;
+  max-width: 100% !important; }
+
+/* This is for getting Tailwind to work with Trix */
+.trix-content ul {
+  list-style-type: disc; }
+.trix-content ol {
+  list-style-type: decimal; }

data/lib/generators/super/action_text/templates/pack_super_action_text.js

@@ -0,0 +1,4 @@
+import * as ActiveStorage from "@rails/activestorage"
+ActiveStorage.start()
+require("trix")
+require("@rails/actiontext")

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path("templates", __dir__)
@@ -7,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
@@ -14,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
 
@@ -51,12 +58,16 @@ module Super
 
     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,10 @@
-class <%= config[:controller_namespace].classify %>Controller < Super::ApplicationController
+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/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,52 +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,12 +1,6 @@
-<% wrap_with_configured_module do -%>
-class <%= class_name.pluralize %>Controller < <%= parent_controller_name %>
-  private
-
-  def new_controls
-    Controls.new
-  end
-
-  class Controls < Super::Controls
+<% 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

data/lib/generators/super/webpacker/USAGE

@@ -1,14 +1,15 @@
 Description:
     Creates the necessary files for assets to be served under Webpacker
 
-    Webpacker support requires ERB support. There are no other dependencies.
+    Webpacker support requires that you install ERB support for Webpacker.
 
     Installing ERB on webpacker is usually done by running the command:
     `rails webpacker:install:erb`
 
 Example:
     rails webpacker:install:erb             # if you hadn't set up ERB already
-    rails generate super:install:webpacker
+    rails generate super:webpacker
 
-    This will create:
-        app/javascript/packs/super/application.js.erb
+    This will:
+        Create app/javascript/packs/super/application.js.erb
+        Modify config/initializers/super.rb

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class WebpackerGenerator < Rails::Generators::Base
     source_root File.expand_path("templates", __dir__)

data/lib/super.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 require "tsort"
 
 require "rails/engine"
 
 require "super/schema/common"
+require "super/useful/builder"
+require "super/useful/enum"
 
 require "super/action_inquirer"
 require "super/assets"
@@ -18,11 +22,11 @@ require "super/filter"
 require "super/filter/form_object"
 require "super/filter/guesser"
 require "super/filter/operator"
-require "super/filter/plugin"
 require "super/filter/schema_types"
 require "super/form"
 require "super/form/builder"
 require "super/form/guesser"
+require "super/form/inline_errors"
 require "super/form/schema_types"
 require "super/form/strong_params"
 require "super/layout"
@@ -32,8 +36,10 @@ require "super/pagination"
 require "super/panel"
 require "super/partial"
 require "super/plugin"
+require "super/query/form_object"
 require "super/schema"
 require "super/schema/guesser"
+require "super/sort"
 require "super/version"
 require "super/view_helper"
 

data/lib/super/action_inquirer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # ```ruby
   # action = Super::ActionInquirer.new(

data/lib/super/assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # Utilities for determining whether to use Sprockets or Webpacker
   class Assets
@@ -80,6 +82,10 @@ module Super
             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?

data/lib/super/client_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # A container class for all user-facing (4xx) errors thrown by this library.
   #

data/lib/super/compatibility.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   module Compatability
     module_function