filterable-by 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e533d4d75b6d63e5fb7618d137ea0d3c74b33556
-  data.tar.gz: c2b26115a0d7c1a035230914d54aa47fa9d4de16
+SHA256:
+  metadata.gz: 8a45bdeb246550581221e6a721af41f27e355b9d87d1fd8dd791731142bba9cd
+  data.tar.gz: 06f4640997ef9fbfc88b6cedb943cf0840c0e643c7012ffd441700e52495113e
 SHA512:
-  metadata.gz: 5e3720c7264c8ca31db45f5393778f3f3795c655e5f440bc5e49cda15bdf7c50988e1bccf48ed7871b3fc80d286b4181bf8f3c0228a854acb987e76ef32b4655
-  data.tar.gz: 78c319fb3bd03c79094f72268dfaa589930985809e5ff2bcd524420980e01f30ebd2fb9e10e2174e2dee93fec50dcf2c499e0d27bde165256ff044a0b451e0c4
+  metadata.gz: c292090ad77af10f1729f4ad652fb84595fe20d866bf4ab221d642465fc56fa4073dc7cc2ed2469b9a92169e418f2860f44ea4702bbf4cbf34e1591b07645077
+  data.tar.gz: '08a1ec2870b5da50e5b41b35a06e8adf5b72f375c50fb2bc3009d9a4c17f5140b4f44f44ffc764aa8f73703a9f041610b37075ebbedabfd84db362690562b9a2'

data/.github/workflows/ruby.yml

@@ -0,0 +1,21 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.gitignore

@@ -1,3 +1,4 @@
 spec/tmp
 pkg
 *.gem
+.rubocop-*

data/.rubocop.yml

@@ -1,7 +1,11 @@
-inherit_from: .rubocop_todo.yml
+inherit_gem:
+  rubocop-bsm:
+    - default.yml
+inherit_mode:
+  merge:
+    - Exclude
 
-Style/Documentation:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 120
+AllCops:
+  TargetRubyVersion: "2.6"
+Naming/FileName:
+  Exclude: [lib/filterable-by.rb]

data/Gemfile.lock

@@ -1,64 +1,86 @@
 PATH
   remote: .
   specs:
-    filterable-by (0.4.0)
+    filterable-by (0.5.2)
       activerecord
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.3)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    builder (3.2.2)
-    diff-lcs (1.2.5)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.2)
-    parser (2.2.2.5)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
+      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.8)
+    diff-lcs (1.4.4)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.32.0)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-    sqlite3 (1.3.10)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-bsm (0.5.4)
+      rubocop (~> 1.0)
+      rubocop-performance
+      rubocop-rails
+      rubocop-rake
+      rubocop-rspec
+    rubocop-performance (1.10.1)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    sqlite3 (1.4.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -68,8 +90,8 @@ DEPENDENCIES
   filterable-by!
   rake
   rspec
-  rubocop
+  rubocop-bsm
   sqlite3
 
 BUNDLED WITH
-   1.10.6
+   2.1.4

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2015-2018 Black Square Media
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -16,47 +16,33 @@ class Comment < ActiveRecord::Base
 
   filterable_by :post_id, :user_id
   filterable_by :post_author_id do |scope, value|
-    scope.joins(:posts).where(:"posts.author_id" => value)
+    scope.joins(:posts).where(:'posts.author_id' => value)
+  end
+  filterable_by :only do |scope, value, **opts|
+    case value
+    when 'mine'
+      scope.where(user_id: opts[:user_id]) if opts[:user_id]
+    else
+      scope
+    end
   end
 end
 
-Comment.filter_by(params[:filter])  # => ActiveRecord::Relation
+Comment.filter_by(params[:filter], user_id: current_user.id)  # => ActiveRecord::Relation
 ```
 
 Simple use cases:
 
 ```ruby
-Comment.filter_by({ "post_id" => "1" })
+Comment.filter_by({ 'post_id' => '1' })
 # => WHERE post_id = 1
 
-Comment.filter_by({ "user_id" => "2", "ignored" => "3" })
+Comment.filter_by({ 'user_id' => '2', 'ignored' => '3' })
 # => WHERE user_id = 2
 
-Comment.filter_by({ "post_author_id" => "5" })
-# => JOINS posts ON posts.id = comments.post_id WHERE posts.author_id = 5
-```
-
-## LICENCE
+Comment.filter_by({ 'only' => 'mine' }, user_id: 4)
+# => WHERE user_id = 4
 
-```
-Copyright (c) 2015 Black Square Media
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Comment.filter_by({ 'post_author_id' => '5' })
+# => JOINS posts ON posts.id = comments.post_id WHERE posts.author_id = 5
 ```

data/Rakefile

@@ -6,4 +6,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new(:rubocop)
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]

data/filterable-by.gemspec

@@ -1,7 +1,6 @@
-# -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'filterable-by'
-  s.version     = '0.4.0'
+  s.version     = '0.5.2'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate white-listed filter scopes from URL parameter values'
@@ -9,17 +8,17 @@ Gem::Specification.new do |s|
   s.homepage    = 'https://github.com/bsm/filterable-by'
   s.license     = 'MIT'
 
-  s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
+  s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.6'
 
-  s.add_dependency 'activesupport'
   s.add_dependency 'activerecord'
+  s.add_dependency 'activesupport'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-bsm'
   s.add_development_dependency 'sqlite3'
 end

data/lib/filterable_by.rb

@@ -3,43 +3,59 @@ require 'active_support/concern'
 require 'set'
 
 module ActiveRecord
-  module FilterableByHelper
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :_filterable_by_scope_options, instance_accessor: false
-      self._filterable_by_scope_options = {}
+  module FilterableBy
+    def self.normalize(value)
+      case value
+      when String, Numeric
+        value
+      when Array
+        value.select {|v| normalize(v) }
+      end
     end
 
     module ClassMethods
+      def self.extended(base) # :nodoc:
+        base.class_attribute :_filterable_by_config, instance_accessor: false, instance_predicate: false
+        base._filterable_by_config = {}
+        super
+      end
+
+      def inherited(base) # :nodoc:
+        base._filterable_by_config = _filterable_by_config.deep_dup
+        super
+      end
 
       def filterable_by(*names, &block)
         names.each do |name|
-          _filterable_by_scope_options[name.to_s] = block || ->(scope, v) { scope.where(name.to_sym => v) }
+          _filterable_by_config[name.to_s] = block || ->(scope, value, **) { scope.where(name.to_sym => value) }
         end
       end
 
       # @param [Hash] hash the filter params
       # @return [ActiveRecord::Relation] the scoped relation
-      def filter_by(hash)
+      def filter_by(hash = nil, **opts)
+        if hash.nil?
+          hash = opts
+          opts = {}
+        end
         scope = all
         return scope unless hash.is_a?(Hash)
 
-        _filterable_by_scope_options.each do |name, block|
+        _filterable_by_config.each do |name, block|
           next unless hash.key?(name)
 
-          value = hash[name]
-          next unless (value.is_a?(String) && value.present?) || value.is_a?(Numeric)
+          value = FilterableBy.normalize(hash[name])
+          next if value.blank?
 
-          scope = block.call(scope, value)
+          scope = block.call(scope, value, **opts)
         end
-        scope
-      end
 
+        scope || none
+      end
     end
   end
 
   class Base
-    include FilterableByHelper
+    extend FilterableBy::ClassMethods
   end
 end

data/spec/active_record/filterable_by_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe ActiveRecord::FilterableBy do
+  let(:alice) { AUTHORS[:alice] }
+  let(:bob)   { AUTHORS[:bob] }
+
+  let(:apost) { POSTS[:alices] }
+  let(:bpost) { POSTS[:bobs] }
+
+  it 'has config' do
+    expect(Comment.send(:_filterable_by_config).count).to eq(3)
+    expect(Rating.send(:_filterable_by_config).count).to eq(2)
+    expect(Post.send(:_filterable_by_config).count).to eq(2)
+  end
+
+  it 'ignores bad inputs' do
+    expect(Comment.filter_by.count).to eq(4)
+    expect(Comment.filter_by(nil).count).to eq(4)
+    expect(Comment.filter_by(nil, extra: true).count).to eq(4)
+    expect(Comment.filter_by('bad').count).to eq(4)
+
+    expect(Comment.filter_by('author_id' => '').count).to eq(4)
+    expect(Comment.filter_by('author_id' => []).count).to eq(4)
+  end
+
+  it 'generates simple scopes' do
+    expect(Comment.filter_by('author_id' => alice.id).pluck(:title)).to match_array(%w[AA AB])
+    expect(Comment.filter_by('author_id' => bob.id).pluck(:title)).to match_array(%w[BA BB])
+    expect(Comment.filter_by('author_id' => [alice.id, '']).pluck(:title)).to match_array(%w[AA AB])
+
+    expect(Comment.filter_by('post_id' => apost.id).pluck(:title)).to match_array(%w[AA BA])
+    expect(Comment.filter_by('post_id' => bpost.id).pluck(:title)).to match_array(%w[AB BB])
+
+    expect(Comment.filter_by('post_author_id' => alice.id).pluck(:title)).to match_array(%w[AA BA])
+    expect(Comment.filter_by('post_author_id' => bob.id).pluck(:title)).to match_array(%w[AB BB])
+
+    expect(Rating.filter_by('author_id' => alice.id).count).to eq(0)
+    expect(Rating.filter_by('author_id' => bob.id).count).to eq(1)
+
+    expect(Post.filter_by('author_id' => bob.id).count).to eq(1)
+  end
+
+  it 'generates combined scopes' do
+    expect(Comment.filter_by('author_id' => alice.id, 'post_id' => apost.id).pluck(:title)).to match_array(['AA'])
+    expect(Comment.filter_by('author_id' => alice.id, 'post_id' => bpost.id).pluck(:title)).to match_array(['AB'])
+    expect(Comment.filter_by('author_id' => bob.id, 'post_id' => apost.id).pluck(:title)).to match_array(['BA'])
+    expect(Comment.filter_by('author_id' => bob.id, 'post_id' => bpost.id).pluck(:title)).to match_array(['BB'])
+
+    scope = Comment.filter_by('author_id' => [alice.id, bob.id], 'post_id' => bpost.id)
+    expect(scope.pluck(:title)).to match_array(%w[AB BB])
+  end
+
+  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'])
+  end
+
+  it 'allows custom options' do
+    scope = Post.filter_by({ 'only' => 'me' }, user_id: alice.id)
+    expect(scope).to match_array([apost])
+
+    scope = Post.filter_by({ 'only' => '??' }, user_id: alice.id)
+    expect(scope.count).to eq(2)
+
+    scope = Post.filter_by({ 'only' => 'me' })
+    expect(scope.count).to eq(0)
+  end
+
+  it 'allows custom options from params' do
+    filter = { 'only' => 'me' }
+    expect(Post.filter_by(filter, user_id: alice.id)).to match_array([apost])
+    expect(Post.filter_by(filter).count).to eq(0)
+  end
+
+  it 'ignores invalid scopes' do
+    expect(Comment.filter_by('invalid' => 1).count).to eq(4)
+    expect(Post.filter_by('post_id' => bpost.id).count).to eq(2)
+    expect(Rating.filter_by('post_author_id' => bob.id).count).to eq(1)
+  end
+end

data/spec/spec_helper.rb

@@ -2,17 +2,20 @@ ENV['RACK_ENV'] ||= 'test'
 require 'filterable-by'
 require 'rspec'
 
-ActiveRecord::Base.configurations['test'] = { 'adapter' => 'sqlite3', 'database' => ':memory:' }
+ActiveRecord::Base.configurations = { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
 ActiveRecord::Base.establish_connection :test
 
 ActiveRecord::Base.connection.instance_eval do
   create_table :authors do |_|
+    # no columns
   end
   create_table :posts do |t|
     t.integer :author_id, null: false
   end
-  create_table :comments do |t|
-    t.string  :title, null: false
+  create_table :feedbacks do |t|
+    t.string  :type, null: false
+    t.string  :title
+    t.integer :stars, null: false, default: 0
     t.integer :post_id, null: false
     t.integer :author_id, null: false
   end
@@ -23,31 +26,48 @@ end
 
 class Post < ActiveRecord::Base
   belongs_to :author
+
+  filterable_by :author_id
+  filterable_by :only do |scope, value, **opts|
+    case value
+    when 'me'
+      scope.where(author_id: opts[:user_id]) if opts[:user_id]
+    else
+      scope
+    end
+  end
 end
 
-class Comment < ActiveRecord::Base
+class Feedback < ActiveRecord::Base
   belongs_to :author
   belongs_to :post
 
   filterable_by :post_id, :author_id
+end
+
+class Comment < Feedback
   filterable_by :post_author_id do |scope, value|
     scope.joins(:post).where(Post.arel_table[:author_id].eq(value))
   end
 end
 
+class Rating < Feedback
+end
+
 AUTHORS = {
   alice: Author.create!,
-  bob:   Author.create!,
-}
+  bob: Author.create!,
+}.freeze
 
 POSTS = {
   alices: Post.create!(author_id: AUTHORS[:alice].id),
-  bobs:   Post.create!(author_id: AUTHORS[:bob].id),
-}
+  bobs: Post.create!(author_id: AUTHORS[:bob].id),
+}.freeze
 
 COMMENTS = {
   alice_on_alice: Comment.create!(title: 'AA', post_id: POSTS[:alices].id, author_id: AUTHORS[:alice].id),
-  bob_on_alice:   Comment.create!(title: 'BA', post_id: POSTS[:alices].id, author_id: AUTHORS[:bob].id),
-  alice_on_bob:   Comment.create!(title: 'AB', post_id: POSTS[:bobs].id, author_id: AUTHORS[:alice].id),
-  bob_on_bob:     Comment.create!(title: 'BB', post_id: POSTS[:bobs].id, author_id: AUTHORS[:bob].id),
-}
+  bob_on_alice: Comment.create!(title: 'BA', post_id: POSTS[:alices].id, author_id: AUTHORS[:bob].id),
+  alice_on_bob: Comment.create!(title: 'AB', post_id: POSTS[:bobs].id, author_id: AUTHORS[:alice].id),
+  bob_on_bob: Comment.create!(title: 'BB', post_id: POSTS[:bobs].id, author_id: AUTHORS[:bob].id),
+  boa_rating: Rating.create!(stars: 5, post_id: POSTS[:alices].id, author_id: AUTHORS[:bob].id),
+}.freeze

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: filterable-by
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-bsm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,18 +115,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - filterable-by.gemspec
 - lib/filterable-by.rb
 - lib/filterable_by.rb
-- spec/filterable_by_spec.rb
+- spec/active_record/filterable_by_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bsm/filterable-by
 licenses:
@@ -140,18 +140,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Generate white-listed filter scopes from URL parameter values
 test_files:
-- spec/filterable_by_spec.rb
+- spec/active_record/filterable_by_spec.rb
 - spec/spec_helper.rb

data/.rubocop_todo.yml

@@ -1,40 +0,0 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-10-29 12:58:41 +0000 using RuboCop version 0.32.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: Exclude.
-Style/FileName:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SingleSpaceBeforeFirstArg:
-  Enabled: false
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-Style/TrailingComma:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
-Style/WordArray:
-  MinSize: 2

data/.travis.yml

@@ -1,6 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.1.2
-  - 2.2.3
-gemfile:
-  - Gemfile

data/spec/filterable_by_spec.rb

@@ -1,46 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe ActiveRecord::FilterableByHelper do
-
-  let(:alice) { AUTHORS[:alice] }
-  let(:bob)   { AUTHORS[:bob] }
-
-  let(:apost) { POSTS[:alices] }
-  let(:bpost) { POSTS[:bobs] }
-
-  it 'should have config' do
-    expect(Comment._filterable_by_scope_options.size).to eq(3)
-  end
-
-  it 'should ignore bad inputs' do
-    expect(Comment.filter_by(nil).count).to eq(4)
-    expect(Comment.filter_by({}).count).to eq(4)
-
-    expect(Comment.filter_by('author_id' => '').count).to eq(4)
-    expect(Comment.filter_by('author_id' => []).count).to eq(4)
-  end
-
-  it 'should generate simple scopes' do
-    expect(Comment.filter_by('author_id' => alice.id).pluck(:title)).to match_array(['AA', 'AB'])
-    expect(Comment.filter_by('author_id' => bob.id).pluck(:title)).to match_array(['BA', 'BB'])
-
-    expect(Comment.filter_by('post_id' => apost.id).pluck(:title)).to match_array(['AA', 'BA'])
-    expect(Comment.filter_by('post_id' => bpost.id).pluck(:title)).to match_array(['AB', 'BB'])
-
-    expect(Comment.filter_by('post_author_id' => alice.id).pluck(:title)).to match_array(['AA', 'BA'])
-    expect(Comment.filter_by('post_author_id' => bob.id).pluck(:title)).to match_array(['AB', 'BB'])
-  end
-
-  it 'should generate combined scopes' do
-    expect(Comment.filter_by('author_id' => alice.id, 'post_id' => apost.id).pluck(:title)).to match_array(['AA'])
-    expect(Comment.filter_by('author_id' => alice.id, 'post_id' => bpost.id).pluck(:title)).to match_array(['AB'])
-    expect(Comment.filter_by('author_id' => bob.id, 'post_id' => apost.id).pluck(:title)).to match_array(['BA'])
-    expect(Comment.filter_by('author_id' => bob.id, 'post_id' => bpost.id).pluck(:title)).to match_array(['BB'])
-  end
-
-  it 'should combine 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'])
-  end
-
-end