sparkql 1.1.9 → 1.1.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWU0MjI4OGI0ZjllY2JkNDdkMGU4Njc5MzRhYjNhZDIyNTEyZmY2Zg==
+    OWZlM2JjZmE5OWM2ZDNkMDcwOGI3NDM3YjNhMWY5YmI0MWZkYTU0NQ==
   data.tar.gz: !binary |-
-    ZjMwY2NmMDllODkyMTdhNzMxMGI0M2U4YTFjNjQ2NTVjNDkwOGViZg==
+    MzE2NzAxNGExYTVlNzZiMjQ5Yzk4YTBhMDdhNGUyNzJhMjc3M2FjMQ==
 SHA512:
   metadata.gz: !binary |-
-    MGViNzNjMjJmMTk1NWQ5NWZmNGExNmJjZGZjNTBiZDJlNGQwY2QyNDVmOWIz
-    ODI5MWFlMmMyMTA5MDk5MWJkZDE1NGRhOWRkMmQwOGQ0OWQwYjcxNGU0ZWE5
-    NzczMWE4ZjIxOTE0OTUyMGI5ODEzZDE2NjBkZDRjMTY2ZWY0N2U=
+    YjYyOTJlMzYxOTcwMjBhYzdmOGUyY2Q3NTFiZDViYzM4MTQzMDgwMDQwY2M1
+    NDM4NzE5MzA2MmMwMTZmYmI4ODlhODk5NzEwY2E2MWE5NjNmZWVhZjYxNWEx
+    YjVhODQxZjZjZGEwODNkNWMxMGEzMWVkZWJhZGU0NjA4YzdiYWI=
   data.tar.gz: !binary |-
-    NTI4NGQ0NjNjMTUyMTVkZDdlMDEwOTRlNTRlNjBlNWY3MTA0YjMwNzUzNTA3
-    MmRhYmZhY2Y0ZjJiNzA1ZDc5MDY1YTE0ZTA3MmZkOTVhMDQ0ZmQxNmU2YmY1
-    ZTM4OGZkNDU3YjcxMWEyZTc3Y2QzNDBlOTFmNDFkYjU2ZTEwMzA=
+    Y2U3MTQyODlhNmQ1Y2FlYWJhMDEwODcyNjY1YjE1YjAzN2M2MDg1ZGU5Mjc0
+    YTQzOWQ3OTE3OGJhOTk0MWM1YjE5Y2Q1YTE5MzI4MzEwYTMyMzU5YzhhNmQ2
+    YTZjMWU5ZDA2M2Y1ZDhmNGU1NDZiZWY2ZjM1MjUzNzI0ZTFhOWM=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.10, 2018-01-05
+-------------------
+  * [IMPROVEMENT] Allow radius to take integer
+
 v1.1.9, 2018-01-05
 -------------------
   * [IMPROVEMENT] New function: wkt()

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.1.10

data/lib/sparkql/function_resolver.rb

@@ -24,7 +24,7 @@ class Sparkql::FunctionResolver
       :return_type => :shape
     }, 
     :radius => {
-      :args => [:character, :decimal],
+      :args => [:character, [:decimal, :integer]],
       :return_type => :shape
     },
     :regex => {
@@ -162,7 +162,7 @@ class Sparkql::FunctionResolver
         :status => :fatal )
       return
     end
-    
+
     count = 0
     @args.each do |arg|
       unless Array(total_args[count]).include?(arg[:type])

data/test/unit/parser_test.rb

@@ -350,6 +350,16 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 1.0, expressions.first[:value].radius, "#{expressions.first[:value].inspect} "
   end
 
+  test "Location Eq radius() accepts integer" do
+    filter = "Location Eq radius('35.12 -68.33',1)"
+    @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

metadata

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