nql 0.0.4 → 0.0.5

data/README.md

@@ -18,17 +18,18 @@ Or install it yourself as:
 
 ## Supported comparators
 
-    ----------------------------------
-    | Symbol | Description           |
-    ----------------------------------
-    | :      | Contains              |
-    | =      | Equals                |
-    | !=     | Not equals            |
-    | >      | Grater than           |
-    | >=     | Grater or equals than |
-    | <      | Less than             |
-    | <=     | Less or equals than   |
-    ----------------------------------
+    --------------------------------------
+    | Symbol | Description               |
+    --------------------------------------
+    | :      | Contains                  |
+    | =      | Equals                    |
+    | !=     | Not equals                |
+    | >      | Grater than               |
+    | >=     | Grater or equals than     |
+    | <      | Less than                 |
+    | <=     | Less or equals than       |
+    | ~      | Matches (eq ignore case)  |
+    --------------------------------------
 
 
 ## Usage

data/lib/nql/grammar.rb

@@ -393,7 +393,8 @@ module NQL
           '>=' => 'gteq',
           '<' => 'lt',
           '<=' => 'lteq',
-          ':' => 'cont'
+          ':' => 'cont',
+          '~' => 'matches'
         }
         comparators[text_value]
       end
@@ -483,8 +484,19 @@ module NQL
                     if r8
                       r1 = r8
                     else
-                      @index = i1
-                      r1 = nil
+                      if has_terminal?('~', false, index)
+                        r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                        @index += 1
+                      else
+                        terminal_parse_failure('~')
+                        r9 = nil
+                      end
+                      if r9
+                        r1 = r9
+                      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',
@@ -77,7 +77,8 @@ module NQL
             '>=' => 'gteq',
             '<' => 'lt',
             '<=' => 'lteq',
-            ':' => 'cont'
+            ':' => 'cont',
+            '~' => 'matches'
           }
           comparators[text_value]
         end

data/lib/nql/version.rb

@@ -1,3 +1,3 @@
 module NQL
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/comparison_parser_spec.rb

@@ -62,6 +62,14 @@ describe NQL::SyntaxParser, '-> Comparison' do
       tree.comparison.value.text_value.should eq 'value'
     end
 
+    it 'Matches' 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
+
   end
 
   context 'Space separators' do

data/spec/ransack_spec.rb

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

data/spec/sql_spec.rb

@@ -45,6 +45,11 @@ describe 'SQL generation' do
       Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" LIKE '%abcd%')"
     end
 
+    it 'Matches' do
+      q = 'name ~ abcd'
+      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" LIKE 'abcd')"
+    end
+
   end
 
   context 'Coordinated comparisons' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nql
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop