hellobase 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5e628aa228c5ccc17184aa096c4b13207afa0d9971e7f3a70c9022273ba51e
-  data.tar.gz: 91b1dd1327d4ba48a855afcc6cb4accccee0c9503a11518ed330da314d59441a
+  metadata.gz: 58d94618d33b35eb07fa61f5a1ec5dbffaf39184dd15ba53b952864ff87bc50a
+  data.tar.gz: 26ab6624cbf12e1a09e31e2e9959130f91ebf6ee4f4c237ded77d6daecfcd585
 SHA512:
-  metadata.gz: ce2d8fbb8bdff6be2e47b3d9ac12950f1c2cc0c887d51595cfa22ec890b13931218eadeb6c12844cae7a52ad3a817cfb45d1a1747cfb6360119b77a2c12c8705
-  data.tar.gz: 0f5e821adf40ecb6eeac769f0016fec799cf9578aa638bb9d8558e71cc37721f1a6e3f22327ddba778e682c46c2990e058cfff7719f1b60455bc7fee588e902c
+  metadata.gz: a94d80712b33120f7697250b4efc2410c0669ae612f87c70fbf383f69f7026635f9ef1914b4c0943416c67cc33132532f520d5f99113e7cf9e388ca31000cd15
+  data.tar.gz: a025c3bc76d3b544300087e2cfb5c2aa4c5c40ac8d0d84f7b65926f18568f899e6c5cc4d65956c0ad2cb1c0d8596b2a97d1c0ca58d0cbc47830e920f3b7e37b1

data/lib/hellobase/formtastic/datepicker_with_time_input.rb

@@ -3,54 +3,64 @@ require 'active_admin/inputs'
 class DatepickerWithTimeInput
   include ::Formtastic::Inputs::Base
 
-  def to_html
-    init_object
+  def self.virtual_attributes(attr)
+    [:"_dpwt_#{attr}_d", :"_dpwt_#{attr}_t"]
+  end
 
-    datepicker_html = ActiveAdmin::Inputs::DatepickerInput.new(builder, template, object, object_name, "#{method}_date", datepicker_options).to_html
-    time_select_html = Formtastic::Inputs::SelectInput.new(builder, template, object, object_name, "#{method}_time", time_select_options).to_html
-    zone_hidden_html = Formtastic::Inputs::HiddenInput.new(builder, template, object, object_name, "#{method}_tz", {}).to_html
-    value_hidden_html = Formtastic::Inputs::HiddenInput.new(builder, template, object, object_name, method, {}).to_html
-    zone_span_html = template.content_tag(:span, time_zone)
+  def self.define_virtual_attributes(klass, attr)
+    return if klass.respond_to? :_dpwt_defined
 
-    wrapper_contents = [
-      replace_li_tag(datepicker_html),
-      replace_li_tag(time_select_html),
-      replace_li_tag(zone_hidden_html),
-      replace_li_tag(value_hidden_html),
-      zone_span_html,
-      error_html,
-      hint_html,
-    ].compact.join("\n").html_safe
+    klass.class_eval <<-RUBY
+      def self._dpwt_defined; end
 
-    template.content_tag(:li, wrapper_contents, wrapper_html_options)
-  end
+      def _dpwt_#{attr}_d
+        self.#{attr}&.strftime('%Y-%m-%d')
+      end
 
-  private
+      def _dpwt_#{attr}_t
+        self.#{attr}&.strftime('%R')
+      end
 
-  def init_object
-    if value = object.send(method)
-      object.send "#{method}=", value.in_time_zone(time_zone)
-    end
+      def _dpwt_#{attr}_d=(val)
+        @_dpwt_#{attr}_d = val
+        _dpwt_set_#{attr}
 
-    object.class_eval <<-RUBY
-      define_method(:#{method}_buffer) do
-        @#{method}_v ||= #{method}&.in_time_zone('#{time_zone}')
+        val
       end
 
-      define_method(:#{method}_tz) do
-        #{method}_buffer&.strftime('%z') || '#{time_zone}'
-      end
+      def _dpwt_#{attr}_t=(val)
+        @_dpwt_#{attr}_t = val
+        _dpwt_set_#{attr}
 
-      define_method(:#{method}_date) do
-        #{method}_buffer&.strftime('%Y-%m-%d')
+        val
       end
 
-      define_method(:#{method}_time) do
-        #{method}_buffer&.strftime('%R')
+      private
+
+      def _dpwt_set_#{attr}
+        self.#{attr} = @_dpwt_#{attr}_d.blank? || @_dpwt_#{attr}_t.blank? ? nil : [@_dpwt_#{attr}_d, @_dpwt_#{attr}_t].join(' ')
       end
     RUBY
   end
 
+  def to_html
+    datepicker_html = ActiveAdmin::Inputs::DatepickerInput.new(builder, template, object, object_name, :"_dpwt_#{method}_d", datepicker_options).to_html
+    time_select_html = Formtastic::Inputs::SelectInput.new(builder, template, object, object_name, :"_dpwt_#{method}_t", time_select_options).to_html
+    zone_display_html = options[:time_zone] ? template.content_tag(:span, options[:time_zone]) : nil
+
+    wrapper_contents = [
+      replace_li_tag(datepicker_html),
+      replace_li_tag(time_select_html),
+      zone_display_html,
+      error_html,
+      hint_html,
+    ].compact.join("\n").html_safe
+
+    template.content_tag(:li, wrapper_contents, wrapper_html_options)
+  end
+
+  private
+
   def datepicker_options
     {
       label: label_text,
@@ -64,10 +74,6 @@ class DatepickerWithTimeInput
     }.merge(options[:time_select_options] || {})
   end
 
-  def time_zone
-    options[:time_zone] || 'UTC'
-  end
-
   # formtastic inputs generate <li> with no way to override
   def replace_li_tag(html)
     html.strip.sub(/^<li /, '<span ').sub(/<\/li>$/, '</span>').html_safe

data/lib/hellobase/version.rb

@@ -1,3 +1,3 @@
 module Hellobase
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

metadata

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