config-hash 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d402199a83e315a08c1ec966be61cacd3c611ad159266a9e5302694fe431f986
-  data.tar.gz: 8456cec67ff0dc3b0a7700dbb7d0765334068c8392a836aff9c6d0a3f626e92f
+  metadata.gz: 18cc65d997214d22026cd64bd4a4a648e943d0f5aabe62e25633d583e8c1426c
+  data.tar.gz: 9b8de42e1c7428a97aae9e82338dd0e6dd00c23995d0078ca5be05d6d4d87213
 SHA512:
-  metadata.gz: 46202cd059c38067fed89a376c5db4dedf8a03329df78cfcfabfec930f80bbd810771fdbec14280ff868c932b6b589c9be11065f7ee4503fcb8276ecf109579c
-  data.tar.gz: f77bf4bd20d790219cee22b6beb84ef72b4f649c3a5afe2abf9eac20a24696b5aa96188bfa98ff9347535c3789453f8e8e07fc0b8c16782f4872b53b8191e8a0
+  metadata.gz: fc9e93f97ad627f5ba663d444c35cf3266e0351d1fb5dedf01fe26912e26d0773368d80f6677f474e69905930f1f6d65fe978579840b2f0dbb20f566ada7157f
+  data.tar.gz: d612503adbdc102de8a4a81e2d60c45dca4ab8f21c997384b65263f0dee9cd7e4894d93f3dcbe9feb2f0ae5c6116c0906e44e962e42391cee364c112a3721245

data/.ruby-version

@@ -1 +1 @@
-2.5
+2.6.5

data/config-hash.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "config-hash"
-  s.version     = "0.9.0"
+  s.version     = "1.0.0"
   s.author      = "Steve Shreeve"
   s.email       = "steve.shreeve@gmail.com"
   s.summary     = "A safe, homoiconic, Ruby hash supporting dot notation"

data/lib/config-hash.rb

@@ -3,32 +3,25 @@ class Hash
   def +@; ConfigHash[self]; end
 end
 
-class Array
-  def keys
-    +Hash[zip]
-  end
-end
-
 class NormalHash < Hash
 end
 
 class ConfigHash < Hash
   SEPARATORS ||= %r|[./]|
 
-  # remove likely collisions
-  undef_method :zip
-
   def self.[](hash=nil)
     new(hash)
   end
 
-  def self.load(path="config.rb", var="config")
+  def self.load(path="config.rb", list=nil, name: "config")
     path = File.expand_path(path)
-    eval <<-"end", binding, path, 0
-      #{var} ||= new
-      #{IO.read(path, encoding: 'utf-8') if File.exists?(path)}
-      #{var}
+    data = eval <<~"end", binding, path, 0
+      #{name} ||= new
+      #{IO.read(path, encoding: 'utf-8') if File.readable?(path)}
+      #{name}
     end
+    data.load(*list) if list && !list.empty?
+    data
   end
 
   def initialize(hash=nil)
@@ -36,21 +29,21 @@ class ConfigHash < Hash
     update(hash) if hash
   end
 
-  def import(root, glob)
-    root = File.expand_path(root)
-    pref = root.size + 1
-    Dir[File.join(root, glob)].each do |path|
-      keys = File.dirname(path[pref..-1])
-      data = ConfigHash.load(path)
-      self[keys] = data
+  def load(*list)
+    [list].each do |root, glob|
+      root = File.expand_path(root)
+      pref = root.size + 1
+      full = File.join([root, glob].compact)
+      list = Dir[full].sort {|a,b| [a.count('/'), a] <=> [b.count('/'), b]}
+      list.each do |path|
+        info = File.dirname(path[pref...] || '')
+        data = ConfigHash.load(path)
+        info == '.' ? update(data) : (self[info] = data)
+      end
     end
     self
   end
 
-  def zip!(*args)
-    +Hash[keys.zip(*args)]
-  end
-
   def key?(key)
     super(key.to_s)
   end
@@ -88,15 +81,16 @@ class ConfigHash < Hash
     end
   end
 
-  alias_method :store, :[]=
-
-  def update(hash)
+  def update(hash, nuke=false)
     raise ArgumentError unless Hash === hash
+    clear if nuke
     hash.each {|key, val| self[key] = val}
     self
   end
 
-  alias_method :merge!, :update
+  def update!(hash)
+    update(hash, true)
+  end
 
   def to_hash
     Hash[self]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config-hash
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Steve Shreeve
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies: []
 description: This gem makes it easy to work with configuration data.
 email: steve.shreeve@gmail.com
@@ -26,7 +26,7 @@ homepage: https://github.com/shreeve/config-hash
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -41,9 +41,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: A safe, homoiconic, Ruby hash supporting dot notation
 test_files: []