sparkql 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDJhMGNlYzU2MzNhMzQyZTZjMjE1YWQzYzQxZmZhNmQyZTkwNzEwOQ==
+    NjU4ZTc2ZWNiYjIyODYxYjNmZTY1ZmZmOGExZTc2MmRkMGFjMGIwYg==
   data.tar.gz: !binary |-
-    MDc2M2E2NDk3MjQwNTI4NWExZWRhMTE1OGFhNzYwYTg2YTViMDhkNQ==
+    MzBjYjdhY2E3MTNlMDZjMzU5MDI3NTYzZTVlMDE0NmZiMzQ0OTc4Yg==
 SHA512:
   metadata.gz: !binary |-
-    YmI0ZTZjNmFjYjNjZThiMTVlMWJhNTkxN2EwNDI3YmRmZTg3ZmYyNDJiYTdm
-    OWFhMTQ5NDhlY2EwNGRkMzE3MGU0NTlhZDQwZWNmMGUzMThkM2JiZjVmOTAy
-    YmE0ZmE3OWFmY2RiZWEyYjJlNjE4MGVmN2NjMTc2OWQ0ODJlYTY=
+    ZmQ5NjAxMTg4M2FlMTI1ZjJkMmZmNzQ5OGMwYTNiYWQxNTk0OWU2ZGI0ZDZm
+    MTQwZDQ3ZDViY2U4NDIyNDU2ODg2NjlmZDgwZDEzZWY4ZGM4NTgyNWFlMzJh
+    MjExZmUxZjA2MTI1OTBiMzgxMWEzNDljNzE3YTRhM2YyNmZjMTY=
   data.tar.gz: !binary |-
-    OGQ5OGI2YzdlNmUxYTVkOTJhNjk3NGEwM2ExODAwZGQ4MDA3M2M5YmVjNDcx
-    M2RlNmU3YjU5Zjk5NTgyNjljOTI2ZjZmODRmZjljZTExOTIwNzM3ZTdiMGJk
-    ZDc2NTI3NWUzMTlhOTg5NzM1NWYxOTg5ZDJkMTY1MTc4YmRhNDY=
+    OTFiNjcxN2I1NGUzYzg2ZWEyZjI1OWNiZDZmZWE1MGFmNmE5OWJiZjEwNTNh
+    OTUwNDEwODI3Nzk2OWRkNzJjMzU5YzJhYjRjNzVjNDA0MTFjM2JiN2U1ZTVh
+    NDU0NzU4ZmUxOTJlYzQ4OThjY2MxOTk2NzgxZjM0NzY3M2I4Njc=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.3, 2016-11-10 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.2...v1.1.3))
+-------------------
+  * [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))
 -------------------
   * [IMPROVEMENT] New functions: year(), month(), day(), hour(), minute(), second(), and

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/lib/sparkql/function_resolver.rb

@@ -34,6 +34,16 @@ class Sparkql::FunctionResolver
       }],
       :return_type => :character
     },
+    :tolower => {
+      :args => [[:field, :character]],
+      :resolve_for_type => true,
+      :return_type => :character
+    },
+    :toupper => {
+      :args => [[:field, :character]],
+      :resolve_for_type => true,
+      :return_type => :character
+    },
     :linestring => {
       :args => [:character],
       :return_type => :shape
@@ -41,7 +51,7 @@ class Sparkql::FunctionResolver
     :days => {
       :args => [:integer],
       :return_type => :datetime
-    }, 
+    },
     :months => {
       :args => [:integer],
       :return_type => :datetime
@@ -217,7 +227,36 @@ class Sparkql::FunctionResolver
       :value => regular_expression
     }
   end
-  
+
+  def tolower_character(string)
+    {
+      :type => :character,
+      :value => string.to_s.downcase
+    }
+  end
+
+  def tolower_field(arg) {
+      :type => :function,
+      :value => "tolower",
+      :args => [arg]
+    }
+  end
+
+  def toupper_character(string)
+    {
+      :type => :character,
+      :value => string.to_s.upcase
+    }
+  end
+
+  def toupper_field(arg)
+    {
+      :type => :function,
+      :value => "toupper",
+      :args => [arg]
+    }
+  end
+
   # Offset the current timestamp by a number of days
   def days(num)
     # date calculated as the offset from midnight tommorrow. Zero will provide values for all times 

data/test/unit/function_resolver_test.rb

@@ -14,6 +14,44 @@ class FunctionResolverTest < Test::Unit::TestCase
     assert_equal(["35.12 -68.33", 1.0], value[:function_parameters])
   end
 
+  test "tolower(SomeField)" do
+    f = FunctionResolver.new('tolower', [{:type => :field, :value => "City"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :function, value[:type]
+    assert_equal 'tolower', value[:value]
+    assert_equal "City", value[:args].first
+  end
+
+  test "tolower('string')" do
+    f = FunctionResolver.new('tolower', [{:type => :character, :value => "STRING"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :character, value[:type]
+    assert_equal 'string', value[:value]
+  end
+
+  test "toupper(SomeField)" do
+    f = FunctionResolver.new('toupper', [{:type => :field, :value => "City"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :function, value[:type]
+    assert_equal 'toupper', value[:value]
+    assert_equal "City", value[:args].first
+  end
+
+  test "toupper('string')" do
+    f = FunctionResolver.new('toupper', [{:type => :character, :value => "string"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :character, value[:type]
+    assert_equal 'STRING', value[:value]
+  end
+
   test "now()" do
     start = Time.now
     f = FunctionResolver.new('now', [])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby