rgviz 0.27 → 0.28

data/lib/rgviz/nodes.rb

@@ -42,7 +42,7 @@ module Rgviz
       str << "offset #{offset} " if offset
       str << "label #{labels.map(&:to_s).join(', ')} " if labels
       str << "format #{formats.map(&:to_s).join(', ')} " if formats
-      str << "options #{options.map(&:to_s).join(', ')} " if options
+      str << "options #{options} " if options
       str.strip
     end
   end
@@ -191,24 +191,16 @@ module Rgviz
     end
   end
 
-  class Option
-
-    NoValues = :no_values
-    NoFormat = :no_format
-    
-    attr_accessor :option
-    
-    def initialize(option)
-      @option = option
-    end
+  class Options
     
-    def accept(visitor)
-      visitor.visit_option(self)
-      visitor.end_visit_option self
-    end
+    attr_accessor :no_values
+    attr_accessor :no_format
     
     def to_s
-      @option.to_s
+      s = ''
+      s += 'no_values ' if @no_values
+      s += 'no_format ' if @no_format
+      s.strip
     end
 
   end

data/lib/rgviz/parser.rb

@@ -138,14 +138,22 @@ module Rgviz
     def parse_options
       return if not token_is! Token::Options
       
-      @query.options = []
+      @query.options = Options.new
       
-      while @token.value == Token::NoValues || @token.value == Token::NoFormat
-        @query.options << Option.new(@token.value)
-        next_token
+      while true
+        case @token.value
+        when Token::NoFormat
+          @query.options.no_format = true
+          next_token
+        when Token::NoValues
+          @query.options.no_values = true
+          next_token
+        else
+          break
+        end
       end
       
-      raise ParseException.new "Expecting option" if @query.options.empty?
+      raise ParseException.new "Expecting option" if !@query.options.no_format && !@query.options.no_values 
       raise ParseException.new "Unknown option" if @token.value != Token::EOF
     end
     

data/lib/rgviz/visitor.rb

@@ -1,7 +1,7 @@
 module Rgviz
   class Visitor
     ['query', 'select', 'group_by', 'pivot', 'order_by',
-     'sort', 'where', 'label', 'format', 'option',
+     'sort', 'where', 'label', 'format',
      'binary_expression', 'unary_expression',
      'id_column', 'number_column', 'string_column',
      'boolean_column', 'date_column', 'date_time_column',

data/spec/rgviz/parser_spec.rb

@@ -327,13 +327,8 @@ describe Parser do
   it "parses options" do
     query = parse "options no_values no_format"
     options = query.options
-    options.length.should == 2
-    
-    options[0].should be_a_kind_of Option
-    options[0].option.should == Option::NoValues
-    
-    options[1].should be_a_kind_of Option
-    options[1].option.should == Option::NoFormat
+    options.no_values.should be_true
+    options.no_format.should be_true
   end
   
   it_raises_on 'select'

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 27
-  version: "0.27"
+  - 28
+  version: "0.28"
 platform: ruby
 authors: 
 - Ary Borenszweig