scopiform 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca47f44f585db581edd54791485e5016ecc1d8f73c5e09dc0cb3be21a853d0e
-  data.tar.gz: fea9cb2762ac42bdcb1089262ac0e116857fb1d568590bb3c570e9b1f49f60d8
+  metadata.gz: 4797b03e201890c2061d9d034865c69ad3eeff2659e116072762d916cf9d1a5b
+  data.tar.gz: 967d1c00becc5337ea67c70a585eed94b5b9567d873f3b704d64e35082729ff2
 SHA512:
-  metadata.gz: fc021d11757854fc08b8d238ffe7f8bdf2300cf94fb2ceb2d5b87720dbb9de977845343007e6f04377b93f1c95ee94cdc6b89c3daa29ac538cfa184aeb4cae72
-  data.tar.gz: 97669e667b8610924637a185fd5b31c0421f03e54834ccc76fa4ea326fa68ce82e44011ce0c55a47d1f4a2380171c597e5f4c1a7dffca7ed644ee34f0ea8cceb
+  metadata.gz: 4e9f003fad523f7807b8019d7cec7b041551c9512cdb0b7db182960d2b7d24cc2b8b944aa3d048fd99545ffd0973550a41f525e76ed9ac768c4653b15eb6d161
+  data.tar.gz: e2767c5336ef108e5df62ee94d9ac1cb01475d47680da728d8fbbb164703080ece6ca258f7bbf8edbcf5cc3739fef510ca4709fa836a29cb14c92ee0287735e3

data/lib/scopiform/helpers.rb

@@ -6,7 +6,7 @@ module Scopiform
   module Helpers
     extend ActiveSupport::Concern
 
-    STRING_TYPES = %i[string text].freeze
+    STRING_TYPES = %i[string text varchar].freeze
     NUMBER_TYPES = %i[integer float decimal].freeze
     DATE_TYPES = %i[date time datetime timestamp].freeze
 
@@ -63,16 +63,16 @@ module Scopiform
 
       def safe_columns
         @safe_columns ||= columns
-      rescue *safe_column_rescue_errors
-        logger.warn "Unable to load columns for `#{name}`"
-        @safe_columns = []
+      # rescue *safe_column_rescue_errors
+      #   logger.warn "Unable to load columns for `#{name}`"
+      #   @safe_columns = []
       end
 
       def safe_columns_hash
         @safe_columns_hash ||= columns_hash
-      rescue *safe_column_rescue_errors
-        logger.warn "Unable to load columns_hash for `#{name}`"
-        @safe_columns_hash = {}
+      # rescue *safe_column_rescue_errors
+      #   logger.warn "Unable to load columns_hash for `#{name}`"
+      #   @safe_columns_hash = {}
       end
 
       private

data/lib/scopiform/scope_context.rb

@@ -1,6 +1,6 @@
 module Scopiform
   class ScopeContext
-    attr_accessor :association, :arel_table, :association_arel_table, :joins, :ancestors, :scopes
+    attr_accessor :association, :arel_table, :association_arel_table, :joins, :ancestors, :scopes, :has_manys
 
     def self.from(ctx)
       created = new
@@ -20,6 +20,7 @@ module Scopiform
       @joins = []
       @ancestors = []
       @scopes = []
+      @has_manys = []
     end
 
     def set(arel_table)
@@ -35,6 +36,10 @@ module Scopiform
           self.association = association.through_reflection
         end
 
+        unless association.has_one? || association.belongs_to?
+          has_manys << association.name
+        end
+
         ancestors << association.name.to_s.pluralize
         self.association_arel_table = association.klass.arel_table.alias(alias_name)
 

data/lib/scopiform/utilities.rb

@@ -17,10 +17,13 @@ module Scopiform
 
       ctx.association = association
       ctx.build_joins
+      has_manys = ctx.has_manys.present?
 
       applied = ctx.association.klass.send(method, value, ctx: ScopeContext.from(ctx).set(ctx.association_arel_table))
 
-      if is_root
+      if is_root && !has_manys
+        ctx.scopes.reduce(active_record.joins(ctx.joins).merge(applied)) { |chain, scope| chain.merge(scope) }
+      elsif is_root && has_manys
         ctx.scopes.reduce(active_record.distinct.joins(ctx.joins).merge(applied)) { |chain, scope| chain.merge(scope) }
       else
         ctx.scopes.reduce(active_record.all.merge(applied)) { |chain, scope| chain.merge(scope) }

data/lib/scopiform/version.rb

@@ -1,3 +1,3 @@
 module Scopiform
-  VERSION = '0.2.10'.freeze
+  VERSION = '0.2.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scopiform
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - jayce.pulsipher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-08 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -123,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Generate scope methods to ActiveRecord classes based on columns and associations