hellobase 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c5d3e9cf754c5b79f4c40d8f81d386eefdd9b4d0cc5ac1e6e6d20c99750cba
-  data.tar.gz: 54c85b5b7e21630f79bff2138663a7d4075495d55b5a35d31803ffcc66aa1351
+  metadata.gz: 925574afb7726175b0a972403d9e805692779cbbb8f6e87ff8fbe911a135df28
+  data.tar.gz: a2ca4330eca04f5b069e00f7c4fdcca8d245c394044c34eefd922c2619d3ce72
 SHA512:
-  metadata.gz: 06263c3bf10883966e08359e07470355e587e62e35827c170f8b833b042a485f899672c135823a18333e7d2f719a67035c87d2d0dbf5a71ef7c8c8f38ee9df65
-  data.tar.gz: a37f2ef4a5364b2e619e484b91dcd17650973eb9433e16c9dc486e0d6fcc599dca0fbd04bfb844fd633d3a5f14709fc9701250abbe97cb098d65b899b46cdda7
+  metadata.gz: 41a29344cdece20c0f7ec4485d7db02f7297775892032763083f62fc3d823cf0253efeb09266ae50866c715cf7e089ce9215ba14cdec494d1625c63b58a514d6
+  data.tar.gz: be6935db61dfb6320d9a3bcbb5a00b6326c27bcce4a7a850322e0aad7180fdb0fe5f49000d3791512a1a7ddc85b347e37dd21431f384f8d697b4dd4643a5177f

data/lib/hellobase/formtastic/datepicker_with_time_input.rb

@@ -1,71 +1,101 @@
+# require these here so we can load this as a standalone file - see formtastic.rb
+require 'active_support'
+require 'formtastic'
+
 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}_h", :"_dpwt_#{attr}_m"]
+  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}_h
+        self.#{attr}&.strftime('%H')
+      end
 
-  def init_object
-    if value = object.send(method)
-      object.send "#{method}=", value.in_time_zone(time_zone)
-    end
+      def _dpwt_#{attr}_m
+        self.#{attr}&.strftime('%M')
+      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')
+      def _dpwt_#{attr}_h=(val)
+        @_dpwt_#{attr}_h = val
+        _dpwt_set_#{attr}
+
+        val
       end
 
-      define_method(:#{method}_date) do
-        #{method}_buffer&.strftime('%Y-%m-%d')
+      def _dpwt_#{attr}_m=(val)
+        @_dpwt_#{attr}_m = val
+        _dpwt_set_#{attr}
+
+        val
       end
 
-      define_method(:#{method}_time) do
-        #{method}_buffer&.strftime('%R')
+      private
+
+      def _dpwt_set_#{attr}
+        self.#{attr} = @_dpwt_#{attr}_d.blank? || @_dpwt_#{attr}_h.blank? || @_dpwt_#{attr}_m.blank? ? nil : [@_dpwt_#{attr}_d, [@_dpwt_#{attr}_h, @_dpwt_#{attr}_m].join(':')].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
+    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
+
+    wrapper_contents = [
+      replace_li_tag(datepicker_html),
+      replace_li_tag(hour_select_html),
+      replace_li_tag(minute_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,
     }.merge(options[:datepicker_options] || {})
   end
 
-  def time_select_options
+  def hour_select_options
     {
       label: false,
-      collection: (0..23).map {|h| (0..59).select {|m| m % 5 == 0 }.map {|m| ['%02i' % h, '%02i' % m].join(':') } }.flatten,
-    }.merge(options[:time_select_options] || {})
+      collection: (0..23).map {|i| '%02i' % i },
+    }.merge(options[:hour_select_options] || {})
   end
 
-  def time_zone
-    options[:time_zone] || 'UTC'
+  def minute_select_options
+    {
+      label: false,
+      collection: (0..59).map {|i| '%02i' % i },
+    }.merge(options[:minute_select_options] || {})
   end
 
   # formtastic inputs generate <li> with no way to override

data/lib/hellobase/version.rb

@@ -1,3 +1,3 @@
 module Hellobase
-  VERSION = '0.1.9'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hellobase
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.14
 platform: ruby
 authors:
 - Anthony Wang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -99,9 +99,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.13'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.14'
   type: :development
@@ -109,9 +106,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.13'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.14'
 - !ruby/object:Gem::Dependency
@@ -184,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: Ruby runtime environment for Hellobase