search_cop 1.1.0 → 1.2.0

data/test/database.yml

@@ -6,11 +6,12 @@ sqlite:
 mysql:
   adapter: mysql2
   database: search_cop
+  host: 127.0.0.1
   username: root
   encoding: utf8
 
 postgres:
-  host: localhost
+  host: 127.0.0.1
   adapter: postgresql
   database: search_cop
   username: search_cop

data/test/date_test.rb

@@ -1,9 +1,8 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class DateTest < SearchCop::TestCase
   def test_mapping
-    product = create(:product, :created_on => Date.parse("2014-05-01"))
+    product = create(:product, created_on: Date.parse("2014-05-01"))
 
     assert_includes Product.search("created_on: 2014"), product
     assert_includes Product.search("created_on: 2014-05"), product
@@ -11,84 +10,84 @@ class DateTest < SearchCop::TestCase
   end
 
   def test_anywhere
-    product = create(:product, :created_on => Date.parse("2014-05-01"))
+    product = create(:product, created_on: Date.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_on => Date.parse("2014-05-01"))
+    product = create(:product, created_on: Date.parse("2014-05-01"))
 
     assert_includes Product.search("created_on: 2014-05-01"), product
     refute_includes Product.search("created_on: 2014-05-02"), product
   end
 
   def test_equals
-    product = create(:product, :created_on => Date.parse("2014-05-01"))
+    product = create(:product, created_on: Date.parse("2014-05-01"))
 
     assert_includes Product.search("created_on = 2014-05-01"), product
     refute_includes Product.search("created_on = 2014-05-02"), product
   end
 
   def test_equals_not
-    product = create(:product, :created_on => Date.parse("2014-05-01"))
+    product = create(:product, created_on: Date.parse("2014-05-01"))
 
     assert_includes Product.search("created_on != 2014-05-02"), product
     refute_includes Product.search("created_on != 2014-05-01"), product
   end
 
   def test_greater
-    product = create(:product, :created_on => Date.parse("2014-05-01"))
+    product = create(:product, created_on: Date.parse("2014-05-01"))
 
     assert_includes Product.search("created_on > 2014-04-01"), product
     refute_includes Product.search("created_on > 2014-05-01"), product
   end
 
   def test_greater_equals
-    product = create(:product, :created_on => Date.parse("2014-05-01"))
+    product = create(:product, created_on: Date.parse("2014-05-01"))
 
     assert_includes Product.search("created_on >= 2014-05-01"), product
     refute_includes Product.search("created_on >= 2014-05-02"), product
   end
 
   def test_less
-    product = create(:product, :created_on => Date.parse("2014-05-01"))
+    product = create(:product, created_on: Date.parse("2014-05-01"))
 
     assert_includes Product.search("created_on < 2014-05-02"), product
     refute_includes Product.search("created_on < 2014-05-01"), product
   end
 
   def test_less_equals
-    product = create(:product, :created_on => Date.parse("2014-05-02"))
+    product = create(:product, created_on: Date.parse("2014-05-02"))
 
     assert_includes Product.search("created_on <= 2014-05-02"), product
     refute_includes Product.search("created_on <= 2014-05-01"), product
   end
 
   def test_days_ago
-    product = create(:product, :created_at => 2.days.ago.to_date)
+    product = create(:product, created_at: 2.days.ago.to_date)
 
     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.to_date)
+    product = create(:product, created_at: 2.weeks.ago.to_date)
 
     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.to_date)
+    product = create(:product, created_at: 2.months.ago.to_date)
 
     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.to_date)
+    product = create(:product, created_at: 2.years.ago.to_date)
 
     assert_includes Product.search("created_at <= '1 years ago'"), product
     refute_includes Product.search("created_at <= '3 years ago'"), product
@@ -106,4 +105,3 @@ class DateTest < SearchCop::TestCase
     end
   end
 end
-

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,91 +11,91 @@ 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)
+    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)
+    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)
+    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)
+    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)
+    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
@@ -114,4 +113,3 @@ class DatetimeTest < SearchCop::TestCase
     end
   end
 end
-

data/test/default_operator_test.rb

@@ -1,7 +1,6 @@
-require File.expand_path('../test_helper', __FILE__)
+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")
@@ -25,23 +24,28 @@ class DefaultOperatorTest < SearchCop::TestCase
 
   def test_with_specific_default_operator
     matrix = create(:product, title: "Matrix", description: "1999 Fantasy Sci-fi 2h 30m")
-    start_wars = create(:product, title: "Start Wars", description: "2010 Sci-fi Thriller 2h 28m")
+    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)
+    results = Product.search_multi_columns("Matrix movie", default_operator: "OR")
     assert_includes results, matrix
-    refute_includes results, start_wars
+    refute_includes results, star_wars
 
-    results = Product.search(title: "Matrix", description: "2000", default_operator: :or)
+    results = Product.search({ title: "Matrix", description: "2000" }, default_operator: :or)
     assert_includes results, matrix
-    refute_includes results, start_wars
+    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)
+      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)
+      Product.search_multi_columns({ title: "Matrix movie" }, default_operator: :xpto)
     end
   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,58 +1,57 @@
-
-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
@@ -71,4 +70,3 @@ class FloatTest < SearchCop::TestCase
     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
-