rgviz 0.36 → 0.37

data/lib/rgviz/lexer.rb

@@ -1,9 +1,10 @@
 module Rgviz
   class Lexer
-    def initialize(str)
+    def initialize(str, options = {})
       @str = (str || '').scan(/./)
       @len = @str.length
       @token = Token.new
+      @extensions = options[:extensions]
       @p = 0
     end
     
@@ -120,9 +121,11 @@ module Rgviz
             when 'n', 'N'
               case c!
               when 'c', 'C'
-                case c! when 'a', 'A'
-                  case c! when 't', 'T'
-                    return keyword(Token::Concat) if end_of_identifier!
+                if @extensions
+                  case c! when 'a', 'A'
+                    case c! when 't', 'T'
+                      return keyword(Token::Concat) if end_of_identifier!
+                    end
                   end
                 end
               when 't', 'T'

data/lib/rgviz/parser.rb

@@ -1,13 +1,13 @@
 module Rgviz
   class Parser < Lexer
-    def initialize(string)
+    def initialize(string, options = {})
       super
       @query = Query.new
       next_token
     end
     
-    def self.parse(string)
-      Parser.new(string).parse
+    def self.parse(string, options = {})
+      Parser.new(string, options).parse
     end
     
     def parse
@@ -22,7 +22,7 @@ module Rgviz
       parse_format
       parse_options
       
-      raise ParseException.new("Expecting end of query") if @token.value != Token::EOF
+      raise ParseException.new("Expecting end of query, got: #{@token.string}") if @token.value != Token::EOF
       @query
     end
     

data/spec/rgviz/lexer_spec.rb

@@ -3,15 +3,15 @@ require 'rgviz'
 include Rgviz
 
 describe Lexer do
-  def self.it_lexes_keyword(str, token_value)
+  def self.it_lexes_keyword(str, token_value, options = {})
     it "lexes #{str}" do
-      lex = Lexer.new str
+      lex = Lexer.new str, options
       tok = lex.next_token
       tok.value.should == token_value
     end
     
     it "lexes #{str} upcase" do
-      lex = Lexer.new str.upcase
+      lex = Lexer.new str.upcase, options
       tok = lex.next_token
       tok.value.should == token_value
     end
@@ -83,7 +83,6 @@ describe Lexer do
   it_lexes_keyword 'asc', Token::Asc
   it_lexes_keyword 'avg', Token::Avg
   it_lexes_keyword 'by', Token::By
-  it_lexes_keyword 'concat', Token::Concat
   it_lexes_keyword 'contains', Token::Contains
   it_lexes_keyword 'count', Token::Count
   it_lexes_keyword 'date', Token::Date
@@ -169,4 +168,7 @@ describe Lexer do
   it_lexes_error '!'
   it_lexes_error '?'
   it_lexes_error ':'
+  
+  it_lexes_id 'concat'
+  it_lexes_keyword 'concat', Token::Concat, :extensions => true
 end

data/spec/rgviz/parser_spec.rb

@@ -3,12 +3,12 @@ require 'rgviz'
 include Rgviz
 
 describe Parser do
-  def parse(string)
-    Parser.new(string).parse
+  def parse(string, options = {})
+    Parser.parse(string, options)
   end
   
-  def parse_select_single_column(string)
-    query = parse "select #{string}"
+  def parse_select_single_column(string, options = {})
+    query = parse "select #{string}", options
     select = query.select
     select.columns.length.should == 1
     
@@ -200,10 +200,10 @@ describe Parser do
     ['quarter', ScalarFunctionColumn::Quarter],
     ['dayofweek', ScalarFunctionColumn::DayOfWeek],
     ['todate', ScalarFunctionColumn::ToDate],
-    ['concat', ScalarFunctionColumn::Concat],
-  ].each do |str, function|
+    ['concat', ScalarFunctionColumn::Concat, true],
+  ].each do |str, function, extensions|
     it "parses #{str} function" do
-      col = parse_select_single_column "#{str}(col)" 
+      col = parse_select_single_column "#{str}(col)", :extensions => extensions
       col.should be_a_kind_of ScalarFunctionColumn
       col.function.should == function
       

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 65
   prerelease: false
   segments: 
   - 0
-  - 36
-  version: "0.36"
+  - 37
+  version: "0.37"
 platform: ruby
 authors: 
 - Ary Borenszweig