config_hash 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb58d0a645f55cb6a71ffff9085992006556e8d2
-  data.tar.gz: 0e5d6a482720853a4b81f00a1b074422f0c1c17b
+  metadata.gz: 292b79c9f455f289d56b1f2622342e8768ce2248
+  data.tar.gz: c9f444e4c1458d70b3fdfc10551f2a02a8d62e46
 SHA512:
-  metadata.gz: ef38ff84436fb6ea9252a874f0a0cdb11d9666501c43cce4f99de40d88e5be6e9bbb24ed5e3b044c0ee472a27c27cb01e4375b108973fbb2c81fadef85b6ad4c
-  data.tar.gz: 377c287467c1995f4a903f44519fbc1b8a10108a25eac433538ee2abc6942f3db7a1ff0dd5e0d9e77037d0fc30973a5d9762b91490f40b3a3cfc15f09873fa35
+  metadata.gz: 0e65f0156b16ae9d3b51a49e4ffa89614907aefc8d27b2592f375dba1a15a4074b18858df6945c66330f1b27a8d65c1bf8a573c23bf838e2237484758512d83c
+  data.tar.gz: d22bf341aa33d14aa05eb1253ddee70a3680a0c870e037a6fe416841b1046d5a011a83dcf1c791dcf4c66d350cdeac845ad4868b12f61c759884ae4dcf1ba75c

data/lib/config_hash.rb

@@ -1,7 +1,9 @@
 require 'config_hash/processors'
 
 class ConfigHash < Hash
-  def initialize(hash, default=nil, **options, &default_block)
+  include ConfigHash::Enumerable
+
+  def initialize(hash, **options)
     unless hash.kind_of?(Hash)
       raise ArgumentError.new("first argument must be a hash!")
     end
@@ -20,6 +22,8 @@ class ConfigHash < Hash
       @processors << ConfigHash::Processors.method(proc) if options[proc]
     end
 
+    super(hash.default, &hash.default_proc)
+
     # recursively reconstruct this hash from the passed in hash.
     hash.each do |key, value|
       key = key.to_sym if key.is_a?(String)
@@ -34,10 +38,10 @@ class ConfigHash < Hash
   def [](key)
     key = key.to_sym if key.is_a? String
     if @raise_on_missing && !self.include?(key)
-      raise ArgumentError.new("Missing Key #{key} in #{self.keys}!")
+      raise KeyError.new("key not found: #{key}")
     end
 
-    if @lazy_loading
+    if @lazy_loading && @processors.any?
       @processed[key] ||= process(super(key))
     else
       super(key)
@@ -45,8 +49,6 @@ class ConfigHash < Hash
   end
 
   def []=(key, value)
-    return super(key, value) if self.frozen? # will raise an error.
-
     key = key.to_sym if key.is_a? String
     super(key, value).tap { __build_accessor(key) }
   end
@@ -56,21 +58,43 @@ class ConfigHash < Hash
   # if appropriate.
 
   def values
-    super unless @lazy_loading && @processors.any?
+    return super unless @lazy_loading && @processors.any?
     self.keys.map { |k| self[k] }
   end
 
   # use [] accessor to process values correctly for lazy loading
   def each
-    super unless @lazy_loading && @processors.any?
+    return super unless @lazy_loading && @processors.any?
     self.keys.each { |k| yield k, self[k] }
   end
 
   def map
-    super unless @lazy_loading && @processors.any?
+    return super unless @lazy_loading && @processors.any?
     self.keys.map { |k| yield k, self[k] }
   end
 
+  def select
+    return super unless @lazy_loading && @processors.any?
+    selected = Hash[
+      self.keys.select { |k| yield k, self[k] }.map { |k| [k, self[k]] }
+    ]
+    self.class.new(selected,
+      freeze:           @freeze,
+      processors:       @processors,
+      lazy_loading:     @lazy_loading,
+      raise_on_missing: @raise_on_missing,
+    )
+  end
+
+  [:all?, :any?, :none?, :one?].each do |method|
+    define_method(method) do
+      return super unless @lazy_loading && @processors.any?
+      self.keys.send(method) { |k| yield k, self[k] }
+    end
+  end
+
+  ## misc. overrides
+
   def method_missing(method, *args)
     # if we're not freezing, we can allow assignment and expect nil results.
     if method =~ /^(.*)=$/ && args.length == 1
@@ -81,7 +105,7 @@ class ConfigHash < Hash
 
       self[key] # assignment should return the value
     else
-      raise ArgumentError.new("Missing Key #{method}!") if @raise_on_missing
+      raise KeyError.new("key not found: #{method}!") if @raise_on_missing
       nil
     end
   end
@@ -107,6 +131,11 @@ class ConfigHash < Hash
     end
   end
 
+  # returns the value as reduced by the processors.
+  # only applies to scalars that are not class, module, proc, or method.
+  #
+  # @param [Mixed] value The value to process
+  # @return [Mixed] the value, modified by calls to the processor.
   def process(value)
     case value
     when ConfigHash then value # the sub-config-hash will process on its own
@@ -122,12 +151,10 @@ class ConfigHash < Hash
       when ConfigHash                  then value
       when Hash                        then ConfigHash.new(
         value,
-        value.default,
         freeze:           @freeze,
         processors:       @processors,
         lazy_loading:     @lazy_loading,
         raise_on_missing: @raise_on_missing,
-        &value.default_proc
       )
       when Array                       then value.map { |sv| construct(sv) }
       when Class, Module, Proc, Method then value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config_hash
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Zach Lome