sparkql 0.3.22 → 0.3.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGVjNGQ3MGY3YjczYzYzNTUwZGU4M2Y3MDU5ZDZhNGExOTU4MDI4OA==
+    OGVjOGRmNGJjOWNmNTFiNDkzZDNmY2FhZTcwNzQwOGE5YjQ4NGJhNg==
   data.tar.gz: !binary |-
-    ZGVlZWI0NWVmZDVhNmRjY2ZkOTJlMzNmMTY5MmVkMzZjMzJhZTMyZA==
+    ZWI1NGU5OGVhYTRkNDZkY2EwYTlhYjdiYjY1ZTZkMzc5ODBhZmMzOA==
 SHA512:
   metadata.gz: !binary |-
-    MGZkYzE2ZDA3ODI4ODVlMDgwYTBkMzEyOGNmNTMwNzBhOTZhYjMwYzk5YzZl
-    ZDdhNzBjMTgxNzk4MTY3YWM3YjQyYTJhZDQ2NzkzMTc2OTVlMzYyN2I2Mzlk
-    ZThhNjU0NzEwYTBlMjVmNDkwMDg0MzgxOTdjMTRjOTdlOGZjOWE=
+    YWI4ZjMwOWNkYTIxMmJmNmY1N2Q5NTQwMzY3NzRiZTdlZDNkNmNlMzIwNGE3
+    MDE2ZmZjZGUzODc5ZGE0M2ZhOTllOTFmODEwNjdiMzI1YzM1YjllNGI3YWI4
+    NjE5ODliZTY1NmNmODM5MjNmM2UzMDdiNDU5MTEzZTFhYzAwYTk=
   data.tar.gz: !binary |-
-    MTc2OTUzMjc2MDBjYzFjOTBmMTFiZjk0NDI1Y2EzMDk5ODRlN2RlMjFiMjY2
-    ZmJiZThiOGI2MGY5NTM4NTdhZGE5YjA5OTI1OWIwNjc4MzM3ZGY1OWVjYmM2
-    YmRhOGM3OGI0M2NlNTI2YTBlM2EwYTg0ZTVlYzQxMjA1NzI1NmY=
+    Mjk5MjhkODQ3Yjc0NmIzNDlmZjU5MDY5N2JhOGU3NWFlZDlhODkyN2Q1MzZj
+    ZDU2YTEzNjdmZWU2NWVhY2JkODE4MDNhYzM5NGE2MmJiMTUwNWFjYzg3Y2Qz
+    ZjhhZTBiZGJlODBlY2Q2MDg1MTRmODg5YTA5OTNjMmI3MjE1ZTA=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v0.3.23, 2015-10-09 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.22...v0.3.23))
+-------------------
+
+  * [IMPROVEMENT] Add regex function for character types
+
 v0.3.22, 2015-10-09 ([changes](https://github.com/sparkapi/sparkql/compare/v0.3.21...v0.3.22))
 -------------------
 

data/VERSION

@@ -1 +1 @@
-0.3.22
+0.3.23

data/lib/sparkql/function_resolver.rb

@@ -12,6 +12,7 @@ class Sparkql::FunctionResolver
   SECONDS_IN_DAY = 60 * 60 * 24
   STRFTIME_FORMAT = '%Y-%m-%d'
   
+  VALID_REGEX_FLAGS = ["", "i"]
   SUPPORTED_FUNCTIONS = {
     :polygon => {
       :args => [:character],
@@ -25,6 +26,14 @@ class Sparkql::FunctionResolver
       :args => [:character, :decimal],
       :return_type => :shape
     },
+    :regex => {
+      :args => [:character],
+      :opt_args => [{
+        :type => :character,
+        :default => ''
+      }],
+      :return_type => :character
+    },
     :linestring => {
       :args => [:character],
       :return_type => :shape
@@ -67,8 +76,11 @@ class Sparkql::FunctionResolver
         :status => :fatal )
       return
     end
+
     required_args = support[name][:args]
-    unless required_args.size == @args.size
+    total_args = required_args + Array(support[name][:opt_args]).collect {|args| args[:type]}
+
+    if @args.size < required_args.size || @args.size > total_args.size
       @errors << Sparkql::ParserError.new(:token => @name, 
         :message => "Function call '#{@name}' requires #{required_args.size} arguments",
         :status => :fatal )
@@ -77,7 +89,7 @@ class Sparkql::FunctionResolver
     
     count = 0
     @args.each do |arg|
-      unless arg[:type] == required_args[count]
+      unless arg[:type] == total_args[count]
         @errors << Sparkql::ParserError.new(:token => @name, 
           :message => "Function call '#{@name}' has an invalid argument at #{arg[:value]}",
           :status => :fatal )
@@ -105,7 +117,17 @@ class Sparkql::FunctionResolver
   # Execute the function
   def call()
     real_vals = @args.map { |i| i[:value]}
-    v = self.send(@name.to_sym, *real_vals)
+    name = @name.to_sym
+
+    required_args = support[name][:args]
+    total_args = required_args + Array(support[name][:opt_args]).collect {|args| args[:default]}
+    fill_in_optional_args = total_args.drop(real_vals.length)
+
+    fill_in_optional_args.each do |default|
+      real_vals << default
+    end
+
+    v = self.send(name, *real_vals)
 
     unless v.nil?
       v[:function_name] = @name
@@ -118,6 +140,30 @@ class Sparkql::FunctionResolver
   protected 
   
   # Supported function calls
+
+  def regex(regular_expression, flags)
+
+    unless (flags.chars.to_a - VALID_REGEX_FLAGS).empty?
+      @errors << Sparkql::ParserError.new(:token => regular_expression,
+        :message => "Invalid Regexp",
+        :status => :fatal)
+      return
+    end
+
+    begin
+      Regexp.new(regular_expression)
+    rescue => e
+      @errors << Sparkql::ParserError.new(:token => regular_expression,
+        :message => "Invalid Regexp",
+        :status => :fatal)
+      return
+    end
+
+    {
+      :type => :character,
+      :value => regular_expression
+    }
+  end
   
   # Offset the current timestamp by a number of days
   def days(num)

data/test/unit/parser_test.rb

@@ -147,15 +147,16 @@ class ParserTest < Test::Unit::TestCase
 
   def test_function_days
     d = Date.today
-    dt = DateTime.new(d.year, d.month,d.day, 0,0,0, DateTime.now.offset)
-    start = Time.parse(dt.to_s)
+    start = Time.utc(d.year,d.month,d.day,0,0,0)
     filter = "OriginalEntryTimestamp Ge days(-7)"
     @parser = Parser.new
     expressions = @parser.parse(filter)
     assert !@parser.errors?, "errors #{@parser.errors.inspect}"
     assert_equal 'days(-7)', expressions.first[:condition]
 
-    test_time = Time.parse(expressions.first[:value])
+    vals = expressions.first[:value].split('-')
+
+    test_time = Time.utc(vals[0].to_i, vals[1].to_i, vals[2].to_i)
     
     assert (-605000 < test_time - start && -604000 > test_time - start), "Time range off by more than five seconds #{test_time - start} '#{test_time} - #{start}'"
   end
@@ -217,6 +218,28 @@ class ParserTest < Test::Unit::TestCase
     assert_equal '2014,days(-7)', expressions.first[:condition]
   end
 
+  test "regex function parses without second param" do
+    filter = "ParcelNumber Eq regex('^[0-9]{3}-[0-9]{2}-[0-9]{3}$')"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert_equal '', expression[:function_parameters][1]
+    assert_equal '^[0-9]{3}-[0-9]{2}-[0-9]{3}$', expression[:function_parameters][0]
+  end
+
+  test "regex function parses with case-insensitive flag" do
+    filter = "ParcelNumber Eq regex('^[0-9]{3}-[0-9]{2}-[0-9]{3}$', 'i')"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert_equal 'i', expression[:function_parameters][1]
+    assert_equal '^[0-9]{3}-[0-9]{2}-[0-9]{3}$', expression[:function_parameters][0]
+  end
+
+  test "invalid regex" do
+    filter = "ParcelNumber Eq regex('[1234', '')"
+    @parser = Parser.new
+    expressions = @parser.parse(filter)
+    assert @parser.errors?, "Parser error expected due to invalid regex"
+  end
 
   test "allow timezone offsets" do
     values = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sparkql
-rubygems_version: 2.2.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: API Parser engine for filter searching