sparkql 1.1.11 → 1.1.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTkxNTEwOGJhMzYwNDEyMmU1OTBkNDkyZGJjNDNlY2NkMjY1MzI4ZA==
+    ZmEwYzgyNzFiMjg1MWE0ODQ5YjcyOGMwZDA0MDY2ZmE3MmQ2ZGZjMA==
   data.tar.gz: !binary |-
-    YWY0MzliNGIwNmQ5ODgwZDdhY2ZhZWFjMWIwMGU3NDg0YjNlMmQzOA==
+    Y2M4N2YyNmEyMjFiNDNiMzQ3ODg1YzUxYjljYzQwM2Y0MDdhOTJiNw==
 SHA512:
   metadata.gz: !binary |-
-    OTQ4NzkxMGJiZmI4ZTY3NWYxYmM0NmMzOThhNzY4NGIxNGMxZWU3MTA1NDMw
-    OTFmNjFkNTYwODIwMGEwZDdkYjE5NGM3ZjA0NjM5ZDE2ZDlhN2ViYWFjMGRk
-    NGM5YjcwNWZhMzczNGM1MjM1MmJkNTRkNjBhZWJlMjBlYWExODU=
+    YTg2NDIxZDc0NGM3ZGE1YzZjZWQ2N2I5M2QwODg1NzcxODU4MWI2YTE2YTI5
+    YjAzN2E0YTMwNzI5Y2QyZmIzNmY0MjdiMmQ2ZDBkMDU5NDk2MWJhNWYxMTgw
+    ZDRhNDA3MzY2NmVkMjdiZDJiNGFkOTVkNmY1ZmY2OGM1ZGFjNTE=
   data.tar.gz: !binary |-
-    OGNmOTM4Yjg1MWRmZDg1OGYzYmE2ZTI2ODYwNjNiMjdlZTY4NTIwMGM0M2M4
-    OGFlYmJlMDljYzZlMDRiODY2MzdiNDM3OWY0Mjk1OWI5YzA0NGJhMGE4NjJm
-    MDA1MWEzYmNmNWZhNjBmM2VhZWY3ZjkzNzAwMWNjYTk1ZjM5NzE=
+    NzZjOTgwZGVhYzY0NzM0NTAzYjliYmRlMjExM2M2OGM5NmMxZTQwYmFjNTQz
+    ZTNmY2Q1YWFmN2M4ZTkxY2Y0NjRlMGU5MzAyNDFmM2ZhODg5ZGJhZGM5ZDU5
+    ODk5ODhjNTU1ZjVkYTEwNGIzMmJlMjM0YmQwMWM3YzZhNjE5ODI=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.12, 2018-06-26
+-------------------
+  * [IMPROVEMENT] New Function: indexof()
+
 v1.1.11, 2018-03-30
 -------------------
   * [BUGFIX] contains(), startswith(), endswith() are now case-sensitive

data/VERSION

@@ -1 +1 @@
-1.1.11
+1.1.12

data/lib/sparkql/function_resolver.rb

@@ -45,6 +45,10 @@ class Sparkql::FunctionResolver
       :resolve_for_type => true,
       :return_type => :character
     },
+    :indexof => {
+      :args => [[:field, :character], :character],
+      :return_type => :integer
+    },
     :startswith => {
       :args => [:character],
       :return_type => :startswith
@@ -349,7 +353,15 @@ class Sparkql::FunctionResolver
       :value => Time.now.iso8601
     }
   end
-  
+
+  def indexof(arg1, arg2)
+    {
+      :type => :function,
+      :value => "indexof",
+      :args => [arg1, arg2]
+    }
+  end
+
   def date_field(arg)
     {
       :type => :function,

data/lib/sparkql/parser_tools.rb

@@ -32,6 +32,7 @@ module Sparkql::ParserTools
       if !function.nil?
         field_args[:field_function] = field[:value]
         field_args[:field_function_type] = function[:return_type]
+        field_args[:args] = field[:args]
       else
         tokenizer_error(:token => field[:value], 
           :message => "Unsupported function type", :status => :fatal )
@@ -148,7 +149,7 @@ module Sparkql::ParserTools
       return nil
     else
       result = resolver.call()
-      return result.nil? ? result : result.merge(:condition => "#{name}(#{condition_list.join(',')})")
+      result.nil? ? result : result.merge(:condition => "#{name}(#{condition_list.join(',')})")
     end
   end
   

data/test/unit/parser_test.rb

@@ -174,7 +174,6 @@ class ParserTest < Test::Unit::TestCase
   end
 
   def test_function_range
-    start = Time.now
     filter = "MapCoordinates Eq range('M01','M04')"
     @parser = Parser.new
     expressions = @parser.parse(filter)
@@ -184,6 +183,16 @@ class ParserTest < Test::Unit::TestCase
     assert_equal 'M04', expressions.first[:value][1]
   end
 
+  test 'indexof with field' do
+    filter = "indexof(City, '4131800000000') Eq 13"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "errors #{@parser.errors.inspect}"
+    assert_equal 'City', expression[:field]
+    assert_equal '13', expression[:value]
+    assert_equal '4131800000000', expression[:args].last
+  end
+
   test "function data preserved in expression" do
     filter = "OriginalEntryTimestamp Ge days(-7)"
     @parser = Parser.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby