doing 2.1.42 → 2.1.45

data/lib/doing/hash.rb

@@ -40,14 +40,46 @@ module Doing
 
     # Turn all keys into string
     #
-    # Return a copy of the hash where all its keys are strings
+    # If the hash has both a string and a symbol for key,
+    # keep the string value, discarding the symnbol value
+    #
+    # @return     [Hash] a copy of the hash where all its
+    #             keys are strings
+    #
     def stringify_keys
-      each_with_object({}) { |(k, v), hsh| hsh[k.to_s] = v.is_a?(Hash) ? v.stringify_keys : v }
+      each_with_object({}) do |(k, v), hsh|
+        next if k.is_a?(Symbol) && key?(k.to_s)
+
+        hsh[k.to_s] = v.is_a?(Hash) ? v.stringify_keys : v
+      end
     end
 
     # Turn all keys into symbols
+    #
+    # If the hash has both a string and a symbol for a key,
+    # keep the symbol value and discard the string value
+    #
+    # @return     [Hash] a copy of the hash where all its
+    #             keys are symbols
+    #
     def symbolize_keys
-      each_with_object({}) { |(k, v), hsh| hsh[k.to_sym] = v.is_a?(Hash) ? v.symbolize_keys : v }
+      each_with_object({}) do |(k, v), hsh|
+        next if k.is_a?(String) && key?(k.to_sym)
+
+        hsh[k.to_sym] = v.is_a?(Hash) ? v.symbolize_keys : v
+      end
+    end
+
+    def stringify_values
+      transform_values do |v|
+        if v.is_a?(Hash)
+          v.stringify_values
+        elsif v.is_a?(Symbol)
+          v.to_s
+        else
+          v
+        end
+      end
     end
 
     # Set a nested hash value using an array
@@ -61,30 +93,102 @@ module Doing
     #
     def deep_set(path, value)
       if path.count == 1
-        unless value.nil? || value =~ /^ *$/
-          self[path[0]] = value
-        else
+        if value.nil? || value =~ /^ *$/
           delete(path[0])
+        else
+          self[path[0]] = value
         end
+      elsif value
+        self.default_proc = ->(h, k) { h[k] = Hash.new(&h.default_proc) }
+        dig(*path[0..-2])[path.fetch(-1)] = value
       else
-        if value
-          self.default_proc = ->(h, k) { h[k] = Hash.new(&h.default_proc) }
-          dig(*path[0..-2])[path.fetch(-1)] = value
-        else
-          return self unless dig(*path)
-
-          dig(*path[0..-2]).delete(path.fetch(-1))
-          path.pop
-          cleaned = self
-          path.each do |key|
-            if cleaned[key].empty?
-              cleaned.delete(key)
-              break
-            end
-            cleaned = cleaned[key]
+        return self unless dig(*path)
+
+        dig(*path[0..-2]).delete(path.fetch(-1))
+        path.pop
+        cleaned = self
+        path.each do |key|
+          if cleaned[key].empty?
+            cleaned.delete(key)
+            break
           end
-          empty? ? nil : self
+          cleaned = cleaned[key]
         end
+        empty? ? nil : self
+      end
+    end
+
+    ##
+    ## Rename a key, deleting old key
+    ##
+    ## @param      old_key  The original key
+    ## @param      new_key  The new key
+    ## @param      keep     [Boolean] if true, keep old key
+    ##                      in addition to new key
+    ##
+    def rename_key(old_key, new_key, keep: false)
+      return unless key?(old_key)
+
+      self[new_key] = self[old_key]
+      self[new_key.to_s] = self[old_key] if key?(new_key.to_s)
+      delete(old_key) unless keep
+    end
+
+    ##
+    ## Rename keys in batch
+    ##
+    ## @param      pairs  [Array] pairs of old and new keys
+    ##
+    def rename_keys(*pairs)
+      pairs.each { |p| rename_key(p[0], p[1]) }
+    end
+
+    ##
+    ## Remove keys with empty values
+    ##
+    def remove_empty
+      delete_if { |k, v| !v.is_a?(FalseClass) && !v.good? }
+    end
+
+    def tag_filter_to_options
+      hsh = dup
+      if hsh.key?(:tag_filter)
+        hsh[:tags] = hsh[:tag_filter][:tags]
+        hsh[:bool] = hsh[:tag_filter][:bool]
+        hsh.delete(:tag_filter)
+      end
+      replace hsh
+    end
+
+    ##
+    ## Convert an options hash to a view config
+    ##
+    ## @return     [Hash] View representation of the object.
+    ##
+    def to_view
+      hsh = symbolize_keys
+      %w[x save c a s o h e editor m menu i interactive d delete t fuzzy time_filter sort_tags].each do |key|
+        hsh.delete(key.to_sym) if hsh.key?(key.to_sym)
+      end
+
+      hsh.delete_unless_key(:tag, %i[bool])
+      hsh.delete_unless_key(:search, %i[exact case])
+      hsh.rename_keys(%i[not negate], %i[tag tags])
+      hsh.tag_filter_to_options
+
+      hsh = hsh.remove_empty.stringify_keys.stringify_values
+      hsh.keys.sort.each_with_object({}) { |k, out| out[k] = hsh[k] }
+    end
+
+    ##
+    ## Delete array of keys unless key exists
+    ##
+    ## @param      key        The key to verify
+    ## @param      to_delete  [Array] the keys to delete if key doesn't exist
+    ##
+    def delete_unless_key(key, to_delete)
+      unless key?(key)
+        to_delete.each { |k| delete(k) }
       end
     end
   end

data/lib/doing/normalize.rb

@@ -155,6 +155,19 @@ module Doing
     def normalize_trigger!
       replace normalize_trigger
     end
+
+    def normalize_change_type
+      case self
+      when /^c/i
+        :changed
+      when /^i/i
+        :improved
+      when /^f/i
+        :fixed
+      when /^n/i
+        :new
+      end
+    end
   end
 
   ##

data/lib/doing/pager.rb

@@ -73,7 +73,7 @@ module Doing
         [
           Doing.setting('editors.pager'),
           ENV['PAGER'],
-          'less -Xr',
+          'less -FXr',
           ENV['GIT_PAGER'],
           git_pager,
           'more -r'

data/lib/doing/types.rb

@@ -17,18 +17,19 @@ module Doing
     InvalidExportType = Class.new(RuntimeError)
     MissingConfigFile = Class.new(RuntimeError)
 
-    TagArray = Class.new(Array)
-    TemplateName = Class.new(String)
+    AgeSymbol = Class.new(String)
+    BooleanSymbol = Class.new(Symbol)
+    CaseSymbol = Class.new(Symbol)
     DateBeginString = Class.new(DateTime)
     DateEndString = Class.new(DateTime)
-    DateRangeString = Class.new(Array)
-    DateRangeOptionalString = Class.new(Array)
     DateIntervalString = Class.new(DateTime)
-    BooleanSymbol = Class.new(Symbol)
-    CaseSymbol = Class.new(Symbol)
-    AgeSymbol = Class.new(String)
+    DateRangeOptionalString = Class.new(Array)
+    DateRangeString = Class.new(Array)
+    ExportTemplate = Class.new(String)
+    MatchingSymbol = Class.new(Symbol)
     OrderSymbol = Class.new(Symbol)
+    TagArray = Class.new(Array)
     TagSortSymbol = Class.new(Symbol)
-    MatchingSymbol = Class.new(Symbol)
+    TemplateName = Class.new(String)
   end
 end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.42'
+  VERSION = '2.1.45'
 end

data/lib/doing/wwid/display.rb

@@ -357,7 +357,10 @@ module Doing
       opt ||= {}
       out = nil
 
-      raise InvalidArgument, 'Unknown output format' unless opt[:output] =~ Plugins.plugin_regex(type: :export)
+      unless opt[:output] =~ Plugins.plugin_regex(type: :export)
+        raise InvalidPlugin.new('Unknown output format', opt[:output])
+
+      end
 
       export_options = { page_title: title, is_single: is_single, options: opt }
 

data/lib/doing/wwid/filter.rb

@@ -146,21 +146,24 @@ module Doing
         end
 
         if keep && opt[:time_filter][0] || opt[:time_filter][1]
+          opt[:time_filter][0] = '00:00' if opt[:time_filter][0] =~ /12 *am/i
+          opt[:time_filter][1] = '00:00' if opt[:time_filter][1] =~ /12 *am/i
           start_string = if opt[:time_filter][0].nil?
-                           "#{item.date.strftime('%Y-%m-%d')} 12am"
+                           "#{item.date.strftime('%Y-%m-%d')} 00:00"
                          else
                            "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][0]}"
                          end
           start_time = start_string.chronify(guess: :begin)
 
           end_string = if opt[:time_filter][1].nil?
-                         "#{item.date.to_datetime.next_day.strftime('%Y-%m-%d')} 12am"
+                         "#{item.date.to_datetime.next_day.strftime('%Y-%m-%d')} 00:00"
                        else
                          "#{item.date.strftime('%Y-%m-%d')} #{opt[:time_filter][1]}"
                        end
-          end_time = end_string.chronify(guess: :end)
+          end_time = end_string.chronify(guess: :end) || Time.now
 
           in_time_range = item.date >= start_time && item.date <= end_time
+
           keep = false unless in_time_range
           keep = opt[:not] ? !keep : keep
         end

data/lib/doing/wwid/wwid.rb

@@ -100,10 +100,28 @@ module Doing
     ##
     ## @param      title  [String] The title of the view to retrieve
     ##
-    def get_view(title)
-      return Doing.setting(['views', title], nil)
+    def get_view(title, fallback: nil)
+      Doing.setting(['views', title], fallback)
+    end
+
+    def rename_view_keys(view)
+      options = view.symbolize_keys
+      # options.rename_key(:tags, :tag, keep: true)
+      options.rename_key(:output_format, :output)
+      options.rename_key(:tags_bool, :bool)
+      options.rename_key(:tag_sort, :sort_tags)
+      options.rename_key(:negate, :not)
+      options.rename_key(:order, :sort)
+
+      options
+    end
 
-      false
+    def view_to_options(title)
+      view = rename_view_keys(get_view(guess_view(title)))
+      view.deep_merge(rename_view_keys(get_view(guess_view(view[:parent]), fallback: {}))) if view.key?(:parent)
+      view.deep_merge(rename_view_keys(get_view(view[:config_template], fallback: {}))) if view.key?(:config_template)
+      view.deep_merge(Doing.setting('templates.default').symbolize_keys)
+      view
     end
 
     private

data/lib/doing.rb

@@ -85,6 +85,15 @@ module Doing
       config.settings
     end
 
+    def original_options
+      @original_options ||= {
+        date_begin: nil,
+        date_end: nil,
+        date_range: nil,
+        date_interval: nil
+      }
+    end
+
     ##
     ## Fetch a config setting using a dot-separated keypath
     ## or array of keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.42
+  version: 2.1.45
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -489,6 +489,7 @@ files:
 - docs/doc/BooleanTermParser/QueryParser.html
 - docs/doc/BooleanTermParser/QueryTransformer.html
 - docs/doc/Doing.html
+- docs/doc/Doing/ArrayCleanup.html
 - docs/doc/Doing/ArrayNestedHash.html
 - docs/doc/Doing/ArrayTags.html
 - docs/doc/Doing/CLIFormat.html