abstract-sql 0.0.3 → 0.0.4

data/lib/abstract-sql/parser/statement.rb

@@ -9,7 +9,7 @@ module SQL
       rule(:spaces?){ spaces.maybe}
       rule(:digit) { match('[0-9]') }
       rule(:int){ digit.repeat(1).as(:int) }
-      rule(:bool_not) { spaces >> (str('not') | str('NOT')).as(:not) >> spaces}
+      rule(:bool_not) { spaces? >> (str('not') | str('NOT')).as(:not) >> spaces?}
 
       rule(:float) do
         (str('-').maybe >> (
@@ -48,7 +48,7 @@ module SQL
       end
 
       rule(:entity) do
-        bool_not.maybe >> (value.as(:lvalue) >> operator >> value.as(:rvalue))
+        bool_not.maybe >> ((lparen >> entity >> rparen) | (value.as(:lvalue) >> operator >> value.as(:rvalue)))
       end
 
       rule(:statement) do

data/lib/abstract-sql/version.rb

@@ -1,5 +1,5 @@
 module Abstract
   module Sql
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/test_abstract.rb

@@ -10,6 +10,7 @@ class TestAbstract < Test::Unit::TestCase
   test "parse very simple condition" do
     assert_equal({ :criterion_13 => {:"-<=" => 8} }, @abstract.parse("criterion_13 <= 8"))
     assert_equal({ :criterion_13 => {:"-<=" => 8} }, @abstract.parse("(criterion_13 <= 8)"))
+    assert_equal({ :"-not_bool" => { :criterion_13 => {:"-<=" => 8} } }, @abstract.parse("not (criterion_13 <= 8)"))
   end
 
   test "parse a simple condition" do
@@ -19,13 +20,13 @@ class TestAbstract < Test::Unit::TestCase
   end
 
   test "parse a complex condition" do
-    assert_equal( 
+    assert_equal(
                  {
       :"-or" => [
         {:"-and" => [{:id => { :"-=" => 1}}, {:label => {:"-like" => '%webo%'}}]},
         {:"-and" => [{:id => { :"-!=" => 1}}, {:label => {:"-like" => '%api%'}}]}
     ]
-    }, 
+    },
       @abstract.parse("(id = 1 AND label like '%webo%') OR (id !=1 and label like '%api%')")
                 )
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abstract-sql
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Hallelujah
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 +02:00
+date: 2011-08-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency