sparkql 1.2.2 → 1.2.7

data/test/unit/parser_compatability_test.rb

@@ -565,4 +565,19 @@ class ParserCompatabilityTest < Test::Unit::TestCase
     assert parser.send(:check_type!, expression, :datetime)
     assert_equal '3', parser.escape_value(expression)
   end
+
+  test "function with field and arithmetic" do
+    filter = "year(CloseDate) add 1 Eq 2017"
+    parser = Parser.new
+    expression = parser.tokenize(filter).first
+    assert parser.send(:check_type!, expression, :datetime)
+  end
+
+  test "Cannot perform arithmetic on a String field" do
+    filter = "City Add 3.0 Eq 'Fargo'"
+    parser = Parser.new
+    expression = parser.tokenize(filter).first
+    # Type mismatch
+    assert !parser.send(:check_type!, expression, :datetime)
+  end
 end

data/test/unit/parser_test.rb

@@ -125,19 +125,23 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def test_function_days
-    d = Date.today
-    start = Time.utc(d.year,d.month,d.day,0,0,0)
-    filter = "OriginalEntryTimestamp Ge days(-7)"
+    dt = DateTime.new(2021, 2, 22, 0, 0, 0, 0)
+    DateTime.expects(:now).returns(dt)
     @parser = Parser.new
-    expressions = @parser.parse(filter)
-    assert !@parser.errors?, "errors #{@parser.errors.inspect}"
-    assert_equal 'days(-7)', expressions.first[:condition]
-
-    vals = expressions.first[:value].split('-')
+    expressions = @parser.parse "ExpirationDate Gt days(10)"
+    assert !@parser.errors?
+    assert_equal "2021-03-04", expressions.first[:value]
+    assert_equal 'days(10)', expressions.first[:condition]
+  end
 
-    test_time = Time.utc(vals[0].to_i, vals[1].to_i, vals[2].to_i)
-    
-    assert (-605000 < test_time - start && -604000 > test_time - start), "Time range off by more than five seconds #{test_time - start} '#{test_time} - #{start}'"
+  def test_function_weekdays
+    dt = DateTime.new(2021, 2, 22, 0, 0, 0, 0)
+    DateTime.expects(:now).returns(dt)
+    @parser = Parser.new
+    expressions = @parser.parse "ExpirationDate Gt weekdays(10)"
+    assert !@parser.errors?
+    assert_equal "2021-03-08", expressions.first[:value]
+    assert_equal 'weekdays(10)', expressions.first[:condition]
   end
 
   def test_function_now
@@ -232,6 +236,54 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 'Mod', field_manipulations[:op]
   end
 
+  test 'Mod returns decimal precision' do
+    @parser = Parser.new
+    filter = "Baths Eq 32.7 Mod 20.7"
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    assert_equal '12.0', expressions.first[:value]
+  end
+
+  test 'Adding returns decimal precision' do
+    @parser = Parser.new
+    filter = "Baths Eq 0.1 Add 0.2"
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    assert_equal '0.3', expressions.first[:value]
+  end
+
+  test 'Subtracting returns decimal precision' do
+    @parser = Parser.new
+    filter = "Baths Eq 0.3 Sub 0.1"
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    assert_equal '0.2', expressions.first[:value]
+  end
+
+  test 'Division returns decimal precision' do
+    @parser = Parser.new
+    filter = "Baths Eq 0.6 Div 0.2"
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    assert_equal '3.0', expressions.first[:value]
+  end
+
+  test 'Arithmetic rounds to 20 decimal places' do
+    @parser = Parser.new
+    filter = "Baths Eq 7 Div 10.1"
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    assert_equal '0.69306930693069306931', expressions.first[:value]
+  end
+
+  test 'Multiplication returns decimal precision' do
+    @parser = Parser.new
+    filter = "Baths Eq 7 Mul 0.1"
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    assert_equal '0.7', expressions.first[:value]
+  end
+
   test 'arithmetic with field function' do
     @parser = Parser.new
     filter = "floor(Baths) Add 2 Eq 1"
@@ -340,10 +392,40 @@ class ParserTest < Test::Unit::TestCase
   test "invalid regex" do
     filter = "ParcelNumber Eq regex('[1234', '')"
     @parser = Parser.new
-    expressions = @parser.parse(filter)
+    @parser.parse(filter)
     assert @parser.errors?, "Parser error expected due to invalid regex"
   end
 
+  test "dayofyear function parses" do
+    filter = "dayofyear(DatetimeField) Eq 2012"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    function = expressions.first[:field_manipulations]
+    assert_equal 'dayofyear', function[:function_name]
+    assert_equal 'DatetimeField', function[:function_parameters].first
+  end
+
+  test "dayofweek function parses" do
+    filter = "dayofweek(DatetimeField) Eq 7"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    function = expressions.first[:field_manipulations]
+    assert_equal 'dayofweek', function[:function_name]
+    assert_equal 'DatetimeField', function[:function_parameters].first
+  end
+
+  test "weekdays function resolves" do
+    filter = "DatetimeField Eq weekdays(10)"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.errors.inspect
+    function = expressions.first
+    assert_equal 'weekdays', function[:function_name]
+    assert_equal 10, function[:function_parameters].first
+  end
+
   test "allow timezone offsets" do
     values = [
       "2013-07-26",
@@ -370,7 +452,7 @@ class ParserTest < Test::Unit::TestCase
       assert_equal expressions.first[:value], value, "#{value} failed"
     end
   end
-  
+
   test "Location Eq polygon()" do
     filter = "Location Eq polygon('35.12 -68.33, 35.13 -68.33, 35.13 -68.32, 35.12 -68.32')"
     @parser = Parser.new
@@ -732,6 +814,16 @@ class ParserTest < Test::Unit::TestCase
     parser_errors("Field Eq -'Stringval'")
   end
 
+
+  test "field negation" do
+    @parser = Parser.new
+    expressions = @parser.parse('-Test Eq 10')
+    assert !@parser.errors?
+
+    assert_equal 'Negation', expressions.first[:field_manipulations][:op]
+    assert_equal 'Test', expressions.first[:field]
+  end
+
   def test_substring
     filter = "Name Eq substring('Andy', 1)"
     @parser = Parser.new
@@ -1097,6 +1189,49 @@ class ParserTest < Test::Unit::TestCase
     parser_errors("1 Add 1 Eq 2")
   end
 
+  test "field grouping" do
+    @parser = Parser.new
+    expressions = @parser.parse('(Test) Eq 10')
+    assert !@parser.errors?
+
+    assert_equal 'Group', expressions.first[:field_manipulations][:op]
+  end
+
+  test "grouping arithmetic" do
+    @parser = Parser.new
+    expressions = @parser.parse('(Test mul 10) sub 2 Eq 10')
+    assert !@parser.errors?
+
+    assert_equal 'Sub', expressions.first[:field_manipulations][:op]
+    assert_equal 'Group', expressions.first[:field_manipulations][:lhs][:op]
+  end
+
+  test "grouping literal" do
+    @parser = Parser.new
+    expressions = @parser.parse('Test Eq (5 sub 5) mul 5 ')
+    assert !@parser.errors?
+
+    assert_equal '0', expressions.first[:value]
+  end
+
+  test 'Arithmetic grouping should not influence expression grouping' do
+    filter = "(BathroomsTotalDecimal add (5 mul 5)) Eq ((3.4 add 2.6) mul (1 add 1))"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?
+    assert_equal 0, expressions.first[:level]
+    assert_equal 0, expressions.first[:block_group]
+
+    filter = "((BathroomsTotalDecimal add (5 mul 5)) Eq ((3.4 add 2.6) mul (1 add 1))) And BathroomsTotalDecimal Eq 5"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?
+    assert_equal 1, expressions.first[:level]
+    assert_equal 1, expressions.first[:block_group]
+    assert_equal 0, expressions.last[:level]
+    assert_equal 0, expressions.last[:block_group]
+  end
+
   private
 
   def parser_errors(filter)  

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.7
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: racc
+  name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.4.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 1.4.8
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 2.1.0
 description: Specification and base implementation of the Spark API parsing system.
 email:
 - wade@fbsdata.com
@@ -101,8 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
 - CHANGELOG.md
 - GRAMMAR.md
 - Gemfile
@@ -149,17 +148,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sparkql
-rubygems_version: 2.2.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Parser engine for filter searching

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3