sparkql 1.2.5 → 1.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODQ4YzQ0YzQ1YmJkMDNlMmUxMmFiZTUyZWY2NTcwNjY0YTM2ZTE3OA==
+    MzM0ZTA3ZTIxNjlkMzY5YmFiMGM4MGFkOTA2NWZlNzMzZWQxNTQxMw==
   data.tar.gz: !binary |-
-    NTEyZDlkMWVjY2RjZDY2ZTJlMTg3YjNjNTc4NmE2ZDc3ODdhNTAyYQ==
+    ZmE5ZTQwZDc1YzI0YTJmZTRjYzMxMGY3ZDZmYmFmNzkxMWRmNTBiMg==
 SHA512:
   metadata.gz: !binary |-
-    MzMwODdhYTQ3NWQwYzlhYjQ5NWM2ZTNkZDlhMzczMWZmMDg1NDliZWMyOWJj
-    MmQ3MzMwNjBiYjIzMzE3Y2JiNzk2YzQxMzgyM2EzZDM1MTc4OTVkYmM5YTQw
-    YjQ3NDVjZWVmZjcyZDkxNzE3ZjI5NTFhODU4NWI5ZjZhYWU1YTA=
+    Mjc0NjNjNGVkYWE1ZDVlNzIwNTY3ZDNjZmFiZDc2NGI5MmNlNGU5MjYzN2Yy
+    NTc1ZTMwYTVmNmM5Nzk2Mjk5OTk2Nzc5ZmYyNTA3Njc2ZmU0NjkzM2I2ZmQx
+    YTQxMzIzZjBjNDU0NTc1Y2VmYzMyNGRmZDNmNWFlNTFmYzFiZjg=
   data.tar.gz: !binary |-
-    MmE5ODM3ODdmYTY3MGMxN2I2Mjc2MmQ2NjQwNDM0ZTNiYzU4YTkxYjVkNWE3
-    YThkMmNlZDA3MjI0MWU0MDdkOTVmNzI4NDhkMmMzNTA5ZGYyNTM1ZGM4NDZm
-    M2M2ZjdmYTBlMTEwODUxN2ZkMDIyYmQyZDFjNjNmNGU5YTU2MGQ=
+    MzczODc4ZTAyOTRkNDlhNzZiYTQxYjUyM2FlMTQ0ZmU3NmMyZmY2Y2Q2YmFj
+    MTk0ODFmMTFmZmI4MTQ2MzkxOTFiYjkwYmM1NGQ1NzdmZjNiMjZmYjQ4MGJi
+    ODY1NmM3NWJhNTFmMzgxY2EwZGU5NWY1ZGVmYTVkZTBjMGZlNmU=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.2.6, 2019-04-01
+-------------------
+  * [IMPROVEMENT] hours(), minutes(), and seconds() functions
+
 v1.2.5, 2018-12-19
 -------------------
   * [BUGFIX] Correctly handle arithmetic grouping

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/lib/sparkql/function_resolver.rb

@@ -10,7 +10,9 @@ require 'sparkql/geo'
 # Name and argument requirements for the function should match the function declaration in 
 # SUPPORTED_FUNCTIONS which will run validation on the function syntax prior to execution.
 class Sparkql::FunctionResolver
-  SECONDS_IN_DAY = 60 * 60 * 24
+  SECONDS_IN_MINUTE = 60
+  SECONDS_IN_HOUR = SECONDS_IN_MINUTE * 60
+  SECONDS_IN_DAY = SECONDS_IN_HOUR * 24
   STRFTIME_DATE_FORMAT = '%Y-%m-%d'
   STRFTIME_TIME_FORMAT = '%H:%M:%S.%N'
   VALID_REGEX_FLAGS = ["", "i"]
@@ -111,6 +113,18 @@ class Sparkql::FunctionResolver
       :args => [:character],
       :return_type => :shape
     },
+    :seconds => {
+      :args => [:integer],
+      :return_type => :datetime
+    },
+    :minutes => {
+      :args => [:integer],
+      :return_type => :datetime
+    },
+    :hours => {
+      :args => [:integer],
+      :return_type => :datetime
+    },
     :days => {
       :args => [:integer],
       :return_type => :datetime
@@ -464,6 +478,33 @@ class Sparkql::FunctionResolver
     }
   end
 
+  # Offset the current timestamp by a number of seconds
+  def seconds(num)
+    t = Time.now + num
+    {
+      :type => :datetime,
+      :value => t.iso8601
+    }
+  end
+
+  # Offset the current timestamp by a number of minutes
+  def minutes(num)
+    t = Time.now + num * SECONDS_IN_MINUTE
+    {
+      :type => :datetime,
+      :value => t.iso8601
+    }
+  end
+
+  # Offset the current timestamp by a number of hours
+  def hours(num)
+    t = Time.now + num * SECONDS_IN_HOUR
+    {
+      :type => :datetime,
+      :value => t.iso8601
+    }
+  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/lib/sparkql/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.14
+# This file is automatically generated by Racc 1.4.15
 # from Racc grammer file "".
 #
 

data/test/unit/function_resolver_test.rb

@@ -279,6 +279,175 @@ class FunctionResolverTest < Test::Unit::TestCase
     assert_equal "ListPrice", value[:args].first[:value]
   end
 
+  test "seconds()" do
+    dt = Time.new(2019, 4, 1, 8, 30, 20, 0)
+
+    Time.expects(:now).returns(dt).times(3)
+
+    f = FunctionResolver.new('seconds', [{:type=>:integer, :value => 7}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year, d.year
+    assert_equal dt.month, d.month
+    assert_equal dt.mday, d.mday
+    assert_equal dt.hour, d.hour
+    assert_equal dt.min, d.min
+    assert_equal dt.sec + 7, d.sec
+
+    f = FunctionResolver.new('seconds', [{:type=>:integer, :value => -21}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year, d.year
+    assert_equal dt.month, d.month
+    assert_equal dt.mday, d.mday
+    assert_equal dt.hour, d.hour
+    assert_equal dt.min - 1, d.min
+    assert_equal 29, d.min
+    assert_equal 59, d.sec
+
+    f = FunctionResolver.new('seconds', [{:type=>:integer, 
+                                          :value => -Sparkql::FunctionResolver::SECONDS_IN_DAY}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year, d.year
+    assert_equal dt.month - 1, d.month
+    assert_equal 31, d.mday
+    assert_equal dt.hour, d.hour
+    assert_equal dt.min, d.min
+    assert_equal dt.min, d.min
+    assert_equal dt.sec, d.sec
+  end
+
+  test "minutes()" do
+    dt =Time.new(2019, 4, 1, 8, 30, 20, 0)
+
+    Time.expects(:now).returns(dt).times(3)
+
+    f = FunctionResolver.new('minutes', [{:type=>:integer, :value => 7}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year, d.year
+    assert_equal dt.month, d.month
+    assert_equal dt.mday, d.mday
+    assert_equal dt.hour, d.hour
+    assert_equal dt.min + 7, d.min
+    assert_equal dt.sec, d.sec
+
+    f = FunctionResolver.new('minutes', [{:type=>:integer, :value => -37}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year, d.year
+    assert_equal dt.month, d.month
+    assert_equal dt.mday, d.mday
+    assert_equal dt.hour-1, d.hour
+    assert_equal 53, d.min
+
+    f = FunctionResolver.new('minutes', [{:type=>:integer, 
+                                          :value => -1440}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year, d.year
+    assert_equal dt.month - 1, d.month
+    assert_equal 31, d.mday
+    assert_equal dt.hour, d.hour
+    assert_equal dt.min, d.min
+  end
+
+  test "hours(), same day" do
+    dt =Time.new(2019, 4, 1, 8, 30, 20, 0)
+
+    tests = [1, -1, 5, -5, 12]
+    Time.expects(:now).returns(dt).times(tests.count)
+
+    tests.each do |offset|
+      f = FunctionResolver.new('hours', [{:type=>:integer, 
+                                          :value => offset}])
+      f.validate
+      assert !f.errors?, "Errors #{f.errors.inspect}"
+      value = f.call
+      
+      assert_equal :datetime, value[:type]
+      d = DateTime.parse(value[:value])
+      assert_equal dt.year, d.year
+      assert_equal dt.month, d.month
+      assert_equal dt.mday, d.mday
+      assert_equal dt.hour + offset, d.hour
+      assert_equal dt.min, d.min
+      assert_equal dt.sec, d.sec
+    end
+  end
+
+  test "hours(), wrap day" do
+    dt =Time.new(2019, 4, 1, 8, 30, 20, 0)
+    Time.expects(:now).returns(dt).times(3)
+
+    # Jump forward a few days, and a few hours.
+    f = FunctionResolver.new('hours', [{:type=>:integer, :value => 52}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year, d.year
+    assert_equal dt.month, d.month
+    assert_equal dt.mday + 2, d.mday
+    assert_equal dt.hour + 4, d.hour
+    assert_equal dt.min, d.min
+
+    # Drop back to the previous day, which'll also hit the previous month
+    f = FunctionResolver.new('hours', [{:type=>:integer, :value => -24}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year, d.year
+    assert_equal dt.month - 1, d.month
+    assert_equal 31, d.mday
+    assert_equal dt.hour, d.hour
+    assert_equal dt.min, d.min
+
+    # Drop back one full year's worth of hours.
+    f = FunctionResolver.new('hours', [{:type=>:integer, :value => -8760}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    
+    assert_equal :datetime, value[:type]
+    d = DateTime.parse(value[:value])
+    assert_equal dt.year - 1, d.year
+    assert_equal dt.month, d.month
+    assert_equal dt.mday, d.mday
+    assert_equal dt.hour, d.hour
+    assert_equal dt.min, d.min
+  end
+
   test "days()" do
     d = Date.new(2012,10,20)
     Date.expects(:today).returns(d)

metadata

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