hellobase-formtastic 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6709435108ea76c05c1a914d7de6130d8b2fa24d86df30332ec4c485e92a1e
-  data.tar.gz: 9d85ba91be22e249e95810d78ba805cd7caf84de03e64bc1fff6d47d8375e4ca
+  metadata.gz: 91ed20f61e12cb7e7f2ae092cd5bb50bc1046e67e1ea1951e9f5c34cae10f438
+  data.tar.gz: 8622f461fbe818499fe85bde5fb22561f8a9ecddd3c86d3e15b5ca32946cb247
 SHA512:
-  metadata.gz: 0db3da06a01a65b1a8a91ba4e628b3fbd9fa5925bf4cd01d37fba417a0f52059407314c50af31b59ca6e90b49412ac6b5d9580396bfe2a75ba2aa7552971ead2
-  data.tar.gz: de834bfc586a0300774efd8f2ed1f394fb983b8b06ae8ebb195a208e16a5484b8d2507120e624e298abdf116aea4531ec39761c9b196a18bc80965b12b26b10a
+  metadata.gz: a47ca291dfc839b4884d42180c840b5adb03931a7213e16198280ae518710f5ef6d243d83f4d8fb2f5b913bd943975528385cd5b518fb7c2f9d2b6375e76e994
+  data.tar.gz: 1ed1b99f2dc90f92361732e65c9f38d2b7043ff2ddb7990ff4bba6751272213db762c58f62a5eb1309afe70bad02187fc9ef57704314a9f240080f04bf1dd537

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

@@ -7,7 +7,7 @@ module Hellobase
         include ::Formtastic::Inputs::Base
 
         def self.virtual_attributes(base)
-          [:"_dpwt_#{base}_d", :"_dpwt_#{base}_h", :"_dpwt_#{base}_m"]
+          [:"_dpwt_#{base}_d", :"_dpwt_#{base}_h", :"_dpwt_#{base}_m", :"_dpwt_#{base}_z"]
         end
 
         def self.define_virtual_attributes(klass, base)
@@ -28,6 +28,10 @@ module Hellobase
               send(base)&.strftime('%M')
             end
 
+            define_method attrs[3] do
+              send(base)&.strftime('%Z')
+            end
+
             attrs.each_with_index do |a, i|
               define_method :"#{a}=" do |val|
                 instance_variable_set ivars[i], val
@@ -38,16 +42,19 @@ module Hellobase
             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(':')
-                  ].join(' ')
+              val = if ivars.any? {|v| !instance_variable_defined?(v) || instance_variable_get(v).blank? }
+                nil
+              else
+                begin
+                  Time.use_zone(instance_variable_get(ivars[3])) do
+                    Time.parse("#{instance_variable_get(ivars[0])} #{instance_variable_get(ivars[1])}:#{instance_variable_get(ivars[2])}")
+                  end
+                rescue ArgumentError
+                  nil
+                end
+              end
+
+              send :"#{base}=", val
             end
 
             private method
@@ -58,13 +65,17 @@ module Hellobase
           datepicker_html = ::ActiveAdmin::Inputs::DatepickerInput.new(builder, template, object, object_name, :"_dpwt_#{method}_d", datepicker_options).to_html
           hour_select_html = ::Formtastic::Inputs::SelectInput.new(builder, template, object, object_name, :"_dpwt_#{method}_h", hour_select_options).to_html
           minute_select_html = ::Formtastic::Inputs::SelectInput.new(builder, template, object, object_name, :"_dpwt_#{method}_m", minute_select_options).to_html
-          zone_display_html = options[:time_zone] ? template.content_tag(:span, options[:time_zone]) : nil
+
+          timezone = options[:timezone] || 'UTC'
+          timezone_span_html = template.content_tag(:span, timezone, id: "#{object_name}__dpwt_#{method}_timezone")
+          timezone_hidden_input_html = template.hidden_field_tag("#{object_name}[_dpwt_#{method}_z]", timezone, :id => "#{object_name}__dpwt_#{method}_z")
 
           wrapper_contents = [
             replace_li_tag(datepicker_html),
             replace_li_tag(hour_select_html),
             replace_li_tag(minute_select_html),
-            zone_display_html,
+            timezone_span_html,
+            timezone_hidden_input_html,
             error_html,
             hint_html,
           ].compact.join("\n").html_safe

data/lib/hellobase/formtastic/version.rb

@@ -1,5 +1,5 @@
 module Hellobase
   module Formtastic
-    VERSION = '0.2.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hellobase-formtastic
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Anthony Wang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-16 00:00:00.000000000 Z
+date: 2025-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Custom Formtastic inputs