config-hash 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7f537363101a24d151beb368c314f42bc796eb78ae656b35653ca2499674ed3
-  data.tar.gz: 8c8ff79e58f1801c8e930beb1edf645b9d7761ca98c9a76b043af37a3e12ba65
+  metadata.gz: 18cc65d997214d22026cd64bd4a4a648e943d0f5aabe62e25633d583e8c1426c
+  data.tar.gz: 9b8de42e1c7428a97aae9e82338dd0e6dd00c23995d0078ca5be05d6d4d87213
 SHA512:
-  metadata.gz: 326d2911fe5917de0b68c5041e82cd70a80deb2b4bff3c506185d19075105129039a8125e7fa7089068c374b56061df508697877f805a62d501f5011f7a9c7aa
-  data.tar.gz: a43d76d8d41c52e002328d3484a8b77aa48eac43e3068f3eaaf967c66ab2d164917e617bf069fafdf25531f0c60560572430b48617c8e9e99f81dfa162f0a3d7
+  metadata.gz: fc9e93f97ad627f5ba663d444c35cf3266e0351d1fb5dedf01fe26912e26d0773368d80f6677f474e69905930f1f6d65fe978579840b2f0dbb20f566ada7157f
+  data.tar.gz: d612503adbdc102de8a4a81e2d60c45dca4ab8f21c997384b65263f0dee9cd7e4894d93f3dcbe9feb2f0ae5c6116c0906e44e962e42391cee364c112a3721245

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.6.5

data/config-hash.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "config-hash"
-  s.version     = "0.5.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

@@ -1,61 +1,65 @@
-Encoding.default_external = "UTF-8"
-
 class Hash
-  def -@
-    NormalHash.new.merge!(self)
-  end
-  def +@
-    ConfigHash.new(self)
-  end
+  def -@; NormalHash[self]; end
+  def +@; ConfigHash[self]; end
 end
 
 class NormalHash < Hash
 end
 
 class ConfigHash < Hash
-  SEPARATORS = %r|[./]|
+  SEPARATORS ||= %r|[./]|
 
-  def self.load(path="config.rb", var="config")
+  def self.[](hash=nil)
+    new(hash)
+  end
+
+  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)
     super()
-    merge!(hash) if 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 key?(key)
+    super(key.to_s)
+  end
+
   def [](key)
+    our = self.class
     key = key.to_s
-    if !key?(key) && key =~ SEPARATORS
-      val = self
-      key.split(SEPARATORS).each do |tag|
-        if !val.instance_of?(self.class)
-          return super(key)
-        elsif val.key?(tag)
-          val = val[tag]
-        elsif tag == "*" && val.size == 1
-          val = val[val.keys.first]
-        else
-          return super(key)
+
+    if !key?(key) && key =~ SEPARATORS && (ary = key.split SEPARATORS)
+      val = ary.inject(self) do |obj, sub|
+        if not our === obj  then return super(key)
+        elsif obj.key?(sub) then obj[sub]
+        elsif sub == "*"    then obj[obj.keys.first]
+        else                     return super(key)
         end
       end
-      val
     else
       super(key)
     end
@@ -65,55 +69,38 @@ class ConfigHash < Hash
     our = self.class
     key = key.to_s
     val = our.new(val) if val.instance_of?(Hash)
-    if val.instance_of?(NormalHash)
-      super(key, val)
-    elsif key =~ SEPARATORS
-      all = key.split(SEPARATORS)
-      key = all.pop
-      top = all.inject(self) do |top, tag|
-        if top.key?(tag) && (try = top[tag]).instance_of?(our)
-          top = try
-        else
-          top = top[tag] = our.new
-        end
+
+    if !key?(key) && key =~ SEPARATORS && (ary = key.split SEPARATORS)
+      key = ary.pop
+      obj = ary.inject(self) do |obj, sub|
+        obj.key?(sub) && our === (try = obj[sub]) ? try : (obj[sub] = our.new)
       end
-      top[key] = val
+      obj[key] = val
     else
       super(key, val)
     end
   end
 
-  alias store []=
-
-  def key?(key)
-    super(key.to_s)
-  end
-
-  def merge!(other_hash)
-    raise ArgumentError unless Hash === other_hash
-    other_hash.each do |k, v|
-      if block_given? && key?(k)
-        self[k] = yield(k, self[k], v)
-      else
-        self[k] = v
-      end
-    end
+  def update(hash, nuke=false)
+    raise ArgumentError unless Hash === hash
+    clear if nuke
+    hash.each {|key, val| self[key] = val}
     self
   end
 
-  alias update merge!
+  def update!(hash)
+    update(hash, true)
+  end
 
   def to_hash
     Hash[self]
   end
 
-  def method_missing(sym, *args, &block)
-    if sym =~ /=$/
-      self[$`] = args.first
-    elsif args.empty? # or... key?(sym)
-      self[sym]
-    else
-      super
+  def method_missing(name, *args, &code)
+    case
+      when name =~ /=$/ then self[$`] = args.first
+      when args.empty?  then self[name]
+      else super
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config-hash
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Steve Shreeve
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-25 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.6
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: A safe, homoiconic, Ruby hash supporting dot notation
 test_files: []