sparkql 1.1.3 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjU4ZTc2ZWNiYjIyODYxYjNmZTY1ZmZmOGExZTc2MmRkMGFjMGIwYg==
+    YTM5ZTA1MmJlMzc4M2IwMjEyMGIyOTI2MjdiNGFjOTRhZmFjMDJjNw==
   data.tar.gz: !binary |-
-    MzBjYjdhY2E3MTNlMDZjMzU5MDI3NTYzZTVlMDE0NmZiMzQ0OTc4Yg==
+    ODdmZjYxZWNhMDBiMzlhMmMwODUzY2NmOGU0OTM3ODExOTc5OTNhZg==
 SHA512:
   metadata.gz: !binary |-
-    ZmQ5NjAxMTg4M2FlMTI1ZjJkMmZmNzQ5OGMwYTNiYWQxNTk0OWU2ZGI0ZDZm
-    MTQwZDQ3ZDViY2U4NDIyNDU2ODg2NjlmZDgwZDEzZWY4ZGM4NTgyNWFlMzJh
-    MjExZmUxZjA2MTI1OTBiMzgxMWEzNDljNzE3YTRhM2YyNmZjMTY=
+    ZmVkZTE3YTllMGNjNzA2YmJjZTAxMjJhNzE4YzFmOTlkMjNlMGIwNjI0YmU3
+    OTFjZjUyNGJmZmZhZjZkN2UyZmE1Njk3NmQ4MzY3YjgxM2M4ZGIyMjg1MmNl
+    OTQ5ZGU2YzhlOTI2Y2VjYzZiYzZlMGM1MTM3NGUzYmIwZDA0MzY=
   data.tar.gz: !binary |-
-    OTFiNjcxN2I1NGUzYzg2ZWEyZjI1OWNiZDZmZWE1MGFmNmE5OWJiZjEwNTNh
-    OTUwNDEwODI3Nzk2OWRkNzJjMzU5YzJhYjRjNzVjNDA0MTFjM2JiN2U1ZTVh
-    NDU0NzU4ZmUxOTJlYzQ4OThjY2MxOTk2NzgxZjM0NzY3M2I4Njc=
+    NWUyODUxMzc1MDBmMGUwYWNkNTY4YjNlMDQzOGQzNmQ0MDFjOGQ4ZmE2MDY2
+    NWE5MzNlNWRlMjY3NjQ5ODNjYTkzYzMwYzhlZGNiMDIzMWVmYmZiMTE2OTdl
+    NDgyNTVmYzhhMjVkYWU0NzFmNmEwMzJmNDM0ZDllNjIyODA2YzA=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.4, 2016-11-11 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.3...v1.1.4))
+-------------------
+  * [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))
 -------------------
   * [IMPROVEMENT] New functions: tolower() and toupper() 

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/sparkql/function_resolver.rb

@@ -44,6 +44,18 @@ class Sparkql::FunctionResolver
       :resolve_for_type => true,
       :return_type => :character
     },
+    :startswith => {
+      :args => [:character],
+      :return_type => :startswith
+    },
+    :endswith => {
+      :args => [:character],
+      :return_type => :endswith
+    },
+    :contains => {
+      :args => [:character],
+      :return_type => :contains
+    },
     :linestring => {
       :args => [:character],
       :return_type => :shape
@@ -257,6 +269,54 @@ class Sparkql::FunctionResolver
     }
   end
 
+  def startswith(string)
+    # Wrap this string in quotes, as we effectively translate
+    #   City Eq startswith('far')
+    # ...to...
+    #    City Eq 'far*'
+    #
+    # The string passed in will merely be "far", rather than
+    # the string literal "'far'".
+    new_value = "'#{string}*'"
+
+    {
+      :type => :character,
+      :value => new_value
+    }
+  end
+
+  def endswith(string)
+    # Wrap this string in quotes, as we effectively translate
+    #   City Eq endswith('far')
+    # ...to...
+    #    City Eq '*far'
+    #
+    # The string passed in will merely be "far", rather than
+    # the string literal "'far'".
+    new_value = "'*#{string}'"
+
+    {
+      :type => :character,
+      :value => new_value
+    }
+  end
+
+  def contains(string)
+    # Wrap this string in quotes, as we effectively translate
+    #   City Eq contains('far')
+    # ...to...
+    #    City Eq '*far*'
+    #
+    # The string passed in will merely be "far", rather than
+    # the string literal "'far'".
+    new_value = "'*#{string}*'"
+
+    {
+      :type => :character,
+      :value => new_value
+    }
+  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

@@ -284,4 +284,20 @@ class FunctionResolverTest < Test::Unit::TestCase
     assert_equal 'date', value[:value]
     assert_equal "OriginalEntryTimestamp", value[:args].first
   end
+
+  test "startswith(), endswith() and contains()" do
+    [{'startswith' => "'far*'"}, 
+     {'endswith' => "'*far'"}, 
+     {'contains' => "'*far*'"}].each do |test_case|
+      function = test_case.keys.first
+      expected_value = test_case[function]
+
+      f = FunctionResolver.new(function, [{:type => :character, :value => "far"}])
+      f.validate
+      assert !f.errors?, "Errors #{f.errors.inspect}"
+      value = f.call
+      assert_equal :character, value[:type]
+      assert_equal expected_value, value[:value]
+    end
+  end
 end

metadata

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