sparkql 0.1.8 → 0.3.2

data/test/unit/parser_test.rb

@@ -21,6 +21,10 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 10.to_s, expression.first[:value]
     assert_equal 11.to_s, expression.last[:value]
     assert_equal 'Or', expression.last[:conjunction]
+    expression = @parser.parse('Test Eq 10 Not Test Ne 11')
+    assert_equal 10.to_s, expression.first[:value]
+    assert_equal 11.to_s, expression.last[:value]
+    assert_equal 'Not', expression.last[:conjunction]
   end
   
   def test_tough_conjunction
@@ -28,6 +32,7 @@ class ParserTest < Test::Unit::TestCase
     expression = @parser.parse('Test Eq 10 Or Test Ne 11 And Test Ne 9')
     assert_equal 9.to_s, expression.last[:value]
     assert_equal 'And', expression.last[:conjunction]
+    assert_equal '9', expression.last[:condition]
   end
 
   def test_grouping
@@ -48,6 +53,7 @@ class ParserTest < Test::Unit::TestCase
     @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,11,12', expression[:condition]
   end
     
   def parse(q,v)
@@ -69,6 +75,14 @@ class ParserTest < Test::Unit::TestCase
       [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]
+    )
+  end
 
   def test_multilevel_nesting
     assert_nesting(
@@ -111,6 +125,26 @@ class ParserTest < Test::Unit::TestCase
     assert @parser.fatal_errors?, "Should be nil: #{@parser.errors.inspect}"
   end
 
+  def test_function_months
+    dt = DateTime.new(2014, 1, 5, 0, 0, 0, 0)
+    DateTime.expects(:now).returns(dt)
+    @parser = Parser.new
+    expressions = @parser.parse "ExpirationDate Gt months(-3)"
+    assert !@parser.errors?, "errors :( #{@parser.errors.inspect}"
+    assert_equal "2013-10-05", expressions.first[:value]
+    assert_equal 'months(-3)', expressions.first[:condition]
+  end
+
+  def test_function_years
+    dt = DateTime.new(2014, 1, 5, 0, 0, 0, 0)
+    DateTime.expects(:now).returns(dt)
+    @parser = Parser.new
+    expressions = @parser.parse "SoldDate Lt years(2)"
+    assert !@parser.errors?, "errors :( #{@parser.errors.inspect}"
+    assert_equal "2016-01-05", expressions.first[:value]
+    assert_equal 'years(2)', expressions.first[:condition]
+  end
+
   def test_function_days
     d = Date.today
     dt = DateTime.new(d.year, d.month,d.day, 0,0,0, DateTime.now.offset)
@@ -119,6 +153,8 @@ class ParserTest < Test::Unit::TestCase
     @parser = Parser.new
     expressions = @parser.parse(filter)
     assert !@parser.errors?, "errors #{@parser.errors.inspect}"
+    assert_equal 'days(-7)', expressions.first[:condition]
+
     test_time = Time.parse(expressions.first[:value])
     
     assert (-605000 < test_time - start && -604000 > test_time - start), "Time range off by more than five seconds #{test_time - start} '#{test_time} - #{start}'"
@@ -130,10 +166,135 @@ class ParserTest < Test::Unit::TestCase
     @parser = Parser.new
     expressions = @parser.parse(filter)
     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}"
   end
+
+  test "function data preserved in expression" do
+    filter = "OriginalEntryTimestamp Ge days(-7)"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert_equal 'days', expressions.first[:function_name]
+    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
+    expressions = @parser.parse(filter)
+    assert_equal(2, expressions.first[:value].size)
+    assert_equal 'days(-7),days(-1)', expressions.first[:condition]
+  end
+
+  test "mixed rangeable " do
+    filter = "OriginalEntryTimestamp Bt days(-7),2013-07-26"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert_equal(2, expressions.first[:value].size)
+    assert_equal("2013-07-26", expressions.first[:value].last)
+    assert_equal 'days(-7),2013-07-26', expressions.first[:condition]
+  end
+
+  test "function list" do
+    filter = "OriginalEntryTimestamp Eq days(-1),days(-7),days(-30)"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert_equal(3, expressions.first[:value].size)
+    assert_equal 'days(-1),days(-7),days(-30)', expressions.first[:condition]
+  end
+
+  test "mixed list" do
+    # TODO This is an unrealistic example. We need number functions or support 
+    # for dates in lists
+    filter = "OriginalEntryTimestamp Eq 2014,days(-7)"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert_equal(2, expressions.first[:value].size)
+    assert_equal("2014", expressions.first[:value].first)
+    assert_equal '2014,days(-7)', expressions.first[:condition]
+  end
+
+
+  test "allow timezone offsets" do
+    values = [
+      "2013-07-26T10:22",
+      "2013-07-26T10:22Z",
+      "2013-07-26T10:22+01:00",
+      "2013-07-26T10:22:15+01:00",
+      "2013-07-26T10:22:15.1-01:00",
+      "2013-07-26T10:22:15.11+0100",
+      "2013-07-26T10:22:15.111-0100",
+      "2013-07-26T10:22:15.1111Z",
+      "2013-07-26T10:22:15.11111+01:00",
+      "2013-07-26T10:22:15.111111+01:00"
+    ]
+    values.each do |value|
+      filter = "DatetimeField Eq #{value}"
+      @parser = Parser.new
+      expressions = @parser.parse(filter)
+      assert_not_nil expressions, "#{value} failed"
+      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
+    expressions = @parser.parse(filter)
+    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} "
+  end
+
+  test "Location Eq linestring()" do
+    filter = "Location Eq linestring('35.12 -68.33, 35.13 -68.33')"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, "errors #{@parser.errors.inspect}"
+    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
+    filter = "Location Eq rectangle('35.12 -68.33, 35.13 -68.32')"
+    @parser = Parser.new
+    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} "
+  end
+
+  test "Location Eq radius()" do
+    # This exposed a funny nesting limit problem FUN!
+    filter = "Location Eq radius('35.12 -68.33',1.0)"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, "errors #{@parser.errors.inspect}"
+    assert_equal :shape, expressions.first[:type]
+    assert_equal [-68.33, 35.12], expressions.first[:value].center.to_coordinates, "#{expressions.first[:value].inspect} "
+    assert_equal 1.0, expressions.first[:value].radius, "#{expressions.first[:value].inspect} "
+  end
+
+  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)
+    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]}
+  end
   
   def test_for_reserved_words_first_literals_second
     ["OrOrOr Eq true", "Equador Eq true", "Oregon Ge 10"].each do |filter|
@@ -160,6 +321,7 @@ class ParserTest < Test::Unit::TestCase
       '"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
@@ -190,6 +352,7 @@ class ParserTest < Test::Unit::TestCase
     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
@@ -205,6 +368,102 @@ 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')
+    assert !@parser.errors?, @parser.inspect
+    expression = expressions.last
+    assert_equal 2.to_s, expression[:value]
+    assert_equal "Not", expression[:conjunction]
+    assert_equal expression[:level], expression[:conjunction_level]
+  end
+
+  def test_not_unary_expression
+    @parser = Parser.new
+    expressions = @parser.parse('Not Test Eq 10')
+    assert !@parser.errors?, @parser.inspect
+    expression = expressions.first
+    assert_equal 10.to_s, expression[:value]
+    assert_equal "Not", expression[:unary]
+    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)')
+    assert !@parser.errors?, @parser.inspect
+    expression = expressions.first
+    assert_equal 10.to_s, expression[:value]
+    assert_equal "Not", expression[:unary]
+    assert_equal 0, expression[:unary_level]
+  end
+
+  def test_not_unary_expression_keeps_conjunction
+    @parser = Parser.new
+    expressions = @parser.parse('Test Lt 10 Or (Not Test Eq 11)')
+    assert !@parser.errors?, @parser.inspect
+    expression = expressions.last
+    assert_equal 11.to_s, expression[:value]
+    assert_equal "Not", expression[:unary]
+    assert_equal "Or", expression[:conjunction]
+    assert_equal expression[:level], expression[:unary_level]
+    assert_equal 0, expression[:conjunction_level]
+  end
+
+  def test_expression_conditions_attribute
+    conditions = [
+      "1",
+      "1,2",
+      "1.0,2.1,3.1415",
+      "'a '",
+      "'A',' b'",
+      "'A','B ',' c'",
+      "radius('35.12 -68.33',1.0)",
+      "days(-1),days(-7)"
+    ]
+    conditions.each do |condition|
+      @parser = Parser.new
+      expressions = @parser.parse("Test Eq #{condition}")
+      assert !@parser.errors?, @parser.inspect
+      expression = expressions.last
+      assert_equal condition, expression[:condition]
+    end
+  end
+
+  def test_bad_expressions_with_conditions_attribute
+    conditions = [
+      "BADSTRING",
+      "radius('46.8 -96.8',-20.0)"
+    ]
+    conditions.each do |condition|
+      @parser = Parser.new
+      expressions = @parser.parse("Test Eq #{condition}")
+      assert @parser.errors?, @parser.inspect
+    end
+  end
+
+  def test_datetimes_as_ranges
+    ["DatetimeField Bt 2013-07-26T10:22:15.422804,2013-07-26T10:22:15.422805",
+     "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}"
+     end
+  end
+  
+  def test_coercible_types
+    @parser = Parser.new
+    assert_equal :datetime, @parser.coercible_types(:date, :datetime)
+    assert_equal :datetime, @parser.coercible_types(:datetime, :date)
+    assert_equal :decimal, @parser.coercible_types(:decimal, :integer)
+    assert_equal :decimal, @parser.coercible_types(:integer, :decimal)
+    # That covers the gambit, anything else should be null
+    assert_nil @parser.coercible_types(:integer, :date)
+  end
+
 
   def parser_errors(filter)  
     @parser = Parser.new

metadata

@@ -1,129 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sparkql
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
+version: !ruby/object:Gem::Version
+  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 4
-        - 8
-        version: 1.4.8
-  version_requirements: *id001
+date: 2015-05-14 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.0
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
   name: racc
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.8
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 2
-        - 9
-        version: 0.2.9
-  version_requirements: *id002
   prerelease: false
-  name: flexmls_gems
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.8
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  version_requirements: *id003
-  prerelease: false
-  name: rake
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  version_requirements: *id004
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: test-unit
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
-  version_requirements: *id005
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
   name: ci_reporter
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
-  version_requirements: *id006
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+- !ruby/object:Gem::Dependency
   name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 description: Specification and base implementation of the Spark API parsing system.
-email: 
+email:
 - wade@fbsdata.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
-- .rvmrc
+- .ruby-version
+- CHANGELOG.md
+- GRAMMAR.md
 - Gemfile
 - README.md
 - Rakefile
@@ -132,6 +127,8 @@ files:
 - lib/sparkql/errors.rb
 - lib/sparkql/expression_state.rb
 - lib/sparkql/function_resolver.rb
+- lib/sparkql/geo.rb
+- lib/sparkql/geo/record_circle.rb
 - lib/sparkql/lexer.rb
 - lib/sparkql/parser.rb
 - lib/sparkql/parser.y
@@ -139,45 +136,49 @@ files:
 - lib/sparkql/parser_tools.rb
 - lib/sparkql/token.rb
 - lib/sparkql/version.rb
+- script/bootstrap
+- script/ci_build
+- script/markdownify.rb
+- script/release
 - sparkql.gemspec
 - test/test_helper.rb
+- test/unit/errors_test.rb
 - test/unit/expression_state_test.rb
 - test/unit/function_resolver_test.rb
+- test/unit/geo/record_circle_test.rb
 - test/unit/lexer_test.rb
 - test/unit/parser_compatability_test.rb
 - test/unit/parser_test.rb
-homepage: ""
-licenses: []
-
+homepage: ''
+licenses:
+- Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sparkql
-rubygems_version: 1.8.24
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: API Parser engine for filter searching
-test_files: []
-
+test_files:
+- test/test_helper.rb
+- test/unit/errors_test.rb
+- test/unit/expression_state_test.rb
+- test/unit/function_resolver_test.rb
+- test/unit/geo/record_circle_test.rb
+- test/unit/lexer_test.rb
+- test/unit/parser_compatability_test.rb
+- test/unit/parser_test.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm use ree-1.8.7-2011.03
-