super 0.0.6 → 0.0.7

data/lib/super/pagination.rb

@@ -52,6 +52,10 @@ module Super
       end
     end
 
+    def to_partial_path
+      "super_pagination"
+    end
+
     private
 
     def pages
@@ -66,5 +70,62 @@ module Super
           end
         end
     end
+
+    module ControllerMethods
+      def index
+        super
+        @pagination = controls.initialize_pagination(action: action_inquirer, records: @records, query_params: request.GET)
+        @records = controls.paginate_records(action: action_inquirer, records: @records, pagination: @pagination)
+        @view.mains.first.parts.push(:@pagination)
+      end
+    end
+  end
+
+  class Controls
+    module Optional
+      # Specifies how many records to show per page
+      #
+      # @param action [ActionInquirer]
+      # @param query_params [Hash]
+      # @return [ActiveRecord::Relation]
+      def records_per_page(action:, query_params:)
+        default_for(:records_per_page, action: action, query_params: query_params) do
+          Super.configuration.index_records_per_page
+        end
+      end
+    end
+
+    module Steps
+      # Sets up pagination
+      #
+      # @param action [ActionInquirer]
+      # @param records [ActiveRecord::Relation]
+      # @param query_params [Hash]
+      # @return [Pagination]
+      def initialize_pagination(action:, records:, query_params:)
+        default_for(:initialize_pagination, action: action, records: records, query_params: query_params) do
+          Pagination.new(
+            total_count: records.size,
+            limit: records_per_page(action: action, query_params: query_params),
+            query_params: query_params,
+            page_query_param: :page
+          )
+        end
+      end
+
+      # Paginates
+      #
+      # @param action [ActionInquirer]
+      # @param records [ActiveRecord::Relation]
+      # @param pagination [Pagination]
+      # @return [ActiveRecord::Relation]
+      def paginate_records(action:, records:, pagination:)
+        default_for(:paginate_records, action: action, records: records, pagination: pagination) do
+          records
+            .limit(pagination.limit)
+            .offset(pagination.offset)
+        end
+      end
+    end
   end
 end

data/lib/super/partial.rb

@@ -1,5 +1,17 @@
 module Super
   class Partial
+    def self.render(partialish, template:)
+      if partialish.respond_to?(:to_partial_path)
+        if partialish.respond_to?(:locals)
+          template.render(partialish, partialish.locals)
+        else
+          template.render(partialish)
+        end
+      else
+        partialish
+      end
+    end
+
     def initialize(path, locals: {})
       @to_partial_path = path
       @locals = locals

data/lib/super/plugin.rb

@@ -1,88 +1,59 @@
 module Super
-  class Pluggable < Module
-    def initialize(registry_name)
-      @registry_name = registry_name
-    end
-
-    def included(base)
-      super
-
-      PluginRegistry.base_set(@registry_name, base)
-
-      plugins = PluginRegistry.plugins_for(@registry_name)
-
-      plugins.each do |klass, method_name|
-        base.public_send(method_name, klass)
+  module Plugin
+    class Registry
+      class << self
+        def controller
+          @controller ||= Registry.new
+        end
       end
-    end
-  end
 
-  class PluginRegistry
-    class << self
-      def include_to(name, klass)
-        plugin_push(name.to_sym, :include, klass)
+      def initialize
+        @registry = {}
+        @ordering = Hash.new { |hash, key| hash[key] = [] }
       end
 
-      def prepend_to(name, klass)
-        plugin_push(name.to_sym, :prepend, klass)
+      def use(include: nil, prepend: nil)
+        register(include: include, prepend: prepend, before: [], after: [])
       end
 
-      def plugins_for(name)
-        name = name.to_sym
-
-        plugins.fetch(name) { {} }
+      def insert_before(*before, include: nil, prepend: nil)
+        register(include: include, prepend: prepend, before: before, after: [])
       end
 
-      def base_set(name, klass)
-        name = name.to_sym
-
-        if !klass.kind_of?(Class)
-          raise Error::InvalidPluginArgument,
-            "Received `#{klass}` which must be a class"
-        end
-
-        bases[name] = klass
-
-        true
+      def insert_after(*after, include: nil, prepend: nil)
+        register(include: include, prepend: prepend, before: [], after: after)
       end
 
-      def base_get(name)
-        name = name.to_sym
+      def classes_ordered
+        each_node = -> (&b) { @ordering.each_key(&b) }
+        each_child = -> (cb, &b) { @ordering[cb].each(&b) }
 
-        bases[name]
+        TSort.tsort(each_node, each_child)
       end
 
-      private
-
-      def plugin_push(name, method_name, klass)
-        if ![:include, :prepend].include?(method_name)
-          raise Error::InvalidPluginArgument,
-            "Received `#{method_name.inspect}`, must be either :include or :prepend"
+      def ordered
+        classes_ordered.each do |class_name|
+          yield class_name, @registry[class_name]
         end
+      end
 
-        if !klass.kind_of?(Module)
-          raise Error::InvalidPluginArgument,
-            "Received `#{klass}` which must be a module"
-        end
+      private
 
-        plugins[name] ||= {}
-        plugins[name][klass] = method_name
+      def register(include:, prepend:, before: [], after: [])
+        raise Error::InvalidPluginArgument, "only one of :include or :prepend can be filled out" if include && prepend
+        raise Error::InvalidPluginArgument, "at least one of :include or :prepend must be filled out" if include.nil? && prepend.nil?
 
-        base = base_get(name)
+        klass = include || prepend
+        @registry[klass] = :include if include
+        @registry[klass] = :prepend if prepend
 
-        if base
-          base.public_send(method_name, klass)
+        before.each do |b|
+          @ordering[b].push(klass)
         end
 
-        true
-      end
-
-      def plugins
-        @plugins ||= {}
-      end
+        @ordering[klass].push(*after)
 
-      def bases
-        @bases ||= {}
+        nil
       end
     end
   end

data/lib/super/schema.rb

@@ -20,6 +20,7 @@ module Super
     end
 
     attr_reader :fields
+    attr_reader :schema_type
 
     def field_keys
       fields.keys

data/lib/super/version.rb

@@ -1,3 +1,3 @@
 module Super
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/super/view_helper.rb

@@ -23,7 +23,7 @@ module Super
 
     def errors_accounting_for_reflections(model_instance, column_or_association)
       errable_fields(model_instance, column_or_association)
-        .flat_map { |field| Compatability.rails_50_errable_fields(field) }
+        .flat_map { |field| Compatability.errable_fields(field) }
         .flat_map { |field| model_instance.errors.full_messages_for(field) }
         .uniq
     end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: super
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -199,9 +213,12 @@ files:
 - app/assets/javascripts/super/application.js
 - app/assets/stylesheets/super/application.css
 - app/controllers/super/application_controller.rb
-- app/helpers/super/application_helper.rb
 - app/views/layouts/super/application.html.erb
 - app/views/super/application/_collection_header.html.erb
+- app/views/super/application/_filter.html.erb
+- app/views/super/application/_filter_type_select.html.erb
+- app/views/super/application/_filter_type_text.html.erb
+- app/views/super/application/_filter_type_timestamp.html.erb
 - app/views/super/application/_flash.html.erb
 - app/views/super/application/_form_field__destroy.html.erb
 - app/views/super/application/_form_field_select.html.erb
@@ -212,6 +229,7 @@ files:
 - app/views/super/application/_form_inline_errors.html.erb
 - app/views/super/application/_member_header.html.erb
 - app/views/super/application/_super_layout.html.erb
+- app/views/super/application/_super_pagination.html.erb
 - app/views/super/application/_super_panel.html.erb
 - app/views/super/application/_super_schema_display_actions.html.erb
 - app/views/super/application/_super_schema_display_index.html.erb
@@ -268,6 +286,9 @@ files:
 - lib/super/display/schema_types.rb
 - lib/super/engine.rb
 - lib/super/error.rb
+- lib/super/filter.rb
+- lib/super/filter/operator.rb
+- lib/super/filter/schema_types.rb
 - lib/super/form.rb
 - lib/super/form/schema_types.rb
 - lib/super/layout.rb

data/app/helpers/super/application_helper.rb

@@ -1,39 +0,0 @@
-module Super
-  # View helpers, available within views
-  module ApplicationHelper
-    def super_render_partialish(partialish)
-      if partialish.respond_to?(:to_partial_path)
-        if partialish.is_a?(Super::Partial)
-          render(partialish, partialish.locals)
-        else
-          render(partialish)
-        end
-      else
-        partialish
-      end
-    end
-
-    def super_format_for_display(schema, record, column)
-      formatter = schema.fields[column]
-
-      formatted =
-        if formatter.real?
-          value = record.public_send(column)
-          formatter.present(value)
-        else
-          formatter.present
-        end
-
-      if formatted.respond_to?(:to_partial_path)
-        if formatted.respond_to?(:locals)
-          formatted.locals[:record] ||= record
-          render(formatted, formatted.locals)
-        else
-          render(formatted)
-        end
-      else
-        formatted
-      end
-    end
-  end
-end