abstract-sql 0.0.2 → 0.0.3

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

@@ -20,6 +20,11 @@ module SQL
         { String(z).to_sym => { operator(op) => x } } 
       end
 
+      # Very simple criterion
+      rule({:lstatement => subtree(:l)}) do
+        l
+      end
+
       # Statement right or left without right leaf
       rule(:lstatement => { :lstatement => subtree(:y) })do
         {:lstatement => y } 
@@ -50,7 +55,6 @@ module SQL
         {:lstatement => l, :boolean_operator => operator(op), :rstatement => r} 
       end
 
-
       rule(:boolean_operator => simple(:op), :lstatement => subtree(:l), :rstatement => subtree(:r) ) do 
         {operator(op) => [l, r] } 
       end

data/lib/abstract-sql/version.rb

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

data/test/test_abstract.rb

@@ -6,9 +6,16 @@ class TestAbstract < Test::Unit::TestCase
     @abstract = SQL::Abstract.new
   end
 
+
+  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)"))
+  end
+
   test "parse a simple condition" do
     assert_equal( {:"-and" => [{:id => { :"-=" => 1}}, {:label => {:"-like" => '%webo%'}}]}, @abstract.parse("id = 1 and label like '%webo%'"))
     assert_equal( {:"-and" => [{:id => { :"-=" => 1}}, {:label => {:"-like" => '%webo%'}}]}, @abstract.parse("((id = 1 )) and label like '%webo%'"))
+    assert_equal({:"-and" => [{ :criterion_13 => {:"-<=" => 8} },{ :age => {:"->=" => 5} }]}, @abstract.parse("(criterion_13 <= 8) and age >= 5"))
   end
 
   test "parse a complex condition" do
@@ -33,7 +40,6 @@ class TestAbstract < Test::Unit::TestCase
     },
       @abstract.parse("( criterion_7 >= 8 or criterion_1 < 8 ) and ( segment_1 < 4 or not segment_2 < 1 )")
     )
-    
   end
 
   test "raise error when bad formatted sql" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: abstract-sql
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Hallelujah
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 +02:00
+date: 2011-08-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: parslet
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  requirement: *id001
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +46,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  prerelease: false
-  requirement: *id002
   type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +60,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  requirement: *id003
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,9 +74,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  requirement: *id004
   type: :development
+  version_requirements: *id004
 description: It reverse an SQL statement to a Perl SQL::Abstract JSON format.
 email: 
 - hery@rails-royce.org