scopiform 0.2.6 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae35b0a41cb186989dbb8f76fb8dbfa11604782e6b795fca0ac5e50e66bdd3fa
-  data.tar.gz: 88b9bb3f9cf86b143d997502d0ae997606652d813541259c684d76c7c379b40d
+  metadata.gz: cca47f44f585db581edd54791485e5016ecc1d8f73c5e09dc0cb3be21a853d0e
+  data.tar.gz: fea9cb2762ac42bdcb1089262ac0e116857fb1d568590bb3c570e9b1f49f60d8
 SHA512:
-  metadata.gz: a6239fb1c253b895b3bf35f640fde0f600cc853f9348839108536abf2eed887c71c763b1c1ebb71fa4d2eff07bb77b953732641edb4dde3f271127d25d76287e
-  data.tar.gz: fde9049ba6c66da3901eb99352b3e938130a46e8a24e85c42a04a92c4c641188e112299ea2882b632fe3f6d833f300d9bc8f7aa52928a69b4df7653377af268f
+  metadata.gz: fc021d11757854fc08b8d238ffe7f8bdf2300cf94fb2ceb2d5b87720dbb9de977845343007e6f04377b93f1c95ee94cdc6b89c3daa29ac538cfa184aeb4cae72
+  data.tar.gz: 97669e667b8610924637a185fd5b31c0421f03e54834ccc76fa4ea326fa68ce82e44011ce0c55a47d1f4a2380171c597e5f4c1a7dffca7ed644ee34f0ea8cceb

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,20 +16,28 @@ 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:)
-        if filter_name.to_s.casecmp('OR').zero?
+        is_or = filter_name.to_s.casecmp?('OR')
+        is_and = filter_name.to_s.casecmp?('AND')
+        if is_or || is_and
           ctx ||= ScopeContext.new
           ctx.joins = []
+          chain_method = is_or ? :or : :merge
 
           return (
             filter_argument
-              .map { |or_filters_hash| apply_filters(or_filters_hash, injecting: out, ctx: ctx) }
+              .map { |filter_hash| apply_filters(filter_hash, injecting: out, ctx: ctx) }
               .map { |a| a.joins(ctx.joins) }
-              .inject { |chain, applied| chain.or(applied) }
+              .inject { |chain, applied| chain.public_send(chain_method, applied) }
           )
         end
+
         out.send(filter_name, filter_argument, ctx: ctx)
       end
 
@@ -37,6 +45,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/helpers.rb

@@ -44,7 +44,7 @@ module Scopiform
         name = resolve_alias(name)
         association = reflect_on_association(name)
 
-        association.klass if association.present?
+        association.klass if association.present? && !association.polymorphic?
         association
       rescue NameError
         logger.warn "Unable to load class for association `#{name}` in model `#{self.name}`"
@@ -62,17 +62,26 @@ module Scopiform
       protected
 
       def safe_columns
-        columns
-      rescue ActiveRecord::StatementInvalid
+        @safe_columns ||= columns
+      rescue *safe_column_rescue_errors
         logger.warn "Unable to load columns for `#{name}`"
-        []
+        @safe_columns = []
       end
 
       def safe_columns_hash
-        columns_hash
-      rescue ActiveRecord::StatementInvalid
+        @safe_columns_hash ||= columns_hash
+      rescue *safe_column_rescue_errors
         logger.warn "Unable to load columns_hash for `#{name}`"
-        {}
+        @safe_columns_hash = {}
+      end
+
+      private
+
+      def safe_column_rescue_errors
+        [
+          ActiveRecord::StatementInvalid,
+          Object.const_defined?('TinyTds') ? TinyTds::Error : nil,
+        ]
       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.10'.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.10
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord