search_cop 1.0.9 → 1.2.1

data/test/datetime_test.rb

@@ -1,9 +1,8 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class DatetimeTest < SearchCop::TestCase
   def test_mapping
-    product = create(:product, :created_at => Time.parse("2014-05-01 12:30:30"))
+    product = create(:product, created_at: Time.parse("2014-05-01 12:30:30"))
 
     assert_includes Product.search("created_at: 2014"), product
     assert_includes Product.search("created_at: 2014-05"), product
@@ -12,61 +11,96 @@ class DatetimeTest < SearchCop::TestCase
   end
 
   def test_anywhere
-    product = create(:product, :created_at => Time.parse("2014-05-01"))
+    product = create(:product, created_at: Time.parse("2014-05-01"))
 
     assert_includes Product.search("2014-05-01"), product
     refute_includes Product.search("2014-05-02"), product
   end
 
   def test_includes
-    product = create(:product, :created_at => Time.parse("2014-05-01"))
+    product = create(:product, created_at: Time.parse("2014-05-01"))
 
     assert_includes Product.search("created_at: 2014-05-01"), product
     refute_includes Product.search("created_at: 2014-05-02"), product
   end
 
   def test_equals
-    product = create(:product, :created_at => Time.parse("2014-05-01"))
+    product = create(:product, created_at: Time.parse("2014-05-01"))
 
     assert_includes Product.search("created_at = 2014-05-01"), product
     refute_includes Product.search("created_at = 2014-05-02"), product
   end
 
   def test_equals_not
-    product = create(:product, :created_at => Time.parse("2014-05-01"))
+    product = create(:product, created_at: Time.parse("2014-05-01"))
 
     assert_includes Product.search("created_at != 2014-05-02"), product
     refute_includes Product.search("created_at != 2014-05-01"), product
   end
 
   def test_greater
-    product = create(:product, :created_at => Time.parse("2014-05-01"))
+    product = create(:product, created_at: Time.parse("2014-05-01"))
 
     assert_includes Product.search("created_at > 2014-04-01"), product
     refute_includes Product.search("created_at > 2014-05-01"), product
   end
 
   def test_greater_equals
-    product = create(:product, :created_at => Time.parse("2014-05-01"))
+    product = create(:product, created_at: Time.parse("2014-05-01"))
 
     assert_includes Product.search("created_at >= 2014-05-01"), product
     refute_includes Product.search("created_at >= 2014-05-02"), product
   end
 
   def test_less
-    product = create(:product, :created_at => Time.parse("2014-05-01"))
+    product = create(:product, created_at: Time.parse("2014-05-01"))
 
     assert_includes Product.search("created_at < 2014-05-02"), product
     refute_includes Product.search("created_at < 2014-05-01"), product
   end
 
   def test_less_equals
-    product = create(:product, :created_at => Time.parse("2014-05-02"))
+    product = create(:product, created_at: Time.parse("2014-05-02"))
 
     assert_includes Product.search("created_at <= 2014-05-02"), product
     refute_includes Product.search("created_at <= 2014-05-01"), product
   end
 
+  def test_hours_ago
+    product = create(:product, created_at: 5.hours.ago)
+
+    assert_includes Product.search("created_at <= '4 hours ago'"), product
+    refute_includes Product.search("created_at <= '6 hours ago'"), product
+  end
+
+  def test_days_ago
+    product = create(:product, created_at: 2.days.ago)
+
+    assert_includes Product.search("created_at <= '1 day ago'"), product
+    refute_includes Product.search("created_at <= '3 days ago'"), product
+  end
+
+  def test_weeks_ago
+    product = create(:product, created_at: 2.weeks.ago)
+
+    assert_includes Product.search("created_at <= '1 weeks ago'"), product
+    refute_includes Product.search("created_at <= '3 weeks ago'"), product
+  end
+
+  def test_months_ago
+    product = create(:product, created_at: 2.months.ago)
+
+    assert_includes Product.search("created_at <= '1 months ago'"), product
+    refute_includes Product.search("created_at <= '3 months ago'"), product
+  end
+
+  def test_years_ago
+    product = create(:product, created_at: 2.years.ago)
+
+    assert_includes Product.search("created_at <= '1 years ago'"), product
+    refute_includes Product.search("created_at <= '3 years ago'"), product
+  end
+
   def test_no_overflow
     assert_nothing_raised do
       Product.search("created_at: 1000000").to_a
@@ -79,4 +113,3 @@ class DatetimeTest < SearchCop::TestCase
     end
   end
 end
-

data/test/default_operator_test.rb

@@ -0,0 +1,51 @@
+require File.expand_path("test_helper", __dir__)
+
+class DefaultOperatorTest < SearchCop::TestCase
+  def test_without_default_operator
+    avengers = create(:product, title: "Title Avengers", description: "2012")
+    inception = create(:product, title: "Title Inception", description: "2010")
+
+    results = Product.search_multi_columns("Title Avengers")
+    assert_includes results, avengers
+    refute_includes results, inception
+
+    results = Product.search_multi_columns("Title AND Avengers")
+    assert_includes results, avengers
+    refute_includes results, inception
+
+    results = Product.search_multi_columns("Title OR Avengers")
+    assert_includes results, avengers
+    assert_includes results, inception
+
+    results = Product.search(title: "Avengers", description: "2012")
+    assert_includes results, avengers
+    refute_includes results, inception
+  end
+
+  def test_with_specific_default_operator
+    matrix = create(:product, title: "Matrix", description: "1999 Fantasy Sci-fi 2h 30m")
+    star_wars = create(:product, title: "Star Wars", description: "2010 Sci-fi Thriller 2h 28m")
+
+    results = Product.search("Star Wars", default_operator: "AND")
+    refute_includes results, matrix
+    assert_includes results, star_wars
+
+    results = Product.search_multi_columns("Matrix movie", default_operator: "OR")
+    assert_includes results, matrix
+    refute_includes results, star_wars
+
+    results = Product.search({ title: "Matrix", description: "2000" }, default_operator: :or)
+    assert_includes results, matrix
+    refute_includes results, star_wars
+  end
+
+  def test_with_invalid_default_operator
+    assert_raises SearchCop::UnknownDefaultOperator do
+      Product.search_multi_columns("Matrix movie", default_operator: :xpto)
+    end
+
+    assert_raises SearchCop::UnknownDefaultOperator do
+      Product.search_multi_columns({ title: "Matrix movie" }, default_operator: :xpto)
+    end
+  end
+end

data/test/error_test.rb

@@ -1,10 +1,9 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class ErrorTest < SearchCop::TestCase
   def test_parse_error
     assert_raises SearchCop::ParseError do
-      Product.unsafe_search :title => { :unknown_operator => "Value" }
+      Product.unsafe_search title: { unknown_operator: "Value" }
     end
   end
 
@@ -14,4 +13,3 @@ class ErrorTest < SearchCop::TestCase
     end
   end
 end
-

data/test/float_test.rb

@@ -1,67 +1,72 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class FloatTest < SearchCop::TestCase
   def test_anywhere
-    product = create(:product, :price => 10.5, :created_at => Time.now - 1.day)
+    product = create(:product, price: 10.5, created_at: Time.now - 1.day)
 
     assert_includes Product.search("10.5"), product
     refute_includes Product.search("11.5"), product
   end
 
   def test_includes
-    product = create(:product, :price => 10.5)
+    product = create(:product, price: 10.5)
 
     assert_includes Product.search("price: 10.5"), product
     refute_includes Product.search("price: 11.5"), product
   end
 
   def test_equals
-    product = create(:product, :price => 10.5)
+    product = create(:product, price: 10.5)
 
     assert_includes Product.search("price = 10.5"), product
     refute_includes Product.search("price = 11.5"), product
   end
 
   def test_equals_not
-    product = create(:product, :price => 10.5)
+    product = create(:product, price: 10.5)
 
     assert_includes Product.search("price != 11.5"), product
     refute_includes Product.search("price != 10.5"), product
   end
 
   def test_greater
-    product = create(:product, :price => 10.5)
+    product = create(:product, price: 10.5)
 
     assert_includes Product.search("price > 10.4"), product
     refute_includes Product.search("price < 10.5"), product
   end
 
   def test_greater_equals
-    product = create(:product, :price => 10.5)
+    product = create(:product, price: 10.5)
 
     assert_includes Product.search("price >= 10.5"), product
     refute_includes Product.search("price >= 10.6"), product
   end
 
   def test_less
-    product = create(:product, :price => 10.5)
+    product = create(:product, price: 10.5)
 
     assert_includes Product.search("price < 10.6"), product
     refute_includes Product.search("price < 10.5"), product
   end
 
   def test_less_equals
-    product = create(:product, :price => 10.5)
+    product = create(:product, price: 10.5)
 
     assert_includes Product.search("price <= 10.5"), product
     refute_includes Product.search("price <= 10.4"), product
   end
 
+  def test_negative
+    product = create(:product, price: -10)
+
+    assert_includes Product.search("price = -10"), product
+    refute_includes Product.search("price = -11"), product
+  end
+
   def test_incompatible_datatype
     assert_raises SearchCop::IncompatibleDatatype do
       Product.unsafe_search "price: Value"
     end
   end
 end
-

data/test/fulltext_test.rb

@@ -1,11 +1,10 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class FulltextTest < SearchCop::TestCase
   def test_complex
-    product1 = create(:product, :title => "word1")
-    product2 = create(:product, :title => "word2 word3")
-    product3 = create(:product, :title => "word2")
+    product1 = create(:product, title: "word1")
+    product2 = create(:product, title: "word2 word3")
+    product3 = create(:product, title: "word2")
 
     results = Product.search("word1 OR (title:word2 -word3)")
 
@@ -15,8 +14,8 @@ class FulltextTest < SearchCop::TestCase
   end
 
   def test_mixed
-    expected = create(:product, :title => "Expected title", :stock => 1)
-    rejected = create(:product, :title => "Expected title", :stock => 0)
+    expected = create(:product, title: "Expected title", stock: 1)
+    rejected = create(:product, title: "Expected title", stock: 0)
 
     results = Product.search("Expected title:Title stock > 0")
 
@@ -24,4 +23,3 @@ class FulltextTest < SearchCop::TestCase
     refute_includes results, rejected
   end
 end
-

data/test/hash_test.rb

@@ -1,13 +1,12 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class HashTest < SearchCop::TestCase
   def test_subquery
-    product1 = create(:product, :title => "Title1", :description => "Description")
-    product2 = create(:product, :title => "Title2", :description => "Description")
-    product3 = create(:product, :title => "TItle3", :description => "Description")
+    product1 = create(:product, title: "Title1", description: "Description")
+    product2 = create(:product, title: "Title2", description: "Description")
+    product3 = create(:product, title: "TItle3", description: "Description")
 
-    results = Product.search(:or => [{ :query => "Description Title1" }, { :query => "Description Title2" }])
+    results = Product.search(or: [{ query: "Description Title1" }, { query: "Description Title2" }])
 
     assert_includes results, product1
     assert_includes results, product2
@@ -15,93 +14,92 @@ class HashTest < SearchCop::TestCase
   end
 
   def test_matches
-    expected = create(:product, :title => "Expected")
-    rejected = create(:product, :title => "Rejected")
+    expected = create(:product, title: "Expected")
+    rejected = create(:product, title: "Rejected")
 
-    results = Product.search(:title => { :matches => "Expected" })
+    results = Product.search(title: { matches: "Expected" })
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 
   def test_matches_default
-    expected = create(:product, :title => "Expected")
-    rejected = create(:product, :title => "Rejected")
+    expected = create(:product, title: "Expected")
+    rejected = create(:product, title: "Rejected")
 
-    results = Product.search(:title => "Expected")
+    results = Product.search(title: "Expected")
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 
   def test_eq
-    expected = create(:product, :title => "Expected")
-    rejected = create(:product, :title => "Rejected")
+    expected = create(:product, title: "Expected")
+    rejected = create(:product, title: "Rejected")
 
-    results = Product.search(:title => { :eq => "Expected" })
+    results = Product.search(title: { eq: "Expected" })
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 
   def test_not_eq
-    expected = create(:product, :title => "Expected")
-    rejected = create(:product, :title => "Rejected")
+    expected = create(:product, title: "Expected")
+    rejected = create(:product, title: "Rejected")
 
-    results = Product.search(:title => { :not_eq => "Rejected" })
+    results = Product.search(title: { not_eq: "Rejected" })
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 
   def test_gt
-    expected = create(:product, :stock => 1)
-    rejected = create(:product, :stock => 0)
+    expected = create(:product, stock: 1)
+    rejected = create(:product, stock: 0)
 
-    results = Product.search(:stock => { :gt => 0 })
+    results = Product.search(stock: { gt: 0 })
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 
   def test_gteq
-    expected = create(:product, :stock => 1)
-    rejected = create(:product, :stock => 0)
+    expected = create(:product, stock: 1)
+    rejected = create(:product, stock: 0)
 
-    results = Product.search(:stock => { :gteq => 1 })
+    results = Product.search(stock: { gteq: 1 })
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 
   def test_lt
-    expected = create(:product, :stock => 0)
-    rejected = create(:product, :stock => 1)
+    expected = create(:product, stock: 0)
+    rejected = create(:product, stock: 1)
 
-    results = Product.search(:stock => { :lt => 1 })
+    results = Product.search(stock: { lt: 1 })
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 
   def test_lteq
-    expected = create(:product, :stock => 0)
-    rejected = create(:product, :stock => 1)
+    expected = create(:product, stock: 0)
+    rejected = create(:product, stock: 1)
 
-    results = Product.search(:stock => { :lteq => 0 })
+    results = Product.search(stock: { lteq: 0 })
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 
   def test_custom_matcher
-    expected = create(:product, :title => "Expected")
-    rejected = create(:product, :title => "Rejected")
+    expected = create(:product, title: "Expected")
+    rejected = create(:product, title: "Rejected")
 
-    results = Product.search(:title => { :custom_eq => "Expected" })
+    results = Product.search(title: { custom_eq: "Expected" })
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 end
-

data/test/integer_test.rb

@@ -1,58 +1,57 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class IntegerTest < SearchCop::TestCase
   def test_anywhere
-    product = create(:product, :stock => 1)
+    product = create(:product, stock: 1)
 
     assert_includes Product.search("1"), product
     refute_includes Product.search("0"), product
   end
 
   def test_includes
-    product = create(:product, :stock => 1)
+    product = create(:product, stock: 1)
 
     assert_includes Product.search("stock: 1"), product
     refute_includes Product.search("stock: 10"), product
   end
 
   def test_equals
-    product = create(:product, :stock => 1)
+    product = create(:product, stock: 1)
 
     assert_includes Product.search("stock = 1"), product
     refute_includes Product.search("stock = 0"), product
   end
 
   def test_equals_not
-    product = create(:product, :stock => 1)
+    product = create(:product, stock: 1)
 
     assert_includes Product.search("stock != 0"), product
     refute_includes Product.search("stock != 1"), product
   end
 
   def test_greater
-    product = create(:product, :stock => 1)
+    product = create(:product, stock: 1)
 
     assert_includes Product.search("stock > 0"), product
     refute_includes Product.search("stock < 1"), product
   end
 
   def test_greater_equals
-    product = create(:product, :stock => 1)
+    product = create(:product, stock: 1)
 
     assert_includes Product.search("stock >= 1"), product
     refute_includes Product.search("stock >= 2"), product
   end
 
   def test_less
-    product = create(:product, :stock => 1)
+    product = create(:product, stock: 1)
 
     assert_includes Product.search("stock < 2"), product
     refute_includes Product.search("stock < 1"), product
   end
 
   def test_less_equals
-    product = create(:product, :stock => 1)
+    product = create(:product, stock: 1)
 
     assert_includes Product.search("stock <= 1"), product
     refute_includes Product.search("stock <= 0"), product
@@ -64,4 +63,3 @@ class IntegerTest < SearchCop::TestCase
     end
   end
 end
-

data/test/not_test.rb

@@ -1,10 +1,9 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class NotTest < SearchCop::TestCase
   def test_not_string
-    expected = create(:product, :title => "Expected title")
-    rejected = create(:product, :title => "Rejected title")
+    expected = create(:product, title: "Expected title")
+    rejected = create(:product, title: "Rejected title")
 
     results = Product.search("title: Title NOT title: Rejected")
 
@@ -15,13 +14,12 @@ class NotTest < SearchCop::TestCase
   end
 
   def test_not_hash
-    expected = create(:product, :title => "Expected title")
-    rejected = create(:product, :title => "Rejected title")
+    expected = create(:product, title: "Expected title")
+    rejected = create(:product, title: "Rejected title")
 
-    results = Product.search(:and => [{:title => "Title"}, {:not => {:title => "Rejected"}}])
+    results = Product.search(and: [{ title: "Title" }, { not: { title: "Rejected" } }])
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 end
-

data/test/or_test.rb

@@ -1,11 +1,10 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class OrTest < SearchCop::TestCase
   def test_or_string
-    product1 = create(:product, :title => "Title1")
-    product2 = create(:product, :title => "Title2")
-    product3 = create(:product, :title => "Title3")
+    product1 = create(:product, title: "Title1")
+    product2 = create(:product, title: "Title2")
+    product3 = create(:product, title: "Title3")
 
     results = Product.search("title: Title1 OR title: Title2")
 
@@ -15,15 +14,14 @@ class OrTest < SearchCop::TestCase
   end
 
   def test_or_hash
-    product1 = create(:product, :title => "Title1")
-    product2 = create(:product, :title => "Title2")
-    product3 = create(:product, :title => "Title3")
+    product1 = create(:product, title: "Title1")
+    product2 = create(:product, title: "Title2")
+    product3 = create(:product, title: "Title3")
 
-    results = Product.search(:or => [{:title => "Title1"}, {:title => "Title2"}])
+    results = Product.search(or: [{ title: "Title1" }, { title: "Title2" }])
 
     assert_includes results, product1
     assert_includes results, product2
     refute_includes results, product3
   end
 end
-

data/test/scope_test.rb

@@ -1,10 +1,9 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class ScopeTest < SearchCop::TestCase
   def test_scope_name
-    expected = create(:product, :title => "Expected")
-    rejected = create(:product, :notice => "Expected")
+    expected = create(:product, title: "Expected")
+    rejected = create(:product, notice: "Expected")
 
     results = Product.user_search("Expected")
 
@@ -13,8 +12,8 @@ class ScopeTest < SearchCop::TestCase
   end
 
   def test_options
-    expected = create(:product, :title => "Expected")
-    rejected = create(:product, :description => "Expected")
+    expected = create(:product, title: "Expected")
+    rejected = create(:product, description: "Expected")
 
     results = Product.user_search("Expected")
 
@@ -23,8 +22,8 @@ class ScopeTest < SearchCop::TestCase
   end
 
   def test_custom_scope
-    expected = create(:product, :user => create(:user, :username => "Expected"))
-    rejected = create(:product, :user => create(:user, :username => "Rejected"))
+    expected = create(:product, user: create(:user, username: "Expected"))
+    rejected = create(:product, user: create(:user, username: "Rejected"))
 
     results = Product.user_search("user: Expected")
 
@@ -33,8 +32,8 @@ class ScopeTest < SearchCop::TestCase
   end
 
   def test_aliases_with_association
-    expected = create(:product, :user => create(:user, :username => "Expected"))
-    rejected = create(:product, :user => create(:user, :username => "Rejected"))
+    expected = create(:product, user: create(:user, username: "Expected"))
+    rejected = create(:product, user: create(:user, username: "Rejected"))
 
     results = Product.search("user: Expected")
 
@@ -43,8 +42,8 @@ class ScopeTest < SearchCop::TestCase
   end
 
   def test_aliases_with_model
-    expected = create(:product, :user => create(:user, :username => "Expected"))
-    rejected = create(:product, :user => create(:user, :username => "Rejected"))
+    expected = create(:product, user: create(:user, username: "Expected"))
+    rejected = create(:product, user: create(:user, username: "Rejected"))
 
     results = Product.user_search("user: Expected")
 
@@ -52,4 +51,3 @@ class ScopeTest < SearchCop::TestCase
     refute_includes results, rejected
   end
 end
-