configatron 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b9056694b0e769316768fd1c635c150c0193ed
-  data.tar.gz: bc9506af875b3ad87c9f76c5ddc7bbc32c4086f5
+  metadata.gz: 7ad275e874cd8d84144f386f237517860fdfe0d9
+  data.tar.gz: 05020e5145f79ee869a6738a75b4ac3d14db2cf7
 SHA512:
-  metadata.gz: 49bbd0375bd4f9c2fa2eae9568493e6c85a37a1d7a56ee9296d6c40c00961c20f03a57187d5b0bc4257de4143d53f5e92abae6c911688f829213ecef52389686
-  data.tar.gz: 00912c56e963c7f869c756a40669e96280dc4bed428eaa76d3eadc82e0e54ab3bb72ed07e3ff7bb393d094c53c6ac35c2fd73fb81e64faffd499a6f00f6a3f25
+  metadata.gz: 15c5147856dd716772faf24d8ddfec36132fe55813988475528dcf2faf3e2221525dc87fb1be027f15a82bb9dd922f8c0cc01921efd22f25c8b868da86d851d1
+  data.tar.gz: ba5f57da5bcc09e13ba7bae188e94ecdcea75de67ca248cee9fd208709b02390d1b2e2cab8a9df59dab37cd0c85fd657dec77dc18da5a700cd1e357830999994

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    configatron (2.11.0)
+    configatron (2.12.0)
       yamler (>= 0.1.0)
 
 GEM

data/README.md

@@ -224,19 +224,19 @@ Enjoy!
 * Kurtis Rainbolt-Greene
 * Rob Sanheim
 * Cody Maggard
+* Greg Brockman
 * Jean-Denis Vauguet
-* chatgris
-* Mat Brown
-* Gleb Pomykalov
 * Torsten Schönebaum
+* Mat Brown
 * Simon Menke
+* chatgris
+* Gleb Pomykalov
 * Casper Gripenberg
 * mattelacchiato
 * Artiom Diomin
-* Rick Fletcher
 * Tim Riley
+* Rick Fletcher
 * joe miller
-* Dan Pickett
 * Brandon Dimcheff
-* Greg Brockman
+* Dan Pickett
 * Josh Nichols

data/lib/configatron/configatron.rb

@@ -7,7 +7,9 @@ class Configatron
   alias_method :send!, :send
   
   class << self
-    
+
+    attr_accessor :strict
+
     def log
       unless @logger
         if defined?(::Rails)
@@ -17,7 +19,10 @@ class Configatron
       end
       return @logger
     end
-    
+
+    def reset!
+      @strict = false
+    end
   end
 
   def initialize # :nodoc:
@@ -37,6 +42,7 @@ class Configatron
 
   # Removes ALL configuration parameters
   def reset!
+    self.class.reset!
     @_store = {:default => Configatron::Store.new}
   end
 

data/lib/configatron/store.rb

@@ -67,15 +67,7 @@ class Configatron
     end
 
     def inspect
-      path = [@_name]
-      parent = @_parent
-      until parent.nil?
-        path << parent.instance_variable_get('@_name')
-        parent = parent.instance_variable_get('@_parent')
-      end
-      path << 'configatron'
-      path.compact!
-      path.reverse!
+      name = _store_name
       f_out = []
       @_store.each do |k, v|
         if v.is_a?(Configatron::Store)
@@ -91,7 +83,7 @@ class Configatron
             end
           end
         else
-          f_out << "#{path.join('.')}.#{k} = #{v.inspect}"
+          f_out << "#{name}.#{k} = #{v.inspect}"
         end
       end
       f_out.compact.sort.join("\n")
@@ -156,11 +148,11 @@ class Configatron
         raise Configatron::LockedNamespace.new(@_name) if @_locked && !@_store.has_key?(name)
         @_store[name] = parse_options(*args)
       elsif sym.to_s.match(/(.+)\?/)
-        return !@_store[$1.to_sym].blank?
+        return !_store_lookup($1.to_sym).blank?
       elsif block_given?
         yield self.send(sym)
       elsif @_store.has_key?(sym)
-        val = @_store[sym]
+        val = _store_lookup(sym)
         if val.is_a?(Configatron::Proc)
           res = val.execute
           if val.finalize?
@@ -170,6 +162,10 @@ class Configatron
         end
         return val
       else
+        # This will error out if strict is enabled, and be a no-op
+        # otherwise. The nice thing is the error message will be the
+        # same as in the .method? case.
+        _store_lookup(sym)
         store = Configatron::Store.new({}, sym, self)
         @_store[sym] = store
         return store
@@ -333,6 +329,30 @@ class Configatron
       end
     end
 
+    def _store_name
+      path = [@_name]
+      parent = @_parent
+      until parent.nil?
+        path << parent.instance_variable_get('@_name')
+        parent = parent.instance_variable_get('@_parent')
+      end
+      path << 'configatron'
+      path.compact!
+      path.reverse!
+      path.join('.')
+    end
+
+    # Give it this awkward name to hopefully avoid config keys people
+    # are using.
+    def _store_lookup(sym)
+      begin
+        @_store.fetch(sym)
+      rescue IndexError => e
+        raise e.class.new("#{e.message} (for #{_store_name})") if Configatron.strict
+        nil
+      end
+    end
+
     begin
       undef :test # :nodoc:
     rescue Exception => e

data/lib/configatron/version.rb

@@ -1,3 +1,3 @@
 class Configatron
-  VERSION = "2.11.0"
+  VERSION = "2.12.0"
 end

data/spec/lib/configatron_spec.rb

@@ -6,6 +6,22 @@ describe "configatron" do
     configatron.reset!
   end
 
+  describe '.strict' do
+    it 'should raise an error for undefined keys' do
+      Configatron.strict = true
+      lambda {configatron.undefined}.should raise_error(IndexError)
+      lambda {configatron.undefined?}.should raise_error(IndexError)
+    end
+
+    it 'should not raise an error for existing keys' do
+      configatron.defined
+      configatron.defined?
+      Configatron.strict = true
+      configatron.defined
+      configatron.defined?
+    end
+  end
+
   it 'should respond to test without blowing up' do
     configatron.test.should be_nil
     configatron.test = 'hi!'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Mark Bates