search_cop 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ec8667b85e0e2df63ebb83e3d4af5319e52483b9
-  data.tar.gz: 0a1fd1d2c76c9395ac50adc9e1139dbc58ea2cd5
+SHA256:
+  metadata.gz: bf37a33f6c9998a09a09817fe5f14024947a1f83ed63682c066dcf35c385ac57
+  data.tar.gz: 36df6f6110f2126240702636d93c0ed54322794ff5f558fa6dcb27484c3b2b28
 SHA512:
-  metadata.gz: ca9b2397fb9bd9b7e3b339f001c58b36c42be50f5a9314094735f6633bb75cb26a91b9e08120a10750653ae5067a82eda96d2a562cff31b92ea3aaa390487c51
-  data.tar.gz: 6479e2365da9aa3ae8c9a9f6587c6f00a0f0c7d2546d05438dc4738eb810b5eed9a0d5ff432b91a1a9757486d99f795e86f556d55e379a4ce240ed21d89714de
+  metadata.gz: 4c5233ee11b096ec18e1a53f1e76a6dbb0880a99de9ac41ec836993f317612cf728d81a1332c3f7bfeb42766cb7e28e388061d85cabec8355e7c32e969468761
+  data.tar.gz: f766262804751519e3566ea80af0358dba148540883d74b5947804e70876ae90555dcb539032f5e59ff1d64fb03b6b10e293e487842b47eeea31246c14a69024

data/.travis.yml

@@ -1,45 +1,34 @@
 
-addons:
-  postgresql: "9.3"
+services:
+  - postgresql
+  - mysql
 
 before_script:
   - mysql -e 'create database search_cop;'
-  - psql -c 'create database search_cop;' -U postgres
+  - psql -c "create user search_cop password 'secret';" -U postgres
+  - psql -c 'create database search_cop owner search_cop;' -U postgres
 
-rvm:
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - rbx-3
-  - jruby
-env:
-  - DATABASE=sqlite
-  - DATABASE=mysql
-  - DATABASE=postgres
 matrix:
   include:
-    - rvm: 2.4.1
-      gemfile: gemfiles/5.0-Gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/4.2.gemfile
       env: DATABASE=sqlite
-    - rvm: 2.4.1
-      gemfile: gemfiles/5.0-Gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/4.2.gemfile
       env: DATABASE=mysql
-    - rvm: 2.4.1
-      gemfile: gemfiles/5.0-Gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/5.1.gemfile
+      env: DATABASE=mysql
+    - rvm: ruby-head
+      gemfile: gemfiles/4.2.gemfile
+      env: DATABASE=postgres
+    - rvm: ruby-head
+      gemfile: gemfiles/5.1.gemfile
       env: DATABASE=postgres
-  allow_failures:
-    - rvm: rbx-3
-    - 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"
+script: "rake test --trace"
 sudo: false
 

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 
 # Changelog
 
+Version 1.2.0:
+
+* Adds customizable default operator to concatenate conditions (#49)
+* Make the postgis adapter use the postgres extensions
+
+Version 1.0.9:
+
+* Use [:blank:] instead of \s for space (#46)
+* Updated SearchCop::Visitors::Visitor to check the connection's adapter_name when extending. (#47)
+* Fix for negative numeric values
+* allow searching for relative dates, like hours, days, weeks, months or years ago
+
 Version 1.0.8:
 
 * No longer add search scope methods globally #34

data/Gemfile

@@ -3,21 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in search_cop.gemspec
 gemspec
 
-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
-

data/README.md

@@ -2,7 +2,6 @@
 
 [![Build Status](https://secure.travis-ci.org/mrkamel/search_cop.png?branch=master)](http://travis-ci.org/mrkamel/search_cop)
 [![Code Climate](https://codeclimate.com/github/mrkamel/search_cop.png)](https://codeclimate.com/github/mrkamel/search_cop)
-[![Dependency Status](https://gemnasium.com/mrkamel/search_cop.png?travis)](https://gemnasium.com/mrkamel/search_cop)
 [![Gem Version](https://badge.fury.io/rb/search_cop.svg)](http://badge.fury.io/rb/search_cop)
 
 ![search_cop](https://raw.githubusercontent.com/mrkamel/search_cop_logo/master/search_cop.png)
@@ -118,6 +117,24 @@ or post-process the search results in every possible way:
 Book.where(available: true).search("Harry Potter").order("books.id desc").paginate(page: params[:page])
 ```
 
+## Security
+
+When you pass a query string to SearchCop, it gets parsed, analyzed and mapped
+to finally build up an SQL query. To be more precise, when SearchCop parses the
+query, it creates objects (nodes), which represent the query expressions (And-,
+Or-, Not-, String-, Date-, etc Nodes). To build the SQL query, SearchCop uses
+the concept of visitors like e.g. used in
+[Arel](https://github.com/rails/arel), such that, for every node there must be
+a [visitor](https://github.com/mrkamel/search_cop/blob/master/lib/search_cop/visitors/visitor.rb),
+which transforms the node to SQL. When there is no visitor, an exception is
+raised when the query builder tries to "visit" the node. The visitors are
+responsible for sanitizing the user supplied input. This is primilarly done via
+quoting (string-, table-name-, column-quoting, etc). SearchCop is using the
+methods provided by the ActiveRecord connection adapter for sanitizing/quoting
+to prevent SQL injection. While we can never be 100% safe from security issues,
+SearchCop takes security issues seriously. Please report responsibly via
+security at flakks dot com in case you find any security related issues.
+
 ## Fulltext index capabilities
 
 By default, i.e. if you don't tell SearchCop about your fulltext indices,
@@ -283,7 +300,7 @@ For more details about PostgreSQL fulltext indices visit
 
 In case you expose non-fulltext attributes to search queries (price, stock,
 etc.), the respective queries, like `Book.search("stock > 0")`, will profit
-from from the usual non-fulltext indices. Thus, you should add a usual index on
+from the usual non-fulltext indices. Thus, you should add a usual index on
 every column you expose to search queries plus a fulltext index for every
 fulltext attribute.
 
@@ -312,6 +329,41 @@ User.search("admin")
 # ... WHERE users.username LIKE 'admin%'
 ```
 
+## Default operator
+
+When you define multiple fields on a search scope, SearcCop will use
+by default the AND operator to concatenate the conditions, e.g:
+
+```ruby
+class User < ActiveRecord::Base
+  include SearchCop
+
+  search_scope :search do
+    attributes :username, :fullname
+  end
+
+  # ...
+end
+```
+
+So a search like `User.search("something")` will generate a query
+with the following conditions:
+
+```sql
+... WHERE username LIKE '%something%' AND fullname LIKE '%something%'
+```
+
+However, there are cases where using AND as the default operator is not desired,
+so SearchCop allows you to override it and use OR as the default operator instead.
+A query like `User.search("something", default_operator: :or)` will
+generate the query using OR to concatenate the conditions
+
+```sql
+... WHERE username LIKE '%something%' OR fullname LIKE '%something%'
+```
+
+Finally, please note that you can apply it to fulltext indices/queries as well.
+
 ## Associations
 
 If you specify searchable attributes from another model, like
@@ -454,6 +506,10 @@ SearchCop also provides the ability to define custom operators by defining a
 search. This is useful when you want to use database operators that are not
 supported by SearchCop.
 
+Please note, when using generators, you are responsible for sanitizing/quoting
+the values (see example below). Otherwise your generator will allow SQL
+injection. Thus, please only use generators if you know what you're doing.
+
 For example, if you wanted to perform a `LIKE` query where a book title starts
 with a string, you can define the search scope like so:
 

data/docker-compose.yml

@@ -0,0 +1,11 @@
+
+version: '2' 
+services:
+  mysql:
+    image: percona:5.7
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+      - MYSQL_ROOT_PASSWORD=
+    ports:
+      - 3306:3306
+

data/gemfiles/4.2.gemfile

@@ -2,24 +2,12 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.4"
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-end
+gem "activerecord", "~> 4.2"
 
 platforms :ruby do
-  gem "sqlite3"
-  gem "mysql2", "~> 0.3.20"
-  gem "pg"
-end
-
-platforms :rbx do
-  gem "racc"
-  gem "rubysl", "~> 2.0"
-  gem "psych"
+  gem "sqlite3", "1.3.13"
+  gem "mysql2", "0.4.10"
+  gem "pg", "0.21.0"
 end
 
 gemspec :path => "../"

data/gemfiles/5.1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1"
+
+platforms :ruby do
+  gem "sqlite3"
+  gem "mysql2"
+  gem "pg"
+end
+
+gemspec :path => "../"

data/lib/search_cop.rb

@@ -8,21 +8,24 @@ require "search_cop/hash_parser"
 require "search_cop/visitors"
 
 module SearchCop
-  class SpecificationError < StandardError; end
+  class Error < StandardError; end
+
+  class SpecificationError < Error; end
   class UnknownAttribute < SpecificationError; end
+  class UnknownDefaultOperator < SpecificationError; end
 
-  class RuntimeError < StandardError; end
+  class RuntimeError < Error; end
   class UnknownColumn < RuntimeError; end
   class NoSearchableAttributes < RuntimeError; end
   class IncompatibleDatatype < RuntimeError; end
   class ParseError < RuntimeError; end
 
   module Parser
-    def self.parse(query, query_info)
+    def self.parse(query, query_info, query_options = {})
       if query.is_a?(Hash)
         SearchCop::HashParser.new(query_info).parse(query)
       else
-        SearchCop::GrammarParser.new(query_info).parse(query)
+        SearchCop::GrammarParser.new(query_info).parse(query, query_options)
       end
     end
   end
@@ -41,24 +44,24 @@ module SearchCop
       search_scopes[name] = SearchScope.new(name, self)
       search_scopes[name].instance_exec(&block)
 
-      self.send(:define_singleton_method, name) { |query| search_cop query, name }
-      self.send(:define_singleton_method, "unsafe_#{name}") { |query| unsafe_search_cop query, name }
+      self.send(:define_singleton_method, name) { |query, query_options={}| search_cop query, name, query_options }
+      self.send(:define_singleton_method, "unsafe_#{name}") { |query, query_options={}| unsafe_search_cop query, name, query_options }
     end
 
     def search_reflection(scope_name)
       search_scopes[scope_name].reflection
     end
 
-    def search_cop(query, scope_name)
-      unsafe_search_cop query, scope_name
+    def search_cop(query, scope_name, query_options)
+      unsafe_search_cop query, scope_name, query_options
     rescue SearchCop::RuntimeError
       respond_to?(:none) ? none : where("1 = 0")
     end
 
-    def unsafe_search_cop(query, scope_name)
+    def unsafe_search_cop(query, scope_name, query_options)
       return respond_to?(:scoped) ? scoped : all if query.blank?
 
-      query_builder = QueryBuilder.new(self, query, search_scopes[scope_name])
+      query_builder = QueryBuilder.new(self, query, search_scopes[scope_name], query_options)
 
       scope = instance_exec(&search_scopes[scope_name].reflection.scope) if search_scopes[scope_name].reflection.scope
       scope ||= eager_load(query_builder.associations) if query_builder.associations.any?
@@ -66,5 +69,22 @@ module SearchCop
       (scope || self).where(query_builder.sql)
     end
   end
+
+  module Helpers
+    def self.sanitize_default_operator(hash, delete_hash_option=false)
+      default_operator = :and
+      if hash.member?(:default_operator)
+        unless [:and, :or].include?(hash[:default_operator])
+          raise(SearchCop::UnknownDefaultOperator, "Unknown default operator value #{hash[:default_operator]}")
+        end
+
+        default_operator = hash[:default_operator]
+      end
+
+      hash.delete(:default_operator) if delete_hash_option
+
+      default_operator
+    end
+  end
 end
 

data/lib/search_cop/grammar_parser.rb

@@ -12,9 +12,10 @@ module SearchCop
       @query_info = query_info
     end
 
-    def parse(string)
+    def parse(string, query_options)
       node = SearchCopGrammarParser.new.parse(string) || raise(ParseError)
       node.query_info = query_info
+      node.query_options = query_options
       node.evaluate
     end
   end

data/lib/search_cop/hash_parser.rb

@@ -7,6 +7,8 @@ class SearchCop::HashParser
   end
 
   def parse(hash)
+    default_operator = SearchCop::Helpers.sanitize_default_operator(hash, true)
+
     res = hash.collect do |key, value|
       case key
         when :and
@@ -22,7 +24,7 @@ class SearchCop::HashParser
       end
     end
 
-    res.inject :and
+    res.inject default_operator
   end
 
   private

data/lib/search_cop/query_builder.rb

@@ -3,11 +3,11 @@ module SearchCop
   class QueryBuilder
     attr_accessor :query_info, :scope, :sql
 
-    def initialize(model, query, scope)
+    def initialize(model, query, scope, query_options)
       self.scope = scope
       self.query_info = QueryInfo.new(model, scope)
 
-      arel = SearchCop::Parser.parse(query, query_info).optimize!
+      arel = SearchCop::Parser.parse(query, query_info, query_options).optimize!
 
       self.sql = SearchCop::Visitors::Visitor.new(model.connection).visit(arel)
     end

data/lib/search_cop/version.rb

@@ -1,3 +1,3 @@
 module SearchCop
-  VERSION = "1.0.9"
+  VERSION = "1.1.0"
 end

data/lib/search_cop/visitors/visitor.rb

@@ -7,8 +7,8 @@ module SearchCop
       def initialize(connection)
         @connection = connection
 
-        extend(SearchCop::Visitors::Mysql) if @connection.class.name =~ /mysql/i
-        extend(SearchCop::Visitors::Postgres) if @connection.class.name =~ /postgres/i
+        extend(SearchCop::Visitors::Mysql) if @connection.adapter_name =~ /mysql/i
+        extend(SearchCop::Visitors::Postgres) if @connection.adapter_name =~ /postgres|postgis/i
       end
 
       def visit(visit_node = node)

data/lib/search_cop_grammar.rb

@@ -4,12 +4,16 @@ require "search_cop_grammar/nodes"
 
 module SearchCopGrammar
   class BaseNode < Treetop::Runtime::SyntaxNode
-    attr_accessor :query_info
+    attr_writer :query_info, :query_options
 
     def query_info
       (@query_info ||= nil) || parent.query_info
     end
 
+    def query_options
+      (@query_options ||= nil) || parent.query_options
+    end
+
     def evaluate
       elements.collect(&:evaluate).inject(:and)
     end
@@ -110,6 +114,13 @@ module SearchCopGrammar
     end
   end
 
+  class AndOrExpression < BaseNode
+    def evaluate
+      default_operator = SearchCop::Helpers.sanitize_default_operator(query_options)
+      [elements.first.evaluate, elements.last.evaluate].inject(default_operator)
+    end
+  end
+
   class OrExpression < BaseNode
     def evaluate
       [elements.first.evaluate, elements.last.evaluate].inject(:or)

data/lib/search_cop_grammar.treetop

@@ -9,7 +9,9 @@ grammar SearchCopGrammar
   end
 
   rule and_expression
-    or_expression (space? ('AND' / 'and') space? / space !('OR' / 'or')) complex_expression <AndExpression> / or_expression
+    or_expression space? ('AND' / 'and') space? complex_expression <AndExpression> /
+    or_expression space !('OR' / 'or') complex_expression <AndOrExpression> /
+    or_expression
   end
 
   rule or_expression
@@ -37,7 +39,7 @@ grammar SearchCopGrammar
   end
 
   rule anywhere_expression
-    "'" [^\']* "'" <SingleQuotedAnywhereExpression> / '"' [^\"]* '"' <DoubleQuotedAnywhereExpression> / [^\s()]+ <AnywhereExpression>
+    "'" [^\']* "'" <SingleQuotedAnywhereExpression> / '"' [^\"]* '"' <DoubleQuotedAnywhereExpression> / [^[:blank:]()]+ <AnywhereExpression>
   end
 
   rule simple_column
@@ -45,11 +47,11 @@ grammar SearchCopGrammar
   end
 
   rule value
-    "'" [^\']* "'" <SingleQuotedValue> / '"' [^\"]* '"' <DoubleQuotedValue> / [^\s()]+ <Value>
+    "'" [^\']* "'" <SingleQuotedValue> / '"' [^\"]* '"' <DoubleQuotedValue> / [^[:blank:]()]+ <Value>
   end
 
   rule space
-    [\s]+
+    [[:blank:]]+
   end
 end
 

data/lib/search_cop_grammar/attributes.rb

@@ -176,7 +176,7 @@ module SearchCopGrammar
 
     class Float < WithoutMatches
       def compatible?(value)
-        return true if value.to_s =~ /^[0-9]+(\.[0-9]+)?$/
+        return true if value.to_s =~ /^\-?[0-9]+(\.[0-9]+)?$/
 
         false
       end
@@ -198,7 +198,11 @@ module SearchCopGrammar
       def parse(value)
         return value .. value unless value.is_a?(::String)
 
-        if value =~ /^[0-9]{4}$/
+        if value =~ /^[0-9]+ (hour|day|week|month|year)s{0,1} (ago)$/
+          number,period,ago = value.split(' ')
+          time = number.to_i.send(period.to_sym).send(ago.to_sym)
+          time .. ::Time.now
+        elsif value =~ /^[0-9]{4}$/
           ::Time.new(value).beginning_of_year .. ::Time.new(value).end_of_year
         elsif value =~ /^([0-9]{4})(\.|-|\/)([0-9]{1,2})$/
           ::Time.new($1, $3, 15).beginning_of_month .. ::Time.new($1, $3, 15).end_of_month
@@ -244,7 +248,11 @@ module SearchCopGrammar
       def parse(value)
         return value .. value unless value.is_a?(::String)
 
-        if value =~ /^[0-9]{4}$/
+        if value =~ /^[0-9]+ (day|week|month|year)s{0,1} (ago)$/
+          number,period,ago = value.split(' ')
+          time = number.to_i.send(period.to_sym).send(ago.to_sym)
+          time.to_date .. ::Date.today
+        elsif value =~ /^[0-9]{4}$/
           ::Date.new(value.to_i).beginning_of_year .. ::Date.new(value.to_i).end_of_year
         elsif value =~ /^([0-9]{4})(\.|-|\/)([0-9]{1,2})$/
           ::Date.new($1.to_i, $3.to_i, 15).beginning_of_month .. ::Date.new($1.to_i, $3.to_i, 15).end_of_month

data/search_cop.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "activerecord", ">= 3.0.0"
-  spec.add_development_dependency "factory_girl"
-  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "factory_bot"
   spec.add_development_dependency "minitest"
 end

data/test/and_test.rb

@@ -3,7 +3,7 @@ require File.expand_path("../test_helper", __FILE__)
 
 class AndTest < SearchCop::TestCase
   def test_and_string
-    expected = create(:product, :title => "Expected title", :description => "Description")
+    expected = create(:product, :title => "expected title", :description => "Description")
     rejected = create(:product, :title => "Rejected title", :description => "Description")
 
     results = Product.search("title: 'Expected title' description: Description")

data/test/database.yml

@@ -10,8 +10,10 @@ mysql:
   encoding: utf8
 
 postgres:
+  host: localhost
   adapter: postgresql
   database: search_cop
-  username: postgres
+  username: search_cop
+  password: secret
   encoding: utf8
 

data/test/date_test.rb

@@ -66,6 +66,34 @@ class DateTest < SearchCop::TestCase
     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)
+
+    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)
+
+    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)
+
+    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)
+
+    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_on: 1000000").to_a

data/test/datetime_test.rb

@@ -67,6 +67,41 @@ class DatetimeTest < SearchCop::TestCase
     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

data/test/default_operator_test.rb

@@ -0,0 +1,47 @@
+require File.expand_path('../test_helper', __FILE__)
+
+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")
+    start_wars = create(:product, title: "Start Wars", description: "2010 Sci-fi Thriller 2h 28m")
+
+    results = Product.search_multi_columns("Matrix movie", default_operator: :or)
+    assert_includes results, matrix
+    refute_includes results, start_wars
+
+    results = Product.search(title: "Matrix", description: "2000", default_operator: :or)
+    assert_includes results, matrix
+    refute_includes results, start_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/float_test.rb

@@ -58,6 +58,13 @@ class FloatTest < SearchCop::TestCase
     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"

data/test/search_cop_test.rb

@@ -133,8 +133,7 @@ class SearchCopTest < SearchCop::TestCase
   end
 
   def test_not_adding_search_to_object
-    Product
-    assert_equal false, Object.respond_to?(:search)
+    refute Object.respond_to?(:search)
   end
 end
 

data/test/test_helper.rb

@@ -13,7 +13,7 @@ end
 
 require "minitest/autorun"
 require "active_record"
-require "factory_girl"
+require "factory_bot"
 require "yaml"
 
 DATABASE = ENV["DATABASE"] || "sqlite"
@@ -68,13 +68,17 @@ class Product < ActiveRecord::Base
     aliases :users_products => User
   end
 
+  search_scope :search_multi_columns do
+    attributes all: [:title, :description]
+  end
+
   has_many :comments
   has_many :users, :through => :comments
 
   belongs_to :user
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :product do
   end
 
@@ -122,7 +126,7 @@ if DATABASE == "mysql"
 end
 
 class SearchCop::TestCase
-  include FactoryGirl::Syntax::Methods
+  include FactoryBot::Syntax::Methods
 
   def teardown
     Product.delete_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: search_cop
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,7 +103,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -125,11 +110,9 @@ files:
 - MIGRATION.md
 - README.md
 - Rakefile
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
+- docker-compose.yml
 - gemfiles/4.2.gemfile
-- gemfiles/5.0.gemfile
+- gemfiles/5.1.gemfile
 - lib/search_cop.rb
 - lib/search_cop/grammar_parser.rb
 - lib/search_cop/hash_parser.rb
@@ -151,6 +134,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
@@ -183,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Easily perform complex search engine like fulltext queries on your ActiveRecord
@@ -194,6 +178,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/Appraisals

@@ -1,21 +0,0 @@
-
-appraise "3.2" do
-  gem "activerecord", "~> 3.2"
-  gem "search_cop", :path => "../"
-end
-
-appraise "4.1" do
-  gem "activerecord", "~> 4.1"
-  gem "search_cop", :path => "../"
-end
-
-appraise "4.2" do
-  gem "activerecord", "~> 4.2"
-  gem "search_cop", :path => "../"
-end
-
-appraise "5.0" do
-  gem "activerecord", "~> 5.0"
-  gem "search_cop", :path => "../"
-end
-

data/gemfiles/3.2.gemfile

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

data/gemfiles/4.0.gemfile

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

data/gemfiles/4.1.gemfile

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

data/gemfiles/5.0.gemfile

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