key_tree 0.5.2 → 0.8.0

data/lib/key_tree/refinements.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module KeyTree
+  # KeyTree refinements to core classes
+  module Refinements
+    refine Array do
+      def to_key_forest
+        Forest[*map(&:to_key_wood)]
+      end
+      alias_method :to_key_wood, :to_key_forest
+
+      def to_key_path
+        Path.new(self)
+      end
+    end
+
+    refine Hash do
+      def to_key_tree
+        Tree[self]
+      end
+      alias_method :to_key_wood, :to_key_tree
+    end
+
+    refine String do
+      def to_key_path
+        split('.').to_key_path
+      end
+    end
+
+    refine Symbol do
+      def to_key_path
+        to_s.to_key_path
+      end
+    end
+  end
+end
+
+require_relative 'forest'
+require_relative 'path'
+require_relative 'tree'

data/lib/key_tree/tree.rb

@@ -1,118 +1,145 @@
-require 'key_tree/path'
-require 'key_tree/meta_data'
+# frozen_string_literal: true
+
+require 'forwardable'
+require_relative 'meta_data'
+require_relative 'path'
+require_relative 'refinements'
+require_relative 'refine/deep_hash'
+
+module KeyTree # rubocop:disable Style/Documentation
+  using Refinements
+  using Refine::DeepHash
 
-module KeyTree
   # A tree of key-value lookup tables (hashes)
-  class Tree < Hash
+  class Tree
     include MetaData
+    extend Forwardable
     #
     # KeyTree::Tree.new(+hash+)
     #
     # Initialize a new KeyTree from nested Hash:es
     #
     def self.[](hash = {})
-      keytree = Tree.new
-      hash.each do |key, value|
-        keytree[key] = value
-      end
-      keytree
+      new(hash)
     end
 
-    def [](key_or_path)
-      super(Path[key_or_path])
+    def initialize(hash = {}, default = nil, &default_proc)
+      @hash = hash.to_h.deep_key_pathify
+      @default = default
+      @default_proc = default_proc
     end
 
-    def fetch(key_or_path, *args, &missing_key)
-      super(Path[key_or_path], *args, &missing_key)
-    end
+    attr_reader :default, :default_proc
 
-    def values_at(*keys)
-      super(keys.map { |key_or_path| Path[key_or_path] })
-    end
+    alias to_key_tree itself
+    alias to_key_wood itself
 
-    def []=(key_or_path, new_value)
-      path = Path[key_or_path]
+    delegate %i[empty? to_h to_json] => :@hash
+
+    # Convert a Tree to YAML, with string keys
+    #
+    # :call-seq:
+    #   to_yaml => String
+    def to_yaml
+      to_h.deep_transform_keys(&:to_s).to_yaml
+    end
 
-      delete_if { |key, _| path.conflict?(key) }
+    def [](key_path)
+      fetch(key_path) do
+        next default if default_proc.nil?
 
-      case new_value
-      when Hash
-        new_value.each { |suffix, value| self[path + suffix] = value }
-      else
-        super(path, new_value)
+        default_proc.call(self, key_path)
       end
     end
 
-    def key?(key_or_path)
-      super(Path[key_or_path])
+    def fetch(key_path, *args, &key_missing)
+      @hash.deep_fetch(key_path.to_key_path, *args, &key_missing)
     end
 
-    def default_key?(key_or_path)
-      return unless default_proc
-      default_proc.yield(self, Path[key_or_path])
-      true
-    rescue KeyError
-      false
+    def store(key_path, new_value)
+      @hash.deep_store(key_path.to_key_path, new_value)
     end
 
-    def prefix?(key_or_path)
-      keys.any? { |key| key.prefix?(Path[key_or_path]) }
+    def store!(key_path, new_value)
+      store(key_path, new_value)
+    rescue KeyError
+      delete!(key_path)
+      retry
     end
+    alias []= store!
 
-    def conflict?(key_or_path)
-      keys.any? { |key| key.conflict?(Path[key_or_path]) }
+    def delete(key_path)
+      @hash.deep_delete(key_path.to_key_path)
     end
 
-    # The merging of trees needs some extra consideration; due to the
-    # nature of key paths, prefix conflicts must be deleted
-    #
-    def merge!(other, &merger)
-      other = Tree[other] unless other.is_a?(Tree)
-      delete_if { |key, _| other.conflict?(key) }
-      super
+    def delete!(key_path)
+      delete(key_path)
+    rescue KeyError
+      key_path = key_path[0..-2]
+      retry
     end
-    alias << merge!
 
-    def merge(other, &merger)
-      dup.merge!(other, &merger)
+    def values_at(*key_paths)
+      key_paths.map { |key_path| self[key_path] }
     end
-    alias + merge
 
-    # Format +fmtstr+ with values from the Tree
-    def format(fmtstr)
-      Kernel.format(fmtstr, Hash.new { |_, key| fetch(key) })
+    # Return all maximal key paths in a tree
+    #
+    # :call-seq:
+    #   keys => Array of KeyTree::Path
+    def keys
+      @hash.deep.each_with_object([]) do |(key_path, value), result|
+        result << key_path.to_key_path unless value.is_a?(Hash)
+      end
     end
+    alias key_paths keys
 
-    # Convert a Tree back to nested hashes.
-    #
-    # to_h => Hash, with symbol keys
-    # to_h(string_keys: true) => Hash, with string keys
-    def to_h(**kwargs)
-      to_hash_tree(**kwargs)
+    def include?(key_path)
+      fetch(key_path)
+      true
+    rescue KeyError
+      false
     end
+    alias key? include?
+    alias has_key? include?
+    alias key_path? include?
+    alias has_key_path? include?
+
+    def prefix?(key_path)
+      key_path.to_key_path.reduce(@hash) do |subtree, key|
+        return false unless subtree.is_a?(Hash)
+        return false unless subtree.key?(key)
 
-    # Convert a Tree to JSON, with string keys
-    def to_json
-      to_hash_tree(string_keys: true).to_json
+        subtree[key]
+      end
+      true
     end
+    alias has_prefix? prefix?
 
-    # Convert a Tree to YAML, with string keys
-    def to_yaml
-      to_hash_tree(string_keys: true).to_yaml
+    def value?(needle)
+      @hash.deep.lazy.any? { |(_, straw)| straw == needle }
     end
+    alias has_value? value?
 
-    private
+    # Merge values from +other+ tree into self
+    #
+    # :call-seq:
+    #   merge!(other) => self
+    #   merge!(other) { |key, lhs, rhs| } => self
+    def merge!(other, &block)
+      @hash.deep_merge!(other.to_h, &block)
+      self
+    end
+    alias << merge!
 
-    def to_hash_tree(key_pairs = self, string_keys: false)
-      hash = key_pairs.group_by do |path, _|
-        string_keys ? path.first.to_s : path.first
-      end
-      hash.transform_values do |next_level|
-        next_level.map! { |path, value| [path[1..-1], value] }
-        first_key, first_value = next_level.first
-        next first_value if first_key.nil? || first_key.empty?
-        to_hash_tree(next_level)
-      end
+    # Return a new tree by merging values from +other+ tree
+    #
+    # :call-seq:
+    #   merge(other) => Tree
+    #   merge(other) { |key, lhs, rhs| } => Tree
+    def merge(other, &block)
+      @hash.deep_merge(other.to_h, &block).to_key_tree
     end
+    alias + merge
   end
 end

data/lib/key_tree/version.rb

@@ -1,6 +1,10 @@
-require 'git-version-bump'
+# frozen_string_literal: true
 
-module KeyTree
-  VERSION = GVB.version.freeze
-  DATE = GVB.date.freeze
+module KeyTree # rubocop:disable Style/Documentation
+  begin
+    require 'git-version-bump'
+    VERSION = GVB.version.freeze
+  rescue LoadError
+    VERSION = '0.0.0.UNDEF'
+  end
 end

data/ruby-keytree.sublime-project

@@ -0,0 +1,8 @@
+{
+	"folders":
+	[
+		{
+			"path": "."
+		}
+	]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: key_tree
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Calle Englund
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-05-19 00:00:00.000000000 Z
+date: 2021-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump
@@ -16,86 +16,170 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
-description: Manage trees of keys
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+description:
 email:
 - calle@discord.bofh.se
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
-- RELEASE_NOTES.md
 - Rakefile
 - bin/console
 - bin/setup
@@ -106,13 +190,16 @@ files:
 - lib/key_tree/loader/nil.rb
 - lib/key_tree/meta_data.rb
 - lib/key_tree/path.rb
+- lib/key_tree/refine/deep_hash.rb
+- lib/key_tree/refinements.rb
 - lib/key_tree/tree.rb
 - lib/key_tree/version.rb
+- ruby-keytree.sublime-project
 homepage: https://github.com/notcalle/ruby-keytree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,16 +207,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Manage trees of keys
 test_files: []