hellobase 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97553f4ffdcf70e04c9458401cda7c8fa90214289446ed80a9a470b0f33824d5
-  data.tar.gz: 895a9128b0a720b6153b3b1b8e180c909f7f6c591b2bb227d7a0b4e31fb510ba
+  metadata.gz: fb6c04b21300bc5a358e8b7b6ae7c423ee10a0f0a258e974874c3b77da60d0d3
+  data.tar.gz: 8cf2413675ca561f4848a26e40827eb6ea7022be119ce277c2b661f441b868d6
 SHA512:
-  metadata.gz: f6cc31a56055ec57f79230a080ee53c85ac10392c0e662fb730e86f28e3f453eb14a93da96e7f999b94f2ba4abd7690bf666c6644782b1c8d380354c6f9c6309
-  data.tar.gz: c342ae01d51cbba476e1cffd0a043dad49db5463dcc47119588115b211a40c1987b98369ee0acb269d2e266b21ca9a33b0d25893687163c2e243b6794937cf4e
+  metadata.gz: 2986eccc233337b836f9c88930d141b22cbc1d7013d3f57bef9a1fa6f5b804c35b6692c22421f1fe801a9ee834ef4ac4ceaa52c66befa251112cc9eaa7775d99
+  data.tar.gz: df1482326fcdd1bb4c801fd3a137c846f778854c3167a8b8b9c7661b26943d08d25642caa5e3c28981e543366877fafd85c8f3b7200650d8559e0996c9e62247

data/lib/hellobase/core_ext.rb

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

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/formtastic/datepicker_with_time_input.rb

@@ -7,54 +7,64 @@ require 'active_admin/inputs'
 class DatepickerWithTimeInput
   include ::Formtastic::Inputs::Base
 
-  def self.virtual_attributes(attr)
-    [:"_dpwt_#{attr}_d", :"_dpwt_#{attr}_t"]
+  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}_t
-        self.#{attr}&.strftime('%R')
+      define_method attrs[1] do
+        send(base)&.strftime('%H')
       end
 
-      def _dpwt_#{attr}_d=(val)
-        @_dpwt_#{attr}_d = val
-        _dpwt_set_#{attr}
-
-        val
+      define_method attrs[2] do
+        send(base)&.strftime('%M')
       end
 
-      def _dpwt_#{attr}_t=(val)
-        @_dpwt_#{attr}_t = 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
 
-      private
-
-      def _dpwt_set_#{attr}
-        self.#{attr} = @_dpwt_#{attr}_d.blank? || @_dpwt_#{attr}_t.blank? ? nil : [@_dpwt_#{attr}_d, @_dpwt_#{attr}_t].join(' ')
+      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
-    RUBY
+
+      private method
+    end
   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
+    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(time_select_html),
+      replace_li_tag(hour_select_html),
+      replace_li_tag(minute_select_html),
       zone_display_html,
       error_html,
       hint_html,
@@ -71,11 +81,18 @@ class DatepickerWithTimeInput
     }.merge(options[:datepicker_options] || {})
   end
 
-  def time_select_options
+  def hour_select_options
+    {
+      label: false,
+      collection: (0..23).map {|i| '%02i' % i },
+    }.merge(options[:hour_select_options] || {})
+  end
+
+  def minute_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..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.12'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hellobase
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Anthony Wang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2021-02-18 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