rgviz 0.45 → 0.46

data/lib/rgviz/lexer.rb

@@ -2,10 +2,9 @@ require 'strscan'
 
 module Rgviz
   class Lexer < StringScanner
-    def initialize(str, options = {})
+    def initialize(str)
       super
       @token = Token.new
-      @extensions = options[:extensions]
     end
 
     def next_token
@@ -50,7 +49,7 @@ module Rgviz
           elsif scan /asc\b/i then Token::Asc
           elsif scan /avg\b/i then Token::Avg
           elsif scan /by\b/i then Token::By
-          elsif @extensions and scan /concat\b/i then Token::Concat
+          elsif scan /concat\b/i then Token::Concat
           elsif scan /contains\b/i then Token::Contains
           elsif scan /count\b/i then Token::Count
           elsif scan /date\b/i then Token::Date
@@ -61,6 +60,7 @@ module Rgviz
           elsif scan /desc\b/i then Token::Desc
           elsif scan /ends\b/i then Token::Ends
           elsif scan /false\b/i then Token::False
+          elsif scan /floor\b/i then Token::Floor
           elsif scan /format\b/i then Token::Format
           elsif scan /group\b/i then Token::Group
           elsif scan /hour\b/i then Token::Hour
@@ -86,6 +86,7 @@ module Rgviz
           elsif scan /order\b/i then Token::Order
           elsif scan /pivot\b/i then Token::Pivot
           elsif scan /quarter\b/i then Token::Quarter
+          elsif scan /round\b/i then Token::Round
           elsif scan /second\b/i then Token::Second
           elsif scan /select\b/i then Token::Select
           elsif scan /starts\b/i then Token::Starts

data/lib/rgviz/memory_executor.rb

@@ -12,9 +12,9 @@ module Rgviz
       @labels = {}
     end
 
-    def execute(query, options = {})
+    def execute(query)
       @query = query
-      @query = Parser.parse(@query, options) unless @query.kind_of?(Query)
+      @query = Parser.parse(@query) unless @query.kind_of?(Query)
       @table = Table.new
 
       process_labels
@@ -454,6 +454,10 @@ module Rgviz
           @value = val1.sec
         when ScalarFunctionColumn::Quarter
           @value = (val1.month / 3.0).ceil
+        when ScalarFunctionColumn::Round
+          @value = val1.round
+        when ScalarFunctionColumn::Floor
+          @value = val1.floor
         when ScalarFunctionColumn::Millisecond
           raise "Millisecond is not implemented"
         when ScalarFunctionColumn::Lower

data/lib/rgviz/nodes.rb

@@ -422,6 +422,8 @@ module Rgviz
     Product = Token::STAR
     Quarter = Token::Quarter
     Quotient = Token::SLASH
+    Round = Token::Round
+    Floor = Token::Floor
     Second = Token::Second
     Sum = Token::PLUS
     ToDate = Token::ToDate

data/lib/rgviz/parser.rb

@@ -3,14 +3,14 @@ require 'date'
 
 module Rgviz
   class Parser < Lexer
-    def initialize(string, options = {})
+    def initialize(string)
       super
       @query = Query.new
       next_token
     end
 
-    def self.parse(string, options = {})
-      Parser.new(string, options).parse
+    def self.parse(string)
+      Parser.new(string).parse
     end
 
     def parse
@@ -386,7 +386,8 @@ module Rgviz
       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
+           Token::Quarter, Token::DayOfWeek, Token::ToDate, Token::Concat,
+           Token::Round,Token::Floor
         function = @token.value
         string = @token.string
         next_token
@@ -428,12 +429,12 @@ module Rgviz
       check *token_values
       next_token
     end
-    
+
   protected
     def parse_date(date_string)
       Date.parse(date_string)
     end
-    
+
     def parse_time(time_string)
       Time.parse(time_string)
     end

data/lib/rgviz/token.rb

@@ -16,6 +16,7 @@ module Rgviz
     DayOfWeek = :dayOfWeek
     Ends = :ends
     False = :false
+    Floor = :floor
     Format = :format
     Group = :group
     Hour = :hour
@@ -41,6 +42,7 @@ module Rgviz
     Order = :order
     Pivot = :pivot
     Quarter = :quarter
+    Round = :round
     Second = :second
     Select = :select
     Starts = :starts
@@ -53,17 +55,17 @@ module Rgviz
     Where = :where
     With = :with
     Year = :year
-    
+
     ID = :ID
     INTEGER = :INTEGER
     DECIMAL = :DECIMAL
     STRING = :STRING
-    
+
     PLUS = :'+'
     MINUS = :'-'
     STAR = :'*'
     SLASH = :'/'
-    
+
     COMMA = :','
     LPAREN = :'('
     RPAREN = :')'
@@ -73,9 +75,9 @@ module Rgviz
     GT = :'>'
     GTE = :'>='
     NEQ = :'!='
-    
+
     EOF = :'<EOF>'
-    
+
     attr_accessor :start
     attr_accessor :value
     attr_accessor :string

data/spec/rgviz/lexer_spec.rb

@@ -3,20 +3,20 @@ require 'rgviz'
 include Rgviz
 
 describe Lexer do
-  def self.it_lexes_keyword(str, token_value, options = {})
+  def self.it_lexes_keyword(str, token_value)
     it "lexes #{str}" do
-      lex = Lexer.new str, options
+      lex = Lexer.new str
       tok = lex.next_token
       tok.value.should == token_value
     end
-    
+
     it "lexes #{str} upcase" do
-      lex = Lexer.new str.upcase, options
+      lex = Lexer.new str.upcase
       tok = lex.next_token
       tok.value.should == token_value
     end
   end
-  
+
   def self.it_lexes_id(str, id = str)
     it "lexes identifier #{str}" do
       lex = Lexer.new str
@@ -25,7 +25,7 @@ describe Lexer do
       tok.string.should == id
     end
   end
-  
+
   def self.it_lexes_string(str, id = str)
     it "lexes string #{str}" do
       lex = Lexer.new str
@@ -34,7 +34,7 @@ describe Lexer do
       tok.string.should == id
     end
   end
-  
+
   def self.it_lexes_token(str, token_value)
     it "lexes #{str}" do
       lex = Lexer.new str
@@ -42,7 +42,7 @@ describe Lexer do
       tok.value.should == token_value
     end
   end
-  
+
   def self.it_lexes_integer(str, number)
     it "lexes #{str}" do
       lex = Lexer.new str
@@ -51,7 +51,7 @@ describe Lexer do
       tok.number.should == number
     end
   end
-  
+
   def self.it_lexes_decimal(str, number)
     it "lexes #{str}" do
       lex = Lexer.new str
@@ -60,7 +60,7 @@ describe Lexer do
       tok.number.should == number
     end
   end
-  
+
   def self.it_lexes_eof(str)
     it "lexes eof #{str}" do
       lex = Lexer.new str
@@ -68,7 +68,7 @@ describe Lexer do
       tok.value.should == Token::EOF
     end
   end
-  
+
   def self.it_lexes_error(str)
     it "lexes error #{str}" do
       lex = Lexer.new "x#{str}"
@@ -78,7 +78,7 @@ describe Lexer do
       lambda { lex.next_token }.should raise_error(ParseException)
     end
   end
-  
+
   it_lexes_keyword 'and', Token::And
   it_lexes_keyword 'asc', Token::Asc
   it_lexes_keyword 'avg', Token::Avg
@@ -130,7 +130,7 @@ describe Lexer do
   it_lexes_keyword 'where', Token::Where
   it_lexes_keyword 'with', Token::With
   it_lexes_keyword 'year', Token::Year
-  
+
   it_lexes_id 'selected'
   it_lexes_id '  selected  ', 'selected'
   it_lexes_id '`selected`', 'selected'
@@ -139,12 +139,12 @@ describe Lexer do
   it_lexes_id 'hello_123_bye'
   it_lexes_string "'hello world'", "hello world"
   it_lexes_string '"hello world"', "hello world"
-  
+
   it_lexes_token '+', Token::PLUS
   it_lexes_token '-', Token::MINUS
   it_lexes_token '*', Token::STAR
   it_lexes_token '/', Token::SLASH
-  
+
   it_lexes_token ',', Token::COMMA
   it_lexes_token '(', Token::LPAREN
   it_lexes_token ')', Token::RPAREN
@@ -155,20 +155,21 @@ describe Lexer do
   it_lexes_token '>=', Token::GTE
   it_lexes_token '!=', Token::NEQ
   it_lexes_token '<>', Token::NEQ
-  
+
   it_lexes_integer '1', 1
   it_lexes_integer '0123', 123
   it_lexes_integer '45678791230', 45678791230
   it_lexes_decimal '123.456', 123.456
   it_lexes_decimal '.456', 0.456
-  
+
   it_lexes_eof ''
   it_lexes_eof "   \t\n\r"
-  
+
   it_lexes_error '!'
   it_lexes_error '?'
   it_lexes_error ':'
   
-  it_lexes_id 'concat'
-  it_lexes_keyword 'concat', Token::Concat, :extensions => true
+  it_lexes_keyword 'concat', Token::Concat
+  it_lexes_keyword 'round', Token::Round
+  it_lexes_keyword 'floor', Token::Floor
 end

data/spec/rgviz/parser_spec.rb

@@ -3,31 +3,31 @@ require 'rgviz'
 include Rgviz
 
 describe Parser do
-  def parse(string, options = {})
-    Parser.parse(string, options)
+  def parse(string)
+    Parser.parse(string)
   end
   
-  def parse_select_single_column(string, options = {})
-    query = parse "select #{string}", options
+  def parse_select_single_column(string)
+    query = parse "select #{string}"
     select = query.select
     select.columns.length.should == 1
-    
+
     select.columns[0]
   end
-  
+
   def parse_where(string)
     query = parse "where #{string}"
     query.where.expression
   end
-  
+
   def self.it_parses_as_identifier(str)
     it "parses #{str} as identifier" do
-      col = parse_select_single_column "#{str}" 
+      col = parse_select_single_column "#{str}"
       col.should be_a_kind_of IdColumn
       col.name.should == "#{str}"
     end
   end
-  
+
   def self.it_parses_columns_container(str, method)
     it "parses #{str}" do
       query = parse "#{str} foo"
@@ -37,7 +37,7 @@ describe Parser do
       cols.columns[0].name.should == 'foo'
     end
   end
-  
+
   def self.it_raises_on(str)
     it "raises on #{str}" do
       lambda { parse "#{str}" }.should raise_error(ParseException)
@@ -54,81 +54,81 @@ describe Parser do
     select = query.select
     select.columns.should be_empty
   end
-  
+
   it "parses select simple columns" do
     query = parse 'select one, two, three'
     select = query.select
-    
+
     select.columns.length.should == 3
-    
+
     ['one', 'two', 'three'].each_with_index do |name, i|
       select.columns[i].should be_a_kind_of IdColumn
       select.columns[i].name.should == name
     end
   end
-  
+
   it "parses select number" do
     col = parse_select_single_column '1'
     col.should be_a_kind_of NumberColumn
     col.value.should == 1
   end
-  
+
   it "parses select number with minus" do
     col = parse_select_single_column '-1'
     col.should be_a_kind_of NumberColumn
     col.value.should == -1
   end
-  
+
   it "parses select number with plus" do
     col = parse_select_single_column '+1'
     col.should be_a_kind_of NumberColumn
     col.value.should == 1
   end
-  
+
   it "parses select parenthesized number" do
     col = parse_select_single_column '(1)'
     col.should be_a_kind_of NumberColumn
     col.value.should == 1
   end
-  
+
   it "parses select string" do
     col = parse_select_single_column '"hello"'
     col.should be_a_kind_of StringColumn
     col.value.should == 'hello'
   end
-  
+
   it "parses select false" do
     col = parse_select_single_column 'false'
     col.should be_a_kind_of BooleanColumn
     col.value.should == false
   end
-  
+
   it "parses select true" do
     col = parse_select_single_column 'true'
     col.should be_a_kind_of BooleanColumn
     col.value.should == true
   end
-  
+
   it "parses select date" do
-    col = parse_select_single_column 'date "2010-01-02"' 
+    col = parse_select_single_column 'date "2010-01-02"'
     col.should be_a_kind_of DateColumn
     col.value.should == Date.parse('2010-01-02')
   end
-  
+
   it "parses select timeofday" do
-    col = parse_select_single_column 'timeofday "12:01:02"' 
+    col = parse_select_single_column 'timeofday "12:01:02"'
     col.should be_a_kind_of TimeOfDayColumn
     col.value.hour.should == 12
     col.value.min.should == 1
     col.value.sec.should == 2
   end
-  
+
   it "parses select datetime" do
-    col = parse_select_single_column 'datetime "2010-01-02 12:02:03"' 
+    col = parse_select_single_column 'datetime "2010-01-02 12:02:03"'
     col.should be_a_kind_of DateTimeColumn
     col.value.should == Time.parse('2010-01-02 12:02:03')
   end
-  
+
   [
     ['*', ScalarFunctionColumn::Product],
     ['/', ScalarFunctionColumn::Quotient],
@@ -139,25 +139,25 @@ describe Parser do
       col = parse_select_single_column "1 #{str} one"
       col.should be_a_kind_of ScalarFunctionColumn
       col.function.should == func
-      
-      args = col.arguments 
+
+      args = col.arguments
       args.length.should == 2
-      
+
       args[0].should be_a_kind_of NumberColumn
       args[0].value.should == 1
-      
+
       args[1].should be_a_kind_of IdColumn
       args[1].name.should == "one"
     end
   end
-  
+
   it "parses compound arithmetic" do
     col = parse_select_single_column "1 * 2 + 3 * 4"
     col.should be_kind_of ScalarFunctionColumn
     col.function.should == ScalarFunctionColumn::Sum
-    
+
     col.arguments.length.should == 2
-    
+
     [0, 1].each do |i|
       sub = col.arguments[i]
       sub.should be_kind_of ScalarFunctionColumn
@@ -165,7 +165,7 @@ describe Parser do
       sub.arguments.length.should == 2
     end
   end
-  
+
   [
     ['min', AggregateColumn::Min],
     ['max', AggregateColumn::Max],
@@ -174,17 +174,17 @@ describe Parser do
     ['sum', AggregateColumn::Sum]
   ].each do |str, function|
     it "parses #{str} aggregation" do
-      col = parse_select_single_column "#{str}(col)" 
+      col = parse_select_single_column "#{str}(col)"
       col.should be_a_kind_of AggregateColumn
       col.function.should == function
-      
+
       col.argument.should be_a_kind_of IdColumn
       col.argument.name.should == 'col'
     end
-    
+
     it_parses_as_identifier str
   end
-  
+
   [
     ['year', ScalarFunctionColumn::Year],
     ['month', ScalarFunctionColumn::Month],
@@ -200,31 +200,33 @@ describe Parser do
     ['quarter', ScalarFunctionColumn::Quarter],
     ['dayofweek', ScalarFunctionColumn::DayOfWeek],
     ['todate', ScalarFunctionColumn::ToDate],
-    ['concat', ScalarFunctionColumn::Concat, true],
-  ].each do |str, function, extensions|
+    ['concat', ScalarFunctionColumn::Concat],
+    ['round', ScalarFunctionColumn::Round],
+    ['floor', ScalarFunctionColumn::Floor]
+  ].each do |str, function|
     it "parses #{str} function" do
-      col = parse_select_single_column "#{str}(col)", :extensions => extensions
+      col = parse_select_single_column "#{str}(col)"
       col.should be_a_kind_of ScalarFunctionColumn
       col.function.should == function
-      
+
       col.arguments.length.should == 1
       col.arguments[0].should be_a_kind_of IdColumn
       col.arguments[0].name.should == 'col'
     end
-    
+
     it_parses_as_identifier str
   end
-  
+
   it "parses datediff function with many arguments" do
-    col = parse_select_single_column "datediff(1, 2)" 
+    col = parse_select_single_column "datediff(1, 2)"
     col.should be_a_kind_of ScalarFunctionColumn
     col.function.should == ScalarFunctionColumn::DateDiff
-    
+
     col.arguments.length.should == 2
     col.arguments[0].value == 1
     col.arguments[1].value == 2
   end
-  
+
   [
     ['=', BinaryExpression::Eq],
     ['!=', BinaryExpression::Neq],
@@ -249,7 +251,7 @@ describe Parser do
       exp.right.value.should == 1
     end
   end
-  
+
   it_parses_as_identifier 'contains'
   it_parses_as_identifier 'starts'
   it_parses_as_identifier 'ends'
@@ -260,10 +262,10 @@ describe Parser do
   it_parses_as_identifier 'no_format'
   it_parses_as_identifier 'is'
   it_parses_as_identifier 'null'
-  
+
   it_parses_columns_container 'group by', :group_by
   it_parses_columns_container 'pivot', :pivot
-  
+
   [
     ['', Sort::Asc],
     [' asc', Sort::Asc],
@@ -272,86 +274,86 @@ describe Parser do
     it "parses order by" do
       query = parse "order by foo #{order}, bar #{order}"
       order_by = query.order_by
-      
-      sorts = order_by.sorts 
-      
+
+      sorts = order_by.sorts
+
       sorts.length.should == 2
-      
+
       sorts[0].column.should be_a_kind_of IdColumn
       sorts[0].column.name.should == 'foo'
       sorts[0].order.should == order
-      
+
       sorts[1].column.should be_a_kind_of IdColumn
       sorts[1].column.name.should == 'bar'
       sorts[1].order.should == order
     end
   end
-  
+
   it "parses limit" do
     query = parse "limit 10"
     query.limit.should == 10
   end
-  
+
   it "parses offset" do
     query = parse "offset 10"
     query.offset.should == 10
   end
-  
+
   it "parses label" do
     query = parse "label one 'unu', two 'du'"
     labels = query.labels
     labels.length.should == 2
-    
+
     labels[0].column.should be_a_kind_of IdColumn
     labels[0].column.name.should == 'one'
     labels[0].label.should == 'unu'
-    
+
     labels[1].column.should be_a_kind_of IdColumn
     labels[1].column.name.should == 'two'
     labels[1].label.should == 'du'
   end
-  
+
   it "parses format" do
     query = parse "format one 'unu', two 'du'"
     formats = query.formats
     formats.length.should == 2
-    
+
     formats[0].column.should be_a_kind_of IdColumn
     formats[0].column.name.should == 'one'
     formats[0].pattern.should == 'unu'
-    
+
     formats[1].column.should be_a_kind_of IdColumn
     formats[1].column.name.should == 'two'
     formats[1].pattern.should == 'du'
   end
-  
+
   it "parses options" do
     query = parse "options no_values no_format"
     options = query.options
     options.no_values.should be_true
     options.no_format.should be_true
   end
-  
+
   [
     ['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 = query.where.expression
+
       exp.should be_a_kind_of LogicalExpression
       exp.operator.should == op
       exp.operands.length.should == 3
     end
   end
-  
+
   ['+', '-', '*', '/'].each do |op|
     it "parses where with two #{op}" do
       parse "where 1 #{op} 2 #{op} 3 = 4"
     end
   end
-  
+
   it_raises_on 'select'
   it_raises_on 'where'
   it_raises_on 'where 1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgviz
 version: !ruby/object:Gem::Version
-  version: '0.45'
+  version: '0.46'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-06-08 00:00:00.000000000Z
+date: 2010-06-08 00:00:00.000000000 Z
 dependencies: []
 description: Google Visualization API Query Language written in Ruby.
 email: aborenszweig@manas.com.ar