hellobase-formtastic 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23204b79fccf4dbacbe9826a220766e0604923a959673771c8fc38bc6240997e
-  data.tar.gz: f13d31c76387f8646d180dcf65482b85c38cf742de6297b4dcb07a1b0b4fe5a3
+  metadata.gz: '089f5fd3bc31975a859b2201261dd68fd82929873f6064f47141850891e2fcb2'
+  data.tar.gz: 25baf9a20b79540f15b5993844c0a8ac5ceb82c4b04f4ad7d6f212c764281acd
 SHA512:
-  metadata.gz: d9561afc8619c56078637790305dc024d0a19e39e58a4b25942ae76ef3a09cd434c1bbe8d3389068dc276709254d1a79fa820973ab911cdc65bfb0318a31a5b8
-  data.tar.gz: 2e5725f7722d104c5ddecdb173614b7457338eb2030802521045842dcea08adcbaac3c27062bf4dcb2fc49b55040d231624712a9fa0e9d5206aad33393738498
+  metadata.gz: 9397a0119c1744d71906d99aab2d07c4771917cea709cc50df072e5dd19e9305ec2d0e26e9b62e417497038487477c486df325fe005cf35d6b7fd271b9c4751a
+  data.tar.gz: 6101d0b598d27b62203151b1eaf6ad6a6b427d66072ff787e5b193dc7d98cda64337f4a2769d3dbeafc777859033127f1b59abcba78ee89e4c41eeb6eca2eb85

data/lib/hellobase/formtastic/inputs/datepicker_with_time_input.rb

@@ -13,49 +13,65 @@ module Hellobase
         def self.define_virtual_attributes(klass, base)
           attrs = virtual_attributes(base)
           ivars = attrs.map {|a| :"@#{a}" }
-          method = :"_dpwt_set_#{base}"
+          recalc_method = :"_dpwt_recalc_#{base}"
 
           klass.class_eval do
             define_method attrs[0] do
-              send(base)&.strftime('%Y-%m-%d')
+              if instance_variable_defined? ivars[0]
+                instance_variable_get ivars[0]
+              else
+                instance_variable_set ivars[0], send(base)&.strftime('%Y-%m-%d')
+              end
             end
 
             define_method attrs[1] do
-              send(base)&.strftime('%H')
+              if instance_variable_defined? ivars[1]
+                instance_variable_get ivars[1]
+              else
+                instance_variable_set ivars[1], send(base)&.strftime('%H')
+              end
             end
 
             define_method attrs[2] do
-              send(base)&.strftime('%M')
+              if instance_variable_defined? ivars[2]
+                instance_variable_get ivars[2]
+              else
+                instance_variable_set ivars[2], send(base)&.strftime('%M')
+              end
             end
 
             define_method attrs[3] do
-              send(base)&.strftime('%Z')
+              if instance_variable_defined? ivars[3]
+                instance_variable_get ivars[3]
+              else
+                instance_variable_set ivars[3], send(base)&.zone
+              end
             end
 
             attrs.each_with_index do |a, i|
               define_method :"#{a}=" do |val|
                 instance_variable_set ivars[i], val
-                send(method)
-
-                val
+                send recalc_method
               end
             end
 
-            define_method method do
-              send :"#{base}=",
-                ivars.any? {|v| instance_variable_get(v).blank? } ?
-                  nil :
-                  [
-                    instance_variable_get(ivars[0]),
-                    [
-                      instance_variable_get(ivars[1]),
-                      instance_variable_get(ivars[2])
-                    ].join(':'),
-                    instance_variable_get(ivars[3]),
-                  ].join(' ')
+            define_method recalc_method do
+              val = if attrs.any? {|attr| send(attr).blank? }
+                nil
+              else
+                begin
+                  Time.use_zone(send(attrs[3])) do
+                    Time.zone.parse("#{send(attrs[0])} #{send(attrs[1])}:#{send(attrs[2])}")
+                  end
+                rescue ArgumentError
+                  nil
+                end
+              end
+
+              send :"#{base}=", val
             end
 
-            private method
+            private recalc_method
           end
         end
 

data/lib/hellobase/formtastic/version.rb

@@ -1,5 +1,5 @@
 module Hellobase
   module Formtastic
-    VERSION = '0.3.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hellobase-formtastic
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Anthony Wang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-19 00:00:00.000000000 Z
+date: 2025-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin