config-hash 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d7d77612387f4c98acb30d2174f842e9bc686cee148dd35971a50b1af1ffc36
-  data.tar.gz: 5be88d29ba90fb1f0076fb690969e642c8bfc5d7faa98f3235c592f059f7397d
+  metadata.gz: f34e652d639c677341b14b1ae82c77eb72aa1e2618f5de14c0853089eb12fb7e
+  data.tar.gz: f428443a9f4d33fad40f29352ea2b8da536dfacfe4e8671eeb170b9b175cda0e
 SHA512:
-  metadata.gz: 945fb4e4c3fcadc7dc433f36a512ed26ef06bfc17349ea14dae2e6f5bfc063c9821649739fe9bdb85c4ea2f48e8a3ec8bd60ab52fcc79c8175dde38c89c37509
-  data.tar.gz: 35a042c344fa0e43902ed11d7b36111af477bd37eeab5e155b35b1360e85f3fe7898df22a84da19e56415b5e9de262f02972eac1d39a3d657d9677555a4f827b
+  metadata.gz: f8e828acf1e07a92a1e03e40e9b1fe8eb4e81eacfa6f1fac8de58606d899b86ece8ac01d4160d80a4f36d249b7c5b3397928e1ec7c03afb2fb78082f825db83e
+  data.tar.gz: aef9036c64d8baa3b6a18a0748aa39d039b31b2b8cce4f919b8de1166a9e48dce8e19f1c8f6ef52cebc90eef19b06faad3030e37503421149c02bc703fb7d7d6

data/config-hash.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "config-hash"
-  s.version     = "0.6.0"
+  s.version     = "0.7.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,5 +1,3 @@
-Encoding.default_external = "UTF-8"
-
 class Hash
   def -@; NormalHash[self]; end
   def +@; ConfigHash[self]; end
@@ -11,6 +9,10 @@ end
 class ConfigHash < Hash
   SEPARATORS ||= %r|[./]|
 
+  def self.[](hash=nil)
+    new(hash)
+  end
+
   def self.load(path="config.rb", var="config")
     path = File.expand_path(path)
     eval <<-"end", binding, path, 0
@@ -22,7 +24,7 @@ class ConfigHash < Hash
 
   def initialize(hash=nil)
     super()
-    merge!(hash) if hash
+    update(hash) if hash
   end
 
   def import(root, glob)
@@ -36,22 +38,22 @@ class ConfigHash < Hash
     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
@@ -61,55 +63,37 @@ 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 []=
+  alias_method :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)
+    raise ArgumentError unless Hash === hash
+    hash.each {|key, val| self[key] = val}
     self
   end
 
-  alias update merge!
+  alias_method :merge!, :update
 
   def to_hash
     Hash[self]
   end
 
-  def method_missing(sym, *args, &block)
-    if sym =~ /=$/
-      self[$`] = args.first
-    elsif args.empty?
-      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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config-hash
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Steve Shreeve