Fix for namespaced models #70 (#71)

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

lib/search_cop/search_scope.rb

@@ -55,7 +55,7 @@ def generator(name, &block)
     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

lib/search_cop/version.rb

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

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

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