sparkql 0.3.24 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDA4ZDRjM2ExNzI2ZmMyMTViODM4NDNlZTkzOTFkNGU3NDRiZmY5MA==
+    MDMyYjhlMDJkY2ZkZjJmN2VlYzVmNTdkODNjNTRjZjFkMjEwZDJiMA==
   data.tar.gz: !binary |-
-    ODA1NDYzMTM3OTlhYzQyMDY0Y2FhZjhhMTE5OGJjOWQ0Nzg1Mzg0NQ==
+    N2YwNzMyMTJjMGFjZmQ5MDM0OWYyZDYyM2Y2MmQwMWEyMWZhZTg0MA==
 SHA512:
   metadata.gz: !binary |-
-    ZTFkYzJlNWRlY2EwZjdhOGZhZjdjY2JmMTQ5ODI0N2QxYWUxOGIwZjYyZWQ4
-    MDUzNmJlYTU1OGNjZGFjNWI5MjgyYzAyYmQ2ZjVkNGU1OWFiOWNhNTAzZTIy
-    MjJjNDNjNjAwMDI1ZDkzN2I2NjM4ZmRhZTJmOGE1YTk1NmU3YTI=
+    MWQxYWQwZmZjZTRlNGMwYzBkNGJkYWRjZTQxZTRhMTA1ZTZmYzVkNDQ0OTI0
+    OGY5ZmRlMjRlNTUzMGIwOWJlNGY4ODcxZjEyMDg3YTRkMDVhMzNkNDUwYTYy
+    NTFmYThlMGRkMzE2YjcwNzkxZDgwOGQ3MDBkMDMwNjU4ZGYwZTM=
   data.tar.gz: !binary |-
-    MTljODQwOGI1NGY4YWI5NWExM2M5MzZiNmZjMmY1YjJhZDdmNjcyOTg4YjJh
-    MTQ3OGJkZTdmNjgzMDFlOGZiYThlMjI0OGI0NTQxNmM4NWE3NzFkODQxNGMx
-    ZTk2ODY4ZWRlMWJiY2FjZTY4ZDY0NDZjOTM0ZDU4NThiNmRlYTQ=
+    YjM1YWE1MGJlNTlhNWZiZmY5YjZkN2ZhMGIyYTUxMDQ5NzY3N2U4N2RmMTFj
+    YmFmODY2ZTEwNzA2NTFlMzkxNzJhM2RiYTM2Mjc1YTJhMzhjZTFmNWYxMDUy
+    YzZlMmQ0N2RkMWQ2ZGE2M2Y5MjZjMDBjYWRkNzc4NzM2NWVlNzA=

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+v1.0.0, 2016-02-11 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.20...v1.0.0))
+-------------------
+  * [IMPROVEMENT] function support for fields (delayed resolution). Backing systems must
+    implement necessary function behaviour.
+  * Drop support for ruby 1.8.7. Georuby dropped support several years back and
+    this drop allows us to pick up newer update allows us to stay in sync with
+    that gems development
+
 v0.3.24, 2016-01-05 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.23...v0.3.24))
 -------------------
 

data/GRAMMAR.md

@@ -94,6 +94,7 @@ filter.
      field
      	: STANDARD_FIELD
      	| CUSTOM_FIELD
+     	| function
      	;
 ```
 
@@ -140,6 +141,7 @@ Functions may optionally have a comma delimited list of parameters.
      function_arg
        : literal
        | literals
+       | field 
        ;
 ```
 
@@ -187,6 +189,7 @@ Literals only support a single value in a condition
      literal
        : DATE
        | DATETIME
+       | TIME
        | BOOLEAN
        | NULL
        ;
@@ -202,6 +205,7 @@ Functions, and literals that can be used in a range
        | DECIMAL
        | DATE
        | DATETIME
+       | TIME
        | function
        ;
 ```

data/Gemfile

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

data/README.md

@@ -1,6 +1,6 @@
 SparkQL query language parser
 =====================
-This gem contains the syntax parser for processing spark api filter queries into manageable 
+This gem contains the syntax parser for processing spark api filter queries into manageable
 expressions. To get an overview of the language syntax-wise, refer to the following files:
 
 * lib/sparkql/parser.y   # BNF Grammar
@@ -12,14 +12,16 @@ Installation
 Add the gem to your gemfile:
 
 Gemfile
-	gem 'sparkql', '~> 0.0.1' 
+	gem 'sparkql', '~> 0.0.1'
 
 When completed, run 'bundle install'.
 
 
 Usage
 -------------
-See test/unit/parser_test.rb for generic parsing examples. In most cases an extended parser is 
+Ruby 1.9 or greater is required.
+
+See test/unit/parser_test.rb for generic parsing examples. In most cases an extended parser is
 needed to do anything of significance, such as the postgres and db2 search implementations in the
 API.
 
@@ -40,12 +42,12 @@ The return value will be an array with one expression element containing the que
 
 Development
 -------------
-The parser is based on racc, a yacc like LR parser that is a part of the ruby runtime.  The grammar 
-is located at lib/sparkql/parser.y and is compiled as part of the test process.  Refer to the 
-Rakefile for details. When modifying the grammar, please checkin BOTH the parser.y and parser.rb 
+The parser is based on racc, a yacc like LR parser that is a part of the ruby runtime.  The grammar
+is located at lib/sparkql/parser.y and is compiled as part of the test process.  Refer to the
+Rakefile for details. When modifying the grammar, please checkin BOTH the parser.y and parser.rb
 files.
 
-Debugging grammar issues can be done by hand using the "racc" command. For example, a dump of the 
+Debugging grammar issues can be done by hand using the "racc" command. For example, a dump of the
 parser states (and conflicts) can be generated via
 
 	racc -o lib/sparkql/parser.rb lib/sparkql/parser.y -v  # see lib/sparkql/parser.output

data/VERSION

@@ -1 +1 @@
-0.3.24
+1.0.0

data/lib/sparkql/function_resolver.rb

@@ -10,8 +10,8 @@ require 'sparkql/geo'
 # SUPPORTED_FUNCTIONS which will run validation on the function syntax prior to execution.
 class Sparkql::FunctionResolver
   SECONDS_IN_DAY = 60 * 60 * 24
-  STRFTIME_FORMAT = '%Y-%m-%d'
-  
+  STRFTIME_DATE_FORMAT = '%Y-%m-%d'
+  STRFTIME_TIME_FORMAT = '%H:%M:%S.%N'
   VALID_REGEX_FLAGS = ["", "i"]
   SUPPORTED_FUNCTIONS = {
     :polygon => {
@@ -53,6 +53,16 @@ class Sparkql::FunctionResolver
     :now => { 
       :args => [],
       :return_type => :datetime
+    },
+    :date => { 
+      :args => [[:field,:datetime]],
+      :resolve_for_type => true,
+      :return_type => :date
+    },
+    :time => { 
+      :args => [[:field,:datetime]],
+      :resolve_for_type => true,
+      :return_type => :time
     }
   }
   
@@ -89,7 +99,7 @@ class Sparkql::FunctionResolver
     
     count = 0
     @args.each do |arg|
-      unless arg[:type] == total_args[count]
+      unless Array(total_args[count]).include?(arg[:type])
         @errors << Sparkql::ParserError.new(:token => @name, 
           :message => "Function call '#{@name}' has an invalid argument at #{arg[:value]}",
           :status => :fatal )
@@ -99,7 +109,7 @@ class Sparkql::FunctionResolver
   end
   
   def return_type
-    supported[@name.to_sym][:return_type]
+    support[@name.to_sym][:return_type]
   end
   
   def errors
@@ -126,8 +136,12 @@ class Sparkql::FunctionResolver
     fill_in_optional_args.each do |default|
       real_vals << default
     end
-
-    v = self.send(name, *real_vals)
+    method = name
+    if support[name][:resolve_for_type]
+      method_type =  @args.first[:type]
+      method = "#{method}_#{method_type}"
+    end
+    v = self.send(method, *real_vals)
 
     unless v.nil?
       v[:function_name] = @name
@@ -172,7 +186,7 @@ class Sparkql::FunctionResolver
     d = Date.today + num
     {
       :type => :date,
-      :value => d.strftime(STRFTIME_FORMAT)
+      :value => d.strftime(STRFTIME_DATE_FORMAT)
     }
   end
   
@@ -183,12 +197,42 @@ class Sparkql::FunctionResolver
       :value => Time.now.iso8601
     }
   end
+  
+  def date_field(arg)
+    {
+      :type => :function,
+      :value => "date",
+      :args => [arg]
+    }
+  end
+  
+  def time_field(arg)
+    {
+      :type => :function,
+      :value => "time",
+      :args => [arg]
+    }
+  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 = DateTime.now >> num_months
     {
       :type => :date,
-      :value => d.strftime(STRFTIME_FORMAT)
+      :value => d.strftime(STRFTIME_DATE_FORMAT)
     }
   end
 
@@ -196,7 +240,7 @@ class Sparkql::FunctionResolver
     d = DateTime.now >> (num_years * 12)
     {
       :type => :date,
-      :value => d.strftime(STRFTIME_FORMAT)
+      :value => d.strftime(STRFTIME_DATE_FORMAT)
     }
   end
   

data/lib/sparkql/lexer.rb

@@ -39,6 +39,8 @@ class Sparkql::Lexer < StringScanner
         literal :DATETIME, @current_token_value
       when @current_token_value = scan(DATE)
         literal :DATE, @current_token_value
+      when @current_token_value = scan(TIME)
+        literal :TIME, @current_token_value
       when @current_token_value = scan(DECIMAL)
         literal :DECIMAL, @current_token_value
       when @current_token_value = scan(INTEGER)

data/lib/sparkql/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.8
+# This file is automatically generated by Racc 1.4.12
 # from Racc grammer file "".
 #
 
@@ -16,108 +16,120 @@ module Sparkql
 ##### State transition tables begin ###
 
 racc_action_table = [
-    49,    14,    13,    45,    43,    29,    30,    31,    32,    33,
-    34,    35,    27,    46,    29,    30,    31,    32,    33,    34,
-    35,    27,    19,    38,    39,    12,    40,    41,    29,    30,
-    31,    32,    33,    34,    35,    27,   -26,    38,    39,    55,
-    40,    41,     8,    56,     9,    44,    10,    11,     8,   nil,
-     9,   nil,    10,    11,    27,   nil,    29,    30,    31,     9,
-   nil,    10,    11,     9,   nil,    10,    11,     9,   nil,    10,
-    11,    14,    13,    15,    16 ]
+    48,    10,    11,    14,    54,    31,    32,    33,    34,    35,
+    36,    37,    38,    10,    11,    14,    55,    31,    32,    33,
+    34,    35,    36,    37,    38,    14,   -28,    31,    32,    33,
+    34,    35,    36,    37,    38,    14,    23,    41,    42,    22,
+    43,    44,    45,    14,    15,    41,    42,   nil,    43,    44,
+    45,     8,   nil,     9,   nil,    10,    11,    14,     8,   nil,
+     9,   nil,    10,    11,    14,     9,   nil,    10,    11,    14,
+     9,   nil,    10,    11,    14,     9,    56,    10,    11,    14,
+    57,    14,   nil,    31,    32,    33,    17,    16,   nil,    47,
+    18,    19,    17,    16 ]
 
 racc_action_check = [
-    45,    18,    18,    26,    18,    45,    45,    45,    45,    45,
-    45,    45,    15,    37,    15,    15,    15,    15,    15,    15,
-    15,    46,    12,    46,    46,     1,    46,    46,    56,    56,
-    56,    56,    56,    56,    56,    16,    24,    16,    16,    50,
-    16,    16,     9,    50,     9,    25,     9,     9,     0,   nil,
-     0,   nil,     0,     0,    44,   nil,    44,    44,    44,    13,
-   nil,    13,    13,     8,   nil,     8,     8,    14,   nil,    14,
-    14,     2,     2,     6,     6 ]
+    22,    22,    22,    22,    29,    22,    22,    22,    22,    22,
+    22,    22,    22,    57,    57,    57,    40,    57,    57,    57,
+    57,    57,    57,    57,    57,    18,    28,    18,    18,    18,
+    18,    18,    18,    18,    18,    19,    15,    19,    19,    13,
+    19,    19,    19,    55,     1,    55,    55,   nil,    55,    55,
+    55,     9,   nil,     9,   nil,     9,     9,     9,     0,   nil,
+     0,   nil,     0,     0,     0,     8,   nil,     8,     8,     8,
+    16,   nil,    16,    16,    16,    17,    49,    17,    17,    17,
+    49,    54,   nil,    54,    54,    54,    21,    21,   nil,    21,
+     6,     6,     2,     2 ]
 
 racc_action_pointer = [
-    43,    25,    66,   nil,   nil,   nil,    70,   nil,    56,    37,
-   nil,   nil,    22,    52,    60,     1,    24,   nil,    -4,   nil,
-   nil,   nil,   nil,   nil,    24,    33,    -4,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     1,   nil,   nil,
-   nil,   nil,   nil,   nil,    43,    -8,    10,   nil,   nil,   nil,
-    31,   nil,   nil,   nil,   nil,   nil,    15,   nil ]
+    53,    44,    87,   nil,   nil,   nil,    87,   nil,    58,    46,
+   nil,   nil,   nil,    32,   nil,    36,    63,    68,    14,    24,
+   nil,    81,    -8,   nil,   nil,   nil,   nil,   nil,    14,    -8,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     4,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    68,
+   nil,   nil,   nil,   nil,    70,    32,   nil,     4,   nil,   nil,
+   nil,   nil ]
 
 racc_action_default = [
-    -2,   -42,    -1,    -3,    -4,    -5,   -42,    -8,   -42,   -42,
-   -13,   -14,   -42,   -42,   -42,   -42,   -42,    -9,   -42,    58,
-   -10,   -11,    -6,   -15,   -16,   -17,   -42,   -20,   -25,   -30,
-   -31,   -32,   -33,   -34,   -35,   -36,    -7,   -42,   -37,   -38,
-   -39,   -40,   -41,   -12,   -42,   -42,   -42,   -27,   -28,   -18,
-   -42,   -21,   -23,   -24,   -29,   -19,   -42,   -22 ]
+    -2,   -46,    -1,    -3,    -4,    -5,   -46,    -8,   -46,   -46,
+   -13,   -14,   -15,   -46,   -21,   -46,   -46,   -46,   -46,   -46,
+    -9,   -46,   -46,    62,   -10,   -11,    -6,   -16,   -17,   -18,
+   -27,   -32,   -33,   -34,   -35,   -36,   -37,   -38,   -39,    -7,
+   -46,   -40,   -41,   -42,   -43,   -44,   -45,   -12,   -19,   -46,
+   -22,   -24,   -25,   -26,   -46,   -46,   -20,   -46,   -29,   -30,
+   -31,   -23 ]
 
 racc_goto_table = [
-    37,    51,    28,    24,     2,    17,    25,    22,    50,    23,
-    20,    21,    57,    18,    36,     1,   nil,   nil,   nil,   nil,
+    28,    46,    30,    40,     2,    53,    50,    20,    29,    27,
+    49,    39,    26,    21,     1,    24,    25,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    54,    47,    48 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    59,    46,    58,    60,
+    53,    61 ]
 
 racc_goto_check = [
-    17,    15,    16,    11,     2,     3,    12,     7,    14,    10,
-     3,     3,    15,     2,     8,     1,   nil,   nil,   nil,   nil,
+    10,    10,    16,    17,     2,     6,    15,     3,    12,    11,
+    14,     8,     7,     2,     1,     3,     3,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    17,    16,    11 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    10,    10,    16,    17,
+     6,    15 ]
 
 racc_goto_pointer = [
-   nil,    15,     4,    -3,   nil,   nil,   nil,    -8,    -2,   nil,
-    -6,   -12,    -9,   nil,   -37,   -44,   -13,   -16 ]
+   nil,    14,     4,    -1,   nil,   nil,   -17,    -6,    -8,   nil,
+   -18,    -9,   -10,   nil,   -12,   -16,   -16,   -16 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     3,     4,     5,     6,   nil,   nil,     7,
-    52,    42,   nil,    26,   nil,   nil,    53,   nil ]
+    12,    51,   nil,    13,   nil,   nil,    52,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 21, :_reduce_none,
-  0, 21, :_reduce_2,
-  1, 22, :_reduce_none,
-  1, 22, :_reduce_none,
   1, 22, :_reduce_none,
-  3, 23, :_reduce_6,
-  3, 23, :_reduce_7,
+  0, 22, :_reduce_2,
   1, 23, :_reduce_none,
-  2, 25, :_reduce_9,
-  3, 24, :_reduce_10,
-  3, 24, :_reduce_11,
-  3, 29, :_reduce_12,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  3, 24, :_reduce_6,
+  3, 24, :_reduce_7,
+  1, 24, :_reduce_none,
+  2, 26, :_reduce_9,
+  3, 25, :_reduce_10,
+  3, 25, :_reduce_11,
+  3, 30, :_reduce_12,
   1, 27, :_reduce_none,
   1, 27, :_reduce_none,
-  1, 27, :_reduce_17,
-  3, 31, :_reduce_18,
-  4, 31, :_reduce_19,
-  1, 33, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 28, :_reduce_none,
+  1, 28, :_reduce_none,
+  1, 28, :_reduce_18,
+  3, 31, :_reduce_19,
+  4, 31, :_reduce_20,
   1, 34, :_reduce_none,
-  3, 34, :_reduce_22,
-  1, 35, :_reduce_none,
   1, 35, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  3, 32, :_reduce_27,
-  3, 32, :_reduce_28,
-  3, 28, :_reduce_29,
-  1, 36, :_reduce_none,
+  3, 35, :_reduce_23,
   1, 36, :_reduce_none,
   1, 36, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 30, :_reduce_none,
-  1, 37, :_reduce_none,
+  1, 36, :_reduce_26,
+  1, 33, :_reduce_none,
+  1, 33, :_reduce_none,
+  3, 33, :_reduce_29,
+  3, 33, :_reduce_30,
+  3, 29, :_reduce_31,
   1, 37, :_reduce_none,
   1, 37, :_reduce_none,
   1, 37, :_reduce_none,
-  1, 37, :_reduce_none ]
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_none ]
 
-racc_reduce_n = 42
+racc_reduce_n = 46
 
-racc_shift_n = 58
+racc_shift_n = 62
 
 racc_token_table = {
   false => 0,
@@ -138,10 +150,11 @@ racc_token_table = {
   :CHARACTER => 15,
   :DATE => 16,
   :DATETIME => 17,
-  :BOOLEAN => 18,
-  :NULL => 19 }
+  :TIME => 18,
+  :BOOLEAN => 19,
+  :NULL => 20 }
 
-racc_nt_base = 20
+racc_nt_base = 21
 
 racc_use_result_var = true
 
@@ -180,6 +193,7 @@ Racc_token_to_s_table = [
   "CHARACTER",
   "DATE",
   "DATETIME",
+  "TIME",
   "BOOLEAN",
   "NULL",
   "$start",
@@ -192,8 +206,8 @@ Racc_token_to_s_table = [
   "condition",
   "range",
   "group",
-  "literal",
   "function",
+  "literal",
   "literal_list",
   "function_name",
   "function_args",
@@ -260,57 +274,60 @@ end
 
 # reduce 16 omitted
 
-def _reduce_17(val, _values, result)
+# reduce 17 omitted
+
+def _reduce_18(val, _values, result)
  result = tokenize_list(val[0]) 
     result
 end
 
-def _reduce_18(val, _values, result)
+def _reduce_19(val, _values, result)
  result = tokenize_function(val[0], []) 
     result
 end
 
-def _reduce_19(val, _values, result)
+def _reduce_20(val, _values, result)
  result = tokenize_function(val[0], val[2]) 
     result
 end
 
-# reduce 20 omitted
-
 # reduce 21 omitted
 
-def _reduce_22(val, _values, result)
+# reduce 22 omitted
+
+def _reduce_23(val, _values, result)
  result = tokenize_function_args(val[0], val[2]) 
     result
 end
 
-# reduce 23 omitted
-
 # reduce 24 omitted
 
 # reduce 25 omitted
 
-# reduce 26 omitted
+def _reduce_26(val, _values, result)
+ result = tokenize_field_arg(val[0]) 
+    result
+end
+
+# reduce 27 omitted
+
+# reduce 28 omitted
 
-def _reduce_27(val, _values, result)
+def _reduce_29(val, _values, result)
  result = tokenize_multiple(val[0], val[2]) 
     result
 end
 
-def _reduce_28(val, _values, result)
+def _reduce_30(val, _values, result)
  result = tokenize_multiple(val[0], val[2]) 
     result
 end
 
-def _reduce_29(val, _values, result)
+def _reduce_31(val, _values, result)
  result = tokenize_multiple(val[0], val[2]) 
     result
 end
 
-# reduce 30 omitted
-
-# reduce 31 omitted
-
 # reduce 32 omitted
 
 # reduce 33 omitted
@@ -331,6 +348,14 @@ end
 
 # reduce 41 omitted
 
+# reduce 42 omitted
+
+# reduce 43 omitted
+
+# reduce 44 omitted
+
+# reduce 45 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end

data/lib/sparkql/parser.y

@@ -91,6 +91,7 @@ rule
   field
   	: STANDARD_FIELD
   	| CUSTOM_FIELD
+  	| function
   	;
   
 ##### Condition
@@ -130,6 +131,7 @@ rule
   function_arg
     : literal
     | literals
+    | field { result = tokenize_field_arg(val[0]) }
     ;
     
 ##### Literal List
@@ -165,6 +167,7 @@ rule
   literal
     : DATE
     | DATETIME
+    | TIME
     | BOOLEAN
     | NULL
     ;
@@ -177,6 +180,7 @@ rule
     | DECIMAL
     | DATE
     | DATETIME
+    | TIME
     | function
     ;
 

data/lib/sparkql/parser_compatibility.rb

@@ -18,6 +18,11 @@ module Sparkql::ParserCompatibility
       :regex => /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/,
       :operators => Sparkql::Token::OPERATORS + [Sparkql::Token::RANGE_OPERATOR]
     },
+    {
+      :type => :time,
+      :regex => /^[0-9]{2}\:[0-9]{2}(\:[0-9]{2})?(\.[0-9]{6)$/,
+      :operators => Sparkql::Token::OPERATORS + [Sparkql::Token::RANGE_OPERATOR]
+    },
     {
       :type => :character,
       :regex => /^'([^'\\]*(\\.[^'\\]*)*)'$/, # Strings must be single quoted.  Any inside single quotes must be escaped.
@@ -50,6 +55,11 @@ module Sparkql::ParserCompatibility
       :type => :null,
       :regex => /^NULL|Null|null$/,
       :operators => Sparkql::Token::EQUALITY_OPERATORS
+    },
+    {
+      :type => :function,
+      # This type is not parseable, so no regex
+      :operators => Sparkql::Token::OPERATORS + [Sparkql::Token::RANGE_OPERATOR]
     }
   ]
 
@@ -130,6 +140,8 @@ module Sparkql::ParserCompatibility
       return date_escape(expression[:value])
     when :datetime
       return datetime_escape(expression[:value])
+    when :time
+      return time_escape(expression[:value])
     when :boolean
       return boolean_escape(expression[:value])
     when :null
@@ -159,6 +171,10 @@ module Sparkql::ParserCompatibility
   def datetime_escape(string)
     DateTime.parse(string)
   end
+  
+  def time_escape(string)
+    DateTime.parse(string)
+  end
 
   def boolean_escape(string)
     "true" == string
@@ -204,7 +220,8 @@ module Sparkql::ParserCompatibility
 
   # Checks the type of an expression with what is expected.
   def check_type!(expression, expected, supports_nulls = true)
-    if expected == expression[:type] || (supports_nulls && expression[:type] == :null)
+    if expected == expression[:type] || check_function_type?(expression, expected) ||
+      (supports_nulls && expression[:type] == :null)
       return true
     elsif expected == :datetime && expression[:type] == :date
       expression[:type] = :datetime
@@ -233,6 +250,17 @@ module Sparkql::ParserCompatibility
             :message => "expected #{expected} but found #{expression[:type]}",
             :status => :fatal )
   end
+  
+  # If a function is being applied to a field, we check that the return type of
+  # the function matches what is expected, and that the function supports the
+  # field type as the first argument.
+  def check_function_type?(expression, expected)
+    return false unless expression[:field_function_type] == expression[:type]
+    # Lookup the function arguments
+    function = Sparkql::FunctionResolver::SUPPORTED_FUNCTIONS[expression[:field_function].to_sym]
+    return false if function.nil?
+    Array(function[:args].first).include?(expected)
+  end
 
   # Builds the correct operator based on the type and the value.
   # default should be the operator provided in the actual filter string

data/lib/sparkql/parser_tools.rb

@@ -24,10 +24,24 @@ module Sparkql::ParserTools
   
   def tokenize_expression(field, op, val)
     operator = get_operator(val,op) unless val.nil?
+    field_args = {}
+    # Function support for fields is stapled in here. The function information
+    # is remapped to the expression
+    if field.is_a?(Hash) && field[:type] == :function
+      function = Sparkql::FunctionResolver::SUPPORTED_FUNCTIONS[field[:value].to_sym]
+      if !function.nil?
+        field_args[:field_function] = field[:value]
+        field_args[:field_function_type] = function[:return_type]
+      else
+        tokenizer_error(:token => field[:value], 
+          :message => "Unsupported function type", :status => :fatal )
+      end
+      field = field[:args].first
+    end
     custom_field = field.start_with?('"')
     block_group = (@lexer.level == 0) ? 0 : @lexer.block_group_identifier
     expression = {:field => field, :operator => operator, :conjunction => 'And', 
-      :level => @lexer.level, :block_group => block_group, :custom_field => custom_field}
+      :level => @lexer.level, :block_group => block_group, :custom_field => custom_field}.merge!(field_args)
     expression = val.merge(expression) unless val.nil?
     validate_level_depth expression
     if operator.nil?
@@ -98,6 +112,13 @@ module Sparkql::ParserTools
     array
   end
   
+  def tokenize_field_arg(field)
+    {
+      :type => :field,
+      :value => field,
+    }
+  end
+  
   def tokenize_function(name, f_args)
     @lexer.leveldown
     @lexer.block_group_identifier -= 1

data/lib/sparkql/token.rb

@@ -10,7 +10,8 @@ module Sparkql::Token
   DECIMAL = /^\-?[0-9]+\.[0-9]+/
   CHARACTER = /^'([^'\\]*(\\.[^'\\]*)*)'/
   DATE = /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}/
-  DATETIME = /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}T[0-9]{2}\:[0-9]{2}(\:[0-9]{2})?(\.[0-9]{1,50})?(((\+|-)[0-9]{2}\:?[0-9]{2})|Z)?/
+  TIME = /^[0-9]{2}\:[0-9]{2}((\:[0-9]{2})(\.[0-9]{1,50})?)?/
+  DATETIME = /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}T[0-9]{2}\:[0-9]{2}((\:[0-9]{2})(\.[0-9]{1,50})?)?(((\+|-)[0-9]{2}\:?[0-9]{2})|Z)?/
   BOOLEAN = /^true|false/
   NULL = /NULL|null|Null/
   # Reserved words

data/sparkql.gemspec

@@ -20,14 +20,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # georuby 2.1.x adds ruby 1.9-only syntax, so that's 
-  # a no-go for us at the moment
-  s.add_dependency             'georuby', '~> 2.0.0'
-  s.add_development_dependency 'racc', '1.4.8'
+  s.add_dependency             'georuby', '~> 2.0'
+  s.add_development_dependency 'racc', '~> 1.4.8'
   s.add_development_dependency 'rake', '~> 0.9.2'
   s.add_development_dependency 'test-unit', '~> 2.1.0'
   s.add_development_dependency 'ci_reporter', '~> 1.6'
   s.add_development_dependency 'mocha', '~> 0.12.0'
-  s.add_development_dependency 'rcov', '~> 0.9.9'
 
 end

data/test/unit/function_resolver_test.rb

@@ -1,8 +1,10 @@
 require 'test_helper'
 require 'sparkql/geo'
 
-class ParserTest < Test::Unit::TestCase
+class FunctionResolverTest < Test::Unit::TestCase
   include Sparkql
+  
+  EXAMPLE_DATE = DateTime.parse("2013-07-26T10:22:15.422804")
 
   test "function parameters and name preserved" do
     f = FunctionResolver.new('radius', [{:type => :character, 
@@ -147,10 +149,59 @@ class ParserTest < Test::Unit::TestCase
     assert_nil f.call
   end
   
+  test "return_type" do 
+    f = FunctionResolver.new('radius', [{:type => :character, 
+        :value => "35.12 -68.33, 35.13 -68.34"},{:type => :decimal, 
+        :value => 1.0}])
+    assert_equal :shape, f.return_type
+  end
+  
   test "invalid function" do
     f = FunctionResolver.new('then', [])
     f.validate
     assert f.errors?, "'then' is not a function"
   end
+
+  test "time(datetime)" do
+    f = FunctionResolver.new('time', [{:type => :datetime, :value => EXAMPLE_DATE}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :time, value[:type]
+    assert_equal '10:22:15.422804000', value[:value]
+  end
+
+  test "date(datetime)" do
+    f = FunctionResolver.new('date', [{:type => :datetime, :value => EXAMPLE_DATE}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :date, value[:type]
+    assert_equal '2013-07-26', value[:value]
+  end
+
+###
+# Delayed functions. These functions don't get run immediately and require
+#  resolution by the backing system
+###
   
+  test "time(field)" do
+    f = FunctionResolver.new('time', [{:type => :field, :value => "OriginalEntryTimestamp"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :function, value[:type]
+    assert_equal 'time', value[:value]
+    assert_equal "OriginalEntryTimestamp", value[:args].first
+  end
+  
+  test "date(field)" do
+    f = FunctionResolver.new('date', [{:type => :field, :value => "OriginalEntryTimestamp"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :function, value[:type]
+    assert_equal 'date', value[:value]
+    assert_equal "OriginalEntryTimestamp", value[:args].first
+  end
 end

data/test/unit/lexer_test.rb

@@ -77,6 +77,22 @@ class LexerTest < Test::Unit::TestCase
     end
   end
 
+  def test_dates_matches
+    ['2013-07-26', '1999-01-01'].each do |op|
+      @lexer = Lexer.new(op)
+      token = @lexer.shift
+      assert_equal :DATE, token.first, op
+    end
+  end
+
+  def test_times_matches
+    ['10:22:15.422804', '10:22:15', '10:22'].each do |op|
+      @lexer = Lexer.new(op)
+      token = @lexer.shift
+      assert_equal :TIME, token.first, op
+    end
+  end
+
   def test_utc_offsets
     ['2013-07-26T10:22:15.422804-0300', '2013-07-26T10:22:15+0400'].each do |op|
       @lexer = Lexer.new(op)

data/test/unit/parser_compatability_test.rb

@@ -498,8 +498,8 @@ class ParserCompatabilityTest < Test::Unit::TestCase
     expression = parser.tokenize( "DateField Eq now()").first
     assert !parser.errors?
     assert parser.send(:check_type!, expression, :date)
-    assert_equal t.strftime(Sparkql::FunctionResolver::STRFTIME_FORMAT), 
-                 parser.escape_value(expression).strftime(Sparkql::FunctionResolver::STRFTIME_FORMAT)
+    assert_equal t.strftime(Sparkql::FunctionResolver::STRFTIME_DATE_FORMAT), 
+                 parser.escape_value(expression).strftime(Sparkql::FunctionResolver::STRFTIME_DATE_FORMAT)
   end
   
   test "datetime->date type coercion array" do
@@ -509,9 +509,9 @@ class ParserCompatabilityTest < Test::Unit::TestCase
     assert !parser.errors?
     assert parser.send(:check_type!, expression, :date)
     yesterday = today - 3600 * 24
-    assert_equal [ yesterday.strftime(Sparkql::FunctionResolver::STRFTIME_FORMAT),
-                   today.strftime(Sparkql::FunctionResolver::STRFTIME_FORMAT)], 
-                 parser.escape_value(expression).map { |i| i.strftime(Sparkql::FunctionResolver::STRFTIME_FORMAT)}
+    assert_equal [ yesterday.strftime(Sparkql::FunctionResolver::STRFTIME_DATE_FORMAT),
+                   today.strftime(Sparkql::FunctionResolver::STRFTIME_DATE_FORMAT)], 
+                 parser.escape_value(expression).map { |i| i.strftime(Sparkql::FunctionResolver::STRFTIME_DATE_FORMAT)}
   end
 
   

data/test/unit/parser_test.rb

@@ -218,6 +218,36 @@ class ParserTest < Test::Unit::TestCase
     assert_equal '2014,days(-7)', expressions.first[:condition]
   end
 
+  def test_function_date
+    filter = "OnMarketDate Eq date(OriginalEntryTimestamp)"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, "errors #{@parser.errors.inspect}"
+    assert_equal 'date(OriginalEntryTimestamp)', expressions.first[:condition]
+    assert_equal 'date', expressions.first[:value]
+    assert_equal :function, expressions.first[:type]
+    # Run using a static value, we just resolve the type
+    filter = "OnMarketDate Eq date(2013-07-26T10:22:15.111-0100)"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, "errors #{@parser.errors.inspect}"
+    assert_equal 'date(2013-07-26T10:22:15.111-0100)', expressions.first[:condition]
+    assert_equal '2013-07-26', expressions.first[:value]
+    assert_equal :date, expressions.first[:type]
+    # And the grand finale: run on both sides
+    filter = "date(OriginalEntryTimestamp) Eq date(2013-07-26T10:22:15.111-0100)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "errors #{@parser.errors.inspect}"
+    assert_equal 'date(2013-07-26T10:22:15.111-0100)', expression[:condition]
+    assert_equal '2013-07-26', expression[:value]
+    assert_equal :date, expression[:type]
+    # annnd the field function stuff
+    assert_equal "OriginalEntryTimestamp", expression[:field]
+    assert_equal :date, expression[:field_function_type]
+    assert_equal "date", expression[:field_function]
+  end
+
   test "regex function parses without second param" do
     filter = "ParcelNumber Eq regex('^[0-9]{3}-[0-9]{2}-[0-9]{3}$')"
     @parser = Parser.new
@@ -243,6 +273,10 @@ class ParserTest < Test::Unit::TestCase
 
   test "allow timezone offsets" do
     values = [
+      "2013-07-26",
+      "10:22",
+      "10:22:15.1111",
+      "10:22:15",
       "2013-07-26T10:22",
       "2013-07-26T10:22Z",
       "2013-07-26T10:22+01:00",
@@ -258,6 +292,7 @@ class ParserTest < Test::Unit::TestCase
       filter = "DatetimeField Eq #{value}"
       @parser = Parser.new
       expressions = @parser.parse(filter)
+      assert !@parser.errors?, "errors #{@parser.errors.inspect}"
       assert_not_nil expressions, "#{value} failed"
       assert_equal expressions.first[:value], value, "#{value} failed"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 1.0.0
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.8
 - !ruby/object:Gem::Dependency
@@ -94,20 +94,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.9
 description: Specification and base implementation of the Spark API parsing system.
 email:
 - wade@fbsdata.com