sparkql 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDQ2MjhlNzA5NWY1ZGM5YmM4ODEzMGE2Y2Y5ZWQ0YzkzZWYwODMxYQ==
+    ZjQzN2Y3YTIyNDJiZmE2YzFiZGVjZDk2OGY5NjhiYTNhMjc3ZTBiZg==
   data.tar.gz: !binary |-
-    OTNiMjFjMjA2ODZmMmRmYWNkM2JiNjA4NDA5NjcwZDBhNTVlY2Q5NA==
+    MWI4NzJjZWM3YWQwN2IwZjMzYWJiMjIwMWZmMDBjZWU5NjEyODg3NA==
 SHA512:
   metadata.gz: !binary |-
-    MWFhMTU2MDQ1ZjBkZDFhOTAyNGMyNDM4MjZmZDI0ODg0ZTg3NmI1MWRkYWMz
-    ZTI4ZDgxNTg1YWFhY2ZkOTUxOTM5ZGQ1NWEwMGMzNWVlNDc3NDYyOTMzODEx
-    YmEwNDNmMGMwZWFkOTk1MzNkZjVkMGVmOGJjYzE0MzViYTczZGY=
+    ZDUyMWRiMTY1YWYwMDY1ZjNkODkwMGU2ZGY1OWQ2YTA2MTYwNDNjMzI5ODM3
+    MzhiZDU0NzViZjIwYmI0MTc5ZjMyNjQ2OTgzNDFkODk5MzhjNmU1YTI4ZDBm
+    YThkMTMxMGQ1MjM5MDRlZGQwZTU2YWQyNTgyZWEzNDM1ZTNiZjE=
   data.tar.gz: !binary |-
-    Y2ZlNWFkYThlN2UwMjFiNzI5ZjE5NTJkNmY3OTNlODRhMzY1YjNhNjJmYTRl
-    ODg5ZTQ4ZDJlMjU0NWRiYmNmYzViNzdjZDY0NmNmYTAxYjc3YTAxOTg0YmEy
-    YmVjYThkZTg0ZGZiOTdlM2Y0YWYyNzY0YTE4ZTU1Y2QzN2NhMzU=
+    ZWQyOGEyZjJmMjhmMmFjODk5ZGM2YWYwMDZjY2FmYWNhNWE3NzU0OWQ0MzM5
+    NjAzYzI0ZjJkOGYzNDJkZjdiOGQ3YjY3MWFlMGVkZTdkNGNmNDcwM2JiMThi
+    ZTEyNTU5NDYzMzFkMGRiNThkNzkyOTBlNzk4MmVlZWFlNTRjY2I=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.0.2, 2016-04-26 ([changes](https://github.com/sparkapi/sparkql/compare/v1.0.1...v1.0.2))
+-------------------
+  * [IMPROVEMENT] Support for new range() function for character ranges
+
 v1.0.1, 2016-02-24 ([changes](https://github.com/sparkapi/sparkql/compare/v1.0.0...v1.0.1))
 -------------------
   * [IMPROVEMENT] Support scientific notation for floating point numbers

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/sparkql/function_resolver.rb

@@ -1,4 +1,4 @@
-require 'time'
+require 'time' 
 require 'geo_ruby'
 require 'sparkql/geo'
 
@@ -63,6 +63,10 @@ class Sparkql::FunctionResolver
       :args => [[:field,:datetime]],
       :resolve_for_type => true,
       :return_type => :time
+    },
+    :range => {
+      :args => [:character, :character],
+      :return_type => :character
     }
   }
   
@@ -344,6 +348,14 @@ class Sparkql::FunctionResolver
     }
   end
   
+  def range(start_str, end_str)
+    {
+      :type => :character,
+      :operator => "Bt",
+      :value => [start_str.to_s, end_str.to_s]
+    }
+  end
+  
   private
 
   def is_coords?(coord_string)

data/lib/sparkql/lexer.rb

@@ -53,7 +53,7 @@ class Sparkql::Lexer < StringScanner
         check_keywords(@current_token_value)
       when @current_token_value = scan(CUSTOM_FIELD)
         [:CUSTOM_FIELD,@current_token_value]
-      when empty?
+      when eos?
         [false, false] # end of file, \Z don't work with StringScanner
       else
         [:UNKNOWN, "ERROR: '#{self.string}'"]

data/lib/sparkql/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 

data/lib/sparkql/parser_tools.rb

@@ -43,6 +43,7 @@ module Sparkql::ParserTools
     expression = {:field => field, :operator => operator, :conjunction => 'And', 
       :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
     if operator.nil?
       tokenizer_error(:token => op, :expression => expression,

data/test/unit/function_resolver_test.rb

@@ -127,6 +127,16 @@ class FunctionResolverTest < Test::Unit::TestCase
     assert_equal GeoRuby::SimpleFeatures::Polygon, value[:value].class
     assert_equal [[-68.33,35.12], [-68.32,35.12], [-68.32,35.13], [-68.33,35.13], [-68.33,35.12]], value[:value].to_coordinates.first, "#{value[:value].inspect} "
   end
+
+  test "range()" do
+    f = FunctionResolver.new('range', [{:type => :character, :value => "M01"},
+                                              {:type => :character, :value => "M05"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :character, value[:type]
+    assert_equal ["M01", "M05"], value[:value]
+  end
   
   test "invalid params" do
     f = FunctionResolver.new('now', [{:type => :character, :value=>'bad value'}])

data/test/unit/parser_test.rb

@@ -173,6 +173,17 @@ class ParserTest < Test::Unit::TestCase
     assert -5 < test_time - start, "Time range off by more than five seconds #{test_time - start}"
   end
 
+  def test_function_range
+    start = Time.now
+    filter = "MapCoordinates Eq range('M01','M04')"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert !@parser.errors?, "errors #{@parser.errors.inspect}"
+    assert_equal "range('M01','M04')", expressions.first[:condition]
+    assert_equal 'M01', expressions.first[:value].first
+    assert_equal 'M04', expressions.first[:value][1]
+  end
+
   test "function data preserved in expression" do
     filter = "OriginalEntryTimestamp Ge days(-7)"
     @parser = Parser.new
@@ -513,7 +524,9 @@ class ParserTest < Test::Unit::TestCase
       "'A',' b'",
       "'A','B ',' c'",
       "radius('35.12 -68.33',1.0)",
-      "days(-1),days(-7)"
+      "days(-1),days(-7)",
+      "2016-03-10",
+      "2016-03-10T10:01:15.1-06:00"
     ]
     conditions.each do |condition|
       @parser = Parser.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby