nql 0.0.3 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 2425f04ebb2fc216c2026f10a69d644162249f7dd0cc76ceacebd71c0f266603
+  data.tar.gz: c0616e9d0f4ed6fea53b8669420dee4054475e3287fbdfa601f011f3f549de0f
+SHA512:
+  metadata.gz: 8272a744a3a6786c1549d237937ab05815cc543440f3561897fdaee1c96d451ade59f14d4e4e56d1669073ebc00a22bc4fa0afc11d65cb1eab6d3dffff1de723
+  data.tar.gz: b93e13fe0b17a89c1ea394b0e50f0b3bf3c7e3c9a7523c2b21013b560968ef92a5ce704c9cf983c6b17076101ee78ec3deb342ed429d5c71e0c147603f5edbc9

data/.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-ci
+repo_token: tyUx6a4cZK6H9VorUnDSz798WfDILLXUb

data/.gitignore

@@ -1,18 +1,18 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.idea
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+.idea

data/.ruby-gemset

@@ -0,0 +1 @@
+nql

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.5.0

data/.travis.yml

@@ -0,0 +1,22 @@
+language: ruby
+
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - jruby-9.2.9.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: 2.7
+    - rvm: jruby-9.2.9.0
+    - rvm: ruby-head
+    - rvm: jruby-head

data/Gemfile

@@ -1,4 +1,6 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in nql.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in nql.gemspec
+gemspec
+
+gem 'coveralls', require: false

data/LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2012 gabriel
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2012 gabriel
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,54 +1,74 @@
-# NQL
-
-Natural Query Language built on top of ActiveRecord and Ransack
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'nql'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install nql
-
-## Supported comparators
-
-    ----------------------------------
-    | Symbol | Description           |
-    ----------------------------------
-    | :      | Contains              |
-    | =      | Equals                |
-    | !=     | Not equals            |
-    | >      | Grater than           |
-    | >=     | Grater or equals than |
-    | <      | Less than             |
-    | <=     | Less or equals than   |
-    ----------------------------------
-
-
-## Usage
-
-Converts from natural language to query expression
-
-    q = '(name: arg | name: br) & region = south'
-    Country.search(NQL.to_ransack(q)).result.to_sql
-    => "SELECT coutries.* FROM countries WHERE (countries.name LIKE '%arg%' OR countries.name LIKE '%br%') AND region = 'south'"
-
-### Joins support
-
-    q = 'cities.name: buenos'
-    Country.search(NQL.to_ransack(q)).result.to_sql
-    => "SELECT countries.* FROM countries LEFT OUTER JOIN cities ON countries.id = cities.country_id WHERE cities.name LIKE '%buenos%'"
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+# NQL
+
+[![Gem Version](https://badge.fury.io/rb/nql.svg)](https://rubygems.org/gems/nql)
+[![Build Status](https://travis-ci.org/gabynaiman/nql.svg?branch=master)](https://travis-ci.org/gabynaiman/nql)
+[![Coverage Status](https://coveralls.io/repos/gabynaiman/nql/badge.svg?branch=master)](https://coveralls.io/r/gabynaiman/nql?branch=master)
+[![Code Climate](https://codeclimate.com/github/gabynaiman/nql.svg)](https://codeclimate.com/github/gabynaiman/nql)
+
+Natural Query Language built on top of ActiveRecord and Ransack
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'nql'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install nql
+
+## Supported comparators
+
+    --------------------------------------
+    | Symbol | Description               |
+    --------------------------------------
+    | :      | Contains                  |
+    | !:     | Not contains              |
+    | =      | Equals                    |
+    | !=     | Not equals                |
+    | >      | Grater than               |
+    | >=     | Grater or equals than     |
+    | <      | Less than                 |
+    | <=     | Less or equals than       |
+    | ~      | Matches (eq ignore case)  |
+    --------------------------------------
+
+
+## Usage
+
+Converts from natural language to query expression
+
+    Country.nql('(name: arg | name: br) & region = south').to_sql
+    => "SELECT coutries.* FROM countries WHERE (countries.name LIKE '%arg%' OR countries.name LIKE '%br%') AND region = 'south'"
+
+### Joins support
+
+    Country.nql('cities.name: buenos').to_sql
+    => "SELECT countries.* FROM countries LEFT OUTER JOIN cities ON countries.id = cities.country_id WHERE cities.name LIKE '%buenos%'"
+
+### Invalid expressions handling
+
+Safe query
+
+    Country.nql('xyz').to_sql
+    => "SELECT coutries.* FROM countries WHERE (1=2)
+
+Raising exceptions
+
+    Country.nql!('xyz') => raise NQL::SyntaxError
+
+    Country.nql!('xyz: arg') => raise NQL::AttributesNotFoundError
+
+    Country.nql!(1234) => raise NQL::DataTypeError
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,2 +1,10 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+  task.rspec_opts = '--tty --color -f documentation'
+  task.verbose = false
+end
+
+task default: :spec

data/lib/nql.rb

@@ -1,25 +1,12 @@
-require 'treetop'
-require 'active_record'
-require 'active_support/all'
-require 'ransack'
-
-require 'nql/version'
-require 'nql/grammar'
-require 'nql/invalid_expression_error'
-
-module NQL
-
-  def self.to_ransack(query)
-    return nil if query.nil? || query.strip.empty?
-    expression = parser.parse(query)
-    raise InvalidExpressionError.new(parser.failure_reason) unless expression
-    expression.to_ransack
-  end
-
-  private
-
-  def self.parser
-    @@parser ||= SyntaxParser.new
-  end
-
-end
+require 'treetop'
+require 'active_record'
+require 'active_support/all'
+require 'ransack'
+
+require 'nql/version'
+require 'nql/extension/hash'
+require 'nql/extension/active_record'
+require 'nql/extension/arel'
+require 'nql/grammar'
+require 'nql/query'
+require 'nql/error'

data/lib/nql/error.rb

@@ -0,0 +1,26 @@
+module NQL
+  class Error < StandardError
+  end
+
+  class SyntaxError < Error
+  end
+
+  class DataTypeError < Error
+    def initialize(text)
+      super "#{text} must be a String"
+    end
+  end
+
+  class InvalidModelError < Error
+    def initialize(model)
+      super "#{model} must be subclass of ActiveRecord::Base"
+    end
+  end
+
+  class AttributesNotFoundError < Error
+    def initialize(model, attributes)
+      super "#{model} does not contains the attributes #{attributes}"
+    end
+  end
+
+end

data/lib/nql/extension/active_record.rb

@@ -0,0 +1,19 @@
+module ActiveRecord
+  class Base
+
+    def self.nql(query, options={})
+      nql! query, options
+    rescue NQL::Error
+      self.where('1=2')
+    end
+
+    def self.nql!(query, options={})
+      nql_search(query).result(options)
+    end
+
+    def self.nql_search(query)
+      NQL::Query.new(self, query).ransack_search
+    end
+
+  end
+end

data/lib/nql/extension/arel.rb

@@ -0,0 +1,7 @@
+module Arel
+  module Visitors
+    class ToSql
+      alias :visit_Integer :literal
+    end
+  end
+end

data/lib/nql/extension/hash.rb

@@ -0,0 +1,9 @@
+class Hash
+  def deep_symbolize_keys
+    inject({}) { |result, (key, value)|
+      value = value.deep_symbolize_keys if value.is_a?(Hash)
+      result[(key.to_sym rescue key) || key] = value
+      result
+    }
+  end unless Hash.method_defined?(:deep_symbolize_keys)
+end

data/lib/nql/grammar.rb

@@ -1,761 +1,843 @@
-# Autogenerated from a Treetop grammar. Edits may be lost.
-
-
-module NQL
-  module Syntax
-    include Treetop::Runtime
-
-    def root
-      @root ||= :expression
-    end
-
-    def _nt_expression
-      start_index = index
-      if node_cache[:expression].has_key?(index)
-        cached = node_cache[:expression][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0 = index
-      r1 = _nt_boolean
-      if r1
-        r0 = r1
-      else
-        r2 = _nt_primary
-        if r2
-          r0 = r2
-        else
-          @index = i0
-          r0 = nil
-        end
-      end
-
-      node_cache[:expression][start_index] = r0
-
-      r0
-    end
-
-    module Boolean0
-      def left
-        elements[0]
-      end
-
-      def space1
-        elements[1]
-      end
-
-      def coordinator
-        elements[2]
-      end
-
-      def space2
-        elements[3]
-      end
-
-      def right
-        elements[4]
-      end
-    end
-
-    module Boolean1
-      def to_ransack
-        group = {g: [{m: coordinator.to_ransack}]}
-
-        [left, right].each do |side|
-          if side.is_node?(:boolean)
-            group[:g][0].merge! side.to_ransack
-          else
-            group[:g][0][:c] ||= []
-            group[:g][0][:c] << side.to_ransack
-          end
-        end
-
-        group
-      end
-
-      def is_node?(node_type)
-        node_type.to_sym == :boolean
-      end
-    end
-
-    def _nt_boolean
-      start_index = index
-      if node_cache[:boolean].has_key?(index)
-        cached = node_cache[:boolean][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0, s0 = index, []
-      r1 = _nt_primary
-      s0 << r1
-      if r1
-        r2 = _nt_space
-        s0 << r2
-        if r2
-          r3 = _nt_coordinator
-          s0 << r3
-          if r3
-            r4 = _nt_space
-            s0 << r4
-            if r4
-              r5 = _nt_expression
-              s0 << r5
-            end
-          end
-        end
-      end
-      if s0.last
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        r0.extend(Boolean0)
-        r0.extend(Boolean1)
-      else
-        @index = i0
-        r0 = nil
-      end
-
-      node_cache[:boolean][start_index] = r0
-
-      r0
-    end
-
-    module Primary0
-      def space1
-        elements[0]
-      end
-
-      def comparison
-        elements[1]
-      end
-
-      def space2
-        elements[2]
-      end
-    end
-
-    module Primary1
-      def space1
-        elements[1]
-      end
-
-      def expression
-        elements[2]
-      end
-
-      def space2
-        elements[3]
-      end
-
-    end
-
-    module Primary2
-      def to_ransack
-        detect_node.to_ransack
-      end
-
-      def detect_node
-        self.send %w(comparison expression).detect { |m| self.respond_to? m }
-      end
-
-      def is_node?(node_type)
-        detect_node.is_node?(node_type)
-      end
-    end
-
-    def _nt_primary
-      start_index = index
-      if node_cache[:primary].has_key?(index)
-        cached = node_cache[:primary][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0 = index
-      i1, s1 = index, []
-      r2 = _nt_space
-      s1 << r2
-      if r2
-        r3 = _nt_comparison
-        s1 << r3
-        if r3
-          r4 = _nt_space
-          s1 << r4
-        end
-      end
-      if s1.last
-        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-        r1.extend(Primary0)
-      else
-        @index = i1
-        r1 = nil
-      end
-      if r1
-        r0 = r1
-        r0.extend(Primary2)
-      else
-        i5, s5 = index, []
-        if has_terminal?('(', false, index)
-          r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('(')
-          r6 = nil
-        end
-        s5 << r6
-        if r6
-          r7 = _nt_space
-          s5 << r7
-          if r7
-            r8 = _nt_expression
-            s5 << r8
-            if r8
-              r9 = _nt_space
-              s5 << r9
-              if r9
-                if has_terminal?(')', false, index)
-                  r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
-                else
-                  terminal_parse_failure(')')
-                  r10 = nil
-                end
-                s5 << r10
-              end
-            end
-          end
-        end
-        if s5.last
-          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
-          r5.extend(Primary1)
-        else
-          @index = i5
-          r5 = nil
-        end
-        if r5
-          r0 = r5
-          r0.extend(Primary2)
-        else
-          @index = i0
-          r0 = nil
-        end
-      end
-
-      node_cache[:primary][start_index] = r0
-
-      r0
-    end
-
-    module Coordinator0
-      def to_ransack
-        coordinators = {'|' => 'or', '&' => 'and'}
-        coordinators[text_value]
-      end
-    end
-
-    def _nt_coordinator
-      start_index = index
-      if node_cache[:coordinator].has_key?(index)
-        cached = node_cache[:coordinator][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0 = index
-      if has_terminal?('|', false, index)
-        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
-      else
-        terminal_parse_failure('|')
-        r1 = nil
-      end
-      if r1
-        r0 = r1
-        r0.extend(Coordinator0)
-      else
-        if has_terminal?('&', false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('&')
-          r2 = nil
-        end
-        if r2
-          r0 = r2
-          r0.extend(Coordinator0)
-        else
-          @index = i0
-          r0 = nil
-        end
-      end
-
-      node_cache[:coordinator][start_index] = r0
-
-      r0
-    end
-
-    module Comparison0
-      def variable
-        elements[0]
-      end
-
-      def space1
-        elements[1]
-      end
-
-      def comparator
-        elements[2]
-      end
-
-      def space2
-        elements[3]
-      end
-
-      def value
-        elements[4]
-      end
-    end
-
-    module Comparison1
-      def to_ransack
-        hash = {a: {'0' => {name: self.variable.text_value.gsub('.', '_')}}, p: self.comparator.to_ransack, v: {'0' => {value: self.value.text_value}}}
-        hash = {c: [hash]} if !parent || !parent.parent || text_value == parent.parent.text_value
-        hash
-      end
-
-      def is_node?(node_type)
-        node_type.to_sym == :comparison
-      end
-    end
-
-    def _nt_comparison
-      start_index = index
-      if node_cache[:comparison].has_key?(index)
-        cached = node_cache[:comparison][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0, s0 = index, []
-      r1 = _nt_alphanumeric
-      s0 << r1
-      if r1
-        r2 = _nt_space
-        s0 << r2
-        if r2
-          r3 = _nt_comparator
-          s0 << r3
-          if r3
-            r4 = _nt_space
-            s0 << r4
-            if r4
-              r5 = _nt_text
-              s0 << r5
-            end
-          end
-        end
-      end
-      if s0.last
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        r0.extend(Comparison0)
-        r0.extend(Comparison1)
-      else
-        @index = i0
-        r0 = nil
-      end
-
-      node_cache[:comparison][start_index] = r0
-
-      r0
-    end
-
-    module Comparator0
-      def to_ransack
-        comparators = {
-          '=' => 'eq',
-          '!=' => 'not_eq',
-          '>' => 'gt',
-          '>=' => 'gteq',
-          '<' => 'lt',
-          '<=' => 'lteq',
-          ':' => 'cont'
-        }
-        comparators[text_value]
-      end
-    end
-
-    def _nt_comparator
-      start_index = index
-      if node_cache[:comparator].has_key?(index)
-        cached = node_cache[:comparator][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      s0, i0 = [], index
-      loop do
-        i1 = index
-        if has_terminal?('=', false, index)
-          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('=')
-          r2 = nil
-        end
-        if r2
-          r1 = r2
-        else
-          if has_terminal?('!=', false, index)
-            r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
-            @index += 2
-          else
-            terminal_parse_failure('!=')
-            r3 = nil
-          end
-          if r3
-            r1 = r3
-          else
-            if has_terminal?('>', false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
-            else
-              terminal_parse_failure('>')
-              r4 = nil
-            end
-            if r4
-              r1 = r4
-            else
-              if has_terminal?('>=', false, index)
-                r5 = instantiate_node(SyntaxNode,input, index...(index + 2))
-                @index += 2
-              else
-                terminal_parse_failure('>=')
-                r5 = nil
-              end
-              if r5
-                r1 = r5
-              else
-                if has_terminal?('<', false, index)
-                  r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
-                else
-                  terminal_parse_failure('<')
-                  r6 = nil
-                end
-                if r6
-                  r1 = r6
-                else
-                  if has_terminal?('<=', false, index)
-                    r7 = instantiate_node(SyntaxNode,input, index...(index + 2))
-                    @index += 2
-                  else
-                    terminal_parse_failure('<=')
-                    r7 = nil
-                  end
-                  if r7
-                    r1 = r7
-                  else
-                    if has_terminal?(':', false, index)
-                      r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                      @index += 1
-                    else
-                      terminal_parse_failure(':')
-                      r8 = nil
-                    end
-                    if r8
-                      r1 = r8
-                    else
-                      @index = i1
-                      r1 = nil
-                    end
-                  end
-                end
-              end
-            end
-          end
-        end
-        if r1
-          s0 << r1
-        else
-          break
-        end
-      end
-      if s0.empty?
-        @index = i0
-        r0 = nil
-      else
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        r0.extend(Comparator0)
-      end
-
-      node_cache[:comparator][start_index] = r0
-
-      r0
-    end
-
-    module Text0
-      def space
-        elements[0]
-      end
-
-    end
-
-    module Text1
-    end
-
-    def _nt_text
-      start_index = index
-      if node_cache[:text].has_key?(index)
-        cached = node_cache[:text][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      i0, s0 = index, []
-      s1, i1 = [], index
-      loop do
-        i2 = index
-        r3 = _nt_alphanumeric
-        if r3
-          r2 = r3
-        else
-          r4 = _nt_utf8
-          if r4
-            r2 = r4
-          else
-            r5 = _nt_symbol
-            if r5
-              r2 = r5
-            else
-              @index = i2
-              r2 = nil
-            end
-          end
-        end
-        if r2
-          s1 << r2
-        else
-          break
-        end
-      end
-      if s1.empty?
-        @index = i1
-        r1 = nil
-      else
-        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-      end
-      s0 << r1
-      if r1
-        s6, i6 = [], index
-        loop do
-          i7, s7 = index, []
-          r8 = _nt_space
-          s7 << r8
-          if r8
-            s9, i9 = [], index
-            loop do
-              i10 = index
-              r11 = _nt_alphanumeric
-              if r11
-                r10 = r11
-              else
-                r12 = _nt_utf8
-                if r12
-                  r10 = r12
-                else
-                  r13 = _nt_symbol
-                  if r13
-                    r10 = r13
-                  else
-                    @index = i10
-                    r10 = nil
-                  end
-                end
-              end
-              if r10
-                s9 << r10
-              else
-                break
-              end
-            end
-            if s9.empty?
-              @index = i9
-              r9 = nil
-            else
-              r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-            end
-            s7 << r9
-          end
-          if s7.last
-            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
-            r7.extend(Text0)
-          else
-            @index = i7
-            r7 = nil
-          end
-          if r7
-            s6 << r7
-          else
-            break
-          end
-        end
-        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-        s0 << r6
-      end
-      if s0.last
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        r0.extend(Text1)
-      else
-        @index = i0
-        r0 = nil
-      end
-
-      node_cache[:text][start_index] = r0
-
-      r0
-    end
-
-    def _nt_alphanumeric
-      start_index = index
-      if node_cache[:alphanumeric].has_key?(index)
-        cached = node_cache[:alphanumeric][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      s0, i0 = [], index
-      loop do
-        if has_terminal?('\G[a-zA-Z0-9_.]', true, index)
-          r1 = true
-          @index += 1
-        else
-          r1 = nil
-        end
-        if r1
-          s0 << r1
-        else
-          break
-        end
-      end
-      if s0.empty?
-        @index = i0
-        r0 = nil
-      else
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      end
-
-      node_cache[:alphanumeric][start_index] = r0
-
-      r0
-    end
-
-    def _nt_space
-      start_index = index
-      if node_cache[:space].has_key?(index)
-        cached = node_cache[:space][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      s0, i0 = [], index
-      loop do
-        if has_terminal?(' ', false, index)
-          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure(' ')
-          r1 = nil
-        end
-        if r1
-          s0 << r1
-        else
-          break
-        end
-      end
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-
-      node_cache[:space][start_index] = r0
-
-      r0
-    end
-
-    def _nt_symbol
-      start_index = index
-      if node_cache[:symbol].has_key?(index)
-        cached = node_cache[:symbol][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      if has_terminal?('\G[><=+-\\/\\\\@#$%!?:]', true, index)
-        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
-      else
-        r0 = nil
-      end
-
-      node_cache[:symbol][start_index] = r0
-
-      r0
-    end
-
-    def _nt_utf8
-      start_index = index
-      if node_cache[:utf8].has_key?(index)
-        cached = node_cache[:utf8][index]
-        if cached
-          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
-          @index = cached.interval.end
-        end
-        return cached
-      end
-
-      if has_terminal?('\G[\\u00c1\\u00c0\\u00c9\\u00c8\\u00cd\\u00cc\\u00d3\\u00d2\\u00da\\u00d9\\u00dc\\u00d1\\u00c7\\u00e1\\u00e0\\u00e9\\u00e8\\u00ed\\u00ec\\u00f3\\u00f2\\u00fa\\u00f9\\u00fc\\u00f1\\u00e7]', true, index)
-        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
-      else
-        r0 = nil
-      end
-
-      node_cache[:utf8][start_index] = r0
-
-      r0
-    end
-
-  end
-
-  class SyntaxParser < Treetop::Runtime::CompiledParser
-    include Syntax
-  end
-
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module NQL
+  module Syntax
+    include Treetop::Runtime
+
+    def root
+      @root ||= :expression
+    end
+
+    def _nt_expression
+      start_index = index
+      if node_cache[:expression].has_key?(index)
+        cached = node_cache[:expression][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0 = index
+      r1 = _nt_boolean
+      if r1
+        r0 = r1
+      else
+        r2 = _nt_primary
+        if r2
+          r0 = r2
+        else
+          @index = i0
+          r0 = nil
+        end
+      end
+
+      node_cache[:expression][start_index] = r0
+
+      r0
+    end
+
+    module Boolean0
+      def left
+        elements[0]
+      end
+
+      def space1
+        elements[1]
+      end
+
+      def coordinator
+        elements[2]
+      end
+
+      def space2
+        elements[3]
+      end
+
+      def right
+        elements[4]
+      end
+    end
+
+    module Boolean1
+      def to_ransack
+        group = {g: [{m: coordinator.to_ransack}]}
+
+        [left, right].each do |side|
+          if side.is_node?(:boolean)
+            group[:g][0].merge! side.to_ransack
+          else
+            group[:g][0][:c] ||= []
+            group[:g][0][:c] << side.to_ransack
+          end
+        end
+
+        group
+      end
+
+      def is_node?(node_type)
+        node_type.to_sym == :boolean
+      end
+    end
+
+    def _nt_boolean
+      start_index = index
+      if node_cache[:boolean].has_key?(index)
+        cached = node_cache[:boolean][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0, s0 = index, []
+      r1 = _nt_primary
+      s0 << r1
+      if r1
+        r2 = _nt_space
+        s0 << r2
+        if r2
+          r3 = _nt_coordinator
+          s0 << r3
+          if r3
+            r4 = _nt_space
+            s0 << r4
+            if r4
+              r5 = _nt_expression
+              s0 << r5
+            end
+          end
+        end
+      end
+      if s0.last
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Boolean0)
+        r0.extend(Boolean1)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:boolean][start_index] = r0
+
+      r0
+    end
+
+    module Primary0
+      def space1
+        elements[0]
+      end
+
+      def comparison
+        elements[1]
+      end
+
+      def space2
+        elements[2]
+      end
+    end
+
+    module Primary1
+      def space1
+        elements[1]
+      end
+
+      def comparison
+        elements[2]
+      end
+
+      def space2
+        elements[3]
+      end
+
+    end
+
+    module Primary2
+      def space1
+        elements[1]
+      end
+
+      def expression
+        elements[2]
+      end
+
+      def space2
+        elements[3]
+      end
+
+    end
+
+    module Primary3
+      def to_ransack
+        detect_node.to_ransack
+      end
+
+      def detect_node
+        self.send %w(comparison expression).detect { |m| self.respond_to? m }
+      end
+
+      def is_node?(node_type)
+        detect_node.is_node?(node_type)
+      end
+    end
+
+    def _nt_primary
+      start_index = index
+      if node_cache[:primary].has_key?(index)
+        cached = node_cache[:primary][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0 = index
+      i1, s1 = index, []
+      r2 = _nt_space
+      s1 << r2
+      if r2
+        r3 = _nt_comparison
+        s1 << r3
+        if r3
+          r4 = _nt_space
+          s1 << r4
+        end
+      end
+      if s1.last
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+        r1.extend(Primary0)
+      else
+        @index = i1
+        r1 = nil
+      end
+      if r1
+        r0 = r1
+        r0.extend(Primary3)
+      else
+        i5, s5 = index, []
+        if has_terminal?('(', false, index)
+          r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('(')
+          r6 = nil
+        end
+        s5 << r6
+        if r6
+          r7 = _nt_space
+          s5 << r7
+          if r7
+            r8 = _nt_comparison
+            s5 << r8
+            if r8
+              r9 = _nt_space
+              s5 << r9
+              if r9
+                if has_terminal?(')', false, index)
+                  r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure(')')
+                  r10 = nil
+                end
+                s5 << r10
+              end
+            end
+          end
+        end
+        if s5.last
+          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+          r5.extend(Primary1)
+        else
+          @index = i5
+          r5 = nil
+        end
+        if r5
+          r0 = r5
+          r0.extend(Primary3)
+        else
+          i11, s11 = index, []
+          if has_terminal?('(', false, index)
+            r12 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('(')
+            r12 = nil
+          end
+          s11 << r12
+          if r12
+            r13 = _nt_space
+            s11 << r13
+            if r13
+              r14 = _nt_expression
+              s11 << r14
+              if r14
+                r15 = _nt_space
+                s11 << r15
+                if r15
+                  if has_terminal?(')', false, index)
+                    r16 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                    @index += 1
+                  else
+                    terminal_parse_failure(')')
+                    r16 = nil
+                  end
+                  s11 << r16
+                end
+              end
+            end
+          end
+          if s11.last
+            r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+            r11.extend(Primary2)
+          else
+            @index = i11
+            r11 = nil
+          end
+          if r11
+            r0 = r11
+            r0.extend(Primary3)
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+      end
+
+      node_cache[:primary][start_index] = r0
+
+      r0
+    end
+
+    module Coordinator0
+      def to_ransack
+        coordinators = {'|' => 'or', '&' => 'and'}
+        coordinators[text_value]
+      end
+    end
+
+    def _nt_coordinator
+      start_index = index
+      if node_cache[:coordinator].has_key?(index)
+        cached = node_cache[:coordinator][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0 = index
+      if has_terminal?('|', false, index)
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure('|')
+        r1 = nil
+      end
+      if r1
+        r0 = r1
+        r0.extend(Coordinator0)
+      else
+        if has_terminal?('&', false, index)
+          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('&')
+          r2 = nil
+        end
+        if r2
+          r0 = r2
+          r0.extend(Coordinator0)
+        else
+          @index = i0
+          r0 = nil
+        end
+      end
+
+      node_cache[:coordinator][start_index] = r0
+
+      r0
+    end
+
+    module Comparison0
+      def variable
+        elements[0]
+      end
+
+      def space1
+        elements[1]
+      end
+
+      def comparator
+        elements[2]
+      end
+
+      def space2
+        elements[3]
+      end
+
+      def value
+        elements[4]
+      end
+    end
+
+    module Comparison1
+      def to_ransack
+        hash = {a: {'0' => {name: self.variable.text_value.gsub('.', '_')}}, p: self.comparator.to_ransack, v: {'0' => {value: self.value.text_value}}}
+        hash = {c: [hash]} if !parent || !parent.parent || text_value == parent.parent.text_value
+        hash
+      end
+
+      def is_node?(node_type)
+        node_type.to_sym == :comparison
+      end
+    end
+
+    def _nt_comparison
+      start_index = index
+      if node_cache[:comparison].has_key?(index)
+        cached = node_cache[:comparison][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0, s0 = index, []
+      r1 = _nt_alphanumeric
+      s0 << r1
+      if r1
+        r2 = _nt_space
+        s0 << r2
+        if r2
+          r3 = _nt_comparator
+          s0 << r3
+          if r3
+            r4 = _nt_space
+            s0 << r4
+            if r4
+              r5 = _nt_text
+              s0 << r5
+            end
+          end
+        end
+      end
+      if s0.last
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Comparison0)
+        r0.extend(Comparison1)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:comparison][start_index] = r0
+
+      r0
+    end
+
+    module Comparator0
+      def to_ransack
+        comparators = {
+          '=' => 'eq',
+          '!=' => 'not_eq',
+          '>' => 'gt',
+          '>=' => 'gteq',
+          '<' => 'lt',
+          '<=' => 'lteq',
+          ':' => 'cont',
+          '!:' => 'not_cont',
+          '~' => 'matches'
+        }
+        comparators[text_value]
+      end
+    end
+
+    def _nt_comparator
+      start_index = index
+      if node_cache[:comparator].has_key?(index)
+        cached = node_cache[:comparator][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        i1 = index
+        if has_terminal?('=', false, index)
+          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('=')
+          r2 = nil
+        end
+        if r2
+          r1 = r2
+        else
+          if has_terminal?('!=', false, index)
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
+            @index += 2
+          else
+            terminal_parse_failure('!=')
+            r3 = nil
+          end
+          if r3
+            r1 = r3
+          else
+            if has_terminal?('>', false, index)
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('>')
+              r4 = nil
+            end
+            if r4
+              r1 = r4
+            else
+              if has_terminal?('>=', false, index)
+                r5 = instantiate_node(SyntaxNode,input, index...(index + 2))
+                @index += 2
+              else
+                terminal_parse_failure('>=')
+                r5 = nil
+              end
+              if r5
+                r1 = r5
+              else
+                if has_terminal?('<', false, index)
+                  r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure('<')
+                  r6 = nil
+                end
+                if r6
+                  r1 = r6
+                else
+                  if has_terminal?('<=', false, index)
+                    r7 = instantiate_node(SyntaxNode,input, index...(index + 2))
+                    @index += 2
+                  else
+                    terminal_parse_failure('<=')
+                    r7 = nil
+                  end
+                  if r7
+                    r1 = r7
+                  else
+                    if has_terminal?(':', false, index)
+                      r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                      @index += 1
+                    else
+                      terminal_parse_failure(':')
+                      r8 = nil
+                    end
+                    if r8
+                      r1 = r8
+                    else
+                      if has_terminal?('!:', false, index)
+                        r9 = instantiate_node(SyntaxNode,input, index...(index + 2))
+                        @index += 2
+                      else
+                        terminal_parse_failure('!:')
+                        r9 = nil
+                      end
+                      if r9
+                        r1 = r9
+                      else
+                        if has_terminal?('~', false, index)
+                          r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                          @index += 1
+                        else
+                          terminal_parse_failure('~')
+                          r10 = nil
+                        end
+                        if r10
+                          r1 = r10
+                        else
+                          @index = i1
+                          r1 = nil
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Comparator0)
+      end
+
+      node_cache[:comparator][start_index] = r0
+
+      r0
+    end
+
+    module Text0
+      def space
+        elements[0]
+      end
+
+    end
+
+    module Text1
+    end
+
+    def _nt_text
+      start_index = index
+      if node_cache[:text].has_key?(index)
+        cached = node_cache[:text][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0, s0 = index, []
+      s1, i1 = [], index
+      loop do
+        i2 = index
+        r3 = _nt_alphanumeric
+        if r3
+          r2 = r3
+        else
+          r4 = _nt_utf8
+          if r4
+            r2 = r4
+          else
+            r5 = _nt_symbol
+            if r5
+              r2 = r5
+            else
+              @index = i2
+              r2 = nil
+            end
+          end
+        end
+        if r2
+          s1 << r2
+        else
+          break
+        end
+      end
+      if s1.empty?
+        @index = i1
+        r1 = nil
+      else
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      end
+      s0 << r1
+      if r1
+        s6, i6 = [], index
+        loop do
+          i7, s7 = index, []
+          r8 = _nt_space
+          s7 << r8
+          if r8
+            s9, i9 = [], index
+            loop do
+              i10 = index
+              r11 = _nt_alphanumeric
+              if r11
+                r10 = r11
+              else
+                r12 = _nt_utf8
+                if r12
+                  r10 = r12
+                else
+                  r13 = _nt_symbol
+                  if r13
+                    r10 = r13
+                  else
+                    @index = i10
+                    r10 = nil
+                  end
+                end
+              end
+              if r10
+                s9 << r10
+              else
+                break
+              end
+            end
+            if s9.empty?
+              @index = i9
+              r9 = nil
+            else
+              r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
+            end
+            s7 << r9
+          end
+          if s7.last
+            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+            r7.extend(Text0)
+          else
+            @index = i7
+            r7 = nil
+          end
+          if r7
+            s6 << r7
+          else
+            break
+          end
+        end
+        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+        s0 << r6
+      end
+      if s0.last
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Text1)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:text][start_index] = r0
+
+      r0
+    end
+
+    def _nt_alphanumeric
+      start_index = index
+      if node_cache[:alphanumeric].has_key?(index)
+        cached = node_cache[:alphanumeric][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        if has_terminal?('\G[a-zA-Z0-9_.]', true, index)
+          r1 = true
+          @index += 1
+        else
+          r1 = nil
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      end
+
+      node_cache[:alphanumeric][start_index] = r0
+
+      r0
+    end
+
+    def _nt_space
+      start_index = index
+      if node_cache[:space].has_key?(index)
+        cached = node_cache[:space][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        if has_terminal?(' ', false, index)
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure(' ')
+          r1 = nil
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+
+      node_cache[:space][start_index] = r0
+
+      r0
+    end
+
+    def _nt_symbol
+      start_index = index
+      if node_cache[:symbol].has_key?(index)
+        cached = node_cache[:symbol][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      if has_terminal?('\G[><=+-\\/\\\\@#$%!?:]', true, index)
+        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        r0 = nil
+      end
+
+      node_cache[:symbol][start_index] = r0
+
+      r0
+    end
+
+    def _nt_utf8
+      start_index = index
+      if node_cache[:utf8].has_key?(index)
+        cached = node_cache[:utf8][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      if has_terminal?('\G[\\u00c0\\u00c1\\u00c2\\u00c3\\u00c4\\u00c7\\u00c8\\u00c9\\u00ca\\u00cb\\u00cc\\u00cd\\u00ce\\u00cf\\u00d1\\u00d2\\u00d3\\u00d4\\u00d5\\u00d6\\u00d9\\u00da\\u00db\\u00dc\\u00e0\\u00e1\\u00e2\\u00e3\\u00e4\\u00e7\\u00e8\\u00e9\\u00ea\\u00eb\\u00ec\\u00ed\\u00ee\\u00ef\\u00f1\\u00f2\\u00f3\\u00f4\\u00f5\\u00f6\\u00f9\\u00fa\\u00fb\\u00fc]', true, index)
+        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        r0 = nil
+      end
+
+      node_cache[:utf8][start_index] = r0
+
+      r0
+    end
+
+  end
+
+  class SyntaxParser < Treetop::Runtime::CompiledParser
+    include Syntax
+  end
+
 end