doing 2.1.82 → 2.1.84

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.82
+v2.1.84
 
 === Global Options
 === --config_file arg

data/lib/doing/configuration.rb

@@ -44,6 +44,15 @@ module Doing
       'timer_format' => 'text',
       'interval_format' => 'text',
 
+      'order' => 'asc',
+
+      'shortdate_format' => {
+        'today' => '%_I:%M%P',
+        'this_week' => '%a %_I:%M%P',
+        'this_month' => '%m/%d %_I:%M%P',
+        'older' => '%m/%d/%y %_I:%M%P'
+      },
+
       'templates' => {
         'default' => {
           'date_format' => '%Y-%m-%d %H:%M',
@@ -200,7 +209,7 @@ module Doing
     ##                      matched, first match wins)
     ## @return     [Array] ordered array of resolved keys
     ##
-    def resolve_key_path(keypath, create: false, distance: 2)
+    def resolve_key_path(keypath, create: false, distance: 2, exact: false)
       cfg = @settings
       real_path = []
       unless keypath =~ /^[.*]?$/
@@ -211,7 +220,11 @@ module Doing
           new_cfg = nil
 
           if cfg.is_a?(Hash)
-            matches = cfg.select { |key, val| key =~ path.to_rx(distance: distance) }
+            matches = if exact
+                        cfg.select { |key, _| key == path }
+                      else
+                        cfg.select { |key, _| key =~ path.to_rx(distance: distance) }
+                      end
             if matches.count.positive?
               shortest = matches.keys.group_by(&:length).min.last[0]
               real_path << shortest

data/lib/doing/hash.rb

@@ -99,7 +99,7 @@ module Doing
     #
     def deep_set(path, value)
       if path.count == 1
-        if value.nil? || value =~ /^ *$/
+        if value.nil? || (value.is_a?(String) && value =~ /^ *$/) || (value.is_a?(Array) && value.empty?)
           delete(path[0])
         else
           self[path[0]] = value

data/lib/doing/template_string.rb

@@ -116,7 +116,8 @@ module Doing
           pad = m['width'].to_i
           mark = m['mchar'] || ''
           if placeholder == 'shortdate' && m['width'].nil?
-            pad = 13
+            fmt_string = Doing.setting('shortdate_format.older', '%m/%d/%y %_I:%M%P', exact: true)
+            pad = Date.today.strftime(fmt_string).length
           end
           indent = nil
           if m['ichar']

data/lib/doing/time.rb

@@ -12,13 +12,13 @@ module Doing
     #
     def relative_date
       if self > Date.today.to_time
-        strftime('%_I:%M%P')
+        strftime(Doing.setting('shortdate_format.today', '%_I:%M%P', exact: true))
       elsif self > (Date.today - 6).to_time
-        strftime('%a %_I:%M%P')
+        strftime(Doing.setting('shortdate_format.this_week', '%a %_I:%M%P', exact: true))
       elsif year == Date.today.year || (year + 1 == Date.today.year && month > Date.today.month)
-        strftime('%m/%d %_I:%M%P')
+        strftime(Doing.setting('shortdate_format.this_month', '%m/%d %_I:%M%P', exact: true))
       else
-        strftime('%m/%d/%y %_I:%M%P')
+        strftime(Doing.setting('shortdate_format.older', '%m/%d/%y %_I:%M%P', exact: true))
       end
     end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.82'
+  VERSION = '2.1.84'
 end

data/lib/doing.rb

@@ -106,14 +106,14 @@ module Doing
     ## @param      default  A default value to return if the
     ##                      provided path returns nil result
     ##
-    def setting(keypath, default = nil)
+    def setting(keypath, default = nil, exact: false)
       cfg = config.settings
       case keypath
       when Array
         cfg.dig(*keypath) || default
       when String
         unless keypath =~ /^[.*]?$/
-          real_path = config.resolve_key_path(keypath, create: false)
+          real_path = config.resolve_key_path(keypath, create: false, distance: 0, exact: exact)
           return default unless real_path&.count&.positive?
 
           cfg = cfg.dig(*real_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.82
+  version: 2.1.84
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup