sparkql 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODFlYzJkZDViM2E4OWI2YmRmZDc0MTIyYTVmZDFlNzdhMzlkYzJkMg==
+    ZDJhMGNlYzU2MzNhMzQyZTZjMjE1YWQzYzQxZmZhNmQyZTkwNzEwOQ==
   data.tar.gz: !binary |-
-    YmYzYWIyZDJiZTRkZTYyZjg4NzQyYzYxZGI4OTQ1OWQzNDIzN2M4ZQ==
+    MDc2M2E2NDk3MjQwNTI4NWExZWRhMTE1OGFhNzYwYTg2YTViMDhkNQ==
 SHA512:
   metadata.gz: !binary |-
-    MGRjNTRhZDU5NjQ1NmFkOGUzMjQ4M2JhOTNiY2Q1NTdiOWM2ODQ0NGVmYzY0
-    Yjk0OTQyZWEwY2I3ZGUyMTA3YWI4YmJkOTFjOGUzMDMyN2QwNWYzNjg1MTRl
-    OTNiOTkyNDY2OTYxYWI0ZDQ2YjUyMjZkYWRkZDgzNDI4NGViYTU=
+    YmI0ZTZjNmFjYjNjZThiMTVlMWJhNTkxN2EwNDI3YmRmZTg3ZmYyNDJiYTdm
+    OWFhMTQ5NDhlY2EwNGRkMzE3MGU0NTlhZDQwZWNmMGUzMThkM2JiZjVmOTAy
+    YmE0ZmE3OWFmY2RiZWEyYjJlNjE4MGVmN2NjMTc2OWQ0ODJlYTY=
   data.tar.gz: !binary |-
-    YTFjOTA1YjUyMzc2MWQzMTE5YWUzMDY5MjVjNGFhMDg5NzVmNTBjZDNkZDlm
-    YWJkMDBjNzYwNmI5MTcwY2QzZGYyNWEyODNiNDAzNTdiNTA3YjQ1NzQ4MTI1
-    YjIzYTdmZDQwNjA0OTFiNzhhNWJjODJjMTk1YzZhMjI5N2ZhNDk=
+    OGQ5OGI2YzdlNmUxYTVkOTJhNjk3NGEwM2ExODAwZGQ4MDA3M2M5YmVjNDcx
+    M2RlNmU3YjU5Zjk5NTgyNjljOTI2ZjZmODRmZjljZTExOTIwNzM3ZTdiMGJk
+    ZDc2NTI3NWUzMTlhOTg5NzM1NWYxOTg5ZDJkMTY1MTc4YmRhNDY=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+v1.1.2, 2016-11-08 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.1...v1.1.2))
+-------------------
+  * [IMPROVEMENT] New functions: year(), month(), day(), hour(), minute(), second(), and
+    fractionalseconds().
+
 v1.1.1, 2016-09-09 ([changes](https://github.com/sparkapi/sparkql/compare/v1.1.0...v1.1.1))
 -------------------
   * [BUGFIX] Fix `Not` handling in the new Evaluation class

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/sparkql/function_resolver.rb

@@ -55,15 +55,50 @@ class Sparkql::FunctionResolver
       :return_type => :datetime
     },
     :date => { 
-      :args => [[:field,:datetime]],
+      :args => [[:field,:datetime,:date]],
       :resolve_for_type => true,
       :return_type => :date
     },
     :time => { 
-      :args => [[:field,:datetime]],
+      :args => [[:field,:datetime,:date]],
       :resolve_for_type => true,
       :return_type => :time
     },
+    :year => { 
+      :args => [[:field,:datetime,:date]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
+    :month => { 
+      :args => [[:field,:datetime,:date]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
+    :day => { 
+      :args => [[:field,:datetime,:date]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
+    :hour => { 
+      :args => [[:field,:datetime,:date]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
+    :minute => { 
+      :args => [[:field,:datetime,:date]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
+    :second => { 
+      :args => [[:field,:datetime,:date]],
+      :resolve_for_type => true,
+      :return_type => :integer
+    },
+    :fractionalseconds => { 
+      :args => [[:field,:datetime,:date]],
+      :resolve_for_type => true,
+      :return_type => :decimal
+    },
     :range => {
       :args => [:character, :character],
       :return_type => :character
@@ -218,6 +253,62 @@ class Sparkql::FunctionResolver
     }
   end
 
+  def year_field(arg)
+    {
+      :type => :function,
+      :value => "year",
+      :args => [arg]
+    }
+  end
+
+  def month_field(arg)
+    {
+      :type => :function,
+      :value => "month",
+      :args => [arg]
+    }
+  end
+
+  def day_field(arg)
+    {
+      :type => :function,
+      :value => "day",
+      :args => [arg]
+    }
+  end
+
+  def hour_field(arg)
+    {
+      :type => :function,
+      :value => "hour",
+      :args => [arg]
+    }
+  end
+
+  def minute_field(arg)
+    {
+      :type => :function,
+      :value => "minute",
+      :args => [arg]
+    }
+  end
+
+  def second_field(arg)
+    {
+      :type => :function,
+      :value => "second",
+      :args => [arg]
+    }
+  end
+
+  def fractionalseconds_field(arg)
+    {
+      :type => :function,
+      :value => "fractionalseconds",
+      :args => [arg]
+    }
+  end
+
   def date_datetime(dt)
     {
       :type => :date,

data/test/unit/function_resolver_test.rb

@@ -63,7 +63,39 @@ class FunctionResolverTest < Test::Unit::TestCase
     assert_equal '2010-01-06', value[:value], "negative values should go back in time"
   end
 
-
+  test "year(), month(), and day()" do
+    ['year', 'month', 'day'].each do |function|
+      f = FunctionResolver.new(function, [{:type => :field, :value => "OriginalEntryTimestamp"}])
+      f.validate
+      assert !f.errors?, "Errors #{f.errors.inspect}"
+      value = f.call
+      assert_equal :function, value[:type]
+      assert_equal function, value[:value]
+      assert_equal "OriginalEntryTimestamp", value[:args].first
+    end
+  end
+
+  test "hour(), minute(), and second()" do
+    ['year', 'month', 'day'].each do |function|
+      f = FunctionResolver.new(function, [{:type => :field, :value => "OriginalEntryTimestamp"}])
+      f.validate
+      assert !f.errors?, "Errors #{f.errors.inspect}"
+      value = f.call
+      assert_equal :function, value[:type]
+      assert_equal function, value[:value]
+      assert_equal "OriginalEntryTimestamp", value[:args].first
+    end
+  end
+
+  test "fractionalseconds()" do
+    f = FunctionResolver.new('fractionalseconds', [{:type => :field, :value => "OriginalEntryTimestamp"}])
+    f.validate
+    assert !f.errors?, "Errors #{f.errors.inspect}"
+    value = f.call
+    assert_equal :function, value[:type]
+    assert_equal 'fractionalseconds', value[:value]
+    assert_equal "OriginalEntryTimestamp", value[:args].first
+  end
 
   # Polygon searches
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparkql
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Wade McEwen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby