sparkql 1.1.10 → 1.1.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWZlM2JjZmE5OWM2ZDNkMDcwOGI3NDM3YjNhMWY5YmI0MWZkYTU0NQ==
+    MTkxNTEwOGJhMzYwNDEyMmU1OTBkNDkyZGJjNDNlY2NkMjY1MzI4ZA==
   data.tar.gz: !binary |-
-    MzE2NzAxNGExYTVlNzZiMjQ5Yzk4YTBhMDdhNGUyNzJhMjc3M2FjMQ==
+    YWY0MzliNGIwNmQ5ODgwZDdhY2ZhZWFjMWIwMGU3NDg0YjNlMmQzOA==
 SHA512:
   metadata.gz: !binary |-
-    YjYyOTJlMzYxOTcwMjBhYzdmOGUyY2Q3NTFiZDViYzM4MTQzMDgwMDQwY2M1
-    NDM4NzE5MzA2MmMwMTZmYmI4ODlhODk5NzEwY2E2MWE5NjNmZWVhZjYxNWEx
-    YjVhODQxZjZjZGEwODNkNWMxMGEzMWVkZWJhZGU0NjA4YzdiYWI=
+    OTQ4NzkxMGJiZmI4ZTY3NWYxYmM0NmMzOThhNzY4NGIxNGMxZWU3MTA1NDMw
+    OTFmNjFkNTYwODIwMGEwZDdkYjE5NGM3ZjA0NjM5ZDE2ZDlhN2ViYWFjMGRk
+    NGM5YjcwNWZhMzczNGM1MjM1MmJkNTRkNjBhZWJlMjBlYWExODU=
   data.tar.gz: !binary |-
-    Y2U3MTQyODlhNmQ1Y2FlYWJhMDEwODcyNjY1YjE1YjAzN2M2MDg1ZGU5Mjc0
-    YTQzOWQ3OTE3OGJhOTk0MWM1YjE5Y2Q1YTE5MzI4MzEwYTMyMzU5YzhhNmQ2
-    YTZjMWU5ZDA2M2Y1ZDhmNGU1NDZiZWY2ZjM1MjUzNzI0ZTFhOWM=
+    OGNmOTM4Yjg1MWRmZDg1OGYzYmE2ZTI2ODYwNjNiMjdlZTY4NTIwMGM0M2M4
+    OGFlYmJlMDljYzZlMDRiODY2MzdiNDM3OWY0Mjk1OWI5YzA0NGJhMGE4NjJm
+    MDA1MWEzYmNmNWZhNjBmM2VhZWY3ZjkzNzAwMWNjYTk1ZjM5NzE=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.11, 2018-03-30
+-------------------
+  * [BUGFIX] contains(), startswith(), endswith() are now case-sensitive
+
 v1.1.10, 2018-01-05
 -------------------
   * [IMPROVEMENT] Allow radius to take integer

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.1.11

data/lib/sparkql/function_resolver.rb

@@ -209,7 +209,7 @@ class Sparkql::FunctionResolver
     end
     v = self.send(method, *real_vals)
 
-    unless v.nil?
+    unless v.nil? || v.key?(:function_name)
       v[:function_name] = @name
       v[:function_parameters] = real_vals
     end
@@ -232,7 +232,7 @@ class Sparkql::FunctionResolver
 
     begin
       Regexp.new(regular_expression)
-    rescue => e
+    rescue
       @errors << Sparkql::ParserError.new(:token => regular_expression,
         :message => "Invalid Regexp",
         :status => :fatal)
@@ -278,13 +278,16 @@ class Sparkql::FunctionResolver
     # Wrap this string in quotes, as we effectively translate
     #   City Eq startswith('far')
     # ...to...
-    #    City Eq 'far*'
+    #    City Eq '^far'
     #
     # The string passed in will merely be "far", rather than
     # the string literal "'far'".
-    new_value = "'#{string}*'"
+    string = Regexp.escape(string)
+    new_value = "^#{string}"
 
     {
+      :function_name => "regex",
+      :function_parameters => [new_value, ''],
       :type => :character,
       :value => new_value
     }
@@ -294,13 +297,16 @@ class Sparkql::FunctionResolver
     # Wrap this string in quotes, as we effectively translate
     #   City Eq endswith('far')
     # ...to...
-    #    City Eq '*far'
+    #    City Eq regex('far$')
     #
     # The string passed in will merely be "far", rather than
     # the string literal "'far'".
-    new_value = "'*#{string}'"
+    string = Regexp.escape(string)
+    new_value = "#{string}$"
 
     {
+      :function_name => "regex",
+      :function_parameters => [new_value, ''],
       :type => :character,
       :value => new_value
     }
@@ -310,13 +316,16 @@ class Sparkql::FunctionResolver
     # Wrap this string in quotes, as we effectively translate
     #   City Eq contains('far')
     # ...to...
-    #    City Eq '*far*'
+    #    City Eq regex('far')
     #
     # The string passed in will merely be "far", rather than
     # the string literal "'far'".
-    new_value = "'*#{string}*'"
+    string = Regexp.escape(string)
+    new_value = "#{string}"
 
     {
+      :function_name => "regex",
+      :function_parameters => [new_value, ''],
       :type => :character,
       :value => new_value
     }
@@ -575,7 +584,7 @@ class Sparkql::FunctionResolver
       term.strip.split(/\s+/).reverse.map { |i| i.to_f }
     end
     coords
-  rescue => e
+  rescue
     @errors << Sparkql::ParserError.new(:token => coord_string, 
       :message => "Unable to parse coordinate string.",
       :status => :fatal )

data/test/unit/function_resolver_test.rb

@@ -286,9 +286,9 @@ class FunctionResolverTest < Test::Unit::TestCase
   end
 
   test "startswith(), endswith() and contains()" do
-    [{'startswith' => "'far*'"}, 
-     {'endswith' => "'*far'"}, 
-     {'contains' => "'*far*'"}].each do |test_case|
+    [{'startswith' => "^far"},
+     {'endswith' => "far$"},
+     {'contains' => "far"}].each do |test_case|
       function = test_case.keys.first
       expected_value = test_case[function]
 
@@ -298,6 +298,8 @@ class FunctionResolverTest < Test::Unit::TestCase
       value = f.call
       assert_equal :character, value[:type]
       assert_equal expected_value, value[:value]
+      assert_equal 'regex', value[:function_name]
+      assert_equal [value[:value], ''], value[:function_parameters]
     end
   end
 

metadata

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