search_cop 1.0.6 → 1.2.0

data/lib/search_cop_grammar.rb

@@ -1,13 +1,16 @@
-
 require "search_cop_grammar/attributes"
 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 || parent.query_info
+      (@query_info ||= nil) || parent.query_info
+    end
+
+    def query_options
+      (@query_options ||= nil) || parent.query_options
     end
 
     def evaluate
@@ -15,7 +18,7 @@ module SearchCopGrammar
     end
 
     def elements
-      super.select { |element| element.class != Treetop::Runtime::SyntaxNode }
+      super.reject { |element| element.instance_of?(Treetop::Runtime::SyntaxNode) }
     end
 
     def collection_for(key)
@@ -94,13 +97,13 @@ module SearchCopGrammar
 
   class SingleQuotedAnywhereExpression < AnywhereExpression
     def text_value
-      super.gsub /^'|'$/, ""
+      super.gsub(/^'|'$/, "")
     end
   end
 
   class DoubleQuotedAnywhereExpression < AnywhereExpression
     def text_value
-      super.gsub /^"|"$/, ""
+      super.gsub(/^"|"$/, "")
     end
   end
 
@@ -110,6 +113,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)
@@ -130,16 +140,15 @@ module SearchCopGrammar
 
   class SingleQuotedValue < BaseNode
     def text_value
-      super.gsub /^'|'$/, ""
+      super.gsub(/^'|'$/, "")
     end
   end
 
   class DoubleQuotedValue < BaseNode
     def text_value
-      super.gsub /^"|"$/, ""
+      super.gsub(/^"|"$/, "")
     end
   end
 
   class Value < BaseNode; end
 end
-

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

@@ -1,4 +1,3 @@
-
 require "treetop"
 
 module SearchCopGrammar
@@ -6,6 +5,8 @@ module SearchCopGrammar
     class Collection
       attr_reader :query_info, :key
 
+      INCLUDED_OPERATORS = [:matches, :eq, :not_eq, :gt, :gteq, :lt, :lteq].freeze
+
       def initialize(query_info, key)
         raise(SearchCop::UnknownColumn, "Unknown column #{key}") unless query_info.scope.reflection.attributes[key]
 
@@ -26,9 +27,15 @@ module SearchCopGrammar
       end
 
       [:eq, :not_eq, :lt, :lteq, :gt, :gteq].each do |method|
-         define_method method do |value|
-           attributes.collect! { |attribute| attribute.send method, value }.inject(:or)
-         end
+        define_method method do |value|
+          attributes.collect! { |attribute| attribute.send method, value }.inject(:or)
+        end
+      end
+
+      def generator(generator, value)
+        attributes.collect! do |attribute|
+          SearchCopGrammar::Nodes::Generator.new(attribute, generator: generator, value: value)
+        end.inject(:or)
       end
 
       def matches(value)
@@ -88,6 +95,18 @@ module SearchCopGrammar
 
         Attributes.const_get(klass.columns_hash[column].type.to_s.classify).new(klass, alias_for(table), column, options)
       end
+
+      def generator_for(name)
+        generators[name]
+      end
+
+      def valid_operator?(operator)
+        (INCLUDED_OPERATORS + generators.keys).include?(operator)
+      end
+
+      def generators
+        query_info.scope.reflection.generators
+      end
     end
 
     class Base
@@ -117,7 +136,7 @@ module SearchCopGrammar
         false
       end
 
-      { :eq => "Equality", :not_eq => "NotEqual", :lt => "LessThan", :lteq => "LessThanOrEqual", :gt => "GreaterThan", :gteq => "GreaterThanOrEqual", :matches => "Matches" }.each do |method, class_name|
+      { eq: "Equality", not_eq: "NotEqual", lt: "LessThan", lteq: "LessThanOrEqual", gt: "GreaterThan", gteq: "GreaterThanOrEqual", matches: "Matches" }.each do |method, class_name|
         define_method method do |value|
           raise(SearchCop::IncompatibleDatatype, "Incompatible datatype for #{value}") unless compatible?(value)
 
@@ -126,19 +145,32 @@ module SearchCopGrammar
       end
 
       def method_missing(name, *args, &block)
-        @attribute.send(name, *args, &block)
+        if @attribute.respond_to?(name)
+          @attribute.send(name, *args, &block)
+        else
+          super
+        end
       end
 
-      def respond_to?(*args)
-        super(*args) || @attribute.respond_to?(*args)
+      def respond_to_missing?(*args)
+        @attribute.respond_to?(*args) || super
       end
     end
 
     class String < Base
       def matches_value(value)
-        return value.gsub(/\*/, "%") if (options[:left_wildcard] != false && value.strip =~ /^[^*]+\*$|^\*[^*]+$/) || value.strip =~ /^[^*]+\*$/
+        res = value.gsub(/[%_\\]/) { |char| "\\#{char}" }
+
+        if value.strip =~ /^\*|\*$/
+          res = res.gsub(/^\*/, "%") if options[:left_wildcard] != false
+          res = res.gsub(/\*$/, "%") if options[:right_wildcard] != false
+
+          return res
+        end
 
-        options[:left_wildcard] != false ? "%#{value}%" : "#{value}%"
+        res = "%#{res}" if options[:left_wildcard] != false
+        res = "#{res}%" if options[:right_wildcard] != false
+        res
       end
 
       def matches(value)
@@ -156,7 +188,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
@@ -176,20 +208,26 @@ module SearchCopGrammar
 
     class Datetime < WithoutMatches
       def parse(value)
-        return value .. value unless value.is_a?(::String)
-
-        if 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
-        elsif value =~ /^([0-9]{1,2})(\.|-|\/)([0-9]{4})$/
-          ::Time.new($3, $1, 15).beginning_of_month .. ::Time.new($3, $1, 15).end_of_month
-        elsif value !~ /:/
+        return value..value unless value.is_a?(::String)
+
+        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 =~ %r{^([0-9]{4})(\.|-|/)([0-9]{1,2})$}
+          ::Time.new(Regexp.last_match(1), Regexp.last_match(3), 15).beginning_of_month..::Time.new(Regexp.last_match(1), Regexp.last_match(3), 15).end_of_month
+        elsif value =~ %r{^([0-9]{1,2})(\.|-|/)([0-9]{4})$}
+          ::Time.new(Regexp.last_match(3), Regexp.last_match(1), 15).beginning_of_month..::Time.new(Regexp.last_match(3), Regexp.last_match(1), 15).end_of_month
+        elsif value =~ %r{^[0-9]{4}(\.|-|/)[0-9]{1,2}(\.|-|/)[0-9]{1,2}$} || value =~ %r{^[0-9]{1,2}(\.|-|/)[0-9]{1,2}(\.|-|/)[0-9]{4}$}
           time = ::Time.parse(value)
-          time.beginning_of_day .. time.end_of_day
-        else
+          time.beginning_of_day..time.end_of_day
+        elsif value =~ %r{[0-9]{4}(\.|-|/)[0-9]{1,2}(\.|-|/)[0-9]{1,2}} || value =~ %r{[0-9]{1,2}(\.|-|/)[0-9]{1,2}(\.|-|/)[0-9]{4}}
           time = ::Time.parse(value)
-          time .. time
+          time..time
+        else
+          raise ArgumentError
         end
       rescue ArgumentError
         raise SearchCop::IncompatibleDatatype, "Incompatible datatype for #{value}"
@@ -220,17 +258,23 @@ module SearchCopGrammar
 
     class Date < Datetime
       def parse(value)
-        return value .. value unless value.is_a?(::String)
-
-        if 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
-        elsif value =~ /^([0-9]{1,2})(\.|-|\/)([0-9]{4})$/
-          ::Date.new($3.to_i, $1.to_i, 15).beginning_of_month .. ::Date.new($3.to_i, $1.to_i, 15).end_of_month
-        else
+        return value..value unless value.is_a?(::String)
+
+        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 =~ %r{^([0-9]{4})(\.|-|/)([0-9]{1,2})$}
+          ::Date.new(Regexp.last_match(1).to_i, Regexp.last_match(3).to_i, 15).beginning_of_month..::Date.new(Regexp.last_match(1).to_i, Regexp.last_match(3).to_i, 15).end_of_month
+        elsif value =~ %r{^([0-9]{1,2})(\.|-|/)([0-9]{4})$}
+          ::Date.new(Regexp.last_match(3).to_i, Regexp.last_match(1).to_i, 15).beginning_of_month..::Date.new(Regexp.last_match(3).to_i, Regexp.last_match(1).to_i, 15).end_of_month
+        elsif value =~ %r{[0-9]{4}(\.|-|/)[0-9]{1,2}(\.|-|/)[0-9]{1,2}} || value =~ %r{[0-9]{1,2}(\.|-|/)[0-9]{1,2}(\.|-|/)[0-9]{4}}
           date = ::Date.parse(value)
-          date .. date
+          date..date
+        else
+          raise ArgumentError
         end
       rescue ArgumentError
         raise SearchCop::IncompatibleDatatype, "Incompatible datatype for #{value}"
@@ -249,4 +293,3 @@ module SearchCopGrammar
     end
   end
 end
-

data/lib/search_cop_grammar/nodes.rb

@@ -1,4 +1,3 @@
-
 require "treetop"
 
 module SearchCopGrammar
@@ -73,6 +72,7 @@ module SearchCopGrammar
     class LessThan < Binary; end
     class LessThanOrEqual < Binary; end
     class Matches < Binary; end
+    class Generator < Binary; end
 
     class Not
       include Base
@@ -82,6 +82,12 @@ module SearchCopGrammar
       def initialize(object)
         @object = object
       end
+
+      def finalize!
+        @object.finalize!
+
+        self
+      end
     end
 
     class MatchesFulltext < Binary
@@ -180,4 +186,3 @@ module SearchCopGrammar
     end
   end
 end
-

data/search_cop.gemspec

@@ -1,29 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'search_cop/version'
+require "search_cop/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "search_cop"
   spec.version       = SearchCop::VERSION
   spec.authors       = ["Benjamin Vetter"]
   spec.email         = ["vetter@flakks.com"]
-  spec.description   = %q{Search engine like fulltext query support for ActiveRecord}
-  spec.summary       = %q{Easily perform complex search engine like fulltext queries on your ActiveRecord models}
+  spec.description   = "Search engine like fulltext query support for ActiveRecord"
+  spec.summary       = "Easily perform complex search engine like fulltext queries on your ActiveRecord models"
   spec.homepage      = "https://github.com/mrkamel/search_cop"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency "treetop"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  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 "bundler"
+  spec.add_development_dependency "factory_bot"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop"
 end

data/test/and_test.rb

@@ -1,10 +1,9 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class AndTest < SearchCop::TestCase
   def test_and_string
-    expected = create(:product, :title => "Expected title", :description => "Description")
-    rejected = create(:product, :title => "Rejected 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")
 
@@ -15,13 +14,12 @@ class AndTest < SearchCop::TestCase
   end
 
   def test_and_hash
-    expected = create(:product, :title => "Expected title", :description => "Description")
-    rejected = create(:product, :title => "Rejected title", :description => "Description")
+    expected = create(:product, title: "Expected title", description: "Description")
+    rejected = create(:product, title: "Rejected title", description: "Description")
 
-    results = Product.search(:and => [{:title => "Expected title"}, {:description => "Description"}])
+    results = Product.search(and: [{ title: "Expected title" }, { description: "Description" }])
 
     assert_includes results, expected
     refute_includes results, rejected
   end
 end
-

data/test/boolean_test.rb

@@ -1,15 +1,14 @@
-
-require File.expand_path("../test_helper", __FILE__)
+require File.expand_path("test_helper", __dir__)
 
 class BooleanTest < SearchCop::TestCase
   def test_mapping
-    product = create(:product, :available => true)
+    product = create(:product, available: true)
 
     assert_includes Product.search("available: 1"), product
     assert_includes Product.search("available: true"), product
     assert_includes Product.search("available: yes"), product
 
-    product = create(:product, :available => false)
+    product = create(:product, available: false)
 
     assert_includes Product.search("available: 0"), product
     assert_includes Product.search("available: false"), product
@@ -17,28 +16,28 @@ class BooleanTest < SearchCop::TestCase
   end
 
   def test_anywhere
-    product = create(:product, :available => true)
+    product = create(:product, available: true)
 
     assert_includes Product.search("true"), product
     refute_includes Product.search("false"), product
   end
 
   def test_includes
-    product = create(:product, :available => true)
+    product = create(:product, available: true)
 
     assert_includes Product.search("available: true"), product
     refute_includes Product.search("available: false"), product
   end
 
   def test_equals
-    product = create(:product, :available => true)
+    product = create(:product, available: true)
 
     assert_includes Product.search("available = true"), product
     refute_includes Product.search("available = false"), product
   end
 
   def test_equals_not
-    product = create(:product, :available => false)
+    product = create(:product, available: false)
 
     assert_includes Product.search("available != true"), product
     refute_includes Product.search("available != false"), product
@@ -50,4 +49,3 @@ class BooleanTest < SearchCop::TestCase
     end
   end
 end
-