nql 0.1.0 → 0.1.1

data/README.md

@@ -1,6 +1,6 @@
 # NQL
 
-[![Build Status](https://travis-ci.org/gabynaiman/nql.png)](https://travis-ci.org/gabynaiman/nql)
+[![Build Status](https://travis-ci.org/gabynaiman/nql.png?branch=master)](https://travis-ci.org/gabynaiman/nql)
 
 Natural Query Language built on top of ActiveRecord and Ransack
 

data/lib/nql/grammar.rb

@@ -394,6 +394,7 @@ module NQL
           '<' => 'lt',
           '<=' => 'lteq',
           ':' => 'cont',
+          '!:' => 'not_cont',
           '~' => 'matches'
         }
         comparators[text_value]
@@ -484,18 +485,29 @@ module NQL
                     if r8
                       r1 = r8
                     else
-                      if has_terminal?('~', false, index)
-                        r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                        @index += 1
+                      if has_terminal?('!:', false, index)
+                        r9 = instantiate_node(SyntaxNode,input, index...(index + 2))
+                        @index += 2
                       else
-                        terminal_parse_failure('~')
+                        terminal_parse_failure('!:')
                         r9 = nil
                       end
                       if r9
                         r1 = r9
                       else
-                        @index = i1
-                        r1 = nil
+                        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

data/lib/nql/grammar.treetop

@@ -68,7 +68,7 @@ module NQL
     end
 
     rule comparator
-      ('=' / '!=' / '>' / '>=' / '<' / '<=' / ':' / '~')+ {
+      ('=' / '!=' / '>' / '>=' / '<' / '<=' / ':' / '!:' / '~')+ {
         def to_ransack
           comparators = {
             '=' => 'eq',
@@ -78,6 +78,7 @@ module NQL
             '<' => 'lt',
             '<=' => 'lteq',
             ':' => 'cont',
+            '!:' => 'not_cont',
             '~' => 'matches'
           }
           comparators[text_value]

data/lib/nql/version.rb

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

data/spec/comparison_parser_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'spec_helper'
 
 describe NQL::SyntaxParser, '-> Comparison' do
@@ -62,6 +63,14 @@ describe NQL::SyntaxParser, '-> Comparison' do
       tree.comparison.value.text_value.should eq 'value'
     end
 
+    it 'Not contains' do
+      tree = parser.parse('var !: value')
+
+      tree.comparison.variable.text_value.should eq 'var'
+      tree.comparison.comparator.text_value.should eq '!:'
+      tree.comparison.value.text_value.should eq 'value'
+    end
+
     it 'Matches' do
       tree = parser.parse('var ~ value')
 
@@ -135,7 +144,7 @@ describe NQL::SyntaxParser, '-> Comparison' do
 
 
     it 'With utf8 chars and symbols' do
-      utf8_symbols = "\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"
+      utf8_symbols = "ÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜàáâãäçèéêëìíîïñòóôõöùúûü"
       tree = parser.parse("var = .#+-#{utf8_symbols}")
       tree.comparison.value.text_value.should eq ".#+-#{utf8_symbols}"
     end

data/spec/ransack_spec.rb

@@ -62,6 +62,14 @@ describe 'Ransack Query' do
       q[:c][0].should have_value '1234'
     end
 
+    it 'Not contains' do
+      q = parser.parse('id !: 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'not_cont'
+      q[:c][0].should have_value '1234'
+    end
+
     it 'Matches' do
       q = parser.parse('id ~ 1234').to_ransack
 

data/spec/sql_spec.rb

@@ -45,6 +45,11 @@ describe 'SQL generation' do
       Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" LIKE '%abcd%')"
     end
 
+    it 'Not contains' do
+      q = 'name !: abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" NOT LIKE '%abcd%')"
+    end
+
     it 'Matches' do
       q = 'name ~ abcd'
       Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" LIKE 'abcd')"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop