rgviz 0.39 → 0.40

data/lib/rgviz/lexer.rb

@@ -7,14 +7,14 @@ module Rgviz
       @token = Token.new
       @extensions = options[:extensions]
     end
-    
+
     def next_token
       @token.start = pos
       @token.string = nil
       @token.value = nil
-      
+
       skip /\s*/
-      
+
       if eos?
         @token.value = Token::EOF
       elsif scan /"([^"]*)"/
@@ -31,10 +31,10 @@ module Rgviz
         @token.number = matched.to_f
       elsif scan /\d+/
         @token.value = Token::INTEGER
-        @token.number = matched.to_f
+        @token.number = matched.to_i
       else
         @token.value = if scan /\+/ then Token::PLUS
-          elsif scan /\-/ then Token::MINUS 
+          elsif scan /\-/ then Token::MINUS
           elsif scan /\*/ then Token::STAR
           elsif scan /\// then Token::SLASH
           elsif scan /\,/ then Token::COMMA
@@ -43,7 +43,7 @@ module Rgviz
           elsif scan /\=/ then Token::EQ
           elsif scan /\!\=/ or scan /\<\>/ then Token::NEQ
           elsif scan /\>\=/ then Token::GTE
-          elsif scan /\>/ then Token::GT          
+          elsif scan /\>/ then Token::GT
           elsif scan /\<\=/ then Token::LTE
           elsif scan /\</ then Token::LT
           elsif scan /and\b/i then Token::And
@@ -55,9 +55,9 @@ module Rgviz
           elsif scan /count\b/i then Token::Count
           elsif scan /date\b/i then Token::Date
           elsif scan /datediff\b/i then Token::DateDiff
-          elsif scan /datetime\b/i then Token::DateTime        
+          elsif scan /datetime\b/i then Token::DateTime
           elsif scan /day\b/i then Token::Day
-          elsif scan /dayofweek\b/i then Token::DayOfWeek        
+          elsif scan /dayofweek\b/i then Token::DayOfWeek
           elsif scan /desc\b/i then Token::Desc
           elsif scan /ends\b/i then Token::Ends
           elsif scan /false\b/i then Token::False
@@ -100,14 +100,14 @@ module Rgviz
           elsif scan /year\b/i then Token::Year
           elsif scan /[a-zA-Z_]\w*\b/ then Token::ID
         end
-        
+
         if @token.value
           @token.string = matched
         else
           raise ParseException.new("Unexpected character #{string[pos].chr}")
         end
       end
-      
+
       return @token
     end
   end

data/lib/rgviz/nodes.rb

@@ -10,7 +10,11 @@ module Rgviz
     attr_accessor :labels
     attr_accessor :formats
     attr_accessor :options
-    
+
+    def select?
+      @select && @select.columns && @select.columns.length > 0
+    end
+
     def accept(visitor)
       if visitor.visit_query self
         select.accept visitor if select
@@ -23,7 +27,7 @@ module Rgviz
       end
       visitor.end_visit_query self
     end
-    
+
     def to_s
       str = ''
       if select
@@ -48,11 +52,11 @@ module Rgviz
 
   class ColumnsContainer
     attr_accessor :columns
-    
+
     def initialize
       @columns = []
     end
-    
+
     def to_s
       @columns.map(&:to_s).join(', ')
     end
@@ -87,18 +91,18 @@ module Rgviz
 
   class OrderBy
     attr_accessor :sorts
-    
+
     def initialize
       @sorts = []
     end
-    
+
     def accept(visitor)
       if visitor.visit_order_by(self)
         sorts.each{|x| x.accept visitor}
       end
       visitor.end_visit_order_by self
     end
-    
+
     def to_s
       @sorts.map(&:to_s).join(', ')
     end
@@ -111,19 +115,19 @@ module Rgviz
 
     attr_accessor :column
     attr_accessor :order
-    
+
     def initialize(column, order)
       @column = column
       @order = order
     end
-    
+
     def accept(visitor)
       if visitor.visit_sort(self)
         column.accept visitor
       end
       visitor.end_visit_sort self
     end
-    
+
     def to_s
       "#{column} #{order}"
     end
@@ -131,18 +135,18 @@ module Rgviz
 
   class Where
     attr_accessor :expression
-    
+
     def initialize(expression)
       @expression = expression
     end
-    
+
     def accept(visitor)
       if visitor.visit_where(self)
         expression.accept visitor
       end
       visitor.end_visit_where self
     end
-    
+
     def to_s
       @expression.to_s
     end
@@ -151,50 +155,50 @@ module Rgviz
   class Label
     attr_accessor :column
     attr_accessor :label
-    
+
     def initialize(column, label)
       @column = column
       @label = label
     end
-    
+
     def accept(visitor)
       if visitor.visit_label(self)
         column.accept visitor
       end
       visitor.end_visit_label self
     end
-    
+
     def to_s
-      "#{column} `#{label}`" 
+      "#{column} `#{label}`"
     end
   end
-  
+
   class Format
     attr_accessor :column
     attr_accessor :pattern
-    
+
     def initialize(column, pattern)
       @column = column
       @pattern = pattern
     end
-    
+
     def accept(visitor)
       if visitor.visit_format(self)
         column.accept visitor
       end
       visitor.end_visit_format self
     end
-    
+
     def to_s
-      "#{column} `#{pattern}`" 
+      "#{column} `#{pattern}`"
     end
   end
 
   class Options
-    
+
     attr_accessor :no_values
     attr_accessor :no_format
-    
+
     def to_s
       s = ''
       s += 'no_values ' if @no_values
@@ -203,30 +207,30 @@ 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
@@ -240,19 +244,19 @@ module Rgviz
     Lte = Token::LTE
     Matches = Token::Matches
     Neq = Token::NEQ
-    
+
     StartsWith = :'starts with'
 
     attr_accessor :operator
     attr_accessor :left
     attr_accessor :right
-    
+
     def initialize(left, operator, right)
       @left = left
       @operator = operator
       @right = right
     end
-    
+
     def accept(visitor)
       if visitor.visit_binary_expression(self)
         left.accept visitor
@@ -260,7 +264,7 @@ module Rgviz
       end
       visitor.end_visit_binary_expression self
     end
-    
+
     def to_s
       "#{left} #{operator} #{right}"
     end
@@ -270,22 +274,22 @@ module Rgviz
     Not = Token::Not
     IsNull = :'is null'
     IsNotNull = :'is not null'
-    
+
     attr_accessor :operand
     attr_accessor :operator
-    
+
     def initialize(operator, operand)
       @operator = operator
       @operand = operand
     end
-    
+
     def accept(visitor)
       if visitor.visit_unary_expression(self)
         operand.accept visitor
       end
       visitor.end_visit_unary_expression self
     end
-    
+
     def to_s
       if operator == Not
         "not #{operand}"
@@ -297,16 +301,26 @@ module Rgviz
 
   class IdColumn
     attr_accessor :name
-    
+
     def initialize(name)
       @name = name
     end
-    
+
     def accept(visitor)
       visitor.visit_id_column(self)
       visitor.end_visit_id_column self
     end
-    
+
+    def hash
+      @name.hash
+    end
+
+    def eql?(other)
+      other.class == IdColumn && other.name == @name
+    end
+
+    alias_method :==, :eql?
+
     def to_s
       @name
     end
@@ -314,11 +328,21 @@ module Rgviz
 
   class ValueColumn
     attr_accessor :value
-    
+
     def initialize(value)
       @value = value
     end
-    
+
+    def hash
+      @value.hash
+    end
+
+    def eql?(other)
+      other.class == self.class && other.value == @value
+    end
+
+    alias_method :==, :eql?
+
     def to_s
       value.to_s
     end
@@ -336,7 +360,7 @@ module Rgviz
       visitor.visit_string_column(self)
       visitor.end_visit_string_column self
     end
-    
+
     def to_s
       "'#{value}'"
     end
@@ -354,7 +378,7 @@ module Rgviz
       visitor.visit_date_column(self)
       visitor.end_visit_date_column self
     end
-    
+
     def to_s
       "date '#{value.to_s}'"
     end
@@ -365,7 +389,7 @@ module Rgviz
       visitor.visit_date_time_column(self)
       visitor.end_visit_date_time_column self
     end
-    
+
     def to_s
       "datetime '" + value.strftime("%Y-%m-%d %H:%M:%S") + "'"
     end
@@ -376,7 +400,7 @@ module Rgviz
       visitor.visit_time_of_day_column(self)
       visitor.end_visit_time_of_day_column self
     end
-    
+
     def to_s
       "timeofday '" + value.strftime("%H:%M:%S") + "'"
     end
@@ -406,19 +430,35 @@ module Rgviz
 
     attr_accessor :function
     attr_accessor :arguments
-    
+
     def initialize(function, *arguments)
       @function = function
       @arguments = arguments
     end
-    
+
     def accept(visitor)
       if visitor.visit_scalar_function_column(self)
         arguments.each{|x| x.accept visitor}
       end
       visitor.end_visit_scalar_function_column self
     end
-    
+
+    def hash
+      return @hash if @hash
+      @hash = 1
+      @hash = @hash * 31 + @function.hash
+      @arguments.each do |arg|
+        @hash = @hash * 31 + arg.hash
+      end
+      @hash
+    end
+
+    def eql?(other)
+      other.class == ScalarFunctionColumn && other.function == @function && other.arguments == @arguments
+    end
+
+    alias_method :==, :eql?
+
     def to_s
       case function
       when Sum, Difference, Product, Quotient
@@ -439,12 +479,12 @@ module Rgviz
 
     attr_accessor :function
     attr_accessor :argument
-    
+
     def initialize(function, argument)
       @function = function
       @argument = argument
     end
-    
+
     def accept(visitor)
       if visitor.visit_aggregate_column(self)
         argument.accept visitor
@@ -452,6 +492,20 @@ module Rgviz
       visitor.end_visit_aggregate_column self
     end
 
+    def hash
+      return @hash if @hash
+      @hash = 1
+      @hash = @hash * 31 + @function.hash
+      @hash = @hash * 31 + @argument.hash
+      @hash
+    end
+
+    def eql?(other)
+      other.class == ScalarFunctionColumn && other.function == @function && other.arguments == @arguments
+    end
+
+    alias_method :==, :eql?
+
     def to_s
       "#{function}(#{argument})"
     end

data/lib/rgviz/parser.rb

@@ -1,3 +1,6 @@
+require 'time'
+require 'date'
+
 module Rgviz
   class Parser < Lexer
     def initialize(string, options = {})
@@ -5,11 +8,11 @@ module Rgviz
       @query = Query.new
       next_token
     end
-    
+
     def self.parse(string, options = {})
       Parser.new(string, options).parse
     end
-    
+
     def parse
       parse_select
       parse_where
@@ -21,129 +24,129 @@ module Rgviz
       parse_label
       parse_format
       parse_options
-      
+
       raise ParseException.new("Expecting end of query, got: #{@token.string}") if @token.value != Token::EOF
       @query
     end
-    
+
     def parse_select
       return if not token_is! Token::Select
-      
+
       @query.select = Select.new
-      
+
       return if token_is! Token::STAR
-      
+
       parse_columns @query.select.columns
-      
+
       raise ParseException.new("Expecting select columns") if @query.select.columns.empty?
     end
-    
+
     def parse_where
       return if not token_is! Token::Where
-      
+
       @query.where = Where.new parse_expression
     end
-    
+
     def parse_group_by
       return if not token_is! Token::Group
       check! Token::By
-      
+
       @query.group_by = GroupBy.new
       @query.group_by.columns = parse_columns
-      
+
       raise ParseException.new("Expecting group by columns") if @query.group_by.columns.empty?
     end
-    
+
     def parse_pivot
       return if not token_is! Token::Pivot
-      
+
       @query.pivot = Pivot.new
       @query.pivot.columns = parse_columns
-      
+
       raise ParseException.new("Expecting pivot columns") if @query.pivot.columns.empty?
     end
-    
+
     def parse_order_by
       return if not token_is! Token::Order
       check! Token::By
-      
+
       @query.order_by = OrderBy.new
       @query.order_by.sorts = parse_sorts
-      
+
       raise ParseException.new("Expecting order by columns") if @query.order_by.sorts.empty?
     end
-    
+
     def parse_limit
       return if not token_is! Token::Limit
-      
+
       check Token::INTEGER
-      
+
       @query.limit = @token.number
       next_token
     end
-    
+
     def parse_offset
       return if not token_is! Token::Offset
-      
+
       check Token::INTEGER
-      
+
       @query.offset = @token.number
       next_token
     end
-    
+
     def parse_label
       return if not token_is! Token::Label
-      
+
       @query.labels = []
-      
+
       column = parse_column
       raise ParseException.new("Expecting label") unless column
-      
-      check Token::STRING      
-      @query.labels << Label.new(column, @token.string)      
+
+      check Token::STRING
+      @query.labels << Label.new(column, @token.string)
       next_token
-      
+
       while token_is! Token::COMMA
         column = parse_column
         break unless column
-        
-        check Token::STRING      
-        @query.labels << Label.new(column, @token.string)      
+
+        check Token::STRING
+        @query.labels << Label.new(column, @token.string)
         next_token
       end
-      
+
       raise ParseException.new("Expecting label") if @query.labels.empty?
     end
-    
+
     def parse_format
       return if not token_is! Token::Format
-      
+
       @query.formats = []
-      
+
       column = parse_column
       raise ParseException.new("Expecting format") unless column
-      
-      check Token::STRING      
-      @query.formats << Format.new(column, @token.string)      
+
+      check Token::STRING
+      @query.formats << Format.new(column, @token.string)
       next_token
-      
+
       while token_is! Token::COMMA
         column = parse_column
         break unless column
-        
-        check Token::STRING      
-        @query.formats << Format.new(column, @token.string)      
+
+        check Token::STRING
+        @query.formats << Format.new(column, @token.string)
         next_token
       end
-      
+
       raise ParseException.new("Expecting format") if @query.formats.empty?
     end
-    
+
     def parse_options
       return if not token_is! Token::Options
-      
+
       @query.options = Options.new
-      
+
       while true
         case @token.value
         when Token::NoFormat
@@ -156,30 +159,30 @@ module Rgviz
           break
         end
       end
-      
-      raise ParseException.new("Expecting option") if !@query.options.no_format && !@query.options.no_values 
+
+      raise ParseException.new("Expecting option") if !@query.options.no_format && !@query.options.no_values
       raise ParseException.new("Unknown option #{@token.string}") if @token.value != Token::EOF
     end
-    
+
     def parse_sorts
       sorts = []
-    
+
       column = parse_column
       return sorts unless column
-      
+
       order = parse_sort_order
-      
+
       sorts << Sort.new(column, order)
       while token_is! Token::COMMA
         column = parse_column
         break unless column
-        
+
         order = parse_sort_order
         sorts << Sort.new(column, order)
       end
       sorts
     end
-    
+
     def parse_sort_order
       if token_is! Token::Asc
         Sort::Asc
@@ -189,15 +192,15 @@ module Rgviz
         Sort::Asc
       end
     end
-    
+
     def parse_expression
       parse_or_expression
     end
-    
+
     def parse_or_expression
       left = parse_and_expression
       return left unless token_is? Token::Or
-      
+
       operands = [left]
       while true
         if token_is! Token::Or
@@ -207,11 +210,11 @@ module Rgviz
         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
@@ -221,7 +224,7 @@ module Rgviz
         end
       end
     end
-    
+
     def parse_not_expression
       if token_is! Token::Not
         operand = parse_primary_expression
@@ -230,7 +233,7 @@ module Rgviz
         parse_primary_expression
       end
     end
-    
+
     def parse_primary_expression
       case @token.value
       when Token::LPAREN
@@ -241,7 +244,7 @@ module Rgviz
       else
         left = parse_column
         raise ParseException.new("Expecting left exp") unless left
-        
+
         case @token.value
         when Token::Is
           next_token
@@ -270,11 +273,11 @@ module Rgviz
         end
       end
     end
-    
+
     def parse_columns(columns = [])
       column = parse_column
       return columns unless column
-      
+
       columns << column
       while token_is! Token::COMMA
         column = parse_column
@@ -283,15 +286,15 @@ module Rgviz
       end
       columns
     end
-    
+
     def parse_column
       parse_arithmetic_expression
     end
-    
+
     def parse_arithmetic_expression
       parse_summation_or_substraction
     end
-    
+
     def parse_summation_or_substraction
       left = parse_multiplication_or_divition
       while true
@@ -309,7 +312,7 @@ module Rgviz
         end
       end
     end
-    
+
     def parse_multiplication_or_divition
       left = parse_atomic_column
       while true
@@ -327,9 +330,9 @@ module Rgviz
         end
       end
     end
-    
+
     def parse_atomic_column
-      case @token.value 
+      case @token.value
       when Token::ID
         return value_column(IdColumn.new(@token.string))
       when Token::Contains, Token::Starts, Token::Ends, Token::With,
@@ -380,7 +383,7 @@ module Rgviz
         else
           return IdColumn.new(string)
         end
-      when Token::Year, Token::Month, Token::Day, 
+      when Token::Year, Token::Month, Token::Day,
            Token::Hour, Token::Minute, Token::Second, Token::Millisecond,
            Token::Now, Token::DateDiff, Token::Lower, Token::Upper,
            Token::Quarter, Token::DayOfWeek, Token::ToDate, Token::Concat
@@ -397,17 +400,17 @@ module Rgviz
       end
       nil
     end
-    
+
     def value_column(col)
       column = col
       next_token
       return column
     end
-    
+
     def token_is?(token_value)
-      @token.value == token_value 
+      @token.value == token_value
     end
-    
+
     def token_is!(token_value)
       if @token.value == token_value
         next_token
@@ -416,11 +419,11 @@ module Rgviz
         false
       end
     end
-    
+
     def check(*token_values)
       raise ParseException.new("Expecting token #{token_values}") unless token_values.any?{|value| @token.value == value}
     end
-    
+
     def check!(*token_values)
       check *token_values
       next_token

data/lib/rgviz/table.rb

@@ -2,40 +2,48 @@ module Rgviz
   class Table
     attr_accessor :cols
     attr_accessor :rows
-    
+
     def initialize
       @cols = []
       @rows = []
     end
+
+    def to_csv
+      CsvRenderer.render self
+    end
+
+    def to_html
+      HtmlRenderer.render self
+    end
   end
-  
+
   class Column
     attr_accessor :id
     attr_accessor :label
     attr_accessor :type
     attr_accessor :pattern
     attr_accessor :p
-    
+
     def initialize(attributes = {})
       attributes.each do |key, value|
         self.send "#{key}=", value
       end
     end
   end
-  
+
   class Row
     attr_accessor :c
-    
+
     def initialize
       @c = []
     end
   end
-  
+
   class Cell
     attr_accessor :v
     attr_accessor :f
     attr_accessor :p
-    
+
     def initialize(attributes = {})
       attributes.each do |key, value|
         self.send "#{key}=", value

data/lib/rgviz.rb

@@ -6,6 +6,9 @@ require File.dirname(__FILE__) + '/rgviz/visitor'
 require File.dirname(__FILE__) + '/rgviz/table'
 require File.dirname(__FILE__) + '/rgviz/csv_renderer'
 require File.dirname(__FILE__) + '/rgviz/html_renderer'
+require File.dirname(__FILE__) + '/rgviz/memory_executor'
 
-class ParseException < Exception
+module Rgviz
+  class ParseException < Exception
+  end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz
 version: !ruby/object:Gem::Version 
-  hash: 69
-  prerelease: false
+  hash: 91
+  prerelease: 
   segments: 
   - 0
-  - 39
-  version: "0.39"
+  - 40
+  version: "0.40"
 platform: ruby
 authors: 
 - Ary Borenszweig
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Google Visualization API Query Language written in Ruby.