command_search 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa471a870d21295459efa58aa18e3777752841dc0cfec3033a6423996ed2d98c
-  data.tar.gz: 37a0b72e6cb764c90fd14eb44b0a1c096d4e6c6e2756a4715db3e02471aa6889
+  metadata.gz: 6ab70b519f399ddeeba1a8862085f8017d327b60a2cbfddaa4682363e56d2f38
+  data.tar.gz: 204fc638f22b3ffddef67f3065c551885c9b116b4fcadffb118f52d4d7ccffb2
 SHA512:
-  metadata.gz: fe02049b5e6eec1b62ffa6d030a747312b661f4db05befb66f5e3585bf0b5b679f65c10c7ba3348a19de97ecdb0d4f9f19b2e5466b75bd4604658b66021c6fe0
-  data.tar.gz: a5e0fa90644d5c7dd3346e1b9c7e43ef04c6e652f9f293ac59b468a2667bb388be8614854680612b62cda2812179fd800ee45a9e4229c7d4774760facd2b0b79
+  metadata.gz: 15beca3aa277baf873b57ff539b46c7dc966e357801ed69ed3818b17d89e021a6ead6bc233e119fd227bfc62615e2e0078e954cd92b9a32b216e3414cf6313e4
+  data.tar.gz: 34da12042bd8b24d8b83bdceb08454a8ec72517cd3cfca155072cc286d0b54c683bfa16fc65f8f579759ea1a8279576c989fbd7599fdd818e0a0d45b2a7cd646

data/lib/command_search/backends/postgres.rb

@@ -0,0 +1,94 @@
+module CommandSearch
+  module Postgres
+    module_function
+
+    def quote_string(str)
+      # activerecord/lib/active_record/connection_adapters/abstract/quoting.rb:62
+      str.gsub!('\\', '\&\&')
+      str.gsub!("'", "''")
+      Regexp.escape(str)
+    end
+
+    def build_quoted_regex(input)
+      str = quote_string(input)
+      if str[/(^\W)|(\W$)/]
+        head_border = '(^|\s|[^:+\w])'
+        tail_border = '($|\s|[^:+\w])'
+        return head_border + str + tail_border
+      end
+      '\m' + str + '\y'
+    end
+
+    def command_search(node)
+      field_node = node[:value].first
+      field = field_node[:value]
+      search_node = node[:value].last
+      val = search_node[:value]
+      type = search_node[:type]
+      return '0 = 1' if field == '__CommandSearch_dummy_key__'
+      if type == Boolean || type == :existence
+        false_val = "'f'"
+        false_val = 0 if field_node[:field_type] == Numeric
+        if val
+          return "NOT ((#{field} = #{false_val}) OR (#{field} IS NULL))"
+        end
+        return "((#{field} = #{false_val}) OR (#{field} IS NULL))"
+      end
+      if type == Time
+        return '0 = 1' unless val
+        return "(#{field} >= '#{val[0]}') AND (#{field} < '#{val[1]}') AND (#{field} IS NOT NULL)"
+      end
+      if type == :quote
+        op = '~'
+        val =  "'#{build_quoted_regex(val)}'"
+      elsif type == :str
+        op = '~*'
+        val = "'#{quote_string(val)}'"
+      elsif type == :number
+        op = '='
+      end
+      "(#{field} #{op} #{val}) AND (#{field} IS NOT NULL)"
+    end
+
+    def compare_search(node)
+      field_node = node[:value].first
+      field = field_node[:value]
+      search_node = node[:value].last
+      val = search_node[:value]
+      type = search_node[:type]
+      op = node[:nest_op]
+      if node[:compare_across_fields]
+        "(#{field} #{op} #{val}) AND (#{field} IS NOT NULL) AND (#{val} IS NOT NULL)"
+      elsif type == Time && val
+        "(#{field} #{op} '#{val}') AND (#{field} IS NOT NULL)"
+      elsif val.is_a?(Numeric) || val == val.to_i.to_s || val == val.to_f.to_s
+        "(#{field} #{op} #{val}) AND (#{field} IS NOT NULL)"
+      else
+        '0 = 1'
+      end
+    end
+
+    def build_query(ast)
+      out = []
+      ast = [ast] unless ast.is_a?(Array)
+      ast.each do |node|
+        type = node[:type]
+        if type == :colon
+          out.push(command_search(node))
+        elsif type == :compare
+          out.push(compare_search(node))
+        elsif type == :and
+          out.push(build_query(node[:value]))
+        elsif type == :or
+          clauses = node[:value].map { |x| build_query(x) }
+          clause = clauses.join(' OR ')
+          out.push("(#{clause})")
+        elsif type == :not
+          clause = build_query(node[:value])
+          out.push("NOT (#{clause})")
+        end
+      end
+      out.join(' AND ')
+    end
+  end
+end

data/lib/command_search/normalizer.rb

@@ -96,22 +96,28 @@ module CommandSearch
       { type: :or, value: new_val }
     end
 
-    def type_cast!(node, fields)
+    def type_cast!(node, fields, cast_all)
       (key_node, search_node) = node[:value]
       key = key_node[:value]
       field = fields[key.to_sym] || fields[key.to_s]
       return unless field
       type = field.is_a?(Class) ? field : field[:type]
+      type = Numeric if type == Integer
+      key_node[:field_type] = type
       cast_bool!(field, search_node)
       return cast_time!(node) if [Time, Date, DateTime].include?(type)
-      return cast_numeric!(search_node) if [Integer, Numeric].include?(type)
-      cast_regex!(search_node)
+      return cast_numeric!(search_node) if Numeric == type
+      if cast_all
+        cast_regex!(search_node)
+      else
+        search_node[:type] = :str if search_node[:type] == :number
+      end
     end
 
-    def normalize!(ast, fields)
+    def normalize!(ast, fields, cast_all = true)
       ast.map! do |node|
         if node[:type] == :and || node[:type] == :or || node[:type] == :not
-          normalize!(node[:value], fields)
+          normalize!(node[:value], fields, cast_all)
           next node
         end
         if node[:type] == :colon || node[:type] == :compare
@@ -127,9 +133,9 @@ module CommandSearch
           node = split_general_fields(node, fields)
         end
         if node[:type] == :or
-          node[:value].each { |x| type_cast!(x, fields) }
+          node[:value].each { |x| type_cast!(x, fields, cast_all) }
         else
-          type_cast!(node, fields)
+          type_cast!(node, fields, cast_all)
         end
         node
       end

data/lib/command_search.rb

@@ -6,28 +6,39 @@ load(__dir__ + '/command_search/optimizer.rb')
 
 load(__dir__ + '/command_search/backends/memory.rb')
 load(__dir__ + '/command_search/backends/mongoer.rb')
+load(__dir__ + '/command_search/backends/postgres.rb')
 
 class Boolean; end
 
 module CommandSearch
   module_function
 
-  def search(source, query, options)
+  def build(type, query, options)
     aliases = options[:aliases] || {}
     fields = options[:fields] || {}
-
     aliased_query = Aliaser.alias(query, aliases)
     ast = Lexer.lex(aliased_query)
-
     Parser.parse!(ast)
     Optimizer.optimize!(ast)
+    if type == :postgres
+      Normalizer.normalize!(ast, fields, false)
+      return Postgres.build_query(ast)
+    end
     Normalizer.normalize!(ast, fields)
+    return Mongoer.build_query(ast) if type == :mongo
+    ast
+  end
 
+  def search(source, query, options)
     if source.respond_to?(:mongo_client) && source.queryable
-      mongo_query = Mongoer.build_query(ast)
-      return source.where(mongo_query)
+      ast = CommandSearch.build(:mongo, query, options)
+      return source.where(ast)
     end
-
-    source.select { |x| Memory.check(x, ast) }
+    if source.respond_to?(:postgresql_connection)
+      ast = CommandSearch.build(:postgres, query, options)
+      return source.where(ast)
+    end
+    ast = CommandSearch.build(:other, query, options)
+    source.select { |x| CommandSearch::Memory.check(x, ast) }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_search
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - zumbalogy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -34,6 +34,7 @@ files:
 - lib/command_search/aliaser.rb
 - lib/command_search/backends/memory.rb
 - lib/command_search/backends/mongoer.rb
+- lib/command_search/backends/postgres.rb
 - lib/command_search/lexer.rb
 - lib/command_search/normalizer.rb
 - lib/command_search/optimizer.rb
@@ -57,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Let users query collections with ease.