sparkql 1.2.4 → 1.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmIyYTljOGIyZmFjZTEyZmY1MzU2ODZjYTg4ZWU1NDI2NWNkOWRkYw==
+    ODQ4YzQ0YzQ1YmJkMDNlMmUxMmFiZTUyZWY2NTcwNjY0YTM2ZTE3OA==
   data.tar.gz: !binary |-
-    NDkwMjczNDY2N2JlOGRmMzA5MDQ1YmI4Njg3ZTM5MTJlMzBiODVhMQ==
+    NTEyZDlkMWVjY2RjZDY2ZTJlMTg3YjNjNTc4NmE2ZDc3ODdhNTAyYQ==
 SHA512:
   metadata.gz: !binary |-
-    OTk2NTgwODMyNjExMjBiZThmODdjNzczZmM4M2MzMmY0MWNiNTkxODU5NThk
-    Y2UwYzY0ZTQ1NGRhNmFjYjI1ODIwYzBiMmMyMDM2NzFmNmNhNTI1OGNkYjNj
-    NzJhZTRjMDk4MzVmYjJlNDM4YTE2ZWFjYTVjNzlmMGZlNzM4NjQ=
+    MzMwODdhYTQ3NWQwYzlhYjQ5NWM2ZTNkZDlhMzczMWZmMDg1NDliZWMyOWJj
+    MmQ3MzMwNjBiYjIzMzE3Y2JiNzk2YzQxMzgyM2EzZDM1MTc4OTVkYmM5YTQw
+    YjQ3NDVjZWVmZjcyZDkxNzE3ZjI5NTFhODU4NWI5ZjZhYWU1YTA=
   data.tar.gz: !binary |-
-    NjhmNWU0NmZjNDVkMmUzMDJhMGM2ZTY0ZWVjMTk3ZGUwZGI3MzM2OTQwN2M4
-    MTUzYTk3N2E1NzI2YWFmMTA1YWIxZWY2MTliZTRiOGNjOTU5NjEwMGFlODkz
-    YjRmYmVmN2M4NTJkMGUyM2NlNjhmODA0ZGFkYWYzM2Q0OTNlMDU=
+    MmE5ODM3ODdmYTY3MGMxN2I2Mjc2MmQ2NjQwNDM0ZTNiYzU4YTkxYjVkNWE3
+    YThkMmNlZDA3MjI0MWU0MDdkOTVmNzI4NDhkMmMzNTA5ZGYyNTM1ZGM4NDZm
+    M2M2ZjdmYTBlMTEwODUxN2ZkMDIyYmQyZDFjNjNmNGU5YTU2MGQ=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.2.5, 2018-12-19
+-------------------
+  * [BUGFIX] Correctly handle arithmetic grouping
+
 v1.2.4, 2018-12-13
 -------------------
   * [IMPROVEMENT] Support decimal arithmetic

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

data/lib/sparkql/parser_tools.rb

@@ -126,6 +126,8 @@ module Sparkql::ParserTools
   end
 
   def tokenize_arithmetic_group(lhs)
+    @lexer.leveldown
+    @lexer.block_group_identifier -= 1
     lhs = {type: :field, value: lhs} if lhs.is_a?(String)
     {
       type: :arithmetic,
@@ -260,6 +262,8 @@ module Sparkql::ParserTools
   end
 
   def group_fold(exp)
+    @lexer.leveldown
+    @lexer.block_group_identifier -= 1
     exp
   end
 

data/test/unit/parser_test.rb

@@ -1180,6 +1180,24 @@ class ParserTest < Test::Unit::TestCase
     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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby