hellobase 0.1.14 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 925574afb7726175b0a972403d9e805692779cbbb8f6e87ff8fbe911a135df28
-  data.tar.gz: a2ca4330eca04f5b069e00f7c4fdcca8d245c394044c34eefd922c2619d3ce72
+  metadata.gz: c845087b29c43d1b30d6b890516a532baa1c6848d57ee4dc0ba8be27837bea1b
+  data.tar.gz: 77adb590420eb53377250526052986e60c468a460bb308c3404e42fbf0c03f14
 SHA512:
-  metadata.gz: 41a29344cdece20c0f7ec4485d7db02f7297775892032763083f62fc3d823cf0253efeb09266ae50866c715cf7e089ce9215ba14cdec494d1625c63b58a514d6
-  data.tar.gz: be6935db61dfb6320d9a3bcbb5a00b6326c27bcce4a7a850322e0aad7180fdb0fe5f49000d3791512a1a7ddc85b347e37dd21431f384f8d697b4dd4643a5177f
+  metadata.gz: cc84120eca87a3faeea1a8a8fe8b7da9ff8af48e77ff0cb13e73b76a6e498ee167af925be81062af45dca9d6be3b6a9a425dc7da8465f2ecd9a769aa16c80ec1
+  data.tar.gz: 632211e4b6007b5c1f42ec54c9797843a87b616b0917d4ca2ca7c5d562b4a66c84adf7e75f4c53249500d07a13dbd34201af4fba5265c89ad3be8e1de703ef09

data/lib/hellobase/core_ext/datetime_creation.rb

@@ -20,7 +20,7 @@ Time.singleton_class.prepend(
 
     def new(*args)
       # only allow ActiveSupport::TimeZone to use Time.new
-      unless caller_locations(1, 1)[0].path.end_with? 'active_support/values/time_zone.rb'
+      unless caller_locations.any? {|loc| loc.path.end_with? '/active_support/values/time_zone.rb' }
         raise Hellobase::Error.new(:datetime_new, nil)
       end
 

data/lib/hellobase/core_ext.rb

@@ -1,7 +1,7 @@
 require 'bigdecimal'
 require 'date'
-require 'active_support/core_ext/date'
-require 'active_support/core_ext/time'
+require 'active_support'
+require 'active_support/core_ext'
 require 'active_support/duration'
 require 'tod'
 

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.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hellobase
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.18
 platform: ruby
 authors:
 - Anthony Wang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Ruby runtime environment for Hellobase