filterable-by 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a92cb2cde41910a93ed81348238f61031c3e5c8071ab2b118bfceb25307a8c14
-  data.tar.gz: 231b7712b1fe257b34ab63d8a3dc362304c45318984c3eb1a2c8cf004ef2ee44
+  metadata.gz: 12ba86a11c254ce3ce2a03cafd2b39f75f2b6df80d6899d05ef160dd98c07c96
+  data.tar.gz: 916d29d238b9ae4c14d559cd880b51f8d0f6063fd66cd27470756bd2e38bea43
 SHA512:
-  metadata.gz: 8ca4f69341eaa58f296280b703398c5ce6ad1dcd6551758322c36a03db7f2b9af7e37defeb96c205a5a1520f40e154d4ebd2f5c6110591ccb1505f55f99ac870
-  data.tar.gz: 10691ed7dc8e33b7c6920e8a8e6e670b854bc51d6155baa0923d0cfe363ec2fb8824ed79f3cc635cc9b68f824e3c1951ea32cda8e320e0f40b5ad12fbfa37c2f
+  metadata.gz: 70df7b4aa8a04fd6b820a63658357186185d5ecbfa3a63c9f9a45e9bbdffba4aa8a0d4ec9fca6aadc43d122fb6a298086dd1cf3fc7a692961cfd6642f6a426aa
+  data.tar.gz: 1ce3a1f26079fbafc6cba6d516930adacbf69bcb0523d0431692750f9158058b2df96af5aa8e16d8bcd4138e76d06bec94ae032464c00aeb9178c8909ccefce9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    filterable-by (0.6.2)
+    filterable-by (0.6.3)
       activerecord
       activesupport
 

data/filterable-by.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'filterable-by'
-  s.version     = '0.6.2'
+  s.version     = '0.6.3'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate white-listed filter scopes from URL parameter values'

data/lib/filterable_by.rb

@@ -4,40 +4,56 @@ require 'set'
 
 module ActiveRecord
   module FilterableBy
-    def self.normalize(value)
-      case value
-      when String, Numeric
-        value
-      when Array
-        value.select {|v| normalize(v) }
+    class << self
+      def normalize(value)
+        case value
+        when String, Numeric
+          value
+        when Array
+          value.select {|v| normalize(v) }
+        end
       end
-    end
 
-    def self.merge(scope, unscoped, hash, name, **opts, &block)
-      key = name
-      positive = normalize(hash[key]) if hash.key?(key)
-      if positive.present?
-        sub = block.arity == 2 ? yield(unscoped, positive, **opts) : yield(positive, **opts)
-        return nil unless sub
+      def merge(scope, unscoped, hash, name, **opts, &block)
+        key = name
+        positive = normalize(hash[key]) if hash.key?(key)
+        if positive.present?
+          sub = eval_scope(scope, unscoped, positive, **opts, &block)
+          return nil unless sub
+
+          scope = scope.merge(sub)
+        end
+
+        key = "#{name}_not"
+        negative = normalize(hash[key]) if hash.key?(key)
+        if negative.present?
+          sub = eval_scope(scope, unscoped, negative, **opts, &block)
+          return nil unless sub
 
-        scope = scope.merge(sub)
+          scope = scope.merge(invert_where(sub))
+        end
+
+        scope
       end
 
-      key = "#{name}_not"
-      negative = normalize(hash[key]) if hash.key?(key)
-      if negative.present?
-        sub = block.arity == 2 ? yield(unscoped, negative, **opts) : yield(negative, **opts)
-        return nil unless sub
+      private
 
-        if sub.respond_to?(:invert_where)
-          sub = sub.invert_where
+      def eval_scope(scope, unscoped, value, **opts, &block)
+        if block.arity == 2
+          scope.instance_exec(unscoped, value, **opts, &block)
         else
-          sub.where_clause = sub.where_clause.invert
+          scope.instance_exec(value, **opts, &block)
         end
-        scope = scope.merge(sub)
       end
 
-      scope
+      def invert_where(scope)
+        if scope.respond_to?(:invert_where!)
+          scope.invert_where!
+        else
+          scope.where_clause = scope.where_clause.invert
+        end
+        scope
+      end
     end
 
     module ClassMethods
@@ -58,7 +74,7 @@ module ActiveRecord
         end
 
         names.each do |name|
-          _filterable_by_config[name.to_s] = block
+          _filterable_by_config[name.to_s] = block || ->(value, **) { where(name.to_sym => value) }
         end
       end
 
@@ -74,7 +90,6 @@ module ActiveRecord
         return scope unless hash.respond_to?(:key?) && hash.respond_to?(:[])
 
         _filterable_by_config.each do |name, block|
-          block = ->(value, **) { where(name.to_sym => value) } if block.nil?
           scope = FilterableBy.merge(scope, unscoped, hash, name, **opts, &block)
           break unless scope
         end

data/spec/spec_helper.rb

@@ -27,12 +27,8 @@ end
 
 class AbstractPost < ActiveRecord::Base
   self.abstract_class = true
-  filterable_by :author_id
-end
-
-class Post < AbstractPost
-  belongs_to :author
 
+  filterable_by :author_id
   filterable_by :only do |value, **opts|
     case value
     when 'me'
@@ -43,6 +39,10 @@ class Post < AbstractPost
   end
 end
 
+class Post < AbstractPost
+  belongs_to :author
+end
+
 class Feedback < ActiveRecord::Base
   belongs_to :author
   belongs_to :post

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filterable-by
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord