sparkql 1.1.4 → 1.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTM5ZTA1MmJlMzc4M2IwMjEyMGIyOTI2MjdiNGFjOTRhZmFjMDJjNw==
+    YzQ3MzkyNGE3ZDhjMTMxNDBjY2EwODcxMzE0OWMwZjQ3MWJhNzE3NQ==
   data.tar.gz: !binary |-
-    ODdmZjYxZWNhMDBiMzlhMmMwODUzY2NmOGU0OTM3ODExOTc5OTNhZg==
+    OTYxYzJjMjY5NDI0YTc2MTAwZWZlY2NiNGI1ZjQzZWVkMzUzNmU4Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZmVkZTE3YTllMGNjNzA2YmJjZTAxMjJhNzE4YzFmOTlkMjNlMGIwNjI0YmU3
-    OTFjZjUyNGJmZmZhZjZkN2UyZmE1Njk3NmQ4MzY3YjgxM2M4ZGIyMjg1MmNl
-    OTQ5ZGU2YzhlOTI2Y2VjYzZiYzZlMGM1MTM3NGUzYmIwZDA0MzY=
+    MjgyNGU2ZGM4YjIxZTBjODI2YmY0MjhkY2ZkZjE1ZjM1NDdjOTkyY2MxMDVh
+    NjAyOTVkNTg1MGY1ODgxYzMyNjRlNTVhYTRmNDBkYzMxODliOTFiOGE5NzJl
+    Y2JjMWNkODEyYmYwMDEwMWRjNThiMzgzMDM2ODkxMjZhOWNjOWM=
   data.tar.gz: !binary |-
-    NWUyODUxMzc1MDBmMGUwYWNkNTY4YjNlMDQzOGQzNmQ0MDFjOGQ4ZmE2MDY2
-    NWE5MzNlNWRlMjY3NjQ5ODNjYTkzYzMwYzhlZGNiMDIzMWVmYmZiMTE2OTdl
-    NDgyNTVmYzhhMjVkYWU0NzFmNmEwMzJmNDM0ZDllNjIyODA2YzA=
+    ODE3MTcxNzI1MDg0M2EyZDhlZTk1MzYwYmNkNTE3OTE0YTE5NDJiMjY4YzQz
+    YjJiYzQ1MDI0NzQyYzYzZTYxNTNhZDY4YTY4NzU0NjBlNTgwYTZkYzA1MDM2
+    M2E0MzhiZDdkNGM0YmJkNTMxNzAwOWZhMjUzNmM4OTljMzlmYmU=

data/CHANGELOG.md

@@ -1,10 +1,14 @@
+v1.1.4, 2016-11-11 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.4...v1.1.5))
+-------------------
+  * [BUGFIX] Corrected levels for unary and conjunction elements of an expression
+
 v1.1.4, 2016-11-11 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.3...v1.1.4))
 -------------------
   * [IMPROVEMENT] New functions: contains(), startswith(), endswith()
 
 v1.1.3, 2016-11-10 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.2...v1.1.3))
 -------------------
-  * [IMPROVEMENT] New functions: tolower() and toupper() 
+  * [IMPROVEMENT] New functions: tolower() and toupper()
 
 v1.1.2, 2016-11-08 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.1...v1.1.2))
 -------------------

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/lib/sparkql/parser_tools.rb

@@ -40,8 +40,10 @@ module Sparkql::ParserTools
     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}.merge!(field_args)
+    expression = {:field => field, :operator => operator, :conjunction => 'And',
+      :conjunction_level => 0, :level => @lexer.level,
+      :block_group => block_group, :custom_field => custom_field}.
+      merge!(field_args)
     expression = val.merge(expression) unless val.nil?
     expression[:condition] ||= expression[:value]
     validate_level_depth expression
@@ -63,13 +65,16 @@ module Sparkql::ParserTools
     # Handles the case when a SparkQL filter string
     # begins with a unary operator, and is nested, such as:
     #   Not (Not Field Eq 1)
-    # In this instance we treat the outer unary as a conjunction.
-    if @expression_count == 1 && @lexer.level > 0
-      exp.first[:conjunction] = conj
-      exp.first[:conjunction_level] = @lexer.level - 1
+    # In this instance we treat the outer unary as a conjunction. With any other
+    # expression this would be the case, so that should make processing 
+    # consistent.
+    if exp.first[:unary] && @lexer.level == 0
+      exp.first[:conjunction] =  conj
+      exp.first[:conjunction_level] = @lexer.level
+    else
+      exp.first[:unary] = conj
+      exp.first[:unary_level] = @lexer.level
     end
-    exp.first[:unary] = conj
-    exp.first[:unary_level] = @lexer.level
 
     exp
   end

data/test/unit/parser_test.rb

@@ -494,10 +494,15 @@ class ParserTest < Test::Unit::TestCase
     e3 = expressions[2]
     e4 = expressions[3]
 
+    assert_equal 1, e1[:level]
     assert_equal "Not", e1[:unary]
+    assert_equal 1, e1[:unary_level]
     assert_equal "Not", e1[:conjunction]
+    assert_equal 0, e1[:conjunction_level]
     assert_equal "Not", e2[:unary]
+    assert_equal 1, e2[:unary_level]
     assert_equal "Not", e2[:conjunction]
+    assert_equal 0, e2[:conjunction_level]
     assert_equal "Not", e3[:unary]
     assert_equal "And", e3[:conjunction]
     assert_nil e4[:unary]
@@ -512,7 +517,42 @@ class ParserTest < Test::Unit::TestCase
     e1 = expressions.first
 
     assert_equal "Not", e1[:unary]
+    assert_equal 0, e1[:unary_level]
     assert_equal "And", e1[:conjunction]
+    assert_equal 0, e1[:conjunction_level]
+
+    filter = "(Not ListPrice Eq 1)"
+
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.inspect
+
+    e1 = expressions.first
+
+    assert_equal "Not", e1[:unary]
+    assert_equal 1, e1[:unary_level]
+    assert_equal "And", e1[:conjunction]
+    assert_equal 0, e1[:conjunction_level]
+
+    filter = "Not (Not ListPrice Eq 1 Not BathsTotal Eq 2)"
+
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.inspect
+
+    e1 = expressions.first
+    e2 = expressions[1]
+
+    assert_equal "Not", e1[:unary]
+    assert_equal 1, e1[:unary_level]
+    assert_equal "Not", e1[:conjunction]
+    assert_equal 0, e1[:conjunction_level]
+    assert_nil e2[:unary]
+    assert_nil e2[:unary_level]
+    assert_equal 1, e2[:level]
+    assert_equal "Not", e2[:conjunction]
+    assert_equal 1, e2[:conjunction_level]
+
   end
 
   def test_expression_conditions_attribute

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby