sparkql 1.1.12 → 1.1.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmEwYzgyNzFiMjg1MWE0ODQ5YjcyOGMwZDA0MDY2ZmE3MmQ2ZGZjMA==
+    YTJhM2I5YjU5YTg1NTVhNDgyOTJjYzE5YjI4YjlkZjkzZmI3NjFmYw==
   data.tar.gz: !binary |-
-    Y2M4N2YyNmEyMjFiNDNiMzQ3ODg1YzUxYjljYzQwM2Y0MDdhOTJiNw==
+    MjAyMjAwN2VhYTNmN2Q1NjhkNGZmN2FhNGY5OTgwMjdhNDY3ZWFjMQ==
 SHA512:
   metadata.gz: !binary |-
-    YTg2NDIxZDc0NGM3ZGE1YzZjZWQ2N2I5M2QwODg1NzcxODU4MWI2YTE2YTI5
-    YjAzN2E0YTMwNzI5Y2QyZmIzNmY0MjdiMmQ2ZDBkMDU5NDk2MWJhNWYxMTgw
-    ZDRhNDA3MzY2NmVkMjdiZDJiNGFkOTVkNmY1ZmY2OGM1ZGFjNTE=
+    OWY5MmVmNDhmMGM0OTgzNmE2NjE4OWM5NmQ4M2QxOTJiMGFiOGQ4MDlkMmJj
+    NDBhNTVkZDgyMGJmYmU1Y2YwOTdiOTNmN2ZkYTcxOWM1MWNkNjJmZmJiMmI3
+    ODhmOGIzNWFiYTEwYTQzMThiNGNkNThlNDc0OGQzYTNmMjA4NWU=
   data.tar.gz: !binary |-
-    NzZjOTgwZGVhYzY0NzM0NTAzYjliYmRlMjExM2M2OGM5NmMxZTQwYmFjNTQz
-    ZTNmY2Q1YWFmN2M4ZTkxY2Y0NjRlMGU5MzAyNDFmM2ZhODg5ZGJhZGM5ZDU5
-    ODk5ODhjNTU1ZjVkYTEwNGIzMmJlMjM0YmQwMWM3YzZhNjE5ODI=
+    MzI5MWY5NDRkN2ViNGFhMzUzOTQwMWZmZTQ3ZmUwZjE3ZGY5NDJjM2UxMjYy
+    ZTdiMjY0NDA1OWJiNDVlM2YyM2I0NzdiOWVlN2E3M2M2YjFmNDc4NjQ4ZmJh
+    ZWNlYTE0ODE4ZmQ0ZGQyZjUxNTk5YTM2YWIxYTg2Y2YzMGY4Nzg=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.13, 2018-06-27
+-------------------
+  * [IMPROVEMENT] New Functions: length(), mindatetime(), maxdatetime()
+
 v1.1.12, 2018-06-26
 -------------------
   * [IMPROVEMENT] New Function: indexof()

data/VERSION

@@ -1 +1 @@
-1.1.12
+1.1.13

data/lib/sparkql/function_resolver.rb

@@ -14,6 +14,8 @@ class Sparkql::FunctionResolver
   STRFTIME_DATE_FORMAT = '%Y-%m-%d'
   STRFTIME_TIME_FORMAT = '%H:%M:%S.%N'
   VALID_REGEX_FLAGS = ["", "i"]
+  MIN_DATE_TIME = Time.new(1, 1, 1, 0, 0, 0, "+00:00").iso8601
+  MAX_DATE_TIME = Time.new(9999, 12, 31, 23, 59, 59, "+00:00").iso8601
   SUPPORTED_FUNCTIONS = {
     :polygon => {
       :args => [:character],
@@ -45,6 +47,11 @@ class Sparkql::FunctionResolver
       :resolve_for_type => true,
       :return_type => :character
     },
+    :length => {
+      :args => [[:field, :character]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
     :indexof => {
       :args => [[:field, :character], :character],
       :return_type => :integer
@@ -77,7 +84,15 @@ class Sparkql::FunctionResolver
       :args => [:integer],
       :return_type => :datetime
     },
-    :now => { 
+    :now => {
+      :args => [],
+      :return_type => :datetime
+    },
+    :maxdatetime => {
+      :args => [],
+      :return_type => :datetime
+    },
+    :mindatetime => {
       :args => [],
       :return_type => :datetime
     },
@@ -278,6 +293,21 @@ class Sparkql::FunctionResolver
     }
   end
 
+  def length_character(string)
+    {
+      :type => :integer,
+      :value => "#{string.size}"
+    }
+  end
+
+  def length_field(arg)
+    {
+      :type => :function,
+      :value => "length",
+      :args => [arg]
+    }
+  end
+
   def startswith(string)
     # Wrap this string in quotes, as we effectively translate
     #   City Eq startswith('far')
@@ -354,6 +384,20 @@ class Sparkql::FunctionResolver
     }
   end
 
+  def maxdatetime()
+    {
+      :type => :datetime,
+      :value => MAX_DATE_TIME
+    }
+  end
+
+  def mindatetime()
+    {
+      :type => :datetime,
+      :value => MIN_DATE_TIME
+    }
+  end
+
   def indexof(arg1, arg2)
     {
       :type => :function,

data/test/unit/function_resolver_test.rb

@@ -52,6 +52,25 @@ class FunctionResolverTest < Test::Unit::TestCase
     assert_equal "'STRING'", value[:value]
   end
 
+  test "length(SomeField)" do
+    f = FunctionResolver.new('length', [{:type => :field, :value => "City"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :function, value[:type]
+    assert_equal 'length', value[:value]
+    assert_equal "City", value[:args].first
+  end
+
+  test "length('string')" do
+    f = FunctionResolver.new('length', [{:type => :character, :value => "string"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :integer, value[:type]
+    assert_equal '6', value[:value]
+  end
+
   test "now()" do
     start = Time.now
     f = FunctionResolver.new('now', [])
@@ -62,7 +81,27 @@ class FunctionResolverTest < Test::Unit::TestCase
     test_time = Time.parse(value[:value])
     assert (-5 < test_time - start && 5 > test_time - start), "Time range off by more than five seconds #{test_time - start} '#{test_time} - #{start}'"
   end
-  
+
+  test "mindatetime()" do
+    f = FunctionResolver.new('mindatetime', [])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :datetime, value[:type]
+
+    assert_equal '0001-01-01T00:00:00+00:00', value[:value]
+  end
+
+  test "maxdatetime()" do
+    f = FunctionResolver.new('maxdatetime', [])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :datetime, value[:type]
+
+    assert_equal '9999-12-31T23:59:59+00:00', value[:value]
+  end
+
   test "days()" do
     d = Date.new(2012,10,20)
     Date.expects(:today).returns(d)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - Wade McEwen