sparkql 1.1.8 → 1.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTQ3NzU1YTIzZGVjZWUwZGY1ZjUyODE1YzI1MWMwOGZkNzQ4ZjU1Nw==
+    OWU0MjI4OGI0ZjllY2JkNDdkMGU4Njc5MzRhYjNhZDIyNTEyZmY2Zg==
   data.tar.gz: !binary |-
-    OTY2OWE0NDNkOWE0M2Q5NWQzOWZhZTA2N2FiMTQxZDQ0MmFlNzRjYw==
+    ZjMwY2NmMDllODkyMTdhNzMxMGI0M2U4YTFjNjQ2NTVjNDkwOGViZg==
 SHA512:
   metadata.gz: !binary |-
-    MjlhOWZhMGY4MzY5MzRkZTFlMWVjYjU2MDljYzlmMGIwYzE2ZDk3Zjk4ZmJh
-    NDhiZWFkNWY1NmI2ZTI0YzhmODM5NDZiNjFlZDhjYjYyMGVkZTFlNDUyNjg3
-    NTEzNjViYjBlNGI3MzM0YWQzNTU1OWUyNmUwNTIzOTIxZTY5YjA=
+    MGViNzNjMjJmMTk1NWQ5NWZmNGExNmJjZGZjNTBiZDJlNGQwY2QyNDVmOWIz
+    ODI5MWFlMmMyMTA5MDk5MWJkZDE1NGRhOWRkMmQwOGQ0OWQwYjcxNGU0ZWE5
+    NzczMWE4ZjIxOTE0OTUyMGI5ODEzZDE2NjBkZDRjMTY2ZWY0N2U=
   data.tar.gz: !binary |-
-    NTE3ZmQwMTNhMzM0YWM4OWE4Y2RlMzZmZTU2OGU0YWQ3MjFlMTIxNGU5OGUy
-    NDk1MTUzMDE0ZmZlZWMwMWFiMjE1ZmZkZjExZGQ2NzVmOTMzMjA2MWJjMWM3
-    MGU1NmYwYzJmOGJlNzczYzUwN2QwMjliMjJlODY1YTVlMzAyOWQ=
+    NTI4NGQ0NjNjMTUyMTVkZDdlMDEwOTRlNTRlNjBlNWY3MTA0YjMwNzUzNTA3
+    MmRhYmZhY2Y0ZjJiNzA1ZDc5MDY1YTE0ZTA3MmZkOTVhMDQ0ZmQxNmU2YmY1
+    ZTM4OGZkNDU3YjcxMWEyZTc3Y2QzNDBlOTFmNDFkYjU2ZTEwMzA=

data/CHANGELOG.md

@@ -1,54 +1,58 @@
-v1.1.7, 2017-11-30 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.7...v1.1.8))
+v1.1.9, 2018-01-05
+-------------------
+  * [IMPROVEMENT] New function: wkt()
+
+v1.1.8, 2017-11-30
 -------------------
   * [BUGFIX] Properly coerce integer values to decimals when a function is used
     prior to the operator
 
-v1.1.7, 2017-03-31 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.6...v1.1.7))
+v1.1.7, 2017-03-31
 -------------------
   * [BUGFIX] Add missing require for StringScanner
 
-v1.1.6, 2016-11-11 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.5...v1.1.6))
+v1.1.6, 2016-11-11
 -------------------
   * [BUGFIX] Properly pad return strings from toupper/tolower with single quotes
 
-v1.1.5, 2016-11-11 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.4...v1.1.5))
+v1.1.5, 2016-11-11
 -------------------
   * [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))
+v1.1.4, 2016-11-11
 -------------------
   * [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))
+v1.1.3, 2016-11-10
 -------------------
   * [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))
+v1.1.2, 2016-11-08
 -------------------
   * [IMPROVEMENT] New functions: year(), month(), day(), hour(), minute(), second(), and
     fractionalseconds().
 
-v1.1.1, 2016-09-09 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.0...v1.1.1))
+v1.1.1, 2016-09-09
 -------------------
   * [BUGFIX] Fix `Not` handling in the new Evaluation class
 
-v1.1.0, 2016-07-28 ([changes](https://github.com/sparkapi/sparkql/compare/v1.0.3...v1.1.0))
+v1.1.0, 2016-07-28
 -------------------
   * [IMPROVEMENT] Evaluation class for sparkql boolean algebra processing
 
-v1.0.3, 2016-06-06 ([changes](https://github.com/sparkapi/sparkql/compare/v1.0.2...v1.0.3))
+v1.0.3, 2016-06-06
 -------------------
   * [IMPROVEMENT] Expression limit lifted to 75 expressions
 
-v1.0.2, 2016-04-26 ([changes](https://github.com/sparkapi/sparkql/compare/v1.0.1...v1.0.2))
+v1.0.2, 2016-04-26
 -------------------
   * [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))
+v1.0.1, 2016-02-24
 -------------------
   * [IMPROVEMENT] Support scientific notation for floating point numbers
 
-v1.0.0, 2016-02-11 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.23...v1.0.0))
+v1.0.0, 2016-02-11
 -------------------
   * [IMPROVEMENT] function support for fields (delayed resolution). Backing systems must
     implement necessary function behaviour.
@@ -56,32 +60,32 @@ v1.0.0, 2016-02-11 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.2
     this drop allows us to pick up newer update allows us to stay in sync with
     that gems development
 
-v0.3.24, 2016-01-05 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.23...v0.3.24))
+v0.3.24, 2016-01-05
 -------------------
 
   * [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))
+v0.3.23, 2015-10-09
 -------------------
 
   * [IMPROVEMENT] Add regex function for character types
 
-v0.3.22, 2015-10-09 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.21...v0.3.22))
+v0.3.22, 2015-10-09
 -------------------
 
   * [IMPROVEMENT] Record sparkql and nested errors for fields that embed sparkql
 
-v0.3.21, 2015-09-24 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.20...v0.3.21))
+v0.3.21, 2015-09-24
 -------------------
 
   * [IMPROVEMENT] Record token index and current token in lexer, for error reporting
 
-v0.3.20, 2015-04-14 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.18...v0.3.20))
+v0.3.20, 2015-04-14
 -------------------
 
   * [BUGFIX] Allow seconds for ISO-8601
 
-v0.3.18, 2015-04-10 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.17...v0.3.18))
+v0.3.18, 2015-04-10
 -------------------
 
   * [BUGFIX] Better support for ISO-8601

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.1.9

data/lib/sparkql/function_resolver.rb

@@ -1,5 +1,6 @@
 require 'time' 
 require 'geo_ruby'
+require 'geo_ruby/ewk'
 require 'sparkql/geo'
 
 # Binding class to all supported function calls in the parser. Current support requires that the 
@@ -124,6 +125,10 @@ class Sparkql::FunctionResolver
     :range => {
       :args => [:character, :character],
       :return_type => :character
+    },
+    :wkt => {
+      :args => [:character],
+      :return_type => :shape
     }
   }
   
@@ -475,6 +480,19 @@ class Sparkql::FunctionResolver
       :value => shape
     }
   end
+
+  def wkt(wkt_string)
+    shape = GeoRuby::SimpleFeatures::Geometry.from_ewkt(wkt_string)
+    {
+      :type => :shape,
+      :value => shape
+    }
+  rescue GeoRuby::SimpleFeatures::EWKTFormatError
+    @errors << Sparkql::ParserError.new(:token => wkt_string,
+      :message => "Function call 'wkt' requires a valid wkt string",
+      :status => :fatal )
+    return
+  end
     
   def rectangle(coords)
     bounding_box = parse_coordinates(coords)

data/test/unit/function_resolver_test.rb

@@ -164,7 +164,7 @@ class FunctionResolverTest < Test::Unit::TestCase
     f = FunctionResolver.new('radius', [{:type => :character, :value => "35.12,-68.33"},
                 {:type => :decimal, :value => 1.0}])
     f.validate
-    value = f.call
+    f.call
     assert f.errors?
   end
 
@@ -300,4 +300,23 @@ class FunctionResolverTest < Test::Unit::TestCase
       assert_equal expected_value, value[:value]
     end
   end
+
+  test 'wkt()' do
+    f = FunctionResolver.new('wkt',
+                             [{:type => :character,
+                               :value => "SRID=12345;POLYGON((-127.89734578345 45.234534534,-127.89734578345 45.234534534,-127.89734578345 45.234534534,-127.89734578345 45.234534534))"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal GeoRuby::SimpleFeatures::Polygon, value[:value].class
+  end
+
+  test 'wkt() invalid params' do
+    f = FunctionResolver.new('wkt',
+                             [{:type => :character,
+                               :value => "POLYGON((45.234534534))"}])
+    f.validate
+    f.call
+    assert f.errors?
+  end
 end

metadata

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