rgviz 0.34 → 0.35

data/lib/rgviz/nodes.rb

@@ -203,9 +203,33 @@ module Rgviz
     end
 
   end
+  
+  class LogicalExpression
+    And = Token::And
+    Or = Token::Or
+    
+    attr_accessor :operator
+    attr_accessor :operands
+    
+    def initialize(operator, operands)
+      @operator = operator
+      @operands = operands
+    end
+    
+    def accept(visitor)
+      if visitor.visit_logical_expression(self)
+        operands.each{|x| x.accept visitor}
+      end
+      visitor.end_visit_logical_expression self
+    end
+    
+    def to_s
+      operands.map(&:to_s).join(" #{operator} ")
+    end
+  
+  end
 
   class BinaryExpression
-    And = Token::And
     Contains = Token::Contains
     EndsWith = :'ends with'
     Eq = Token::EQ
@@ -216,7 +240,7 @@ module Rgviz
     Lte = Token::LTE
     Matches = Token::Matches
     Neq = Token::NEQ
-    Or = Token::Or
+    
     StartsWith = :'starts with'
 
     attr_accessor :operator

data/lib/rgviz/parser.rb

@@ -196,24 +196,28 @@ module Rgviz
     
     def parse_or_expression
       left = parse_and_expression
+      return left unless token_is? Token::Or
+      
+      operands = [left]
       while true
         if token_is! Token::Or
-          right = parse_and_expression
-          left = BinaryExpression.new left, BinaryExpression::Or, right
+          operands << parse_and_expression
         else
-          return left
+          return LogicalExpression.new(LogicalExpression::Or, operands)
         end
       end
     end
     
     def parse_and_expression
       left = parse_not_expression
+      return left unless token_is? Token::And
+      
+      operands = [left]
       while true
         if token_is! Token::And
-          right = parse_not_expression
-          left = BinaryExpression.new left, BinaryExpression::And, right
+          operands << parse_not_expression
         else
-          return left
+          return LogicalExpression.new(LogicalExpression::And, operands)
         end
       end
     end

data/lib/rgviz/visitor.rb

@@ -2,7 +2,7 @@ module Rgviz
   class Visitor
     ['query', 'select', 'group_by', 'pivot', 'order_by',
      'sort', 'where', 'label', 'format',
-     'binary_expression', 'unary_expression',
+     'logical_expression', 'binary_expression', 'unary_expression',
      'id_column', 'number_column', 'string_column',
      'boolean_column', 'date_column', 'date_time_column',
      'time_of_day_column', 'scalar_function_column', 'aggregate_column'].each do |name|

data/spec/rgviz/parser_spec.rb

@@ -331,12 +331,18 @@ describe Parser do
     options.no_format.should be_true
   end
   
-  it "parses where with two ands" do
-    parse "where 1 = 1 and 1 = 1 and 1 = 1"
-  end
-  
-  it "parses where with two ors" do
-    parse "where 1 = 1 or 1 = 1 or 1 = 1"
+  [
+    ['and', LogicalExpression::And],
+    ['or', LogicalExpression::Or]
+  ].each do |str, op|
+    it "parses where with two #{str}" do
+      query = parse "where 1 = 1 #{str} 1 = 2 #{str} 1 = 3"
+      exp = query.where.expression 
+      
+      exp.should be_a_kind_of LogicalExpression
+      exp.operator.should == op
+      exp.operands.length.should == 3
+    end
   end
   
   ['+', '-', '*', '/'].each do |op|

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: false
   segments: 
   - 0
-  - 34
-  version: "0.34"
+  - 35
+  version: "0.35"
 platform: ruby
 authors: 
 - Ary Borenszweig