search_cop 1.2.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb7e91b305057b2ea3df0c96643f8cd2cc726583f2362db9d576ef128826a75
-  data.tar.gz: 419ee38ec698795d478f7749486e63b533c9cc497057aa820b5627b343cbdeb4
+  metadata.gz: 3d50fc64d55fb96b64906163d2f2e88f253974e8aeb0653307795fcab40eb636
+  data.tar.gz: 86184be05de8b457dbe709c89c4938aa35f600adf5cd1c20d38819a1ba933b86
 SHA512:
-  metadata.gz: 19b765a13b9a21a5b798b60618253729b4a8c1279babe47644d5c030b93b09c87706138ab11cd5bfd9daee757d8d04bff95fc1bc3ce50c5f6f7399aaaabc09d1
-  data.tar.gz: a65e72e3d6e5500b986bb312c45dbbd00432419b344765c71387432dd127efd5eb463cd42f71c3e405913a66b8d45201b9d909b9e66da17bf28f11ea3b7aa5c8
+  metadata.gz: abc70826323ea53b7966a415d78f18a64a10e004e9e6e08687c6118ebcd60964a5732691706c3d2d52aea05d919d9154484c57517a4882b4f9056518bf8ab4f3
+  data.tar.gz: 47c56ea7175559e06bbde1c830f6dc8437279cfb6639446babc6d2b731a86037c815fb8664f4fba64f6832cac33168a6e6f86cf79275cc410eec1b0cce17fb72

data/.github/workflows/test.yml

@@ -4,10 +4,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7"]
-        rails: ["rails5", "rails6"]
+        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        rails: ["rails5", "rails6", "rails7"]
         database: ["sqlite", "postgres", "mysql"]
+        exclude:
+          - ruby: "3.0"
+            rails: "rails5"
+          - ruby: "3.1"
+            rails: "rails5"
+          - ruby: "2.6"
+            rails: "rails7"
     services:
       postgres:
         image: postgres
@@ -27,7 +35,7 @@ jobs:
           - 3306:3306
     steps:
       - uses: actions/checkout@v1
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: test

data/.rubocop.yml

@@ -1,6 +1,12 @@
 AllCops:
   NewCops: enable
 
+Gemspec/RequireMFA:
+  Enabled: false
+
+Style/FetchEnvVar:
+  Enabled: false
+
 Gemspec/RequiredRubyVersion:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 
 # Changelog
 
+Version 1.2.3:
+
+* Fix table name for namespaced and inherited models #70 #67
+
+Version 1.2.2:
+
+* Fix table name for namespaced models #70
+
+Version 1.2.1:
+
+* Fix use of `table_name` to work with inherited models
+* Fix linter, add ruby 3 and rails 7 to ci pipeline
+
 Version 1.2.0:
 
 * Added support for disabling the right wildcard

data/gemfiles/rails7.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 7.0"
+
+platforms :ruby do
+  gem "mysql2"
+  gem "pg"
+  gem "sqlite3"
+end
+
+gemspec path: "../"

data/lib/search_cop/query_builder.rb

@@ -12,7 +12,7 @@ module SearchCop
     end
 
     def associations
-      all_associations - [query_info.model.name.tableize.to_sym]
+      all_associations - [query_info.model.name.tableize.to_sym] - [query_info.model.table_name.to_sym]
     end
 
     private

data/lib/search_cop/version.rb

@@ -1,3 +1,3 @@
 module SearchCop
-  VERSION = "1.2.0"
+  VERSION = "1.2.3"
 end

data/search_cop.gemspec

@@ -14,7 +14,6 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency "treetop"

data/test/search_cop_test.rb

@@ -61,6 +61,35 @@ class SearchCopTest < SearchCop::TestCase
     refute_includes results, rejected
   end
 
+  def test_inherited_model
+    expected = create(:available_product, comments: [create(:comment, user: create(:user, username: "Expected"))])
+    rejected = create(:available_product, comments: [create(:comment, user: create(:user, username: "Rejected"))])
+
+    results = AvailableProduct.search("user: Expected")
+    assert_includes results, expected
+    refute_includes results, rejected
+  end
+
+  def test_namespaced_model
+    expected = create(:blog_post, title: "Expected")
+    rejected = create(:blog_post, title: "Rejected")
+
+    results = Blog::Post.search("Expected")
+
+    assert_includes results, expected
+    refute_includes results, rejected
+  end
+
+  def test_namespaced_model_with_associations
+    expected = create(:blog_post, user: create(:user, username: "Expected"))
+    rejected = create(:blog_post, user: create(:user, username: "Rejected"))
+
+    results = Blog::Post.search("user:Expected")
+
+    assert_includes results, expected
+    refute_includes results, rejected
+  end
+
   def test_multiple
     product = create(:product, comments: [create(:comment, title: "Title", message: "Message")])
 

data/test/test_helper.rb

@@ -77,10 +77,34 @@ class Product < ActiveRecord::Base
   belongs_to :user
 end
 
+module Blog
+  class Post < ActiveRecord::Base
+    include SearchCop
+
+    belongs_to :user
+
+    search_scope :search do
+      attributes :title, :content
+      attributes user: ["user.username"]
+    end
+  end
+end
+
+class AvailableProduct < Product
+  default_scope { where(available: true) }
+end
+
 FactoryBot.define do
   factory :product do
   end
 
+  factory :blog_post, class: Blog::Post do
+  end
+
+  factory :available_product do
+    available { true }
+  end
+
   factory :comment do
   end
 
@@ -89,6 +113,7 @@ FactoryBot.define do
 end
 
 ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS products"
+ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS posts"
 ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS comments"
 ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS users"
 
@@ -105,6 +130,12 @@ ActiveRecord::Base.connection.create_table :products do |t|
   t.string :notice
 end
 
+ActiveRecord::Base.connection.create_table :posts do |t|
+  t.references :user
+  t.string :title
+  t.text :content
+end
+
 ActiveRecord::Base.connection.create_table :comments do |t|
   t.references :product
   t.references :user

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_cop
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Benjamin Vetter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -128,6 +128,7 @@ files:
 - docker-compose.yml
 - gemfiles/rails5.gemfile
 - gemfiles/rails6.gemfile
+- gemfiles/rails7.gemfile
 - lib/search_cop.rb
 - lib/search_cop/grammar_parser.rb
 - lib/search_cop/hash_parser.rb
@@ -167,7 +168,7 @@ homepage: https://github.com/mrkamel/search_cop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,27 +183,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Easily perform complex search engine like fulltext queries on your ActiveRecord
   models
-test_files:
-- test/and_test.rb
-- test/boolean_test.rb
-- test/database.yml
-- test/date_test.rb
-- test/datetime_test.rb
-- test/default_operator_test.rb
-- test/error_test.rb
-- test/float_test.rb
-- test/fulltext_test.rb
-- test/hash_test.rb
-- test/integer_test.rb
-- test/not_test.rb
-- test/or_test.rb
-- test/scope_test.rb
-- test/search_cop_test.rb
-- test/string_test.rb
-- test/test_helper.rb
-- test/visitor_test.rb
+test_files: []