sparkql 1.1.14 → 1.1.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTMwMTA4MTcwZWRiNzFiMzJkOTFmYzgwNmVlYjRhNzQwZTZlOWQ5OA==
+    ZWExMjRhNmFjYzM3NTdjYWNkMjdmOWRjYzBhYTJiNGVjMTRjOTViZg==
   data.tar.gz: !binary |-
-    OWQ3NWE4ZmQxOTQ3ZTcxMTk1MmE5MDM4OWU5NWNhNWY5NDUwZDUyYg==
+    YzhiYTlhMWM0OTRkNWE4ZTFjMTQzYzE4MmNjYzJiZWQ3MDdhMmFiYQ==
 SHA512:
   metadata.gz: !binary |-
-    MzY2NGFkZWYxNWM2ZGQyZWMyNjRmZTkzMzU2OTYwZDBmNzk2YjhmMzc4ZjFj
-    NjdiYTM5MTBjNmY3ZTQxNmVkOWU4YzFjYzY5MjY2NDQzZDI3MzVmZmUxYWQ0
-    NGZmYzE5MGM3ODlkZmQ1M2M4NGY4M2I2MGE0MzQyYzVkNzcwOTU=
+    Mzk5MGUxM2M0ZWQ2M2QxMTQ2ZDM3MTMxNTEwODVhZTc0NzJlZWJhYzkzODA4
+    NDIxZTUxNzE4OTYxYmI3MTJiNzkxMGU1MzVjMGQ3ZDdkMzIzZDQ5OGExMmI5
+    YmM1NDU2M2IzM2JhMWU2OTY3Y2NhYzM5MDNiMjllNmVkYjA2NDM=
   data.tar.gz: !binary |-
-    NDVmYjg0NjJkYTI1OGJkNjI1MDYxMzc4OGNkNzkyZmFkNjM1ZmU1NmE1OGJl
-    ODcyOTRiYzcyYjcxNWJhMTk2NWM2ODc2YjQyZTg5YjgwMjBkNzk2NzczODAx
-    OTc4ZmVmZDBiY2I5ZDc0YWE3YmQyMDAwNTFlZTJkZTg4Yjg2Mjc=
+    MTRjZDEyN2U5N2IwZTA5NGEwZjZjMmEyMzM5ZTA4YWUwMDcxNWEwZTZjODli
+    OWNmZDBjNmU0YzNiNWZiNjc3MWRkYmRjNjc1ZTg4MjNlNWVlNzAzYTVhY2Uz
+    NzU2OTg2NzAzZTA4ZjdmMDFkZDdhMzY3NTU4ZTQxNTRhODkyNDQ=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.1.15, 2018-07-12
+-------------------
+  * [IMPROVEMENT] New Functions: ceiling(), floor()
+
 v1.1.14, 2018-07-12
 -------------------
   * [IMPROVEMENT] Allow Negation for integer and decimal literals

data/VERSION

@@ -1 +1 @@
-1.1.14
+1.1.15

data/lib/sparkql/function_resolver.rb

@@ -74,6 +74,16 @@ class Sparkql::FunctionResolver
       :resolve_for_type => true,
       :return_type => :integer
     },
+    :ceiling => {
+      :args => [[:field, :decimal]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
+    :floor => {
+      :args => [[:field, :decimal]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
     :startswith => {
       :args => [:character],
       :return_type => :startswith
@@ -468,6 +478,36 @@ class Sparkql::FunctionResolver
     }
   end
 
+  def floor_decimal(arg)
+    {
+      :type => :integer,
+      :value => arg.floor.to_s
+    }
+  end
+
+  def floor_field(arg)
+    {
+      :type => :function,
+      :value => "floor",
+      :args => [arg]
+    }
+  end
+
+  def ceiling_decimal(arg)
+    {
+      :type => :integer,
+      :value => arg.ceil.to_s
+    }
+  end
+
+  def ceiling_field(arg)
+    {
+      :type => :function,
+      :value => "ceiling",
+      :args => [arg]
+    }
+  end
+
   def round_decimal(arg)
     {
       :type => :integer,

data/test/unit/function_resolver_test.rb

@@ -239,6 +239,46 @@ class FunctionResolverTest < Test::Unit::TestCase
     assert_equal '9999-12-31T23:59:59+00:00', value[:value]
   end
 
+  test "floor(float)" do
+    f = FunctionResolver.new('floor', [{:type => :decimal, :value => 0.5}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :integer, value[:type]
+    assert_equal '0', value[:value]
+  end
+
+  test "floor(Field)" do
+    f = FunctionResolver.new('floor', [{:type => :field, :value => 'ListPrice'}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :function, value[:type]
+    assert_equal 'floor', value[:value]
+    assert_equal "ListPrice", value[:args].first
+  end
+
+  test "ceiling(float)" do
+    f = FunctionResolver.new('ceiling', [{:type => :decimal, :value => 0.5}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :integer, value[:type]
+    assert_equal '1', value[:value]
+  end
+
+  test "ceiling(Field)" do
+    f = FunctionResolver.new('ceiling', [{:type => :field, :value => 'ListPrice'}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+
+    assert_equal :function, value[:type]
+    assert_equal 'ceiling', value[:value]
+    assert_equal "ListPrice", value[:args].first
+  end
+
   test "days()" do
     d = Date.new(2012,10,20)
     Date.expects(:today).returns(d)

data/test/unit/parser_test.rb

@@ -695,6 +695,64 @@ class ParserTest < Test::Unit::TestCase
     assert_equal(["FieldName"], expression[:function_parameters])
   end
 
+  def test_ceiling_with_literal
+    filter = "ListPrice Eq ceiling(0.5)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal "1", expression[:value]
+
+    filter = "ListPrice Eq ceiling(-0.5)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal "0", expression[:value]
+  end
+
+  def test_ceiling_with_field
+    filter = "ListPrice Eq ceiling(FieldName)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal 'ceiling', expression[:function_name]
+    assert_equal 'ceiling(FieldName)', expression[:condition]
+    assert_equal(["FieldName"], expression[:function_parameters])
+  end
+
+  def test_floor_with_literal
+    filter = "ListPrice Eq floor(0.5)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal "0", expression[:value]
+
+    filter = "ListPrice Eq floor(-0.5)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal :integer, expression[:type]
+    assert_equal "-1", expression[:value]
+  end
+
+  def test_floor_with_field
+    filter = "ListPrice Eq floor(FieldName)"
+    @parser = Parser.new
+    expression = @parser.parse(filter).first
+    assert !@parser.errors?, "Filter '#{filter}' failed: #{@parser.errors.first.inspect}"
+
+    assert_equal 'floor', expression[:function_name]
+    assert_equal 'floor(FieldName)', expression[:condition]
+    assert_equal(["FieldName"], expression[:function_parameters])
+  end
+
   private
 
   def parser_errors(filter)  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby