search_cop 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07623ce75206a9b6b4455141697c09782649b05f1073ec27c965a7a4fdf2862a
-  data.tar.gz: 5adef700f6a6514d0d1de0b1f17958d03ecacc0a0f83df57de5aff480bc96da5
+  metadata.gz: ebdc7756338ed85d56d22c0e350930651f3776f75bcf027f27a95a994b7e3955
+  data.tar.gz: 9f56f6e8b3fb01533ce3e938cd9fb32476970789baf6e6d9a0752e21c125f71d
 SHA512:
-  metadata.gz: fbe73b6ec59b87263d9bfd7d4740618deab1dd7d4867dcb39a864e75db8614f08beed34518477791dd3d66f10ee8461a1282a3d81d35ee17b2a7de26d8c995cf
-  data.tar.gz: c131ea06253e994bc5550570708cc5dc973b5392ca208020de08c3384153492c0bc9820438fc0d32c596ec46f27c9982b445d98b80363a89764b6461a4a35706
+  metadata.gz: c570e77317b1b19d28edb11e9b8d3fe34c08d81f0ddf929efd043da51bda078c60139bc4f27c5e62c31c0fbd5a1b8e21245ec8aae03ebcc2b163d0f5e7570e22
+  data.tar.gz: 3d1b6708a2c114271ea733fd245f73ed5be1c577d2140d2a46107dd81a082e5ac9111a8e06151aa185b31c490af1d7f2feb5fd9b7527661b525faa4c48d724f9

data/CHANGELOG.md

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

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.name.tableize, column]
+          table, attribute = column.to_s =~ /\./ ? column.to_s.split(".") : [model.table_name, column]
 
           "#{table}.#{attribute}"
         end

data/lib/search_cop/version.rb

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

data/test/namespace_test.rb

@@ -0,0 +1,23 @@
+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

data/test/test_helper.rb

@@ -77,6 +77,19 @@ class Product < ActiveRecord::Base
   belongs_to :user
 end
 
+module SomeNamespace
+  class Product < ActiveRecord::Base
+    include SearchCop
+
+    belongs_to :user
+
+    search_scope :search do
+      attributes :title, :description
+      attributes user: ["user.username"]
+    end
+  end
+end
+
 class AvailableProduct < Product
   default_scope { where(available: true) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_cop
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -157,6 +157,7 @@ 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