sparkql 1.2.8 → 1.3.0

data/test/unit/parser_test.rb

@@ -5,10 +5,10 @@ class ParserTest < Test::Unit::TestCase
 
   def test_simple
     @parser = Parser.new
-    parse 'Test Eq 10',10.to_s
-    parse 'Test Eq 10.0',10.0.to_s
-    parse 'Test Eq true',true.to_s
-    parse "Test Eq 'false'","'false'"
+    parse 'Test Eq 10', 10.to_s
+    parse 'Test Eq 10.0', 10.0.to_s
+    parse 'Test Eq true', true.to_s
+    parse "Test Eq 'false'", "'false'"
   end
 
   def test_conjunction
@@ -26,7 +26,7 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 11.to_s, expression.last[:value]
     assert_equal 'Not', expression.last[:conjunction]
   end
-  
+
   def test_tough_conjunction
     @parser = Parser.new
     expression = @parser.parse('Test Eq 10 Or Test Ne 11 And Test Ne 9')
@@ -52,50 +52,50 @@ class ParserTest < Test::Unit::TestCase
   def test_multiples
     @parser = Parser.new
     expression = @parser.parse('(Test Eq 10,11,12)').first
-    assert_equal [10.to_s,11.to_s,12.to_s], expression[:value]
+    assert_equal [10.to_s, 11.to_s, 12.to_s], expression[:value]
     assert_equal '10,11,12', expression[:condition]
   end
-    
+
   def test_invalid_syntax
     @parser = Parser.new
     expression = @parser.parse('Test Eq DERP')
     assert @parser.errors?, "Should be nil: #{expression}"
   end
-  
+
   def test_nesting
     assert_nesting(
       "City Eq 'Fargo' Or (BathsFull Eq 1 Or BathsFull Eq 2) Or City Eq 'Moorhead' Or City Eq 'Dilworth'",
-      [0,1,1,0,0]
+      [0, 1, 1, 0, 0]
     )
   end
-  
+
   def test_nesting_and_functions
     # Nesting with a function thrown in. Yes, this was a problem.
     assert_nesting(
       "City Eq 'Fargo' Or (BathsFull Eq 1 And Location Eq rectangle('35.12 -68.33, 35.13 -68.32')) Or Location Eq radius('35.12 -68.33',10.0) Or City Eq 'Dilworth'",
-      [0,1,1,0,0]
+      [0, 1, 1, 0, 0]
     )
   end
 
   def test_multilevel_nesting
     assert_nesting(
       "(City Eq 'Fargo' And (BathsFull Eq 1 Or BathsFull Eq 2)) Or City Eq 'Moorhead' Or City Eq 'Dilworth'",
-      [1,2,2,0,0]
+      [1, 2, 2, 0, 0]
     )
-    
+
     # API-629
     assert_nesting(
       "((MlsStatus Eq 'A') Or (MlsStatus Eq 'D' And CloseDate Ge 2011-05-17)) And ListPrice Ge 150000.0 And PropertyType Eq 'A'",
-      [2,2,2,0,0],
-      [2,3,3,0,0]
+      [2, 2, 2, 0, 0],
+      [2, 3, 3, 0, 0]
     )
     assert_nesting(
       "ListPrice Ge 150000.0 And PropertyType Eq 'A' And ((MlsStatus Eq 'A') Or (MlsStatus Eq 'D' And CloseDate Ge 2011-05-17))",
-      [0,0,2,2,2],
-      [0,0,2,3,3]
+      [0, 0, 2, 2, 2],
+      [0, 0, 2, 3, 3]
     )
   end
-  
+
   def test_bad_queries
     filter = "City IsLikeA 'Town'"
     @parser = Parser.new
@@ -105,8 +105,8 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def test_function_months
-    dt = DateTime.new(2014, 1, 5, 0, 0, 0, 0)
-    DateTime.expects(:now).returns(dt)
+    t = Time.new(2014, 1, 5, 0, 0, 0, 0)
+    Time.expects(:now).returns(t)
     @parser = Parser.new
     expressions = @parser.parse "ExpirationDate Gt months(-3)"
     assert !@parser.errors?, "errors :( #{@parser.errors.inspect}"
@@ -115,8 +115,8 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def test_function_years
-    dt = DateTime.new(2014, 1, 5, 0, 0, 0, 0)
-    DateTime.expects(:now).returns(dt)
+    t = Time.new(2014, 1, 5, 0, 0, 0, 0)
+    Time.expects(:now).returns(t)
     @parser = Parser.new
     expressions = @parser.parse "SoldDate Lt years(2)"
     assert !@parser.errors?, "errors :( #{@parser.errors.inspect}"
@@ -125,8 +125,8 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def test_function_days
-    dt = DateTime.new(2021, 2, 22, 0, 0, 0, 0)
-    DateTime.expects(:now).returns(dt)
+    t = Time.new(2021, 2, 22, 0, 0, 0, 0)
+    Time.expects(:now).returns(t)
     @parser = Parser.new
     expressions = @parser.parse "ExpirationDate Gt days(10)"
     assert !@parser.errors?
@@ -135,8 +135,8 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def test_function_weekdays
-    dt = DateTime.new(2021, 2, 22, 0, 0, 0, 0)
-    DateTime.expects(:now).returns(dt)
+    t = Time.new(2021, 2, 22, 0, 0, 0, 0)
+    Time.expects(:now).returns(t)
     @parser = Parser.new
     expressions = @parser.parse "ExpirationDate Gt weekdays(10)"
     assert !@parser.errors?
@@ -152,8 +152,8 @@ class ParserTest < Test::Unit::TestCase
     assert !@parser.errors?, "errors #{@parser.errors.inspect}"
     assert_equal 'now()', expressions.first[:condition]
     test_time = Time.parse(expressions.first[:value])
-    assert 5 > test_time - start, "Time range off by more than five seconds #{test_time - start}"
-    assert -5 < test_time - start, "Time range off by more than five seconds #{test_time - start}"
+    assert test_time - start < 5, "Time range off by more than five seconds #{test_time - start}"
+    assert(test_time - start > -5, "Time range off by more than five seconds #{test_time - start}")
   end
 
   def test_function_range
@@ -178,7 +178,8 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 'indexof', expression[:field_manipulations][:function_name]
     assert_equal :function, expression[:field_manipulations][:type]
     assert_equal :integer, expression[:field_manipulations][:return_type]
-    assert_equal ['City', '4131800000000'], expression[:field_manipulations][:args].map {|v| v[:value]}
+    assert_equal(%w[City 4131800000000],
+                 expression[:field_manipulations][:args].map { |v| v[:value] })
   end
 
   test 'add' do
@@ -311,7 +312,7 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 'days(-7)', expressions.first[:condition]
     assert_equal([-7], expressions.first[:function_parameters])
   end
-  
+
   test "function rangeable " do
     filter = "OriginalEntryTimestamp Bt days(-7),days(-1)"
     @parser = Parser.new
@@ -460,7 +461,7 @@ class ParserTest < Test::Unit::TestCase
     assert !@parser.errors?, "errors #{@parser.errors.inspect}"
     assert_equal "polygon('35.12 -68.33, 35.13 -68.33, 35.13 -68.32, 35.12 -68.32')", expressions.first[:condition]
     assert_equal :shape, expressions.first[:type]
-    assert_equal [[-68.33, 35.12], [-68.33, 35.13], [-68.32,35.13], [-68.32,35.12],[-68.33, 35.12]], expressions.first[:value].to_coordinates.first, "#{expressions.first[:value].inspect} "
+    assert_equal [[-68.33, 35.12], [-68.33, 35.13], [-68.32, 35.13], [-68.32, 35.12], [-68.33, 35.12]], expressions.first[:value].to_coordinates.first, "#{expressions.first[:value].inspect} "
   end
 
   test "Location Eq linestring()" do
@@ -471,7 +472,6 @@ class ParserTest < Test::Unit::TestCase
     assert_equal "linestring('35.12 -68.33, 35.13 -68.33')", expressions.first[:condition]
     assert_equal :shape, expressions.first[:type]
     assert_equal [[-68.33, 35.12], [-68.33, 35.13]], expressions.first[:value].to_coordinates, "#{expressions.first[:value].inspect} "
-
   end
 
   test "Location Eq rectangle()" do
@@ -480,7 +480,7 @@ class ParserTest < Test::Unit::TestCase
     expressions = @parser.parse(filter)
     assert !@parser.errors?, "errors #{@parser.errors.inspect}"
     assert_equal :shape, expressions.first[:type]
-    assert_equal [[-68.33,35.12], [-68.32,35.12], [-68.32,35.13], [-68.33,35.13], [-68.33,35.12]], expressions.first[:value].to_coordinates.first, "#{expressions.first[:value].inspect} "
+    assert_equal [[-68.33, 35.12], [-68.32, 35.12], [-68.32, 35.13], [-68.33, 35.13], [-68.33, 35.12]], expressions.first[:value].to_coordinates.first, "#{expressions.first[:value].inspect} "
   end
 
   test "Location Eq radius()" do
@@ -507,26 +507,26 @@ class ParserTest < Test::Unit::TestCase
   test "Location eq radius() error on invalid syntax" do
     filter = "Location Eq radius('35.12,-68.33',1.0)"
     @parser = Parser.new
-    expressions = @parser.parse(filter)
+    @parser.parse(filter)
     assert @parser.errors?, "Parser error expected due to comma between radius points"
   end
-  
+
   test "Location ALL TOGETHER NOW" do
     filter = "Location Eq linestring('35.12 -68.33, 35.13 -68.33') And Location Eq radius('35.12 -68.33',1.0) And Location Eq rectangle('35.12 -68.33, 35.13 -68.32') And Location Eq polygon('35.12 -68.33, 35.13 -68.33, 35.13 -68.32, 35.12 -68.32')"
     @parser = Parser.new
     expressions = @parser.parse(filter)
     assert !@parser.errors?, "errors #{@parser.errors.inspect}"
-    assert_equal [:shape,:shape,:shape,:shape], expressions.map{|e| e[:type]}
+    assert_equal(%i[shape shape shape shape], expressions.map { |e| e[:type] })
   end
-  
+
   def test_for_reserved_words_first_literals_second
     ["OrOrOr Eq true", "Equador Eq true", "Oregon Ge 10"].each do |filter|
       @parser = Parser.new
-      expressions = @parser.parse(filter)
+      @parser.parse(filter)
       assert !@parser.errors?, "Filter '#{filter}' errors: #{@parser.errors.inspect}"
     end
   end
-  
+
   def test_custom_fields
     filter = '"General Property Description"."Taxes" Lt 500.0'
     @parser = Parser.new
@@ -536,48 +536,46 @@ class ParserTest < Test::Unit::TestCase
     assert expressions.first[:custom_field], "Custom field expression #{expressions.inspect}"
     assert_equal '500.0', expressions.first[:value], "Custom field expression #{expressions.inspect}"
   end
-  
+
   def test_valid_custom_field_filters
     ['"General Property Description"."Taxes$" Lt 500.0',
-      '"General Property Desc\'"."Taxes" Lt 500.0',
-      '"General Property Description"."Taxes" Lt 500.0',
-      '"General \'Property\' Description"."Taxes" Lt 500.0',
-      '"General Property Description"."Taxes #" Lt 500.0',
-      '"General$Description"."Taxes" Lt 500.0',
-      '"Garage Type"."1" Eq true',
-      '" a "." b " Lt 500.0'
-    ].each do |filter|
+     '"General Property Desc\'"."Taxes" Lt 500.0',
+     '"General Property Description"."Taxes" Lt 500.0',
+     '"General \'Property\' Description"."Taxes" Lt 500.0',
+     '"General Property Description"."Taxes #" Lt 500.0',
+     '"General$Description"."Taxes" Lt 500.0',
+     '"Garage Type"."1" Eq true',
+     '" a "." b " Lt 500.0'].each do |filter|
       @parser = Parser.new
-      expressions = @parser.parse(filter)
+      @parser.parse(filter)
       assert !@parser.errors?, "errors '#{filter}'\n#{@parser.errors.inspect}"
     end
   end
-  
+
   def test_invalid_custom_field_filters
     ['"$General Property Description"."Taxes" Lt 500.0',
-      '"General Property Description"."$Taxes" Lt 500.0',
-      '"General Property Description"."Tax.es" Lt 500.0',
-      '"General Property Description".".Taxes" Lt 500.0',
-      '"General Property Description".".Taxes"."SUB" Lt 500.0',
-      '"General.Description"."Taxes" Lt 500.0',
-      '""."" Lt 500.0'
-    ].each do |filter|
+     '"General Property Description"."$Taxes" Lt 500.0',
+     '"General Property Description"."Tax.es" Lt 500.0',
+     '"General Property Description".".Taxes" Lt 500.0',
+     '"General Property Description".".Taxes"."SUB" Lt 500.0',
+     '"General.Description"."Taxes" Lt 500.0',
+     '""."" Lt 500.0'].each do |filter|
       @parser = Parser.new
-      expressions = @parser.parse(filter)
+      @parser.parse(filter)
       assert @parser.errors?, "No errors? '#{filter}'\n#{@parser.inspect}"
     end
   end
 
   def test_case_insensitve_ops_and_conjunctions
     @parser = Parser.new
-    parse 'Test EQ 10',10.to_s
-    parse 'Test eq 10.0',10.0.to_s
-    parse 'Test eQ true',true.to_s
+    parse 'Test EQ 10', 10.to_s
+    parse 'Test eq 10.0', 10.0.to_s
+    parse 'Test eQ true', true.to_s
     parse 'Test EQ 10 AND Test NE 11', 10.to_s
     parse 'Test eq 10 or Test ne 11', 10.to_s
     parse 'Test eq 10 NOT Test ne 11', 10.to_s
   end
-  
+
   def test_null
     @parser = Parser.new
     parse 'Test Eq NULL', "NULL"
@@ -591,7 +589,7 @@ class ParserTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_not_expression
     @parser = Parser.new
     expressions = @parser.parse('Test Lt 10 Not Test Eq 2')
@@ -612,7 +610,7 @@ class ParserTest < Test::Unit::TestCase
     assert_equal "And", expression[:conjunction]
     assert_equal expression[:level], expression[:unary_level]
   end
-  
+
   def test_not_expression_group
     @parser = Parser.new
     expressions = @parser.parse('Not (Test Eq 10 Or Test Eq 11)')
@@ -637,7 +635,7 @@ class ParserTest < Test::Unit::TestCase
 
   def test_not_not_expression
     @parser = Parser.new
-    filter = "Not (Not ListPrice Eq 1) Not (Not BathsTotal Eq 2) And " +
+    filter = "Not (Not ListPrice Eq 1) Not (Not BathsTotal Eq 2) And " \
              "(Not TotalRooms Eq 3) Or (HasPool Eq true)"
 
     expressions = @parser.parse(filter)
@@ -706,7 +704,6 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 1, e2[:level]
     assert_equal "Not", e2[:conjunction]
     assert_equal 1, e2[:conjunction_level]
-
   end
 
   def test_expression_conditions_attribute
@@ -738,7 +735,7 @@ class ParserTest < Test::Unit::TestCase
     ]
     conditions.each do |condition|
       @parser = Parser.new
-      expressions = @parser.parse("Test Eq #{condition}")
+      @parser.parse("Test Eq #{condition}")
       assert @parser.errors?, @parser.inspect
     end
   end
@@ -748,12 +745,12 @@ class ParserTest < Test::Unit::TestCase
      "DateTimeField Bt 2013-07-26T10:22:15,2013-07-26T10:22:16",
      "DateTimeField Bt 2013-07-26T10:22:15.422804-0300,2013-07-26T10:22:15.422805-0300",
      "DateTimeField Bt 2013-07-26T10:22:15+0400,2013-07-26T10:22:16+0400"].each do |filter|
-      @parser = Parser.new
-      expression = @parser.parse filter
-      assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+       @parser = Parser.new
+       @parser.parse filter
+       assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
      end
   end
-  
+
   def test_coercible_types
     @parser = Parser.new
     assert_equal :datetime, @parser.coercible_types(:date, :datetime)
@@ -814,7 +811,6 @@ class ParserTest < Test::Unit::TestCase
     parser_errors("Field Eq -'Stringval'")
   end
 
-
   test "field negation" do
     @parser = Parser.new
     expressions = @parser.parse('-Test Eq 10')
@@ -861,7 +857,8 @@ class ParserTest < Test::Unit::TestCase
 
     assert_equal 'round', expression[:field_manipulations][:function_name]
     assert_equal :function, expression[:field_manipulations][:type]
-    assert_equal ['ListPrice'], expression[:field_manipulations][:args].map {|v| v[:value]}
+    assert_equal(['ListPrice'],
+                 expression[:field_manipulations][:args].map { |v| v[:value] })
   end
 
   def test_ceiling_with_literal
@@ -921,7 +918,8 @@ class ParserTest < Test::Unit::TestCase
 
     assert_equal 'floor', expression[:field_manipulations][:function_name]
     assert_equal :function, expression[:field_manipulations][:type]
-    assert_equal ['ListPrice'], expression[:field_manipulations][:args].map {|v| v[:value]}
+    assert_equal(['ListPrice'],
+                 expression[:field_manipulations][:args].map { |v| v[:value] })
   end
 
   def test_concat_with_field
@@ -932,12 +930,13 @@ class ParserTest < Test::Unit::TestCase
 
     assert_equal :character, expression[:type]
     assert_equal 'concat', expression[:field_function]
-    assert_equal(["City", 'b'], expression[:args])
+    assert_equal(%w[City b], expression[:args])
     assert_equal("City", expression[:field])
 
     assert_equal 'concat', expression[:field_manipulations][:function_name]
     assert_equal :function, expression[:field_manipulations][:type]
-    assert_equal ['City', 'b'], expression[:field_manipulations][:args].map {|v| v[:value]}
+    assert_equal(%w[City b],
+                 expression[:field_manipulations][:args].map { |v| v[:value] })
   end
 
   def test_concat_with_literal
@@ -949,7 +948,7 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 'concat', expression[:function_name]
     assert_equal :character, expression[:type]
     assert_equal "'ab'", expression[:value]
-    assert_equal ["a", "b"], expression[:function_parameters]
+    assert_equal %w[a b], expression[:function_parameters]
   end
 
   def test_cast_with_field
@@ -964,7 +963,8 @@ class ParserTest < Test::Unit::TestCase
 
     assert_equal 'cast', expression[:field_manipulations][:function_name]
     assert_equal :function, expression[:field_manipulations][:type]
-    assert_equal ['ListPrice', 'character'], expression[:field_manipulations][:args].map {|v| v[:value]}
+    assert_equal(%w[ListPrice character],
+                 expression[:field_manipulations][:args].map { |v| v[:value] })
   end
 
   def test_cast_with_invalid_type
@@ -1165,7 +1165,7 @@ class ParserTest < Test::Unit::TestCase
     function2 = function1[:args].first
     assert_equal :function, function2[:type]
     assert_equal 'toupper', function2[:function_name]
-    assert_equal({:type=>:field, :value=>"City"}, function2[:args].first)
+    assert_equal({ type: :field, value: "City" }, function2[:args].first)
   end
 
   test 'nested functions with multiple params' do
@@ -1176,12 +1176,12 @@ class ParserTest < Test::Unit::TestCase
     function1 = expression[:field_manipulations]
     assert_equal :function, function1[:type]
     assert_equal 'concat', function1[:function_name]
-    assert_equal({type: :character, value: 'b'}, function1[:args].last)
+    assert_equal({ type: :character, value: 'b' }, function1[:args].last)
 
     function2 = function1[:args].first
     assert_equal :function, function2[:type]
     assert_equal 'tolower', function2[:function_name]
-    assert_equal({:type=>:field, :value=>"City"}, function2[:args].first)
+    assert_equal({ type: :field, value: "City" }, function2[:args].first)
   end
 
   test 'parse error with no field' do
@@ -1234,30 +1234,30 @@ class ParserTest < Test::Unit::TestCase
 
   private
 
-  def parser_errors(filter)  
+  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}"
+  def parse(query, value)
+    expressions = @parser.parse(query)
+    assert !@parser.errors?, "Unexpected error parsing #{query} #{@parser.errors.inspect}"
+    assert_equal value, 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)
+  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
+      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.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - GRAMMAR.md
 - Gemfile