hellobase 0.1.11 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d94618d33b35eb07fa61f5a1ec5dbffaf39184dd15ba53b952864ff87bc50a
-  data.tar.gz: 26ab6624cbf12e1a09e31e2e9959130f91ebf6ee4f4c237ded77d6daecfcd585
+  metadata.gz: 2067b7cb6544fd57896f092063b337967e49c673e2ceed3ab5ae771b88b73278
+  data.tar.gz: b33677b0a39f2469aa0449e23a72ab86fb8ad09d8b6aec45f3506df7768be8b9
 SHA512:
-  metadata.gz: a94d80712b33120f7697250b4efc2410c0669ae612f87c70fbf383f69f7026635f9ef1914b4c0943416c67cc33132532f520d5f99113e7cf9e388ca31000cd15
-  data.tar.gz: a025c3bc76d3b544300087e2cfb5c2aa4c5c40ac8d0d84f7b65926f18568f899e6c5cc4d65956c0ad2cb1c0d8596b2a97d1c0ca58d0cbc47830e920f3b7e37b1
+  metadata.gz: e66d67ca7485ab940445ca39ef01355a89b82fb93b9cc95e61dd9b9ee394176339cb8e96b0d5658c5bf86c5fc9d368c06134bef57bef2eb40ce10ab28e386fb9
+  data.tar.gz: 54789c893f773116994819f9003eded25df02276663fade58b05cb432af0fbc4ac1f8e9964a24453f67c159b743b12354be9e3e2f51fb0db8e41dcd910a06926

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

@@ -1,56 +1,70 @@
+# 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 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
-
-    klass.class_eval <<-RUBY
-      def self._dpwt_defined; end
+  def self.define_virtual_attributes(klass, base)
+    attrs = virtual_attributes(base)
+    ivars = attrs.map {|a| :"@#{a}" }
+    method = :"_dpwt_set_#{base}"
 
-      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,
@@ -67,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.11'
+  VERSION = '0.1.16'
 end

metadata

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