sparkql 1.1.13 → 1.1.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTJhM2I5YjU5YTg1NTVhNDgyOTJjYzE5YjI4YjlkZjkzZmI3NjFmYw==
+    MTMwMTA4MTcwZWRiNzFiMzJkOTFmYzgwNmVlYjRhNzQwZTZlOWQ5OA==
   data.tar.gz: !binary |-
-    MjAyMjAwN2VhYTNmN2Q1NjhkNGZmN2FhNGY5OTgwMjdhNDY3ZWFjMQ==
+    OWQ3NWE4ZmQxOTQ3ZTcxMTk1MmE5MDM4OWU5NWNhNWY5NDUwZDUyYg==
 SHA512:
   metadata.gz: !binary |-
-    OWY5MmVmNDhmMGM0OTgzNmE2NjE4OWM5NmQ4M2QxOTJiMGFiOGQ4MDlkMmJj
-    NDBhNTVkZDgyMGJmYmU1Y2YwOTdiOTNmN2ZkYTcxOWM1MWNkNjJmZmJiMmI3
-    ODhmOGIzNWFiYTEwYTQzMThiNGNkNThlNDc0OGQzYTNmMjA4NWU=
+    MzY2NGFkZWYxNWM2ZGQyZWMyNjRmZTkzMzU2OTYwZDBmNzk2YjhmMzc4ZjFj
+    NjdiYTM5MTBjNmY3ZTQxNmVkOWU4YzFjYzY5MjY2NDQzZDI3MzVmZmUxYWQ0
+    NGZmYzE5MGM3ODlkZmQ1M2M4NGY4M2I2MGE0MzQyYzVkNzcwOTU=
   data.tar.gz: !binary |-
-    MzI5MWY5NDRkN2ViNGFhMzUzOTQwMWZmZTQ3ZmUwZjE3ZGY5NDJjM2UxMjYy
-    ZTdiMjY0NDA1OWJiNDVlM2YyM2I0NzdiOWVlN2E3M2M2YjFmNDc4NjQ4ZmJh
-    ZWNlYTE0ODE4ZmQ0ZGQyZjUxNTk5YTM2YWIxYTg2Y2YzMGY4Nzg=
+    NDVmYjg0NjJkYTI1OGJkNjI1MDYxMzc4OGNkNzkyZmFkNjM1ZmU1NmE1OGJl
+    ODcyOTRiYzcyYjcxNWJhMTk2NWM2ODc2YjQyZTg5YjgwMjBkNzk2NzczODAx
+    OTc4ZmVmZDBiY2I5ZDc0YWE3YmQyMDAwNTFlZTJkZTg4Yjg2Mjc=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+v1.1.14, 2018-07-12
+-------------------
+  * [IMPROVEMENT] Allow Negation for integer and decimal literals
+  * [IMPROVEMENT] New Functions: round(), substring(), trim()
+  * [BUGFIX] `MIN_DATE_TIME` was increased to 1970
+
 v1.1.13, 2018-06-27
 -------------------
   * [IMPROVEMENT] New Functions: length(), mindatetime(), maxdatetime()

data/GRAMMAR.md

@@ -178,6 +178,8 @@ Literals that support multiple values in a list for a condition
        : INTEGER
        | DECIMAL
        | CHARACTER
+       | LPAREN literals RPAREN 
+       | UMINUS literals 
        ;
 ```
 

data/VERSION

@@ -1 +1 @@
-1.1.13
+1.1.14

data/lib/sparkql/function_resolver.rb

@@ -14,7 +14,7 @@ class Sparkql::FunctionResolver
   STRFTIME_DATE_FORMAT = '%Y-%m-%d'
   STRFTIME_TIME_FORMAT = '%H:%M:%S.%N'
   VALID_REGEX_FLAGS = ["", "i"]
-  MIN_DATE_TIME = Time.new(1, 1, 1, 0, 0, 0, "+00:00").iso8601
+  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
   SUPPORTED_FUNCTIONS = {
     :polygon => {
@@ -37,6 +37,19 @@ class Sparkql::FunctionResolver
       }],
       :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,
@@ -56,6 +69,11 @@ class Sparkql::FunctionResolver
       :args => [[:field, :character], :character],
       :return_type => :integer
     },
+    :round => {
+      :args => [[:field, :decimal]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
     :startswith => {
       :args => [:character],
       :return_type => :startswith
@@ -264,6 +282,57 @@ class Sparkql::FunctionResolver
     }
   end
 
+  def trim_field(arg)
+    {
+      :type => :function,
+      :value => "trim",
+      :args => [arg]
+    }
+  end
+
+  def trim_character(arg)
+    {
+      :type => :character,
+      :value => arg.strip
+    }
+  end
+
+  def substring_field(field, first_index, number_chars)
+    return if substring_index_error?(number_chars)
+    {
+      :type => :function,
+      :value => "substring",
+      :args => [field, first_index, number_chars]
+    }
+  end
+
+  def substring_character(character, first_index, number_chars)
+    return if substring_index_error?(number_chars)
+
+    second_index = if number_chars.nil?
+      -1
+    else
+      number_chars + first_index - 1
+    end
+
+    new_string = character[first_index..second_index].to_s
+
+    {
+      :type => :character,
+      :value => new_string
+    }
+  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
+    end
+    false
+  end
+
   def tolower_character(string)
     {
       :type => :character,
@@ -271,7 +340,8 @@ class Sparkql::FunctionResolver
     }
   end
 
-  def tolower_field(arg) {
+  def tolower_field(arg)
+    {
       :type => :function,
       :value => "tolower",
       :args => [arg]
@@ -398,6 +468,21 @@ class Sparkql::FunctionResolver
     }
   end
 
+  def round_decimal(arg)
+    {
+      :type => :integer,
+      :value => arg.round.to_s
+    }
+  end
+
+  def round_field(arg)
+    {
+      :type => :function,
+      :value => "round",
+      :args => [arg]
+    }
+  end
+
   def indexof(arg1, arg2)
     {
       :type => :function,

data/lib/sparkql/lexer.rb

@@ -47,6 +47,8 @@ class Sparkql::Lexer < StringScanner
         literal :DECIMAL, @current_token_value
       when @current_token_value = scan(INTEGER)
         literal :INTEGER, @current_token_value
+      when @current_token_value = scan(/\-/)
+        [:UMINUS, @current_token_value]
       when @current_token_value = scan(CHARACTER)
         literal :CHARACTER, @current_token_value
       when @current_token_value = scan(BOOLEAN)

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.14
 # from Racc grammer file "".
 #
 
@@ -16,68 +16,72 @@ module Sparkql
 ##### State transition tables begin ###
 
 racc_action_table = [
-    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 ]
+    35,    14,    15,    43,    44,    34,    45,    46,    47,    14,
+    22,    31,    32,    33,    36,    37,    38,    39,    40,    35,
+    17,    16,    23,    49,    34,    50,    10,    11,    14,   -28,
+    31,    32,    33,    36,    37,    38,    39,    40,    35,    56,
+    60,    17,    16,    34,    61,    10,    11,    14,    59,    31,
+    32,    33,    36,    37,    38,    39,    40,    35,    18,    19,
+    35,    64,    34,   nil,   nil,    34,   nil,   nil,    31,    32,
+    33,    31,    32,    33,    35,    14,   nil,    43,    44,    34,
+    45,    46,    47,    14,   nil,    31,    32,    33,     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,   nil,    10,    11,    14 ]
 
 racc_action_check = [
-    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 ]
+    18,    19,     1,    19,    19,    18,    19,    19,    19,    18,
+    13,    18,    18,    18,    18,    18,    18,    18,    18,    22,
+    21,    21,    15,    21,    22,    22,    22,    22,    22,    28,
+    22,    22,    22,    22,    22,    22,    22,    22,    61,    29,
+    51,     2,     2,    61,    51,    61,    61,    61,    42,    61,
+    61,    61,    61,    61,    61,    61,    61,    34,     6,     6,
+    35,    57,    34,   nil,   nil,    35,   nil,   nil,    34,    34,
+    34,    35,    35,    35,    56,    59,   nil,    59,    59,    56,
+    59,    59,    59,    56,   nil,    56,    56,    56,     0,   nil,
+     0,   nil,     0,     0,     0,     9,   nil,     9,   nil,     9,
+     9,     9,     8,   nil,     8,     8,     8,    16,   nil,    16,
+    16,    16,    17,   nil,    17,    17,    17 ]
 
 racc_action_pointer = [
-    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 ]
+    83,     2,    36,   nil,   nil,   nil,    55,   nil,    95,    90,
+   nil,   nil,   nil,     3,   nil,    22,   100,   105,    -2,   -10,
+   nil,    15,    17,   nil,   nil,   nil,   nil,   nil,    17,    27,
+   nil,   nil,   nil,   nil,    55,    58,   nil,   nil,   nil,   nil,
+   nil,   nil,    36,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    32,   nil,   nil,   nil,   nil,    72,    53,   nil,    64,
+   nil,    36,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -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 ]
+    -2,   -48,    -1,    -3,    -4,    -5,   -48,    -8,   -48,   -48,
+   -13,   -14,   -15,   -48,   -21,   -48,   -48,   -48,   -48,   -48,
+    -9,   -48,   -48,    67,   -10,   -11,    -6,   -16,   -17,   -18,
+   -27,   -32,   -33,   -34,   -48,   -48,   -37,   -38,   -39,   -40,
+   -41,    -7,   -48,   -42,   -43,   -44,   -45,   -46,   -47,   -12,
+   -19,   -48,   -22,   -24,   -25,   -26,   -48,   -48,   -36,   -48,
+   -20,   -48,   -29,   -30,   -35,   -31,   -23 ]
 
 racc_goto_table = [
-    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,
-   nil,   nil,   nil,   nil,   nil,   nil,    59,    46,    58,    60,
-    53,    61 ]
+    28,    48,    42,     2,    55,    52,    20,    30,     1,    26,
+    41,    27,    21,    29,    24,    25,    51,   nil,   nil,   nil,
+   nil,   nil,   nil,    57,    58,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    63,   nil,
+   nil,    48,    65,    55,    66,    62 ]
 
 racc_goto_check = [
-    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,
-   nil,   nil,   nil,   nil,   nil,   nil,    10,    10,    16,    17,
-     6,    15 ]
+    10,    10,    17,     2,     6,    15,     3,    16,     1,     7,
+     8,    11,     2,    12,     3,     3,    14,   nil,   nil,   nil,
+   nil,   nil,   nil,    16,    16,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
+   nil,    10,    17,     6,    15,    16 ]
 
 racc_goto_pointer = [
-   nil,    14,     4,    -1,   nil,   nil,   -17,    -6,    -8,   nil,
-   -18,    -9,   -10,   nil,   -12,   -16,   -16,   -16 ]
+   nil,     8,     3,    -2,   nil,   nil,   -18,    -9,    -9,   nil,
+   -18,    -7,    -5,   nil,    -6,   -17,   -11,   -17 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     3,     4,     5,     6,   nil,   nil,     7,
-    12,    51,   nil,    13,   nil,   nil,    52,   nil ]
+    12,    53,   nil,    13,   nil,   nil,    54,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -115,6 +119,8 @@ racc_reduce_table = [
   1, 37, :_reduce_none,
   1, 37, :_reduce_none,
   1, 37, :_reduce_none,
+  3, 37, :_reduce_35,
+  2, 37, :_reduce_36,
   1, 32, :_reduce_none,
   1, 32, :_reduce_none,
   1, 32, :_reduce_none,
@@ -127,9 +133,9 @@ racc_reduce_table = [
   1, 38, :_reduce_none,
   1, 38, :_reduce_none ]
 
-racc_reduce_n = 46
+racc_reduce_n = 48
 
-racc_shift_n = 62
+racc_shift_n = 67
 
 racc_token_table = {
   false => 0,
@@ -334,9 +340,15 @@ end
 
 # reduce 34 omitted
 
-# reduce 35 omitted
+def _reduce_35(val, _values, result)
+ result = val[1] 
+    result
+end
 
-# reduce 36 omitted
+def _reduce_36(val, _values, result)
+ result = tokenize_literal_negation(val[1]) 
+    result
+end
 
 # reduce 37 omitted
 
@@ -356,6 +368,10 @@ end
 
 # reduce 45 omitted
 
+# reduce 46 omitted
+
+# reduce 47 omitted
+
 def _reduce_none(val, _values, result)
   val[0]
 end

data/lib/sparkql/parser.y

@@ -159,6 +159,8 @@ rule
     : INTEGER
     | DECIMAL
     | CHARACTER
+    | LPAREN literals RPAREN { result = val[1] }
+    | UMINUS literals { result = tokenize_literal_negation(val[1]) }
     ;
   
 ##### Literal

data/lib/sparkql/parser_compatibility.rb

@@ -60,7 +60,7 @@ module Sparkql::ParserCompatibility
       :type => :function,
       # This type is not parseable, so no regex
       :operators => Sparkql::Token::OPERATORS + [Sparkql::Token::RANGE_OPERATOR]
-    }
+    },
   ]
 
   OPERATORS_SUPPORTING_MULTIPLES = ["Eq","Ne"]

data/lib/sparkql/parser_tools.rb

@@ -91,6 +91,25 @@ module Sparkql::ParserTools
     list
   end
 
+  def tokenize_literal_negation(number_token)
+    old_val = case number_token[:type]
+    when :integer
+      number_token[:value].to_i
+    when :decimal
+      number_token[:value].to_f
+    else
+      tokenizer_error(:token => @lexer.current_token_value,
+                      :expression => number_token,
+                      :message => "Negation is only allowed for integer and floats",
+                      :status => :fatal,
+                      :syntax => true)
+      return number_token
+    end
+    number_token[:value] = (-1 * old_val).to_s
+
+    number_token
+  end
+
   def tokenize_multiple(lit1, lit2)
     final_type = lit1[:type]
     if lit1[:type] != lit2[:type]

data/test/unit/function_resolver_test.rb

@@ -14,14 +14,151 @@ class FunctionResolverTest < Test::Unit::TestCase
     assert_equal(["35.12 -68.33", 1.0], value[:function_parameters])
   end
 
-  test "tolower(SomeField)" do
-    f = FunctionResolver.new('tolower', [{:type => :field, :value => "City"}])
+  test "round(float)" do
+    f = FunctionResolver.new('round', [{:type => :decimal, :value => 0.5}])
     f.validate
     assert !f.errors?, "Errors #{f.errors.inspect}"
     value = f.call
+    assert_equal :integer, value[:type]
+    assert_equal '1', value[:value]
+  end
+
+  test "round(Field)" do
+    f = FunctionResolver.new('round', [{:type => :field, :value => 'ListPrice'}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
     assert_equal :function, value[:type]
-    assert_equal 'tolower', value[:value]
-    assert_equal "City", value[:args].first
+    assert_equal 'round', value[:value]
+    assert_equal "ListPrice", value[:args].first
+  end
+
+  test "substring character one index" do
+    f = FunctionResolver.new('substring', [
+      {:type => :character, :value => 'ListPrice'},
+      {:type => :integer, :value => 1}
+    ])
+
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :character, value[:type]
+    assert_equal 'istPrice', value[:value]
+  end
+
+  test "substring character two indexes" do
+    f = FunctionResolver.new('substring', [
+      {:type => :character, :value => 'alfb'},
+      {:type => :integer, :value => 1},
+      {:type => :integer, :value => 2}
+    ])
+
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :character, value[:type]
+    assert_equal "lf", value[:value]
+  end
+
+  test "substring character large first index" do
+    f = FunctionResolver.new('substring', [
+      {:type => :character, :value => 'ListPrice'},
+      {:type => :integer, :value => 10}
+    ])
+
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :character, value[:type]
+    assert_equal '', value[:value]
+  end
+
+  test "substring field one index" do
+    f = FunctionResolver.new('substring', [
+      {:type => :field, :value => 'ListPrice'},
+      {:type => :integer, :value => 1}
+    ])
+
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :function, value[:type]
+    assert_equal 'substring', value[:value]
+    assert_equal "ListPrice", value[:args].first
+    assert_nil value[:args].last
+  end
+
+  test "substring field two indexes" do
+    f = FunctionResolver.new('substring', [
+      {:type => :field, :value => 'ListPrice'},
+      {:type => :integer, :value => 1},
+      {:type => :integer, :value => 2}
+    ])
+
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :function, value[:type]
+    assert_equal 'substring', value[:value]
+    assert_equal "ListPrice", value[:args].first
+    assert_equal 2, value[:args].last
+  end
+
+  test "substring with negative M is a parse error" do
+    f = FunctionResolver.new('substring', [
+      {:type => :field, :value => 'ListPrice'},
+      {:type => :integer, :value => 1},
+      {:type => :integer, :value => -5}
+    ])
+
+    f.validate
+    f.call
+    assert f.errors?
+  end
+
+  test "character substring with negative M is a parse error" do
+    f = FunctionResolver.new('substring', [
+      {:type => :character, :value => 'ListPrice'},
+      {:type => :integer, :value => 1},
+      {:type => :integer, :value => -5}
+    ])
+
+    f.validate
+    f.call
+    assert f.errors?
+  end
+
+  test 'trim with field' do
+    f = FunctionResolver.new('trim', [
+      {:type => :field, :value => 'Name'}
+    ])
+
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :function, value[:type]
+    assert_equal 'trim', value[:value]
+    assert_equal "Name", value[:args].first
+  end
+
+  test 'trim with character' do
+    f = FunctionResolver.new('trim', [
+      {:type => :character, :value => ' val '}
+    ])
+
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :character, value[:type]
+    assert_equal 'val', value[:value]
   end
 
   test "tolower('string')" do
@@ -89,7 +226,7 @@ class FunctionResolverTest < Test::Unit::TestCase
     value = f.call
     assert_equal :datetime, value[:type]
 
-    assert_equal '0001-01-01T00:00:00+00:00', value[:value]
+    assert_equal '1970-01-01T00:00:00+00:00', value[:value]
   end
 
   test "maxdatetime()" do

data/test/unit/parser_test.rb

@@ -56,13 +56,6 @@ class ParserTest < Test::Unit::TestCase
     assert_equal '10,11,12', expression[:condition]
   end
     
-  def parse(q,v)
-    expressions = @parser.parse(q)
-    assert !@parser.errors?, "Unexpected error parsing #{q} #{@parser.errors.inspect}"
-    assert_equal v, expressions.first[:value], "Expression #{expressions.inspect}"
-    assert !expressions.first[:custom_field], "Unexepected custom field #{expressions.inspect}"
-  end
-
   def test_invalid_syntax
     @parser = Parser.new
     expression = @parser.parse('Test Eq DERP')
@@ -103,20 +96,6 @@ class ParserTest < Test::Unit::TestCase
     )
   end
   
-  # verify each expression in the query is at the right nesting level and group
-  def assert_nesting(sparkql, levels=[], block_groups=nil)
-    block_groups = levels.clone if block_groups.nil?
-    parser = Parser.new
-    expressions = parser.parse(sparkql)
-    assert !parser.errors?, "Unexpected error parsing #{sparkql}: #{parser.errors.inspect}"
-    count = 0
-    expressions.each do |ex|
-      assert_equal levels[count],  ex[:level], "Nesting level wrong for #{ex.inspect}"
-      assert_equal(block_groups[count],  ex[:block_group], "Nesting block group wrong for #{ex.inspect}")
-      count +=1
-    end
-  end    
-
   def test_bad_queries
     filter = "City IsLikeA 'Town'"
     @parser = Parser.new
@@ -629,11 +608,119 @@ class ParserTest < Test::Unit::TestCase
     assert_nil @parser.coercible_types(:integer, :date)
   end
 
+  def test_literal_group
+    filter = "ListPrice Gt (5)"
+    @parser = Parser.new
+    @parser.parse(filter)
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+  end
+
+  def test_integer_negation
+    filter = "ListPrice Gt -(5)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal '-5', expression[:value]
+  end
+
+  def test_decimal_negation
+    filter = "ListPrice Gt -(5.1)"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    expression = expressions.first
+    assert_equal :decimal, expression[:type]
+    assert_equal '-5.1', expression[:value]
+  end
+
+  def test_nested_negation
+    filter = "ListPrice Gt -(-5)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal '5', expression[:value]
+
+    filter = "ListPrice Gt --5"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal '5', expression[:value]
+  end
+
+  def test_string_negation_does_not_parse
+    parser_errors("Field Eq -'Stringval'")
+  end
+
+  def test_substring
+    filter = "Name Eq substring('Andy', 1)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+    assert_equal 'ndy', expression[:value]
+  end
+
+  def test_round_with_literal
+    filter = "ListPrice Eq round(0.5)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal "1", expression[:value]
+
+    filter = "ListPrice Eq round(-0.5)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal "-1", expression[:value]
+  end
+
+  def test_round_with_field
+    filter = "ListPrice Eq round(FieldName)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal 'round', expression[:function_name]
+    assert_equal 'round(FieldName)', expression[:condition]
+    assert_equal(["FieldName"], expression[:function_parameters])
+  end
+
+  private
 
   def parser_errors(filter)  
     @parser = Parser.new
     expression = @parser.parse(filter)
     assert @parser.errors?, "Should find errors for '#{filter}': #{expression}"
   end
-    
+
+  def parse(q,v)
+    expressions = @parser.parse(q)
+    assert !@parser.errors?, "Unexpected error parsing #{q} #{@parser.errors.inspect}"
+    assert_equal v, expressions.first[:value], "Expression #{expressions.inspect}"
+    assert !expressions.first[:custom_field], "Unexepected custom field #{expressions.inspect}"
+  end
+
+  # verify each expression in the query is at the right nesting level and group
+  def assert_nesting(sparkql, levels=[], block_groups=nil)
+    block_groups = levels.clone if block_groups.nil?
+    parser = Parser.new
+    expressions = parser.parse(sparkql)
+    assert !parser.errors?, "Unexpected error parsing #{sparkql}: #{parser.errors.inspect}"
+    count = 0
+    expressions.each do |ex|
+      assert_equal levels[count],  ex[:level], "Nesting level wrong for #{ex.inspect}"
+      assert_equal(block_groups[count],  ex[:block_group], "Nesting block group wrong for #{ex.inspect}")
+      count +=1
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.14
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby