hellobase-formtastic 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91ed20f61e12cb7e7f2ae092cd5bb50bc1046e67e1ea1951e9f5c34cae10f438
-  data.tar.gz: 8622f461fbe818499fe85bde5fb22561f8a9ecddd3c86d3e15b5ca32946cb247
+  metadata.gz: '089f5fd3bc31975a859b2201261dd68fd82929873f6064f47141850891e2fcb2'
+  data.tar.gz: 25baf9a20b79540f15b5993844c0a8ac5ceb82c4b04f4ad7d6f212c764281acd
 SHA512:
-  metadata.gz: a47ca291dfc839b4884d42180c840b5adb03931a7213e16198280ae518710f5ef6d243d83f4d8fb2f5b913bd943975528385cd5b518fb7c2f9d2b6375e76e994
-  data.tar.gz: 1ed1b99f2dc90f92361732e65c9f38d2b7043ff2ddb7990ff4bba6751272213db762c58f62a5eb1309afe70bad02187fc9ef57704314a9f240080f04bf1dd537
+  metadata.gz: 9397a0119c1744d71906d99aab2d07c4771917cea709cc50df072e5dd19e9305ec2d0e26e9b62e417497038487477c486df325fe005cf35d6b7fd271b9c4751a
+  data.tar.gz: 6101d0b598d27b62203151b1eaf6ad6a6b427d66072ff787e5b193dc7d98cda64337f4a2769d3dbeafc777859033127f1b59abcba78ee89e4c41eeb6eca2eb85

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

@@ -13,41 +13,55 @@ 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
-              val = if ivars.any? {|v| !instance_variable_defined?(v) || instance_variable_get(v).blank? }
+            define_method recalc_method do
+              val = if attrs.any? {|attr| send(attr).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])}")
+                  Time.use_zone(send(attrs[3])) do
+                    Time.zone.parse("#{send(attrs[0])} #{send(attrs[1])}:#{send(attrs[2])}")
                   end
                 rescue ArgumentError
                   nil
@@ -57,7 +71,7 @@ module Hellobase
               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.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hellobase-formtastic
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Anthony Wang