super 0.0.10 → 0.0.11

data/lib/super/schema/guesser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
   class Schema
     class Guesser

data/lib/super/sort.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Super
+  module Sort
+    class FormObject
+      DIRECTIONS = ["asc", "desc"]
+
+      def initialize(model:, params:, default:, sortable_columns:)
+        @model = model
+        @params = params.dup
+        @default = default
+        @sortable_columns = sortable_columns.map(&:to_s)
+
+        @params.permit!
+      end
+
+      attr_reader :sortable_columns
+
+      def to_partial_path
+        "sort"
+      end
+
+      def exprs
+        sanitized_expr_params.map { |ordering| Expression.new(**ordering) }
+      end
+
+      def new_expr
+        Expression.new(a: nil, d: :desc)
+      end
+
+      class Expression
+        attr_accessor :a # attribute
+        attr_accessor :d # direction
+
+        def initialize(a:, d:)
+          @a = a
+          @d = d.to_s
+        end
+
+        def with_index(index)
+          @index = index
+          self
+        end
+
+        # This is for `fields_for` to work
+        def id
+          @index
+        end
+
+        def persisted?
+          false
+        end
+      end
+
+      def persisted?
+        false
+      end
+
+      def apply_changes(query)
+        exprs.each do |expr|
+          query = query.order(expr.a => expr.d)
+        end
+
+        query
+      end
+
+      private
+
+      # Stringifies the values
+      def sanitized_expr_params
+        seen = {}
+        normalized_expr_params
+          .each do |p|
+            p[:a] = p[:a].presence&.to_s&.strip
+            p[:d] = p[:d].presence&.to_s&.strip
+          end
+          .select { |p| p[:a].present? && DIRECTIONS.include?(p[:d]) }
+          .select { |p| @sortable_columns.include?(p[:a]) }
+          .select do |p|
+            next false if seen.key?(p[:a])
+
+            seen[p[:a]] = true
+            true
+          end
+      end
+
+      # Symbolizes the keys
+      def normalized_expr_params
+        from_params = @params[:exprs]
+
+        return default_as_query if from_params.nil?
+
+        if from_params.is_a?(Array)
+          return from_params.map(&:to_h).map(&:symbolize_keys)
+        end
+
+        from_params.to_h.values.map(&:symbolize_keys)
+      end
+
+      def default_as_query
+        @default.map do |attribute_name, direction|
+          {
+            a: attribute_name,
+            d: direction,
+          }
+        end
+      end
+    end
+  end
+end

data/lib/super/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Super
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/super/view_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Zach Ahn
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -198,6 +198,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - engineering@zachahn.com
@@ -233,6 +247,9 @@ files:
 - app/views/super/application/_form_has_many.html.erb
 - app/views/super/application/_form_has_one.html.erb
 - app/views/super/application/_member_header.html.erb
+- app/views/super/application/_query.html.erb
+- app/views/super/application/_sort.html.erb
+- app/views/super/application/_sort_expression.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
@@ -247,6 +264,7 @@ files:
 - app/views/super/application/show.html.erb
 - app/views/super/feather/README.md
 - app/views/super/feather/_chevron_down.html
+- app/views/super/feather/_x.html
 - config/locales/en.yml
 - config/routes.rb
 - docs/README.md
@@ -283,6 +301,7 @@ files:
 - lib/super/controls/optional.rb
 - lib/super/controls/required.rb
 - lib/super/controls/steps.rb
+- lib/super/controls/view.rb
 - lib/super/display.rb
 - lib/super/display/guesser.rb
 - lib/super/display/schema_types.rb
@@ -292,7 +311,6 @@ files:
 - lib/super/filter/form_object.rb
 - lib/super/filter/guesser.rb
 - lib/super/filter/operator.rb
-- lib/super/filter/plugin.rb
 - lib/super/filter/schema_types.rb
 - lib/super/form.rb
 - lib/super/form/builder.rb
@@ -308,9 +326,11 @@ files:
 - lib/super/partial.rb
 - lib/super/partial/resolving.rb
 - lib/super/plugin.rb
+- lib/super/query/form_object.rb
 - lib/super/schema.rb
 - lib/super/schema/common.rb
 - lib/super/schema/guesser.rb
+- lib/super/sort.rb
 - lib/super/version.rb
 - lib/super/view_helper.rb
 homepage:

data/lib/super/filter/plugin.rb

@@ -1,47 +0,0 @@
-module Super
-  class Filter
-    module ControllerMethods
-      def index
-        super
-        @filter_form = controls.initialize_filtering(params: params, query_params: request.GET)
-        @records = controls.filter_records(filter_form: @filter_form, records: @records)
-        @view.asides.push(:@filter_form)
-      end
-    end
-  end
-
-  class Controls
-    module Optional
-      def filters_enabled?
-        true
-      end
-
-      def filter_schema
-        Filter.new do |fields, type|
-          Filter::Guesser.new(model: model, fields: fields, type: type).call
-        end
-      end
-    end
-
-    module Steps
-      def initialize_filtering(params:, query_params:)
-        if filters_enabled?
-          Super::Filter::FormObject.new(
-            model: model,
-            schema: filter_schema,
-            params: params[:q],
-            url: query_params
-          )
-        end
-      end
-
-      def filter_records(filter_form:, records:)
-        if filters_enabled? && records
-          filter_form.to_search_query(records)
-        else
-          records
-        end
-      end
-    end
-  end
-end