subroutine 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a69ecebbd8549a3067d41ac4d8981d51c175614f4e052b296226cdce3ad15b30
-  data.tar.gz: e375bae8ee9f1e73ff3eb3128373d50e4cd20af0cf68eaeef16af28688ca2d36
+  metadata.gz: fb0e95ecb87d3b848cbc99714e68405ead97c7c82b2ea7e80b49925502a15790
+  data.tar.gz: dfdae7d9a7a7b227eb35cecc53334412c0d27259f7b8f3bc5a83cf8e402faebd
 SHA512:
-  metadata.gz: bc51e2794c9a41589aec6d47097cc13644f6e9683b5d5e99ce13310dcf07184d23896dd493ab00ddf54dfa648d7b6236a45968318194b8da53ac66663ae28fc7
-  data.tar.gz: ef4e70f7bf48e180485082f1107b84a9ffbc02037dcc100432435d07d6a634d427ce58546f3010f24723f7e9fbdac52067944fba1294c71078ce11cf30e66488
+  metadata.gz: b0e0f0d68c428bbed21dd09adc7b98890281fc61b69a6a04cebdb34848a8da9db9ff2cdabf9a5257741a5e1d13592cadfe056f3d4fd274fe74aa9bcac830b439
+  data.tar.gz: 046725136d9300e595dcfd0f83fd6fd9b1271b28bdb213bee2f7a9504c8291841c2c35c48abe13d2e0b0eb137698c0c42e553836099dfd5b61c24f51d41c77ff

data/lib/subroutine/type_caster.rb

@@ -4,9 +4,14 @@ require 'date'
 require 'time'
 require 'bigdecimal'
 require 'securerandom'
+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
@@ -115,10 +120,24 @@ 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?
 
-  ::Time.parse(String(value))
+  if options[:precision] == :high
+    if value.try(:acts_like?, :time)
+      value.to_time
+    else
+      ::Time.parse(String(value))
+    end
+  else # precision == :seconds
+    time = if value.try(:acts_like?, :time)
+      value.to_time
+    else
+      ::Time.parse(String(value))
+    end
+
+    time.change(usec: 0)
+  end
 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 = 2
+  PATCH = 4
   PRE   = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

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,16 +256,139 @@ module Subroutine
       assert_equal 0, op.time_input.min
       assert_equal 0, op.time_input.sec
 
-      op.time_input = '2023-05-05T10:00:30Z'
+      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 0, op.time_input.usec
+
+      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_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

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.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Mike Nelson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel