hellobase 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 925574afb7726175b0a972403d9e805692779cbbb8f6e87ff8fbe911a135df28
-  data.tar.gz: a2ca4330eca04f5b069e00f7c4fdcca8d245c394044c34eefd922c2619d3ce72
+  metadata.gz: bac093aad9f9bedcf9ca8b34666ba172cd71c967a826efcbb41c899158ec329e
+  data.tar.gz: 23798a5a68e2006a4df42258a0344897232c046d5c0f2c6c0fad1b50c1d712fc
 SHA512:
-  metadata.gz: 41a29344cdece20c0f7ec4485d7db02f7297775892032763083f62fc3d823cf0253efeb09266ae50866c715cf7e089ce9215ba14cdec494d1625c63b58a514d6
-  data.tar.gz: be6935db61dfb6320d9a3bcbb5a00b6326c27bcce4a7a850322e0aad7180fdb0fe5f49000d3791512a1a7ddc85b347e37dd21431f384f8d697b4dd4643a5177f
+  metadata.gz: cac0820e4e285e0b7383c0e6d1a225ec43ca28254a71cfbd1d30a6bb6cd01144ce44c47d2df9d930290b6690d456c5062c61802ba8b1e57d3a34d92e9b2bea75
+  data.tar.gz: 4302db7ea840217079eeb31848e13a3f92b1143b82183781c7d1e6af30447416c0d1ba0eccf442dab1898cb4588d05c25a8fd24c80d135e2edc9831bdc3280d2

data/lib/hellobase/formtastic/datepicker_with_time_input.rb

@@ -7,55 +7,52 @@ require 'active_admin/inputs'
 class DatepickerWithTimeInput
   include ::Formtastic::Inputs::Base
 
-  def self.virtual_attributes(attr)
-    [:"_dpwt_#{attr}_d", :"_dpwt_#{attr}_h", :"_dpwt_#{attr}_m"]
+  def self.virtual_attributes(base)
+    [:"_dpwt_#{base}_d", :"_dpwt_#{base}_h", :"_dpwt_#{base}_m"]
   end
 
-  def self.define_virtual_attributes(klass, attr)
-    return if klass.respond_to? :_dpwt_defined
+  def self.define_virtual_attributes(klass, base)
+    attrs = virtual_attributes(base)
+    ivars = attrs.map {|a| :"@#{a}" }
+    method = :"_dpwt_set_#{base}"
 
-    klass.class_eval <<-RUBY
-      def self._dpwt_defined; end
-
-      def _dpwt_#{attr}_d
-        self.#{attr}&.strftime('%Y-%m-%d')
+    klass.class_eval do
+      define_method attrs[0] do
+        send(base)&.strftime('%Y-%m-%d')
       end
 
-      def _dpwt_#{attr}_h
-        self.#{attr}&.strftime('%H')
+      define_method attrs[1] do
+        send(base)&.strftime('%H')
       end
 
-      def _dpwt_#{attr}_m
-        self.#{attr}&.strftime('%M')
+      define_method attrs[2] do
+        send(base)&.strftime('%M')
       end
 
-      def _dpwt_#{attr}_d=(val)
-        @_dpwt_#{attr}_d = val
-        _dpwt_set_#{attr}
+      attrs.each_with_index do |a, i|
+        define_method :"#{a}=" do |val|
+          instance_variable_set ivars[i], val
+          send(method)
 
-        val
+          val
+        end
       end
 
-      def _dpwt_#{attr}_h=(val)
-        @_dpwt_#{attr}_h = val
-        _dpwt_set_#{attr}
-
-        val
+      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(' ')
       end
 
-      def _dpwt_#{attr}_m=(val)
-        @_dpwt_#{attr}_m = val
-        _dpwt_set_#{attr}
-
-        val
-      end
-
-      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
+      private method
+    end
   end
 
   def to_html

data/lib/hellobase/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hellobase
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Anthony Wang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin