search_cop 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebdc7756338ed85d56d22c0e350930651f3776f75bcf027f27a95a994b7e3955
-  data.tar.gz: 9f56f6e8b3fb01533ce3e938cd9fb32476970789baf6e6d9a0752e21c125f71d
+  metadata.gz: 3d50fc64d55fb96b64906163d2f2e88f253974e8aeb0653307795fcab40eb636
+  data.tar.gz: 86184be05de8b457dbe709c89c4938aa35f600adf5cd1c20d38819a1ba933b86
 SHA512:
-  metadata.gz: c570e77317b1b19d28edb11e9b8d3fe34c08d81f0ddf929efd043da51bda078c60139bc4f27c5e62c31c0fbd5a1b8e21245ec8aae03ebcc2b163d0f5e7570e22
-  data.tar.gz: 3d1b6708a2c114271ea733fd245f73ed5be1c577d2140d2a46107dd81a082e5ac9111a8e06151aa185b31c490af1d7f2feb5fd9b7527661b525faa4c48d724f9
+  metadata.gz: abc70826323ea53b7966a415d78f18a64a10e004e9e6e08687c6118ebcd60964a5732691706c3d2d52aea05d919d9154484c57517a4882b4f9056518bf8ab4f3
+  data.tar.gz: 47c56ea7175559e06bbde1c830f6dc8437279cfb6639446babc6d2b731a86037c815fb8664f4fba64f6832cac33168a6e6f86cf79275cc410eec1b0cce17fb72

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 
 # 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

data/lib/search_cop/query_builder.rb

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

data/lib/search_cop/search_scope.rb

@@ -55,7 +55,7 @@ module SearchCop
     def attributes_hash(hash)
       hash.each do |key, value|
         reflection.attributes[key.to_s] = Array(value).collect do |column|
-          table, attribute = column.to_s =~ /\./ ? column.to_s.split(".") : [model.table_name, column]
+          table, attribute = column.to_s =~ /\./ ? column.to_s.split(".") : [model.name.tableize, column]
 
           "#{table}.#{attribute}"
         end

data/lib/search_cop/version.rb

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

data/test/search_cop_test.rb

@@ -70,6 +70,26 @@ class SearchCopTest < SearchCop::TestCase
     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,14 +77,14 @@ class Product < ActiveRecord::Base
   belongs_to :user
 end
 
-module SomeNamespace
-  class Product < ActiveRecord::Base
+module Blog
+  class Post < ActiveRecord::Base
     include SearchCop
 
     belongs_to :user
 
     search_scope :search do
-      attributes :title, :description
+      attributes :title, :content
       attributes user: ["user.username"]
     end
   end
@@ -98,6 +98,9 @@ FactoryBot.define do
   factory :product do
   end
 
+  factory :blog_post, class: Blog::Post do
+  end
+
   factory :available_product do
     available { true }
   end
@@ -110,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"
 
@@ -126,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_cop
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Benjamin Vetter
@@ -157,7 +157,6 @@ files:
 - test/fulltext_test.rb
 - test/hash_test.rb
 - test/integer_test.rb
-- test/namespace_test.rb
 - test/not_test.rb
 - test/or_test.rb
 - test/scope_test.rb

data/test/namespace_test.rb

@@ -1,23 +0,0 @@
-require File.expand_path("test_helper", __dir__)
-
-class NamespaceTest < SearchCop::TestCase
-  def test_model_namespace
-    expected = create(:product, title: "Expected")
-    rejected = create(:product, title: "Rejected")
-
-    results = SomeNamespace::Product.search("Expected")
-
-    assert_includes results.map(&:id), expected.id
-    refute_includes results.map(&:id), rejected.id
-  end
-
-  def test_model_namespace_with_associations
-    expected = create(:product, user: create(:user, username: "Expected"))
-    rejected = create(:product, user: create(:user, username: "Rejected"))
-
-    results = SomeNamespace::Product.search("user:Expected")
-
-    assert_includes results.map(&:id), expected.id
-    refute_includes results.map(&:id), rejected.id
-  end
-end