search_cop 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 
 # Changelog
 
+Version 1.0.4:
+
+* Fix for Rails 4.2 regression regarding reflection access
+
+Version 1.0.3:
+
+* Supporting Rails 4.2
+* Dropped Arel dependencies
+
+Version 1.0.2:
+
+* Avoid eager loading when no associations referenced
+* Prefer objects over class names
+* Readme extended
+
 Version 1.0.1:
 
 * Inheritance fix

data/README.md

@@ -393,7 +393,7 @@ class Book < ActiveRecord::Base
   belongs_to :user
 
   search_scope :search do
-    attributes :user => ["users.username", "users_books.username"]
+    attributes :user => ["user.username", "users_books.username"]
   end
 
   # ...
@@ -412,14 +412,17 @@ class Book < ActiveRecord::Base
   search_scope :search do
     # ...
 
-    aliases :users_books => User
+    aliases :users_books => :users
   end
 
   # ...
 end
 ```
 
-to tell SearchCop about the custom SQL alias and mapping.
+to tell SearchCop about the custom SQL alias and mapping. In addition, you can
+always do the joins yourself via a `scope {}` block plus `aliases` and use your
+own custom sql aliases to become independent of names auto-assigned by
+ActiveRecord.
 
 ## Supported operators
 

data/lib/search_cop/query_builder.rb

@@ -19,7 +19,16 @@ module SearchCop
     private
 
     def all_associations
-      scope.reflection.attributes.values.flatten.uniq.collect { |column| column.split(".").first }.collect { |column| scope.reflection.aliases[column] || column.to_sym }
+      scope.reflection.attributes.values.flatten.collect { |column| association_for column.split(".").first }.uniq
+    end
+
+    def association_for(column)
+      alias_value = scope.reflection.aliases[column]
+
+      association = alias_value.respond_to?(:table_name) ? alias_value.table_name : alias_value
+      association ||= column
+
+      association.to_sym
     end
   end
 end

data/lib/search_cop/search_scope.rb

@@ -38,7 +38,7 @@ module SearchCop
 
     def aliases(hash)
       hash.each do |key, value|
-        reflection.aliases[key.to_s] = value.respond_to?(:table_name) ? value.table_name : value.to_s
+        reflection.aliases[key.to_s] = value.is_a?(Class) ? value : value.to_s
       end
     end
 

data/lib/search_cop/version.rb

@@ -1,3 +1,3 @@
 module SearchCop
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/lib/search_cop_grammar/attributes.rb

@@ -58,16 +58,20 @@ module SearchCopGrammar
       def klass_for_association(name)
         reflections = query_info.model.reflections
 
+        return reflections[name].klass if reflections[name]
         return reflections[name.to_sym].klass if reflections[name.to_sym]
 
         nil
       end
 
       def klass_for(name)
-        mapped_name = query_info.scope.reflection.aliases[name]
-        mapped_name ||= name
+        alias_value = query_info.scope.reflection.aliases[name]
 
-        klass_for_association(mapped_name) || mapped_name.classify.constantize
+        return alias_value if alias_value.is_a?(Class)
+
+        value = alias_value || name
+
+        klass_for_association(value) || value.classify.constantize
       end
 
       def alias_for(name)

data/test/scope_test.rb

@@ -2,7 +2,7 @@
 require File.expand_path("../test_helper", __FILE__)
 
 class ScopeTest < SearchCop::TestCase
-  def test_user_search
+  def test_scope_name
     expected = create(:product, :title => "Expected")
     rejected = create(:product, :notice => "Expected")
 
@@ -22,14 +22,34 @@ class ScopeTest < SearchCop::TestCase
     refute_includes results, rejected
   end
 
-  def test_aliases
-    expected = create(:product, :comments => [create(:comment, :user => create(:user, :username => "Expected"))])
-    rejected = create(:product, :comments => [create(:comment, :user => create(:user, :username => "Rejected"))])
+  def test_custom_scope
+    expected = create(:product, :user => create(:user, :username => "Expected"))
+    rejected = create(:product, :user => create(:user, :username => "Rejected"))
+
+    results = Product.user_search("user: Expected")
+
+    assert_includes results, expected
+    refute_includes results, rejected
+  end
+
+  def test_aliases_with_association
+    expected = create(:product, :user => create(:user, :username => "Expected"))
+    rejected = create(:product, :user => create(:user, :username => "Rejected"))
 
     results = Product.search("user: Expected")
 
     assert_includes results, expected
     refute_includes results, rejected
   end
+
+  def test_aliases_with_model
+    expected = create(:product, :user => create(:user, :username => "Expected"))
+    rejected = create(:product, :user => create(:user, :username => "Rejected"))
+
+    results = Product.user_search("user: Expected")
+
+    assert_includes results, expected
+    refute_includes results, rejected
+  end
 end
 

data/test/test_helper.rb

@@ -55,11 +55,13 @@ class Product < ActiveRecord::Base
   end
 
   search_scope :user_search do
+    scope { joins "LEFT OUTER JOIN users users_products ON users_products.id = products.user_id" }
+
     attributes :title, :description
     attributes :user => "users_products.username"
 
     options :title, :default => true
-    aliases :users_products => :user
+    aliases :users_products => User
   end
 
   has_many :comments

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: search_cop
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop