nql 0.1.1 → 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/.ruby-gemset

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

data/.ruby-version

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

data/.travis.yml

@@ -1,5 +1,22 @@
 language: ruby
+
 rvm:
-  - 1.9.2
-  - 1.9.3
-script: bundle exec rspec spec
+  - 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

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

data/README.md

@@ -1,6 +1,9 @@
 # NQL
 
-[![Build Status](https://travis-ci.org/gabynaiman/nql.png?branch=master)](https://travis-ci.org/gabynaiman/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
 
@@ -24,6 +27,7 @@ Or install it yourself as:
     | Symbol | Description               |
     --------------------------------------
     | :      | Contains                  |
+    | !:     | Not contains              |
     | =      | Equals                    |
     | !=     | Not equals                |
     | >      | Grater than               |

data/Rakefile

@@ -1,2 +1,10 @@
-#!/usr/bin/env rake
 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

@@ -6,6 +6,7 @@ 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/extension/arel.rb

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

data/lib/nql/grammar.rb

@@ -145,7 +145,7 @@ module NQL
         elements[1]
       end
 
-      def expression
+      def comparison
         elements[2]
       end
 
@@ -156,6 +156,21 @@ module NQL
     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
@@ -201,7 +216,7 @@ module NQL
       end
       if r1
         r0 = r1
-        r0.extend(Primary2)
+        r0.extend(Primary3)
       else
         i5, s5 = index, []
         if has_terminal?('(', false, index)
@@ -216,7 +231,7 @@ module NQL
           r7 = _nt_space
           s5 << r7
           if r7
-            r8 = _nt_expression
+            r8 = _nt_comparison
             s5 << r8
             if r8
               r9 = _nt_space
@@ -243,10 +258,53 @@ module NQL
         end
         if r5
           r0 = r5
-          r0.extend(Primary2)
+          r0.extend(Primary3)
         else
-          @index = i0
-          r0 = nil
+          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
 

data/lib/nql/grammar.treetop

@@ -29,7 +29,7 @@ module NQL
     end
 
     rule primary
-      (space comparison space / '(' space expression space ')') {
+      (space comparison space / '(' space comparison space ')' / '(' space expression space ')') {
         def to_ransack
           detect_node.to_ransack
         end

data/lib/nql/version.rb

@@ -1,3 +1,3 @@
 module NQL
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/nql.gemspec

@@ -15,11 +15,13 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency 'treetop', '~> 1.4'
+  s.add_dependency 'treetop', '~> 1.4.0'
   s.add_dependency 'activerecord', '>= 3.2.0'
   s.add_dependency 'activesupport', '>= 3.2.0'
   s.add_dependency 'ransack', '~> 0.7'
 
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'sqlite3', '~> 1.3.0'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'simplecov'
 end

data/spec/coverage_helper.rb

@@ -0,0 +1,8 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start

data/spec/migrations/20121108154439_create_countries.rb

@@ -2,7 +2,7 @@ class CreateCountries < ActiveRecord::Migration
   def change
     create_table :countries do |t|
       t.string :name, null: false
-
+      t.boolean :landlocked, null: true
       t.timestamps
     end
   end

data/spec/ransack_spec.rb

@@ -80,7 +80,20 @@ describe 'Ransack Query' do
 
     it 'Model references' do
       q = parser.parse('models.id = 1234').to_ransack
+      q[:c][0].should have_attribute 'models_id'
+      q[:c][0].should have_predicate 'eq'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Single comparison with parentheses and spaces' do
+      q = parser.parse('( models.id = 1234 )').to_ransack
+      q[:c][0].should have_attribute 'models_id'
+      q[:c][0].should have_predicate 'eq'
+      q[:c][0].should have_value '1234'
+    end
 
+    it 'Single comparison with parentheses' do
+      q = parser.parse('(models.id = 1234)').to_ransack
       q[:c][0].should have_attribute 'models_id'
       q[:c][0].should have_predicate 'eq'
       q[:c][0].should have_value '1234'

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'coverage_helper'
 require 'nql'
 
 Dir["#{File.dirname(__FILE__)}/models/**/*.rb"].each {|f| require f}

data/spec/sql_spec.rb

@@ -15,6 +15,18 @@ describe 'SQL generation' do
       Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE \"countries\".\"name\" = 'abcd'"
     end
 
+    it 'With parentheses' do
+      q = '(name = abcd)'
+      a = Country.nql(q)
+      a.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE \"countries\".\"name\" = 'abcd'"
+    end
+
+    it 'With parentheses and boolean value' do
+      q = '(landlocked = true)'
+      a = Country.nql(q)
+      a.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE \"countries\".\"landlocked\" = 't'"
+    end
+
     it 'Not equals' do
       q = 'name != abcd'
       Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" != 'abcd')"

metadata

@@ -1,110 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: nql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Natural Query Language built on top of ActiveRecord and Ransack
@@ -114,8 +129,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -123,6 +141,7 @@ files:
 - lib/nql.rb
 - lib/nql/error.rb
 - lib/nql/extension/active_record.rb
+- lib/nql/extension/arel.rb
 - lib/nql/extension/hash.rb
 - lib/nql/grammar.rb
 - lib/nql/grammar.treetop
@@ -131,6 +150,7 @@ files:
 - nql.gemspec
 - spec/comparison_parser_spec.rb
 - spec/coordination_parser_spec.rb
+- spec/coverage_helper.rb
 - spec/migrations/20121108154439_create_countries.rb
 - spec/migrations/20121108154508_create_cities.rb
 - spec/models/city.rb
@@ -141,31 +161,30 @@ files:
 - spec/sql_spec.rb
 homepage: https://github.com/gabynaiman/nql
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 3.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Natural Query Language built on top of ActiveRecord and Ransack
 test_files:
 - spec/comparison_parser_spec.rb
 - spec/coordination_parser_spec.rb
+- spec/coverage_helper.rb
 - spec/migrations/20121108154439_create_countries.rb
 - spec/migrations/20121108154508_create_cities.rb
 - spec/models/city.rb
@@ -174,4 +193,3 @@ test_files:
 - spec/ransack_spec.rb
 - spec/spec_helper.rb
 - spec/sql_spec.rb
-has_rdoc: