sparkql 1.2.4 → 1.2.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmIyYTljOGIyZmFjZTEyZmY1MzU2ODZjYTg4ZWU1NDI2NWNkOWRkYw==
-  data.tar.gz: !binary |-
-    NDkwMjczNDY2N2JlOGRmMzA5MDQ1YmI4Njg3ZTM5MTJlMzBiODVhMQ==
+SHA256:
+  metadata.gz: 1d6df2039c1c9c690fe60002b8374ec300e1ffab8496b02e668da3f77999d2e8
+  data.tar.gz: a529df747695e8c43a45bec3f166cc8e1b2cfa34a671173a998b4620fe522a67
 SHA512:
-  metadata.gz: !binary |-
-    OTk2NTgwODMyNjExMjBiZThmODdjNzczZmM4M2MzMmY0MWNiNTkxODU5NThk
-    Y2UwYzY0ZTQ1NGRhNmFjYjI1ODIwYzBiMmMyMDM2NzFmNmNhNTI1OGNkYjNj
-    NzJhZTRjMDk4MzVmYjJlNDM4YTE2ZWFjYTVjNzlmMGZlNzM4NjQ=
-  data.tar.gz: !binary |-
-    NjhmNWU0NmZjNDVkMmUzMDJhMGM2ZTY0ZWVjMTk3ZGUwZGI3MzM2OTQwN2M4
-    MTUzYTk3N2E1NzI2YWFmMTA1YWIxZWY2MTliZTRiOGNjOTU5NjEwMGFlODkz
-    YjRmYmVmN2M4NTJkMGUyM2NlNjhmODA0ZGFkYWYzM2Q0OTNlMDU=
+  metadata.gz: e4a0fa65b7cb2b41198f239a6c68613939e3f6f0ce4ce20a9ae00b1ea4f7ae377cdd41b3b67f4a2da158344e33fa2d12d0a9cec7cc7c64a85a14e9f35bdffbdc
+  data.tar.gz: 746cfed6761f6bdc8ec7dfe91ad45b20d44fd6a67a7fe13e184406a8fab533c1a4122435242447da803160c4c4e3f05a8a8e61ba3a83ca568f2dd4d2b305ed1a

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+v1.2.8, 2021-08-11
+-------------------
+  * [IMPROVEMENT] all() function
+
+v1.2.7, 2021-05-06
+-------------------
+  * [IMPROVEMENT] dayofweek(), dayofyear(), and weekdays() functions
+
+v1.2.6, 2019-04-01
+-------------------
+  * [IMPROVEMENT] hours(), minutes(), and seconds() functions
+
+v1.2.5, 2018-12-19
+-------------------
+  * [BUGFIX] Correctly handle arithmetic grouping
+
 v1.2.4, 2018-12-13
 -------------------
   * [IMPROVEMENT] Support decimal arithmetic

data/Gemfile

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-# Specify your gem's dependencies in sparkapi_parser.gemspec
 gemspec

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.8

data/lib/sparkql/function_resolver.rb

@@ -1,763 +1,859 @@
-require 'time' 
+# frozen_string_literal: true
+
+require 'time'
 require 'geo_ruby'
 require 'geo_ruby/ewk'
 require 'sparkql/geo'
 
-# Binding class to all supported function calls in the parser. Current support requires that the 
-# resolution of function calls to happen on the fly at parsing time at which point a value and 
-# value type is required, just as literals would be returned to the expression tokenization level.
-#
-# Name and argument requirements for the function should match the function declaration in 
-# SUPPORTED_FUNCTIONS which will run validation on the function syntax prior to execution.
-class Sparkql::FunctionResolver
-  SECONDS_IN_DAY = 60 * 60 * 24
-  STRFTIME_DATE_FORMAT = '%Y-%m-%d'
-  STRFTIME_TIME_FORMAT = '%H:%M:%S.%N'
-  VALID_REGEX_FLAGS = ["", "i"]
-  MIN_DATE_TIME = Time.new(1970, 1, 1, 0, 0, 0, "+00:00").iso8601
-  MAX_DATE_TIME = Time.new(9999, 12, 31, 23, 59, 59, "+00:00").iso8601
-  VALID_CAST_TYPES = [:field, :character, :decimal, :integer]
-
-  SUPPORTED_FUNCTIONS = {
-    :polygon => {
-      :args => [:character],
-      :return_type => :shape
-    }, 
-    :rectangle => {
-      :args => [:character],
-      :return_type => :shape
-    }, 
-    :radius => {
-      :args => [:character, [:decimal, :integer]],
-      :return_type => :shape
-    },
-    :regex => {
-      :args => [:character],
-      :opt_args => [{
-        :type => :character,
-        :default => ''
-      }],
-      :return_type => :character
-    },
-    :substring => {
-      :args => [[:field, :character], :integer],
-      :opt_args => [{
-        :type => :integer
-      }],
-      :resolve_for_type => true,
-      :return_type => :character
-    },
-    :trim => {
-      :args => [[:field, :character]],
-      :resolve_for_type => true,
-      :return_type => :character
-    },
-    :tolower => {
-      :args => [[:field, :character]],
-      :resolve_for_type => true,
-      :return_type => :character
-    },
-    :toupper => {
-      :args => [[:field, :character]],
-      :resolve_for_type => true,
-      :return_type => :character
-    },
-    :length => {
-      :args => [[:field, :character]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :indexof => {
-      :args => [[:field, :character], :character],
-      :return_type => :integer
-    },
-    :concat => {
-      :args => [[:field, :character], :character],
-      :resolve_for_type => true,
-      :return_type => :character
-    },
-    :cast => {
-      :args => [[:field, :character, :decimal, :integer, :null], :character],
-      :resolve_for_type => true,
-    },
-    :round => {
-      :args => [[:field, :decimal]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :ceiling => {
-      :args => [[:field, :decimal]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :floor => {
-      :args => [[:field, :decimal]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :startswith => {
-      :args => [:character],
-      :return_type => :startswith
-    },
-    :endswith => {
-      :args => [:character],
-      :return_type => :endswith
-    },
-    :contains => {
-      :args => [:character],
-      :return_type => :contains
-    },
-    :linestring => {
-      :args => [:character],
-      :return_type => :shape
-    },
-    :days => {
-      :args => [:integer],
-      :return_type => :datetime
-    },
-    :months => {
-      :args => [:integer],
-      :return_type => :datetime
-    },
-    :years => {
-      :args => [:integer],
-      :return_type => :datetime
-    },
-    :now => {
-      :args => [],
-      :return_type => :datetime
-    },
-    :maxdatetime => {
-      :args => [],
-      :return_type => :datetime
-    },
-    :mindatetime => {
-      :args => [],
-      :return_type => :datetime
-    },
-    :date => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :date
-    },
-    :time => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :time
-    },
-    :year => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :month => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :day => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :hour => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :minute => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :second => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :integer
-    },
-    :fractionalseconds => { 
-      :args => [[:field,:datetime,:date]],
-      :resolve_for_type => true,
-      :return_type => :decimal
-    },
-    :range => {
-      :args => [:character, :character],
-      :return_type => :character
-    },
-    :wkt => {
-      :args => [:character],
-      :return_type => :shape
-    }
-  }
-  
-  # Construct a resolver instance for a function
-  # name: function name (String)
-  # args: array of literal hashes of the format {:type=><literal_type>, :value=><escaped_literal_value>}.
-  #       Empty arry for functions that have no arguments.
-  def initialize(name, args)
-    @name = name
-    @args = args
-    @errors = []
-  end
-  
-  # Validate the function instance prior to calling it. All validation failures will show up in the
-  # errors array.
-  def validate()
-    name = @name.to_sym
-    unless support.has_key?(name)
-      @errors << Sparkql::ParserError.new(:token => @name, 
-        :message => "Unsupported function call '#{@name}' for expression",
-        :status => :fatal )
-      return
-    end
-
-    required_args = support[name][:args]
-    total_args = required_args + Array(support[name][:opt_args]).collect {|args| args[:type]}
-
-    if @args.size < required_args.size || @args.size > total_args.size
-      @errors << Sparkql::ParserError.new(:token => @name, 
-        :message => "Function call '#{@name}' requires #{required_args.size} arguments",
-        :status => :fatal )
-      return
-    end
-
-    count = 0
-    @args.each do |arg|
-      type = arg[:type] == :function ? arg[:return_type] : arg[:type]
-      unless Array(total_args[count]).include?(type)
-        @errors << Sparkql::ParserError.new(:token => @name, 
-          :message => "Function call '#{@name}' has an invalid argument at #{arg[:value]}",
-          :status => :fatal )
-      end
-      count +=1
+module Sparkql
+  # Binding class to all supported function calls in the parser. Current support requires that the
+  # resolution of function calls to happen on the fly at parsing time at which point a value and
+  # value type is required, just as literals would be returned to the expression tokenization level.
+  #
+  # Name and argument requirements for the function should match the function declaration in
+  # SUPPORTED_FUNCTIONS which will run validation on the function syntax prior to execution.
+  class FunctionResolver
+    SECONDS_IN_MINUTE = 60
+    SECONDS_IN_HOUR = SECONDS_IN_MINUTE * 60
+    SECONDS_IN_DAY = SECONDS_IN_HOUR * 24
+    STRFTIME_DATE_FORMAT = '%Y-%m-%d'
+    STRFTIME_TIME_FORMAT = '%H:%M:%S.%N'
+    VALID_REGEX_FLAGS = ['', 'i'].freeze
+    MIN_DATE_TIME = Time.new(1970, 1, 1, 0, 0, 0, '+00:00').iso8601
+    MAX_DATE_TIME = Time.new(9999, 12, 31, 23, 59, 59, '+00:00').iso8601
+    VALID_CAST_TYPES = %i[field character decimal integer].freeze
+
+    SUPPORTED_FUNCTIONS = {
+      all: {
+        args: [:field],
+        return_type: :all
+      },
+      polygon: {
+        args: [:character],
+        return_type: :shape
+      },
+      rectangle: {
+        args: [:character],
+        return_type: :shape
+      },
+      radius: {
+        args: [:character, %i[decimal integer]],
+        return_type: :shape
+      },
+      regex: {
+        args: [:character],
+        opt_args: [{
+          type: :character,
+          default: ''
+        }],
+        return_type: :character
+      },
+      substring: {
+        args: [%i[field character], :integer],
+        opt_args: [{
+          type: :integer
+        }],
+        resolve_for_type: true,
+        return_type: :character
+      },
+      trim: {
+        args: [%i[field character]],
+        resolve_for_type: true,
+        return_type: :character
+      },
+      tolower: {
+        args: [%i[field character]],
+        resolve_for_type: true,
+        return_type: :character
+      },
+      toupper: {
+        args: [%i[field character]],
+        resolve_for_type: true,
+        return_type: :character
+      },
+      length: {
+        args: [%i[field character]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      indexof: {
+        args: [%i[field character], :character],
+        return_type: :integer
+      },
+      concat: {
+        args: [%i[field character], :character],
+        resolve_for_type: true,
+        return_type: :character
+      },
+      cast: {
+        args: [%i[field character decimal integer null], :character],
+        resolve_for_type: true
+      },
+      round: {
+        args: [%i[field decimal]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      ceiling: {
+        args: [%i[field decimal]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      floor: {
+        args: [%i[field decimal]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      startswith: {
+        args: [:character],
+        return_type: :startswith
+      },
+      endswith: {
+        args: [:character],
+        return_type: :endswith
+      },
+      contains: {
+        args: [:character],
+        return_type: :contains
+      },
+      linestring: {
+        args: [:character],
+        return_type: :shape
+      },
+      seconds: {
+        args: [:integer],
+        return_type: :datetime
+      },
+      minutes: {
+        args: [:integer],
+        return_type: :datetime
+      },
+      hours: {
+        args: [:integer],
+        return_type: :datetime
+      },
+      days: {
+        args: [:integer],
+        return_type: :datetime
+      },
+      weekdays: {
+        args: [:integer],
+        return_type: :datetime
+      },
+      months: {
+        args: [:integer],
+        return_type: :datetime
+      },
+      years: {
+        args: [:integer],
+        return_type: :datetime
+      },
+      now: {
+        args: [],
+        return_type: :datetime
+      },
+      maxdatetime: {
+        args: [],
+        return_type: :datetime
+      },
+      mindatetime: {
+        args: [],
+        return_type: :datetime
+      },
+      date: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :date
+      },
+      time: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :time
+      },
+      year: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      dayofyear: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      month: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      day: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      dayofweek: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      hour: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      minute: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      second: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :integer
+      },
+      fractionalseconds: {
+        args: [%i[field datetime date]],
+        resolve_for_type: true,
+        return_type: :decimal
+      },
+      range: {
+        args: %i[character character],
+        return_type: :character
+      },
+      wkt: {
+        args: [:character],
+        return_type: :shape
+      }
+    }.freeze
+
+    # Construct a resolver instance for a function
+    # name: function name (String)
+    # args: array of literal hashes of the format {:type=><literal_type>, :value=><escaped_literal_value>}.
+    #       Empty arry for functions that have no arguments.
+    def initialize(name, args)
+      @name = name
+      @args = args
+      @errors = []
     end
 
-    if name == :cast
-      type = @args.last[:value]
-      if !VALID_CAST_TYPES.include?(type.to_sym)
-        @errors << Sparkql::ParserError.new(:token => @name,
-                                            :message => "Function call '#{@name}' requires a castable type.",
-                                            :status => :fatal )
+    # Validate the function instance prior to calling it. All validation failures will show up in the
+    # errors array.
+    def validate
+      name = @name.to_sym
+      unless support.key?(name)
+        @errors << Sparkql::ParserError.new(token: @name,
+                                            message: "Unsupported function call '#{@name}' for expression",
+                                            status: :fatal)
+        return
+      end
+
+      required_args = support[name][:args]
+      total_args = required_args + Array(support[name][:opt_args]).collect { |args| args[:type] }
+
+      if @args.size < required_args.size || @args.size > total_args.size
+        @errors << Sparkql::ParserError.new(token: @name,
+                                            message: "Function call '#{@name}' requires #{required_args.size} arguments",
+                                            status: :fatal)
         return
       end
+
+      count = 0
+      @args.each do |arg|
+        type = arg[:type] == :function ? arg[:return_type] : arg[:type]
+        unless Array(total_args[count]).include?(type)
+          @errors << Sparkql::ParserError.new(token: @name,
+                                              message: "Function call '#{@name}' has an invalid argument at #{arg[:value]}",
+                                              status: :fatal)
+        end
+        count += 1
+      end
+
+      if name == :cast
+        type = @args.last[:value]
+        unless VALID_CAST_TYPES.include?(type.to_sym)
+          @errors << Sparkql::ParserError.new(token: @name,
+                                              message: "Function call '#{@name}' requires a castable type.",
+                                              status: :fatal)
+          return
+        end
+      end
+
+      substring_index_error?(@args[2][:value]) if name == :substring && !@args[2].nil?
     end
 
-    if name == :substring && !@args[2].nil?
-      substring_index_error?(@args[2][:value])
+    def return_type
+      name = @name.to_sym
+
+      if name == :cast
+        @args.last[:value].to_sym
+      else
+        support[@name.to_sym][:return_type]
+      end
     end
-  end
-  
-  def return_type
-    name = @name.to_sym
 
-    if name == :cast
-      @args.last[:value].to_sym
-    else
-      support[@name.to_sym][:return_type]
+    attr_reader :errors
+
+    def errors?
+      @errors.size.positive?
     end
-  end
-  
-  def errors
-    @errors
-  end
-  
-  def errors?
-    @errors.size > 0
-  end
-  
-  def support
-    SUPPORTED_FUNCTIONS
-  end
-  
-  # Execute the function
-  def call()
-    real_vals = @args.map { |i| i[:value]}
-    name = @name.to_sym
 
-    field = @args.find do |i|
-      i[:type] == :field || i.key?(:field)
+    def support
+      SUPPORTED_FUNCTIONS
     end
 
-    field = field[:type] == :function ? field[:field] : field[:value] unless field.nil?
+    # Execute the function
+    def call
+      real_vals = @args.map { |i| i[:value] }
+      name = @name.to_sym
+
+      field = @args.find do |i|
+        i[:type] == :field || i.key?(:field)
+      end
+
+      field = field[:type] == :function ? field[:field] : field[:value] unless field.nil?
+
+      required_args = support[name][:args]
+      total_args = required_args + Array(support[name][:opt_args]).collect { |args| args[:default] }
+
+      fill_in_optional_args = total_args.drop(real_vals.length)
 
-    required_args = support[name][:args]
-    total_args = required_args + Array(support[name][:opt_args]).collect {|args| args[:default]}
+      fill_in_optional_args.each do |default|
+        real_vals << default
+      end
+
+      v = if field.nil?
+            method = name
+            if support[name][:resolve_for_type]
+              method_type = @args.first[:type]
+              method = "#{method}_#{method_type}"
+            end
+            send(method, *real_vals)
+          else
+            {
+              type: :function,
+              return_type: return_type,
+              value: name.to_s
+            }
+          end
+
+      return if v.nil?
+
+      unless v.key?(:function_name)
+        v.merge!(function_parameters: real_vals,
+                 function_name: @name)
+      end
 
-    fill_in_optional_args = total_args.drop(real_vals.length)
+      v.merge!(args: @args,
+               field: field)
 
-    fill_in_optional_args.each do |default|
-      real_vals << default
+      v
     end
 
+    protected
+
+    # Supported function calls
+
+    def regex(regular_expression, flags)
+      unless (flags.chars.to_a - VALID_REGEX_FLAGS).empty?
+        @errors << Sparkql::ParserError.new(token: regular_expression,
+                                            message: 'Invalid Regexp',
+                                            status: :fatal)
+        return
+      end
 
-    v = if field.nil?
-      method = name
-      if support[name][:resolve_for_type]
-        method_type =  @args.first[:type]
-        method = "#{method}_#{method_type}"
+      begin
+        Regexp.new(regular_expression)
+      rescue StandardError
+        @errors << Sparkql::ParserError.new(token: regular_expression,
+                                            message: 'Invalid Regexp',
+                                            status: :fatal)
+        return
       end
-      self.send(method, *real_vals)
-    else
+
+      {
+        type: :character,
+        value: regular_expression
+      }
+    end
+
+    def trim_character(arg)
       {
-        :type => :function,
-        :return_type => return_type,
-        :value => "#{name}",
+        type: :character,
+        value: arg.strip
       }
     end
 
-    return if v.nil?
+    def substring_character(character, first_index, number_chars)
+      second_index = if number_chars.nil?
+                       -1
+                     else
+                       number_chars + first_index - 1
+                     end
 
-    if !v.key?(:function_name)
-      v.merge!( function_parameters: real_vals,
-              function_name: @name)
+      new_string = character[first_index..second_index].to_s
+
+      {
+        type: :character,
+        value: new_string
+      }
     end
 
-    v.merge!(args: @args,
-            field: field)
+    def substring_index_error?(second_index)
+      if second_index.to_i.negative?
+        @errors << Sparkql::ParserError.new(token: second_index,
+                                            message: "Function call 'substring' may not have a negative integer for its second parameter",
+                                            status: :fatal)
+        true
+      end
+      false
+    end
 
-    v
-  end
-  
-  protected 
-  
-  # Supported function calls
+    def tolower(_args)
+      {
+        type: :character,
+        value: 'tolower'
+      }
+    end
 
-  def regex(regular_expression, flags)
+    def tolower_character(string)
+      {
+        type: :character,
+        value: "'#{string.to_s.downcase}'"
+      }
+    end
 
-    unless (flags.chars.to_a - VALID_REGEX_FLAGS).empty?
-      @errors << Sparkql::ParserError.new(:token => regular_expression,
-        :message => "Invalid Regexp",
-        :status => :fatal)
-      return
+    def toupper_character(string)
+      {
+        type: :character,
+        value: "'#{string.to_s.upcase}'"
+      }
     end
 
-    begin
-      Regexp.new(regular_expression)
-    rescue
-      @errors << Sparkql::ParserError.new(:token => regular_expression,
-        :message => "Invalid Regexp",
-        :status => :fatal)
-      return
+    def length_character(string)
+      {
+        type: :integer,
+        value: string.size.to_s
+      }
     end
 
-    {
-      :type => :character,
-      :value => regular_expression
-    }
-  end
+    def startswith(string)
+      # Wrap this string in quotes, as we effectively translate
+      #   City Eq startswith('far')
+      # ...to...
+      #    City Eq '^far'
+      #
+      # The string passed in will merely be "far", rather than
+      # the string literal "'far'".
+      string = Regexp.escape(string)
+      new_value = "^#{string}"
 
-  def trim_character(arg)
-    {
-      :type => :character,
-      :value => arg.strip
-    }
-  end
+      {
+        function_name: 'regex',
+        function_parameters: [new_value, ''],
+        type: :character,
+        value: new_value
+      }
+    end
 
-  def substring_character(character, first_index, number_chars)
-    second_index = if number_chars.nil?
-      -1
-    else
-      number_chars + first_index - 1
+    def endswith(string)
+      # Wrap this string in quotes, as we effectively translate
+      #   City Eq endswith('far')
+      # ...to...
+      #    City Eq regex('far$')
+      #
+      # The string passed in will merely be "far", rather than
+      # the string literal "'far'".
+      string = Regexp.escape(string)
+      new_value = "#{string}$"
+
+      {
+        function_name: 'regex',
+        function_parameters: [new_value, ''],
+        type: :character,
+        value: new_value
+      }
     end
 
-    new_string = character[first_index..second_index].to_s
+    def contains(string)
+      # Wrap this string in quotes, as we effectively translate
+      #   City Eq contains('far')
+      # ...to...
+      #    City Eq regex('far')
+      #
+      # The string passed in will merely be "far", rather than
+      # the string literal "'far'".
+      string = Regexp.escape(string)
+      new_value = string.to_s
 
-    {
-      :type => :character,
-      :value => new_string
-    }
-  end
+      {
+        function_name: 'regex',
+        function_parameters: [new_value, ''],
+        type: :character,
+        value: new_value
+      }
+    end
 
-  def substring_index_error?(second_index)
-    if second_index.to_i < 0
-      @errors << Sparkql::ParserError.new(:token => second_index,
-        :message => "Function call 'substring' may not have a negative integer for its second parameter",
-        :status => :fatal)
-      true
+    # Offset the current timestamp by a number of seconds
+    def seconds(num)
+      t = current_time + num
+      {
+        type: :datetime,
+        value: t.iso8601
+      }
     end
-    false
-  end
 
-  def tolower(args)
-    {
-      :type => :character,
-      :value => "tolower"
-    }
-  end
+    # Offset the current timestamp by a number of minutes
+    def minutes(num)
+      t = current_time + num * SECONDS_IN_MINUTE
+      {
+        type: :datetime,
+        value: t.iso8601
+      }
+    end
 
-  def tolower_character(string)
-    {
-      :type => :character,
-      :value => "'#{string.to_s.downcase}'"
-    }
-  end
+    # Offset the current timestamp by a number of hours
+    def hours(num)
+      t = current_time + num * SECONDS_IN_HOUR
+      {
+        type: :datetime,
+        value: t.iso8601
+      }
+    end
 
+    # Offset the current timestamp by a number of days
+    def days(number_of_days)
+      # date calculated as the offset from midnight tommorrow. Zero will provide values for all times
+      # today.
+      d = current_date + number_of_days
+      {
+        type: :date,
+        value: d.strftime(STRFTIME_DATE_FORMAT)
+      }
+    end
 
-  def toupper_character(string)
-    {
-      :type => :character,
-      :value => "'#{string.to_s.upcase}'"
-    }
-  end
+    def weekdays(number_of_days)
+      today = current_date
+      weekend_start = today.saturday? || today.sunday?
+      direction = number_of_days.positive? ? 1 : -1
+      weeks = (number_of_days / 5.0).to_i
+      remaining = number_of_days.abs % 5
+
+      # Jump ahead the number of weeks represented in the input
+      today += weeks * 7
+
+      # Now iterate on the remaining weekdays
+      remaining.times do |i|
+        today += direction
+        while today.saturday? || today.sunday?
+          today += direction
+        end
+      end
 
-  def length_character(string)
-    {
-      :type => :integer,
-      :value => "#{string.size}"
-    }
-  end
+      # If we end on the weekend, bump accordingly
+      while today.saturday? || today.sunday?
+        # If we start and end on the weekend, wind things back to the next
+        # appropriate weekday.
+        if weekend_start && remaining == 0
+          today -= direction
+        else
+          today += direction
+        end
+      end
 
-  def startswith(string)
-    # Wrap this string in quotes, as we effectively translate
-    #   City Eq startswith('far')
-    # ...to...
-    #    City Eq '^far'
-    #
-    # The string passed in will merely be "far", rather than
-    # the string literal "'far'".
-    string = Regexp.escape(string)
-    new_value = "^#{string}"
-
-    {
-      :function_name => "regex",
-      :function_parameters => [new_value, ''],
-      :type => :character,
-      :value => new_value
-    }
-  end
+      {
+        type: :date,
+        value: today.strftime(STRFTIME_DATE_FORMAT)
+      }
+    end
 
-  def endswith(string)
-    # Wrap this string in quotes, as we effectively translate
-    #   City Eq endswith('far')
-    # ...to...
-    #    City Eq regex('far$')
-    #
-    # The string passed in will merely be "far", rather than
-    # the string literal "'far'".
-    string = Regexp.escape(string)
-    new_value = "#{string}$"
-
-    {
-      :function_name => "regex",
-      :function_parameters => [new_value, ''],
-      :type => :character,
-      :value => new_value
-    }
-  end
+    # The current timestamp
+    def now
+      {
+        type: :datetime,
+        value: current_time.iso8601
+      }
+    end
 
-  def contains(string)
-    # Wrap this string in quotes, as we effectively translate
-    #   City Eq contains('far')
-    # ...to...
-    #    City Eq regex('far')
-    #
-    # The string passed in will merely be "far", rather than
-    # the string literal "'far'".
-    string = Regexp.escape(string)
-    new_value = "#{string}"
-
-    {
-      :function_name => "regex",
-      :function_parameters => [new_value, ''],
-      :type => :character,
-      :value => new_value
-    }
-  end
+    def maxdatetime
+      {
+        type: :datetime,
+        value: MAX_DATE_TIME
+      }
+    end
 
-  # Offset the current timestamp by a number of days
-  def days(num)
-    # date calculated as the offset from midnight tommorrow. Zero will provide values for all times 
-    # today.
-    d = Date.today + num
-    {
-      :type => :date,
-      :value => d.strftime(STRFTIME_DATE_FORMAT)
-    }
-  end
-  
-  # The current timestamp
-  def now()
-    {
-      :type => :datetime,
-      :value => Time.now.iso8601
-    }
-  end
+    def mindatetime
+      {
+        type: :datetime,
+        value: MIN_DATE_TIME
+      }
+    end
 
-  def maxdatetime()
-    {
-      :type => :datetime,
-      :value => MAX_DATE_TIME
-    }
-  end
+    def floor_decimal(arg)
+      {
+        type: :integer,
+        value: arg.floor.to_s
+      }
+    end
 
-  def mindatetime()
-    {
-      :type => :datetime,
-      :value => MIN_DATE_TIME
-    }
-  end
+    def ceiling_decimal(arg)
+      {
+        type: :integer,
+        value: arg.ceil.to_s
+      }
+    end
 
-  def floor_decimal(arg)
-    {
-      :type => :integer,
-      :value => arg.floor.to_s
-    }
-  end
+    def round_decimal(arg)
+      {
+        type: :integer,
+        value: arg.round.to_s
+      }
+    end
 
-  def ceiling_decimal(arg)
-    {
-      :type => :integer,
-      :value => arg.ceil.to_s
-    }
-  end
+    def indexof(arg1, arg2)
+      {
+        value: 'indexof',
+        args: [arg1, arg2]
+      }
+    end
 
-  def round_decimal(arg)
-    {
-      :type => :integer,
-      :value => arg.round.to_s
-    }
-  end
+    def concat_character(arg1, arg2)
+      {
+        type: :character,
+        value: "'#{arg1}#{arg2}'"
+      }
+    end
 
-  def indexof(arg1, arg2)
-    {
-      :value => "indexof",
-      :args => [arg1, arg2]
-    }
-  end
+    def date_datetime(datetime)
+      {
+        type: :date,
+        value: datetime.strftime(STRFTIME_DATE_FORMAT)
+      }
+    end
 
-  def concat_character(arg1, arg2)
-    {
-      :type => :character,
-      :value => "'#{arg1}#{arg2}'"
-    }
-  end
+    def time_datetime(datetime)
+      {
+        type: :time,
+        value: datetime.strftime(STRFTIME_TIME_FORMAT)
+      }
+    end
 
-  def date_datetime(dt)
-    {
-      :type => :date,
-      :value => dt.strftime(STRFTIME_DATE_FORMAT)
-    }
-  end
-  
-  def time_datetime(dt)
-    {
-      :type => :time,
-      :value => dt.strftime(STRFTIME_TIME_FORMAT)
-    }
-  end
+    def months(num_months)
+      d = current_timestamp >> num_months
+      {
+        type: :date,
+        value: d.strftime(STRFTIME_DATE_FORMAT)
+      }
+    end
 
-  def months num_months
-    d = DateTime.now >> num_months
-    {
-      :type => :date,
-      :value => d.strftime(STRFTIME_DATE_FORMAT)
-    }
-  end
+    def years(num_years)
+      d = current_timestamp >> (num_years * 12)
+      {
+        type: :date,
+        value: d.strftime(STRFTIME_DATE_FORMAT)
+      }
+    end
 
-  def years num_years
-    d = DateTime.now >> (num_years * 12)
-    {
-      :type => :date,
-      :value => d.strftime(STRFTIME_DATE_FORMAT)
-    }
-  end
-  
-  def polygon(coords)
-    new_coords = parse_coordinates(coords)
-    unless new_coords.size > 2
-      @errors << Sparkql::ParserError.new(:token => coords, 
-        :message => "Function call 'polygon' requires at least three coordinates",
-        :status => :fatal )
-      return
-    end
-
-    # auto close the polygon if it's open
-    unless new_coords.first == new_coords.last
-      new_coords << new_coords.first.clone
-    end
-    
-    shape = GeoRuby::SimpleFeatures::Polygon.from_coordinates([new_coords])
-    {
-      :type => :shape,
-      :value => shape
-    }
-  end
+    def polygon(coords)
+      new_coords = parse_coordinates(coords)
+      unless new_coords.size > 2
+        @errors << Sparkql::ParserError.new(token: coords,
+                                            message: "Function call 'polygon' requires at least three coordinates",
+                                            status: :fatal)
+        return
+      end
+
+      # auto close the polygon if it's open
+      new_coords << new_coords.first.clone unless new_coords.first == new_coords.last
 
-  def linestring(coords)
-    new_coords = parse_coordinates(coords)
-    unless new_coords.size > 1
-      @errors << Sparkql::ParserError.new(:token => coords,
-        :message => "Function call 'linestring' requires at least two coordinates",
-        :status => :fatal )
-      return
+      shape = GeoRuby::SimpleFeatures::Polygon.from_coordinates([new_coords])
+      {
+        type: :shape,
+        value: shape
+      }
     end
 
-    shape = GeoRuby::SimpleFeatures::LineString.from_coordinates(new_coords)
-    {
-      :type => :shape,
-      :value => shape
-    }
-  end
+    def linestring(coords)
+      new_coords = parse_coordinates(coords)
+      unless new_coords.size > 1
+        @errors << Sparkql::ParserError.new(token: coords,
+                                            message: "Function call 'linestring' requires at least two coordinates",
+                                            status: :fatal)
+        return
+      end
 
-  def wkt(wkt_string)
-    shape = GeoRuby::SimpleFeatures::Geometry.from_ewkt(wkt_string)
-    {
-      :type => :shape,
-      :value => shape
-    }
-  rescue GeoRuby::SimpleFeatures::EWKTFormatError
-    @errors << Sparkql::ParserError.new(:token => wkt_string,
-      :message => "Function call 'wkt' requires a valid wkt string",
-      :status => :fatal )
-    return
-  end
-    
-  def rectangle(coords)
-    bounding_box = parse_coordinates(coords)
-    unless bounding_box.size == 2
-      @errors << Sparkql::ParserError.new(:token => coords, 
-        :message => "Function call 'rectangle' requires two coordinates for the bounding box",
-        :status => :fatal )
-      return
-    end
-    poly_coords = [
-                    bounding_box.first, 
-                    [bounding_box.last.first, bounding_box.first.last],
-                    bounding_box.last,
-                    [bounding_box.first.first, bounding_box.last.last],
-                    bounding_box.first.clone, 
-                  ]
-    shape = GeoRuby::SimpleFeatures::Polygon.from_coordinates([poly_coords])
-    {
-      :type => :shape,
-      :value => shape
-    }
-  end
-  
-  def radius(coords, length)
-
-    unless length > 0
-      @errors << Sparkql::ParserError.new(:token => length, 
-        :message => "Function call 'radius' length must be positive",
-        :status => :fatal )
-      return
-    end
-
-    # The radius() function is overloaded to allow an identifier
-    # to be specified over lat/lon.  This identifier should specify a
-    # record that, in turn, references a lat/lon. Naturally, this won't be
-    # validated here.
-    shape_error = false
-    shape = if is_coords?(coords)
-              new_coords = parse_coordinates(coords)
-              if new_coords.size != 1
-                shape_error = true
-              else
-                GeoRuby::SimpleFeatures::Circle.from_coordinates(new_coords.first, length);
-              end
-            elsif Sparkql::Geo::RecordRadius.valid_record_id?(coords)
-              Sparkql::Geo::RecordRadius.new(coords, length)
-            else
-              shape_error = true
-            end
+      shape = GeoRuby::SimpleFeatures::LineString.from_coordinates(new_coords)
+      {
+        type: :shape,
+        value: shape
+      }
+    end
 
-    if shape_error
-      @errors << Sparkql::ParserError.new(:token => coords, 
-        :message => "Function call 'radius' requires one coordinate for the center",
-        :status => :fatal )
-      return
+    def wkt(wkt_string)
+      shape = GeoRuby::SimpleFeatures::Geometry.from_ewkt(wkt_string)
+      {
+        type: :shape,
+        value: shape
+      }
+    rescue GeoRuby::SimpleFeatures::EWKTFormatError
+      @errors << Sparkql::ParserError.new(token: wkt_string,
+                                          message: "Function call 'wkt' requires a valid wkt string",
+                                          status: :fatal)
+      nil
     end
 
-    {
-      :type => :shape,
-      :value => shape 
-    }
-  end
-  
-  def range(start_str, end_str)
-    {
-      :type => :character,
-      :value => [start_str.to_s, end_str.to_s]
-    }
-  end
+    def rectangle(coords)
+      bounding_box = parse_coordinates(coords)
+      unless bounding_box.size == 2
+        @errors << Sparkql::ParserError.new(token: coords,
+                                            message: "Function call 'rectangle' requires two coordinates for the bounding box",
+                                            status: :fatal)
+        return
+      end
+      poly_coords = [
+        bounding_box.first,
+        [bounding_box.last.first, bounding_box.first.last],
+        bounding_box.last,
+        [bounding_box.first.first, bounding_box.last.last],
+        bounding_box.first.clone
+      ]
+      shape = GeoRuby::SimpleFeatures::Polygon.from_coordinates([poly_coords])
+      {
+        type: :shape,
+        value: shape
+      }
+    end
 
-  def cast(value, type)
-    if value == 'NULL'
-      value = nil
-    end
-
-    new_type = type.to_sym
-    {
-      type: new_type,
-      value: cast_literal(value, new_type)
-    }
-  rescue
-    {
-      type: :null,
-      value: 'NULL'
-    }
-  end
+    def radius(coords, length)
+      unless length.positive?
+        @errors << Sparkql::ParserError.new(token: length,
+                                            message: "Function call 'radius' length must be positive",
+                                            status: :fatal)
+        return
+      end
 
-  def valid_cast_type?(type)
-    if VALID_CAST_TYPES.key?(type.to_sym)
-      true
-    else
-      @errors << Sparkql::ParserError.new(:token => coords,
-                                          :message => "Function call 'cast' requires a castable type.",
-                                          :status => :fatal )
-      false
+      # The radius() function is overloaded to allow an identifier
+      # to be specified over lat/lon.  This identifier should specify a
+      # record that, in turn, references a lat/lon. Naturally, this won't be
+      # validated here.
+      shape_error = false
+      shape = if coords?(coords)
+                new_coords = parse_coordinates(coords)
+                if new_coords.size != 1
+                  shape_error = true
+                else
+                  GeoRuby::SimpleFeatures::Circle.from_coordinates(new_coords.first, length)
+                end
+              elsif Sparkql::Geo::RecordRadius.valid_record_id?(coords)
+                Sparkql::Geo::RecordRadius.new(coords, length)
+              else
+                shape_error = true
+              end
+
+      if shape_error
+        @errors << Sparkql::ParserError.new(token: coords,
+                                            message: "Function call 'radius' requires one coordinate for the center",
+                                            status: :fatal)
+        return
+      end
+
+      {
+        type: :shape,
+        value: shape
+      }
     end
-  end
 
-  def cast_null(value, type)
-    cast(value, type)
-  end
+    def range(start_str, end_str)
+      {
+        type: :character,
+        value: [start_str.to_s, end_str.to_s]
+      }
+    end
 
-  def cast_decimal(value, type)
-    cast(value, type)
-  end
+    def cast(value, type)
+      value = nil if value == 'NULL'
 
-  def cast_character(value, type)
-    cast(value, type)
-  end
+      new_type = type.to_sym
+      {
+        type: new_type,
+        value: cast_literal(value, new_type)
+      }
+    rescue StandardError
+      {
+        type: :null,
+        value: 'NULL'
+      }
+    end
 
-  def cast_literal(value, type)
-    case type
-    when :character
-      "'#{value.to_s}'"
-    when :integer
-      if value.nil?
-        '0'
+    def valid_cast_type?(type)
+      if VALID_CAST_TYPES.key?(type.to_sym)
+        true
       else
-        Integer(Float(value)).to_s
+        @errors << Sparkql::ParserError.new(token: coords,
+                                            message: "Function call 'cast' requires a castable type.",
+                                            status: :fatal)
+        false
       end
-    when :decimal
-      if value.nil?
-        '0.0'
-      else
-        Float(value).to_s
+    end
+
+    def cast_null(value, type)
+      cast(value, type)
+    end
+
+    def cast_decimal(value, type)
+      cast(value, type)
+    end
+
+    def cast_character(value, type)
+      cast(value, type)
+    end
+
+    def cast_literal(value, type)
+      case type
+      when :character
+        "'#{value}'"
+      when :integer
+        if value.nil?
+          '0'
+        else
+          Integer(Float(value)).to_s
+        end
+      when :decimal
+        if value.nil?
+          '0.0'
+        else
+          Float(value).to_s
+        end
+      when :null
+        'NULL'
       end
-    when :null
-      'NULL'
     end
-  end
 
-  private
+    def current_date
+      current_timestamp.to_date
+    end
 
-  def is_coords?(coord_string)
-    coord_string.split(" ").size > 1
-  end
+    def current_time
+      current_timestamp.to_time
+    end
 
-  def parse_coordinates coord_string
-    terms = coord_string.strip.split(',')
-    coords = terms.map do |term|
-      term.strip.split(/\s+/).reverse.map { |i| i.to_f }
+    def current_timestamp
+      @current_timestamp ||= DateTime.now
+    end
+
+    private
+
+    def coords?(coord_string)
+      coord_string.split(' ').size > 1
+    end
+
+    def parse_coordinates(coord_string)
+      terms = coord_string.strip.split(',')
+      terms.map do |term|
+        term.strip.split(/\s+/).reverse.map(&:to_f)
+      end
+    rescue StandardError
+      @errors << Sparkql::ParserError.new(token: coord_string,
+                                          message: 'Unable to parse coordinate string.',
+                                          status: :fatal)
     end
-    coords
-  rescue
-    @errors << Sparkql::ParserError.new(:token => coord_string, 
-      :message => "Unable to parse coordinate string.",
-      :status => :fatal )
   end
-  
 end