subroutine 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2dedf592996ae8331d333379af49033a3f5a3e74a4c8dd8d8cf5fbe7c878258
-  data.tar.gz: ab33d0b731a9f28b52e4661fdcb6626d6eda2f2e8883a8f05ecfa2b529f2961a
+  metadata.gz: e7441c613353cda046900b7165d787576d3cb757943496fb7b4ccc65a9f5faf1
+  data.tar.gz: b154f7ab48dc32c391be450bc684ee34d59451d6e327d90f463654d53e8f0a55
 SHA512:
-  metadata.gz: 26617e51aeb874dbabb64ad62add32903ad734014ed09e4b0c59f81829bb9bbf728726ab4c7690d82ce1280967b59507c689a58464c13216ad46df87b99c0ff5
-  data.tar.gz: 3a45d5cbac6d68660c875e0c7163b403276b360a7d37efb86199d2b593c04876060e6f83b99cef3e0dd2c144cba2c75c11a2eeb51a17253bfff49cb6657c55c7
+  metadata.gz: 9da5a1f35f9888ebc970e23c60e53871258d837767b6baf3597fb216c64eca039171d993f4abc8c02627b678623e47df35defe5a79799a6c166ff7aebc2cb712
+  data.tar.gz: 5df7cc84df8ec5b19f60f9101fb66abeee95b578b474d956d378857132a60881a039c55ddecc4b8e6405b1ef9c95fb69f5b3d2d3ffc3fd5cb02bdce0aba8da4d

data/lib/subroutine/type_caster.rb

@@ -4,11 +4,16 @@ require 'date'
 require 'time'
 require 'bigdecimal'
 require 'securerandom'
+require 'active_support'
+require 'active_support/json'
+require 'active_support/core_ext/date_time/acts_like'
+require 'active_support/core_ext/date_time/calculations'
 require 'active_support/core_ext/object/acts_like'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/time/acts_like'
+require 'active_support/core_ext/time/calculations'
 
 module Subroutine
   module TypeCaster
@@ -108,7 +113,7 @@ end
   t ||= value if value.is_a?(::Time)
   t ||= value if value.try(:acts_like?, :time)
   t ||= ::Time.parse(String(value))
-  t.utc.iso8601
+  t.utc.iso8601(::ActiveSupport::JSON::Encoding.time_precision)
 end
 
 ::Subroutine::TypeCaster.register :date do |value, _options = {}|
@@ -117,14 +122,19 @@ end
   ::Date.parse(String(value))
 end
 
-::Subroutine::TypeCaster.register :time, :timestamp, :datetime do |value, _options = {}|
+::Subroutine::TypeCaster.register :time, :timestamp, :datetime do |value, options = {}|
   next nil unless value.present?
 
-  if value.try(:acts_like?, :time)
-    value
+  value = if value.try(:acts_like?, :time)
+    value.to_time
   else
     ::Time.parse(String(value))
   end
+
+  # High precision must be opted into. The original implementation is to set usec:0
+  next value if options[:precision] == :high || ::Subroutine.preserve_time_precision?
+
+  value.change(usec: 0)
 end
 
 ::Subroutine::TypeCaster.register :hash, :object, :hashmap, :dict do |value, _options = {}|

data/lib/subroutine/version.rb

@@ -4,7 +4,7 @@ module Subroutine
 
   MAJOR = 3
   MINOR = 0
-  PATCH = 3
+  PATCH = 5
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

data/lib/subroutine.rb

@@ -3,3 +3,17 @@
 require "subroutine/version"
 require "subroutine/fields"
 require "subroutine/op"
+
+module Subroutine
+
+  def self.preserve_time_precision=(bool)
+    @preserve_time_precision = !!bool
+  end
+
+  def self.preserve_time_precision?
+    return !!@preserve_time_precision if defined?(@preserve_time_precision)
+
+    false
+  end
+
+end

data/test/subroutine/type_caster_test.rb

@@ -241,7 +241,7 @@ module Subroutine
       assert_nil op.date_input
     end
 
-    def test_time_inputs
+    def test_time_inputs__with_seconds_precision
       op.time_input = nil
       assert_nil op.time_input
 
@@ -256,22 +256,153 @@ module Subroutine
       assert_equal 0, op.time_input.min
       assert_equal 0, op.time_input.sec
 
+      op.time_input = ::DateTime.new(2022, 12, 22)
+      assert_equal ::Time, op.time_input.class
+      refute_equal ::DateTime, op.time_input.class
+
+      assert_equal 0, op.time_input.utc_offset
+      assert_equal 2022, op.time_input.year
+      assert_equal 12, op.time_input.month
+      assert_equal 22, op.time_input.day
+      assert_equal 0, op.time_input.hour
+      assert_equal 0, op.time_input.min
+      assert_equal 0, op.time_input.sec
+
       op.time_input = '2023-05-05T10:00:30.123456Z'
       assert_equal ::Time, op.time_input.class
       refute_equal ::DateTime, op.time_input.class
 
+      assert_equal 0, op.time_input.utc_offset
       assert_equal 2023, op.time_input.year
       assert_equal 5, op.time_input.month
       assert_equal 5, op.time_input.day
       assert_equal 10, op.time_input.hour
       assert_equal 0, op.time_input.min
       assert_equal 30, op.time_input.sec
-      assert_equal 123456, op.time_input.usec
+      assert_equal 0, op.time_input.usec
 
-      time = Time.at(1678741605.123456)
+      op.time_input = '2023-05-05T10:00:30Z'
+      assert_equal ::Time, op.time_input.class
+      assert_equal 0, op.time_input.utc_offset
+      assert_equal 2023, op.time_input.year
+      assert_equal 5, op.time_input.month
+      assert_equal 5, op.time_input.day
+      assert_equal 10, op.time_input.hour
+      assert_equal 0, op.time_input.min
+      assert_equal 30, op.time_input.sec
+      assert_equal 0, op.time_input.usec
+
+      op.time_input = '2024-11-11T16:42:23.246+0100'
+      assert_equal ::Time, op.time_input.class
+      assert_equal 3600, op.time_input.utc_offset
+      assert_equal 2024, op.time_input.year
+      assert_equal 11, op.time_input.month
+      assert_equal 11, op.time_input.day
+      assert_equal 16, op.time_input.hour
+      assert_equal 42, op.time_input.min
+      assert_equal 23, op.time_input.sec
+      assert_equal 0, op.time_input.usec
+
+      time = Time.at(1678741605.123456).utc
+      op.time_input = time
+      refute_equal time, op.time_input
+      refute_equal time.object_id, op.time_input.object_id
+      assert_equal 2023, op.time_input.year
+      assert_equal 3, op.time_input.month
+      assert_equal 13, op.time_input.day
+      assert_equal 21, op.time_input.hour
+      assert_equal 6, op.time_input.min
+      assert_equal 45, op.time_input.sec
+      assert_equal 0, op.time_input.usec
+    end
+
+    def test_time_inputs__with_preserve_time_precision
+      Subroutine.stubs(:preserve_time_precision?).returns(true)
+
+      time = Time.at(1678741605.123456).utc
       op.time_input = time
-      assert_equal time, op.time_input
-      assert_equal time.object_id, op.time_input.object_id
+      assert_equal 2023, op.time_input.year
+      assert_equal 3, op.time_input.month
+      assert_equal 13, op.time_input.day
+      assert_equal 21, op.time_input.hour
+      assert_equal 6, op.time_input.min
+      assert_equal 45, op.time_input.sec
+      assert_equal 123456, op.time_input.usec
+    end
+
+    def test_time_inputs__with_high_precision
+      op.precise_time_input = nil
+      assert_nil op.precise_time_input
+
+      op.precise_time_input = '2022-12-22'
+      assert_equal ::Time, op.precise_time_input.class
+      refute_equal ::DateTime, op.precise_time_input.class
+
+      assert_equal 2022, op.precise_time_input.year
+      assert_equal 12, op.precise_time_input.month
+      assert_equal 22, op.precise_time_input.day
+      assert_equal 0, op.precise_time_input.hour
+      assert_equal 0, op.precise_time_input.min
+      assert_equal 0, op.precise_time_input.sec
+
+      op.precise_time_input = ::DateTime.new(2022, 12, 22)
+      assert_equal ::Time, op.precise_time_input.class
+      refute_equal ::DateTime, op.precise_time_input.class
+
+      assert_equal 0, op.precise_time_input.utc_offset
+      assert_equal 2022, op.precise_time_input.year
+      assert_equal 12, op.precise_time_input.month
+      assert_equal 22, op.precise_time_input.day
+      assert_equal 0, op.precise_time_input.hour
+      assert_equal 0, op.precise_time_input.min
+      assert_equal 0, op.precise_time_input.sec
+
+      op.precise_time_input = '2023-05-05T10:00:30.123456Z'
+      assert_equal ::Time, op.precise_time_input.class
+      refute_equal ::DateTime, op.precise_time_input.class
+
+      assert_equal 0, op.precise_time_input.utc_offset
+      assert_equal 2023, op.precise_time_input.year
+      assert_equal 5, op.precise_time_input.month
+      assert_equal 5, op.precise_time_input.day
+      assert_equal 10, op.precise_time_input.hour
+      assert_equal 0, op.precise_time_input.min
+      assert_equal 30, op.precise_time_input.sec
+      assert_equal 123456, op.precise_time_input.usec
+
+      op.precise_time_input = '2023-05-05T10:00:30Z'
+      assert_equal ::Time, op.precise_time_input.class
+      assert_equal 0, op.precise_time_input.utc_offset
+      assert_equal 2023, op.precise_time_input.year
+      assert_equal 5, op.precise_time_input.month
+      assert_equal 5, op.precise_time_input.day
+      assert_equal 10, op.precise_time_input.hour
+      assert_equal 0, op.precise_time_input.min
+      assert_equal 30, op.precise_time_input.sec
+      assert_equal 0, op.precise_time_input.usec
+
+      op.precise_time_input = '2024-11-11T16:42:23.246+0100'
+      assert_equal ::Time, op.precise_time_input.class
+      assert_equal 3600, op.precise_time_input.utc_offset
+      assert_equal 2024, op.precise_time_input.year
+      assert_equal 11, op.precise_time_input.month
+      assert_equal 11, op.precise_time_input.day
+      assert_equal 16, op.precise_time_input.hour
+      assert_equal 42, op.precise_time_input.min
+      assert_equal 23, op.precise_time_input.sec
+      assert_equal 246000, op.precise_time_input.usec
+
+      time = Time.at(1678741605.123456).utc
+      op.precise_time_input = time
+      assert_equal time, op.precise_time_input
+      assert_equal time.object_id, op.precise_time_input.object_id
+      assert_equal 2023, op.precise_time_input.year
+      assert_equal 3, op.precise_time_input.month
+      assert_equal 13, op.precise_time_input.day
+      assert_equal 21, op.precise_time_input.hour
+      assert_equal 6, op.precise_time_input.min
+      assert_equal 45, op.precise_time_input.sec
+      assert_equal 123456, op.precise_time_input.usec
     end
 
     def test_iso_date_inputs
@@ -293,11 +424,11 @@ module Subroutine
 
       op.iso_time_input = '2022-12-22T10:30:24Z'
       assert_equal ::String, op.iso_time_input.class
-      assert_equal '2022-12-22T10:30:24Z', op.iso_time_input
+      assert_equal '2022-12-22T10:30:24.000Z', op.iso_time_input
 
-      op.iso_time_input = Time.parse('2022-12-22T10:30:24Z')
+      op.iso_time_input = Time.parse('2022-12-22T10:30:24.123456Z')
       assert_equal ::String, op.iso_time_input.class
-      assert_equal '2022-12-22T10:30:24Z', op.iso_time_input
+      assert_equal '2022-12-22T10:30:24.123Z', op.iso_time_input
     end
 
     def test_file_inputs

data/test/support/ops.rb

@@ -177,6 +177,7 @@ class TypeCastOp < ::Subroutine::Op
   boolean :boolean_input
   date :date_input
   time :time_input, default: -> { Time.now }
+  time :precise_time_input, precision: :high
   iso_date :iso_date_input
   iso_time :iso_time_input
   object :object_input

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.5
 platform: ruby
 authors:
 - Mike Nelson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel