filterable-by 0.6.0 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a5cdaf4511167346ca041eea0e8c3e472c0bea213429ffd7907a6f95501b7f8
-  data.tar.gz: 6e65a71a9e5aa47f41b37cfc5ac054213166e405fd9b3a81ea1054dca0ffb802
+  metadata.gz: 12ba86a11c254ce3ce2a03cafd2b39f75f2b6df80d6899d05ef160dd98c07c96
+  data.tar.gz: 916d29d238b9ae4c14d559cd880b51f8d0f6063fd66cd27470756bd2e38bea43
 SHA512:
-  metadata.gz: d102876e053de4c60fdc714e0371977f389a0e3066a0538dfcb93b0e1ac8f20582fdb6ef86fe53991729c052ca85ffc22c89dca8bec80016e437d746cbd477ba
-  data.tar.gz: c8d8c948a1766a96abb88cab12f51648ebaf21c59e7e53b97cbc54f9778799d58d5baaf6f279d21a808139530076fee4ba47d7da7663e7f49df2a894a58f1d82
+  metadata.gz: 70df7b4aa8a04fd6b820a63658357186185d5ecbfa3a63c9f9a45e9bbdffba4aa8a0d4ec9fca6aadc43d122fb6a298086dd1cf3fc7a692961cfd6642f6a426aa
+  data.tar.gz: 1ce3a1f26079fbafc6cba6d516930adacbf69bcb0523d0431692750f9158058b2df96af5aa8e16d8bcd4138e76d06bec94ae032464c00aeb9178c8909ccefce9

data/.github/workflows/test.yml

@@ -12,6 +12,9 @@ jobs:
     strategy:
       matrix:
         ruby-version: ["2.7", "3.0", "3.1"]
+        gemfiles: ["Gemfile", "Gemfile.rails6"]
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    filterable-by (0.6.0)
+    filterable-by (0.6.3)
       activerecord
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (7.0.2.2)
-      activesupport (= 7.0.2.2)
-    activerecord (7.0.2.2)
-      activemodel (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
-    activesupport (7.0.2.2)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activerecord (7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
-    parallel (1.21.0)
+    parallel (1.22.1)
     parser (3.1.1.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
@@ -40,17 +40,17 @@ GEM
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.25.1)
+    rubocop (1.26.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.16.0)

data/Gemfile.rails6

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activerecord', '~> 6.1'

data/Gemfile.rails6.lock

@@ -0,0 +1,91 @@
+PATH
+  remote: .
+  specs:
+    filterable-by (0.6.1)
+      activerecord
+      activesupport
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.4.7)
+      activesupport (= 6.1.4.7)
+    activerecord (6.1.4.7)
+      activemodel (= 6.1.4.7)
+      activesupport (= 6.1.4.7)
+    activesupport (6.1.4.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.5.0)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.15.0)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-bsm (0.6.0)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.13.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    sqlite3 (1.4.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.4)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.1)
+  bundler
+  filterable-by!
+  rake
+  rspec
+  rubocop-bsm
+  sqlite3
+
+BUNDLED WITH
+   2.3.9

data/filterable-by.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'filterable-by'
-  s.version     = '0.6.0'
+  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,35 +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
 
-        scope = scope.merge(sub.invert_where)
+      def eval_scope(scope, unscoped, value, **opts, &block)
+        if block.arity == 2
+          scope.instance_exec(unscoped, value, **opts, &block)
+        else
+          scope.instance_exec(value, **opts, &block)
+        end
       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

data/spec/active_record/filterable_by_spec.rb

@@ -61,6 +61,12 @@ describe ActiveRecord::FilterableBy do
   it 'combines with other scopes' do
     scope = Comment.where(author_id: alice.id).filter_by('post_id' => apost.id)
     expect(scope.pluck(:title)).to match_array(['AA'])
+
+    expect(alice.posts.filter_by('post_id' => apost.id).count).to be(1)
+    expect(alice.posts.filter_by('author_id' => alice.id).count).to be(1)
+    expect(alice.posts.filter_by('author_id_not' => bob.id).count).to be(1)
+    expect(alice.posts.filter_by('author_id' => bob.id).count).to be_zero
+    expect(alice.posts.filter_by('author_id_not' => alice.id).count).to be_zero
   end
 
   it 'allows custom options' do
@@ -91,4 +97,8 @@ describe ActiveRecord::FilterableBy do
     expect(Comment.filter_by('deprecated_with_opts' => alice.id).pluck(:title)).to match_array(%w[AA AB])
     expect(Comment.filter_by('deprecated_not' => alice.id).pluck(:title)).to match_array(%w[BA BB])
   end
+
+  it 'supports abstract classes' do
+    expect(Post.filter_by('author_id' => bob.id).count).to eq(1)
+  end
 end

data/spec/spec_helper.rb

@@ -22,10 +22,11 @@ ActiveRecord::Base.connection.instance_eval do
 end
 
 class Author < ActiveRecord::Base
+  has_many :posts
 end
 
-class Post < ActiveRecord::Base
-  belongs_to :author
+class AbstractPost < ActiveRecord::Base
+  self.abstract_class = true
 
   filterable_by :author_id
   filterable_by :only do |value, **opts|
@@ -38,6 +39,10 @@ class Post < ActiveRecord::Base
   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.0
+  version: 0.6.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -120,6 +120,8 @@ files:
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
+- Gemfile.rails6
+- Gemfile.rails6.lock
 - LICENSE
 - README.md
 - Rakefile