sparkql 0.3.23 → 0.3.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGVjOGRmNGJjOWNmNTFiNDkzZDNmY2FhZTcwNzQwOGE5YjQ4NGJhNg==
+    NDA4ZDRjM2ExNzI2ZmMyMTViODM4NDNlZTkzOTFkNGU3NDRiZmY5MA==
   data.tar.gz: !binary |-
-    ZWI1NGU5OGVhYTRkNDZkY2EwYTlhYjdiYjY1ZTZkMzc5ODBhZmMzOA==
+    ODA1NDYzMTM3OTlhYzQyMDY0Y2FhZjhhMTE5OGJjOWQ0Nzg1Mzg0NQ==
 SHA512:
   metadata.gz: !binary |-
-    YWI4ZjMwOWNkYTIxMmJmNmY1N2Q5NTQwMzY3NzRiZTdlZDNkNmNlMzIwNGE3
-    MDE2ZmZjZGUzODc5ZGE0M2ZhOTllOTFmODEwNjdiMzI1YzM1YjllNGI3YWI4
-    NjE5ODliZTY1NmNmODM5MjNmM2UzMDdiNDU5MTEzZTFhYzAwYTk=
+    ZTFkYzJlNWRlY2EwZjdhOGZhZjdjY2JmMTQ5ODI0N2QxYWUxOGIwZjYyZWQ4
+    MDUzNmJlYTU1OGNjZGFjNWI5MjgyYzAyYmQ2ZjVkNGU1OWFiOWNhNTAzZTIy
+    MjJjNDNjNjAwMDI1ZDkzN2I2NjM4ZmRhZTJmOGE1YTk1NmU3YTI=
   data.tar.gz: !binary |-
-    Mjk5MjhkODQ3Yjc0NmIzNDlmZjU5MDY5N2JhOGU3NWFlZDlhODkyN2Q1MzZj
-    ZDU2YTEzNjdmZWU2NWVhY2JkODE4MDNhYzM5NGE2MmJiMTUwNWFjYzg3Y2Qz
-    ZjhhZTBiZGJlODBlY2Q2MDg1MTRmODg5YTA5OTNjMmI3MjE1ZTA=
+    MTljODQwOGI1NGY4YWI5NWExM2M5MzZiNmZjMmY1YjJhZDdmNjcyOTg4YjJh
+    MTQ3OGJkZTdmNjgzMDFlOGZiYThlMjI0OGI0NTQxNmM4NWE3NzFkODQxNGMx
+    ZTk2ODY4ZWRlMWJiY2FjZTY4ZDY0NDZjOTM0ZDU4NThiNmRlYTQ=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.3.24, 2016-01-05 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.23...v0.3.24))
+-------------------
+
+  * [BUGFIX] Support opening Not operator for "Not (Not ...)" expressions.
+
 v0.3.23, 2015-10-09 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.22...v0.3.23))
 -------------------
 

data/VERSION

@@ -1 +1 @@
-0.3.23
+0.3.24

data/lib/sparkql/parser_tools.rb

@@ -7,6 +7,7 @@ module Sparkql::ParserTools
   
   def parse(str)
     @lexer = Sparkql::Lexer.new(str)
+    @expression_count = 0
     results = do_parse
     return if results.nil?
     validate_expressions results
@@ -33,6 +34,7 @@ module Sparkql::ParserTools
       tokenizer_error(:token => op, :expression => expression,
         :message => "Operator not supported for this type and value string", :status => :fatal )
     end
+    @expression_count += 1
     [expression]
   end
   
@@ -43,6 +45,14 @@ module Sparkql::ParserTools
   end
 
   def tokenize_unary_conjunction(conj, exp)
+
+    # Handles the case when a SparkQL filter string
+    # begins with a unary operator, and is nested, such as:
+    # Not (Not Field Eq 1)
+    if @expression_count == 1 && @lexer.level > 0
+      exp.first[:conjunction] = conj 
+    end
+
     exp.first[:unary] = conj
     exp.first[:unary_level] = @lexer.level
     exp

data/test/unit/parser_test.rb

@@ -409,6 +409,7 @@ class ParserTest < Test::Unit::TestCase
     expression = expressions.first
     assert_equal 10.to_s, expression[:value]
     assert_equal "Not", expression[:unary]
+    assert_equal "And", expression[:conjunction]
     assert_equal expression[:level], expression[:unary_level]
   end
   
@@ -434,6 +435,40 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 0, expression[:conjunction_level]
   end
 
+  def test_not_not_expression
+    @parser = Parser.new
+    filter = "Not (Not ListPrice Eq 1) Not (Not BathsTotal Eq 2) And " +
+             "(Not TotalRooms Eq 3) Or (HasPool Eq true)"
+
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.inspect
+
+    e1 = expressions.first
+    e2 = expressions[1]
+    e3 = expressions[2]
+    e4 = expressions[3]
+
+    assert_equal "Not", e1[:unary]
+    assert_equal "Not", e1[:conjunction]
+    assert_equal "Not", e2[:unary]
+    assert_equal "Not", e2[:conjunction]
+    assert_equal "Not", e3[:unary]
+    assert_equal "And", e3[:conjunction]
+    assert_nil e4[:unary]
+    assert_equal "Or", e4[:conjunction]
+
+    @parser = Parser.new
+    filter = "Not (ListPrice Eq 1)"
+
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, @parser.inspect
+
+    e1 = expressions.first
+
+    assert_equal "Not", e1[:unary]
+    assert_equal "And", e1[:conjunction]
+  end
+
   def test_expression_conditions_attribute
     conditions = [
       "1",

metadata

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