super 0.0.6 → 0.0.11

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__)

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

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

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

@@ -6,40 +6,10 @@ class <%= class_name.pluralize %>Controller < <%= parent_controller_name %>
     Controls.new
   end
 
-  class Controls
-    def title
-      <%= class_name %>.name.pluralize
-    end
-
+  class Controls < Super::Controls
     def model
       <%= class_name %>
     end
-
-    def scope(action:)
-      if action.read?
-        <%= class_name %>.all
-      else
-        <%= class_name %>.all
-      end
-    end
-
-    def permitted_params(params, action:)
-      if action.create?
-        params.require(:<%= file_name %>).permit()
-      else
-        params.require(:<%= file_name %>).permit()
-      end
-    end
-
-    def display_schema(action:)
-      Super::Schema.new(Super::Display::SchemaTypes.new) do |fields, type|
-      end
-    end
-
-    def form_schema(action:)
-      Super::Schema.new(Super::Form::SchemaTypes.new) do |fields, type|
-      end
-    end
   end
 end
 <% 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__)
@@ -12,14 +14,15 @@ module Super
     def set_asset_handler_to_webpacker
       insert_into_file(
         "config/initializers/super.rb",
-        "  c.asset_handler = Super::Assets.webpacker\n",
+        "  c.javascripts = Super::Assets.use_webpacker(c.javascripts)\n" \
+        "  c.stylesheets = Super::Assets.use_webpacker(c.stylesheets)\n",
         before: /\bend\b/
       )
     end
 
     def remind_about_erb
       say "Make sure ERB is set up for Webpacker!", :bold
-      say "Run if needed: rails webpacker:install:erb", :bold
+      say "Run if needed: bundle exec rails webpacker:install:erb"
     end
   end
 end

data/lib/super.rb

@@ -1,4 +1,10 @@
-require "active_support/concern"
+# frozen_string_literal: true
+
+require "tsort"
+
+require "rails/engine"
+
+require "super/schema/common"
 
 require "super/action_inquirer"
 require "super/assets"
@@ -6,11 +12,21 @@ 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"
-require "super/engine"
 require "super/error"
+require "super/filter"
+require "super/filter/form_object"
+require "super/filter/guesser"
+require "super/filter/operator"
+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"
 require "super/link"
 require "super/navigation/automatic"
@@ -18,6 +34,11 @@ 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"
+
+require "super/engine"

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,8 +1,66 @@
+# frozen_string_literal: true
+
 module Super
   # Utilities for determining whether to use Sprockets or Webpacker
   class Assets
-    def self.sprockets_available?
-      Gem::Dependency.new("sprockets").matching_specs.any?
+    def self.webpacker(path, **arguments)
+      Asset.new(handler: Handler.webpacker, path: path, arguments: arguments)
+    end
+
+    def self.sprockets(path, **arguments)
+      Asset.new(handler: Handler.sprockets, path: path, arguments: arguments)
+    end
+
+    def self.auto(path, **arguments)
+      Asset.new(handler: Handler.auto, path: path, arguments: arguments)
+    end
+
+    def self.use_webpacker(assets, grep: nil)
+      assets = [assets] if !assets.kind_of?(Array)
+
+      assets.map do |asset|
+        grep_matches = grep && asset === grep
+        if grep_matches || !grep
+          asset.instance_variable_set(:@handler, Handler.webpacker)
+        end
+
+        asset
+      end
+    end
+
+    def self.use_sprockets(assets, grep: nil)
+      assets = [assets] if !assets.kind_of?(Array)
+
+      assets.map do |asset|
+        grep_matches = grep && asset === grep
+        if grep_matches || !grep
+          asset.instance_variable_set(:@asset_handler, Handler.sprockets)
+        end
+
+        asset
+      end
+    end
+
+    class Asset
+      def initialize(handler:, path:, arguments:)
+        @handler = handler
+        @path = path
+        @arguments = arguments
+      end
+
+      attr_reader :handler
+      attr_reader :path
+      attr_reader :arguments
+
+      def ===(other)
+        return true if path == other
+        return true if other.is_a?(Regexp) && path.match?(other)
+        return true if handler == other
+        return true if handler.to_sym == other
+        return true if handler.to_s == other
+
+        false
+      end
     end
 
     def self.dist(gem_name, package_name)
@@ -15,49 +73,67 @@ module Super
       gem_path.join("frontend", package_name, "dist")
     end
 
-    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", "~> 4.0").matching_specs.any?
-          webpacker
-        elsif Gem::Dependency.new("webpacker", "~> 3.0").matching_specs.any?
-          webpacker
-        else
-          none
-        end
-    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
+          end
+      end
 
-    def self.sprockets
-      new(:sprockets)
-    end
+      def self.sprockets_available?
+        Gem::Dependency.new("sprockets").matching_specs.any? && defined?(Sprockets)
+      end
 
-    def self.webpacker
-      new(:webpacker)
-    end
+      def self.sprockets
+        @sprockets ||= new(:sprockets)
+      end
 
-    def self.none
-      new(:none)
-    end
+      def self.webpacker
+        @webpacker ||= new(:webpacker)
+      end
 
-    def initialize(asset_handler)
-      @asset_handler = asset_handler
-    end
+      def self.none
+        @none ||= new(:none)
+      end
 
-    def sprockets?
-      @asset_handler == :sprockets
-    end
+      def initialize(asset_handler)
+        @asset_handler = asset_handler
+      end
 
-    def webpacker?
-      @asset_handler == :webpacker
-    end
+      def sprockets?
+        @asset_handler == :sprockets
+      end
+
+      def webpacker?
+        @asset_handler == :webpacker
+      end
+
+      def none?
+        @asset_handler == :none
+      end
+
+      def to_sym
+        @asset_handler
+      end
 
-    def none?
-      @asset_handler == :none
+      def to_s
+        @asset_handler.to_s
+      end
     end
   end
 end

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,13 +1,27 @@
+# frozen_string_literal: true
+
 module Super
   module Compatability
     module_function
 
-    def rails_50_errable_fields(field)
+    # Rails 5.1 and after lets you find field errors using either a string or a
+    # symbol.
+    def errable_fields(field)
       if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 0
         [field.to_s, field.to_sym]
       else
         field
       end
     end
+
+    def sanitize_sql_like(query)
+      if ActiveRecord::VERSION::MAJOR == 4
+        ActiveRecord::Base.send(:sanitize_sql_like, query)
+      elsif ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR <= 1
+        ActiveRecord::Base.send(:sanitize_sql_like, query)
+      else
+        ActiveRecord::Base.sanitize_sql_like(query)
+      end
+    end
   end
 end

data/lib/super/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   # @yield [Configuration]
   # @return [Configuration]
@@ -19,81 +21,32 @@ module Super
   # end
   # ```
   class Configuration
-    module ConfigurationLogic # @api private
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      def initialize
-        self.class.defaults.each do |key, value|
-          if value.respond_to?(:call)
-            value = value.call
-          end
-
-          public_send("#{key}=", value)
-        end
-      end
-
-      def configured?(attr)
-        instance_variable_defined?("@#{attr}")
-      end
-
-      module ClassMethods
-        def defaults
-          @defaults ||= {}
-        end
-
-        def wraps
-          @wraps ||= {}
-        end
+    def initialize
+      self.title = "Super Admin"
+      self.index_records_per_page = 20
+      self.controller_namespace = "admin"
+      self.route_namespace = :admin
 
-        def configure(attr, wrap: nil, enum: nil, **kwargs)
-          if kwargs.key?(:default)
-            defaults[attr] = kwargs[:default]
-          end
+      controller_plugins.use(prepend: Super::Pagination::ControllerMethods)
 
-          define_method(attr) do
-            if !configured?(attr)
-              raise Error::UnconfiguredConfiguration, "unconfigured: #{attr}"
-            end
-
-            result = instance_variable_get("@#{attr}")
-
-            if wrap.nil?
-              result
-            else
-              wrap.call(result)
-            end
-          end
-
-          define_method("#{attr}=") do |value|
-            if enum.is_a?(Array)
-              if !enum.include?(value)
-                raise Error::InvalidConfiguration,
-                  "tried to set `#{attr}` to `#{value.inspect}`, " \
-                  "expected: #{enum.join(", ")}"
-              end
-            end
+      self.javascripts = [Super::Assets.auto("super/application")]
+      self.stylesheets = [Super::Assets.auto("super/application")]
+    end
 
-            instance_variable_set("@#{attr}", value)
-            value
-          end
-        end
-      end
+    attr_accessor :title
+    attr_accessor :index_records_per_page
+    attr_accessor :controller_namespace
+    attr_writer :route_namespace
+    def route_namespace
+      [@route_namespace].flatten
     end
 
-    include ConfigurationLogic
+    attr_accessor :javascripts
+    attr_accessor :stylesheets
 
-    # @!attribute [rw]
-    configure :title
-    # @!attribute [rw]
-    configure :index_records_per_page, default: 20
-    # @!attribute [rw]
-    configure :controller_namespace, default: "admin"
-    # @!attribute [rw]
-    configure :route_namespace, default: :admin, wrap: -> (val) { [val].flatten }
-    # @!attribute [rw]
-    configure :asset_handler, default: -> { Super::Assets.auto }
+    def controller_plugins
+      Plugin::Registry.controller
+    end
 
     # @api private
     def path_parts(*parts)