infer_model 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04ed2000c2f891a8afbecbeb147ea60b99f2d75c3e98894037c9858311d38f2c
-  data.tar.gz: fe283d10e13d59f2579b87639c7707a5e45470bf825b2b71410ff55e1e78bfd4
+  metadata.gz: 0db6650dbf15131ccd40e479b1980e85754cd1055e862eede221cca10f3553e9
+  data.tar.gz: f6ec28401dda3153ea50a1eb1998d821958dfcf3d98c3f5f8f2160ef2322377b
 SHA512:
-  metadata.gz: b88b7f67b42df71dafa09e5b3748a4dca6d3ea7be1c1d36c7a3b9eb834ac906648df33969bbfd8ac426f2ce830206684dd918e72114337f29ef9c1a2f6367b1d
-  data.tar.gz: c75104eecb2ff301cc46c760dad9c2d4985e93e11546ad0caad799f999bd67788507febadaa72367ee44fd25d4f9eab2b1e07ec8c89418f104cc8885a21f0eaa
+  metadata.gz: ea99ee69a52875475ba42929916904c9673ebd605332b0fec90cd8f00132c65956003e9a942babe677320535acb7aaa52c4a8bc42b1415e3060feb248ffda89e
+  data.tar.gz: 6cd11aefd834f5549281f58a705d23a9d14f61ce0907e6ed79a5633c35ffb34d5de2f4f593ab9b261d2a38815fc57d7e99c8a730656aa42c01a14e72774a9208

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    infer_model (0.1.4)
+    infer_model (0.1.5)
       activesupport (~> 7.0)
       dry-initializer (~> 3.0)
       zeitwerk (~> 2.6)

data/lib/infer_model/parsers/date_time.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_support"
 require "date"
 
 module InferModel
@@ -22,19 +23,30 @@ module InferModel
 
     param :value
     option :allow_blank, default: -> { true }
-    option :time_zone_offset, default: -> { "+00:00" }
+    option :time_zone_offset, optional: true
+    option :time_zone, optional: true
 
     def call
       raise Parsers::Error, "value was blank which is not allowed" if value.nil? && !allow_blank
       return if value.nil? || value.empty?
 
-      datetime_without_zone = parsed_datetime.iso8601[..-7]
-      datetime_with_custom_zone = datetime_without_zone + time_zone_offset
-      DateTime.parse(datetime_with_custom_zone)
+      # make sure value parsed once before applying time zone
+      # so formats are validated
+      apply_time_zone(parsed_datetime)
     end
 
     private
 
+    def apply_time_zone(datetime)
+      if time_zone_offset
+        datetime.change(offset: time_zone_offset)
+      elsif time_zone
+        Time.use_zone(time_zone) { Time.zone.parse(value) } # discard parsed result and parse again in assumed zone
+      else
+        datetime
+      end
+    end
+
     def parsed_datetime
       ACCEPTABLE_DATETIME_FORMATS.each do |format|
         return DateTime.strptime(value, format)

data/lib/infer_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InferModel
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infer_model
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jay Schneider
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport