search_cop 1.0.6 → 1.2.0

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-
 require "search_cop"
 
 begin
@@ -13,12 +12,12 @@ end
 
 require "minitest/autorun"
 require "active_record"
-require "factory_girl"
+require "factory_bot"
 require "yaml"
 
 DATABASE = ENV["DATABASE"] || "sqlite"
 
-ActiveRecord::Base.establish_connection YAML.load_file(File.expand_path("../database.yml", __FILE__))[DATABASE]
+ActiveRecord::Base.establish_connection YAML.load_file(File.expand_path("database.yml", __dir__))[DATABASE]
 
 class User < ActiveRecord::Base; end
 
@@ -28,7 +27,7 @@ class Comment < ActiveRecord::Base
   belongs_to :user
 
   search_scope :search do
-    attributes :user => "user.username"
+    attributes user: "user.username"
     attributes :title, :message
   end
 end
@@ -38,19 +37,23 @@ class Product < ActiveRecord::Base
 
   search_scope :search do
     attributes :title, :description, :brand, :notice, :stock, :price, :created_at, :created_on, :available
-    attributes :comment => ["comments.title", "comments.message"], :user => ["users.username", "users_products.username"]
-    attributes :primary => [:title, :description]
+    attributes comment: ["comments.title", "comments.message"], user: ["users.username", "users_products.username"]
+    attributes primary: [:title, :description]
 
-    aliases :users_products => :user
+    aliases users_products: :user
 
     if DATABASE != "sqlite"
-      options :title, :type => :fulltext
-      options :description, :type => :fulltext
-      options :comment, :type => :fulltext
+      options :title, type: :fulltext, coalesce: true
+      options :description, type: :fulltext, coalesce: true
+      options :comment, type: :fulltext, coalesce: true
     end
 
     if DATABASE == "postgres"
-      options :title, :dictionary => "english"
+      options :title, dictionary: "english"
+    end
+
+    generator :custom_eq do |column_name, raw_value|
+      "#{column_name} = #{quote raw_value}"
     end
   end
 
@@ -58,19 +61,23 @@ class Product < ActiveRecord::Base
     scope { joins "LEFT OUTER JOIN users users_products ON users_products.id = products.user_id" }
 
     attributes :title, :description
-    attributes :user => "users_products.username"
+    attributes user: "users_products.username"
 
-    options :title, :default => true
-    aliases :users_products => User
+    options :title, default: true
+    aliases users_products: User
+  end
+
+  search_scope :search_multi_columns do
+    attributes all: [:title, :description]
   end
 
   has_many :comments
-  has_many :users, :through => :comments
+  has_many :users, through: :comments
 
   belongs_to :user
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :product do
   end
 
@@ -118,7 +125,7 @@ if DATABASE == "mysql"
 end
 
 class SearchCop::TestCase
-  include FactoryGirl::Syntax::Methods
+  include FactoryBot::Syntax::Methods
 
   def teardown
     Product.delete_all
@@ -165,4 +172,3 @@ class SearchCop::TestCase
     ActiveRecord::Base.connection.quote object
   end
 end
-

data/test/visitor_test.rb

@@ -1,5 +1,4 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class VisitorTest < SearchCop::TestCase
   def test_and
@@ -53,8 +52,8 @@ class VisitorTest < SearchCop::TestCase
   def test_matches
     node = SearchCopGrammar::Attributes::String.new(Product, "products", "notice").matches("Notice")
 
-    assert_equal("#{quote_table_name "products"}.#{quote_column_name "notice"} LIKE #{quote "%Notice%"}", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] != "postgres"
-    assert_equal("#{quote_table_name "products"}.#{quote_column_name "notice"} ILIKE #{quote "%Notice%"}", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
+    assert_equal("(#{quote_table_name "products"}.#{quote_column_name "notice"} IS NOT NULL AND #{quote_table_name "products"}.#{quote_column_name "notice"} LIKE #{quote "%Notice%"} ESCAPE #{quote "\\"})", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] != "postgres"
+    assert_equal("(#{quote_table_name "products"}.#{quote_column_name "notice"} IS NOT NULL AND #{quote_table_name "products"}.#{quote_column_name "notice"} ILIKE #{quote "%Notice%"} ESCAPE #{quote "\\"})", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
   end
 
   def test_not
@@ -75,7 +74,7 @@ class VisitorTest < SearchCop::TestCase
     node = SearchCopGrammar::Attributes::Collection.new(SearchCop::QueryInfo.new(Product, Product.search_scopes[:search]), "title").matches("Query").optimize!
 
     assert_equal("MATCH(`products`.`title`) AGAINST('Query' IN BOOLEAN MODE)", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "mysql"
-    assert_equal("to_tsvector('english', \"products\".\"title\") @@ to_tsquery('english', '''Query''')", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
+    assert_equal("to_tsvector('english', COALESCE(\"products\".\"title\", '')) @@ to_tsquery('english', '''Query''')", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
   end
 
   def test_fulltext_and
@@ -85,7 +84,7 @@ class VisitorTest < SearchCop::TestCase
     node = query1.and(query2).optimize!
 
     assert_equal("(MATCH(`products`.`title`) AGAINST('+Query1 +Query2' IN BOOLEAN MODE))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "mysql"
-    assert_equal("(to_tsvector('english', \"products\".\"title\") @@ to_tsquery('english', '(''Query1'') & (''Query2'')'))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
+    assert_equal("(to_tsvector('english', COALESCE(\"products\".\"title\", '')) @@ to_tsquery('english', '(''Query1'') & (''Query2'')'))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
   end
 
   def test_fulltext_or
@@ -95,7 +94,15 @@ class VisitorTest < SearchCop::TestCase
     node = query1.or(query2).optimize!
 
     assert_equal("(MATCH(`products`.`title`) AGAINST('(Query1) (Query2)' IN BOOLEAN MODE))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "mysql"
-    assert_equal("(to_tsvector('english', \"products\".\"title\") @@ to_tsquery('english', '(''Query1'') | (''Query2'')'))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
+    assert_equal("(to_tsvector('english', COALESCE(\"products\".\"title\", '')) @@ to_tsquery('english', '(''Query1'') | (''Query2'')'))", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)) if ENV["DATABASE"] == "postgres"
   end
-end
 
+  def test_generator
+    generator = lambda do |column_name, value|
+      "#{column_name} = #{quote value}"
+    end
+    node = SearchCopGrammar::Attributes::Collection.new(SearchCop::QueryInfo.new(Product, Product.search_scopes[:search]), "title").generator(generator, "value").optimize!
+
+    assert_equal "#{quote_table_name "products"}.#{quote_column_name "title"} = 'value'", SearchCop::Visitors::Visitor.new(ActiveRecord::Base.connection).visit(node)
+  end
+end

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: search_cop
 version: !ruby/object:Gem::Version
-  version: 1.0.6
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Search engine like fulltext query support for ActiveRecord
@@ -130,22 +115,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- Appraisals
+- ".github/workflows/test.yml"
+- ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - MIGRATION.md
 - README.md
 - Rakefile
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
-- gemfiles/4.2.gemfile
+- docker-compose.yml
+- gemfiles/rails5.gemfile
+- gemfiles/rails6.gemfile
 - lib/search_cop.rb
 - lib/search_cop/grammar_parser.rb
 - lib/search_cop/hash_parser.rb
+- lib/search_cop/helpers.rb
 - lib/search_cop/query_builder.rb
 - lib/search_cop/query_info.rb
 - lib/search_cop/search_scope.rb
@@ -164,6 +150,7 @@ files:
 - test/database.yml
 - test/date_test.rb
 - test/datetime_test.rb
+- test/default_operator_test.rb
 - test/error_test.rb
 - test/float_test.rb
 - test/fulltext_test.rb
@@ -179,27 +166,25 @@ files:
 homepage: https://github.com/mrkamel/search_cop
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily perform complex search engine like fulltext queries on your ActiveRecord
   models
 test_files:
@@ -208,6 +193,7 @@ test_files:
 - test/database.yml
 - test/date_test.rb
 - test/datetime_test.rb
+- test/default_operator_test.rb
 - test/error_test.rb
 - test/float_test.rb
 - test/fulltext_test.rb

data/.travis.yml

@@ -1,34 +0,0 @@
-
-addons:
-  postgresql: "9.3"
-
-before_script:
-  - mysql -e 'create database search_cop;'
-  - psql -c 'create database search_cop;' -U postgres
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - rbx-2
-  - jruby
-env:
-  - DATABASE=sqlite
-  - DATABASE=mysql
-  - DATABASE=postgres
-matrix:
-  allow_failures:
-    - rvm: rbx-2
-    - rvm: jruby
-
-gemfile:
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
-  - gemfiles/4.2.gemfile
-
-install:
-  - "travis_retry bundle install"
-
-script: "bundle exec rake test"
-

data/Appraisals

@@ -1,20 +0,0 @@
-appraise "3.2" do
-  gem "activerecord", "~> 3.2.18"
-  gem "search_cop", :path => "../"
-end
-
-appraise "4.0" do
-  gem "activerecord", "~> 4.0.0"
-  gem "search_cop", :path => "../"
-end
-
-appraise "4.1" do
-  gem "activerecord", "~> 4.1.0.beta"
-  gem "search_cop", :path => "../"
-end
-
-appraise "4.2" do
-  gem "activerecord", "~> 4.2.0.beta"
-  gem "search_cop", :path => "../"
-end
-

data/gemfiles/3.2.gemfile

@@ -1,26 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.2.18"
-gem "search_cop", :path => "../"
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-  gem "mysql2"
-  gem "pg"
-end
-
-platforms :rbx do
-  gem "racc"
-  gem "rubysl", "~> 2.0"
-  gem "psych"
-end
-
-gemspec :path => "../"