scopiform 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae35b0a41cb186989dbb8f76fb8dbfa11604782e6b795fca0ac5e50e66bdd3fa
-  data.tar.gz: 88b9bb3f9cf86b143d997502d0ae997606652d813541259c684d76c7c379b40d
+  metadata.gz: 9ab70e84303c1c0c272c26be3b64a6933d970b48899776df943d279532b58873
+  data.tar.gz: f9171035e94d58535a2a59097aa14008a1dc997583c677ffe70e96990a2a7361
 SHA512:
-  metadata.gz: a6239fb1c253b895b3bf35f640fde0f600cc853f9348839108536abf2eed887c71c763b1c1ebb71fa4d2eff07bb77b953732641edb4dde3f271127d25d76287e
-  data.tar.gz: fde9049ba6c66da3901eb99352b3e938130a46e8a24e85c42a04a92c4c641188e112299ea2882b632fe3f6d833f300d9bc8f7aa52928a69b4df7653377af268f
+  metadata.gz: 8d35b11ef72e806d0c2620a90fbd5785ad0af0c3b449955cd524783e64cdba72ea4c25ca537cbf1e37585427cd496521191e8de448c02c1cbccfe4d35d3ba11c
+  data.tar.gz: 9287384da79e115b42ea7a0e7971944c97500867e2c987bcffe8fb8f92eae2ab873b6e2278cfa5992d44c263b27988cafd8153571885cc8abea8a88a5df42723

data/lib/scopiform/association_scopes.rb

@@ -44,6 +44,19 @@ module Scopiform
           argument_type: :hash,
           type: :sort
         )
+
+        # Grouping
+        auto_scope_add(
+          association.name,
+          proc { |value, ctx: nil|
+            next all unless Utilities.truthy_hash(value)
+
+            Utilities.association_scope(self, association, :apply_groupings, value, ctx: ctx)
+          },
+          prefix: 'group_by_',
+          argument_type: :hash,
+          type: :group
+        )
       end
     end
   end

data/lib/scopiform/common_scopes.rb

@@ -40,6 +40,15 @@ module Scopiform
             argument_type: :string,
             type: :sort
           )
+
+          # Grouping
+          auto_scope_add(
+            name,
+            proc { |value = true, ctx: nil, **| group(scopiform_arel(ctx)[name_sym]) if value },
+            prefix: 'group_by_',
+            argument_type: :boolean,
+            type: :group
+          )
         end
       end
     end

data/lib/scopiform/filters.rb

@@ -16,6 +16,10 @@ module Scopiform
         sorts_hash.keys.inject(injecting) { |out, sort_name| resolve_sort(out, sort_name, sorts_hash[sort_name], ctx: ctx) }
       end
 
+      def apply_groupings(groupings_hash, injecting = all, ctx: nil)
+        groupings_hash.keys.inject(injecting) { |out, grouping_name| resolve_grouping(out, grouping_name, groupings_hash[grouping_name], ctx: ctx) }
+      end
+
       private
 
       def resolve_filter(out, filter_name, filter_argument, ctx:)
@@ -37,6 +41,11 @@ module Scopiform
         method_name = "sort_by_#{sort_name}"
         out.send(method_name, sort_argument, ctx: ctx)
       end
+
+      def resolve_grouping(out, group_name, group_argument, ctx:)
+        method_name = "group_by_#{group_name}"
+        out.send(method_name, group_argument, ctx: ctx)
+      end
     end
   end
 end

data/lib/scopiform/utilities.rb

@@ -26,5 +26,9 @@ module Scopiform
         ctx.scopes.reduce(active_record.all.merge(applied)) { |chain, scope| chain.merge(scope) }
       end
     end
+
+    def self.truthy_hash(hash)
+      hash.values.find { |value| value.is_a?(Hash) ? truthy_hash(value) : value.present? }
+    end
   end
 end

data/lib/scopiform/version.rb

@@ -1,3 +1,3 @@
 module Scopiform
-  VERSION = '0.2.6'.freeze
+  VERSION = '0.2.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopiform
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord