configatron 2.7.2 → 2.8.0

data/lib/configatron/configatron.rb

@@ -2,24 +2,29 @@ require 'singleton'
 
 class Configatron
   include Singleton
-  
+
   alias_method :send!, :send
-  
+
   def initialize # :nodoc:
     @_namespace = [:default]
     reset!
   end
-  
+
   # Forwards the method call onto the 'namespaced' Configatron::Store
-  def method_missing(sym, *args)
-    @_store[@_namespace.last].send(sym, *args)
+  def method_missing(sym, *args, &block)
+    @_store[@_namespace.last].send(sym, *args, &block)
   end
-  
+
+  # respond_to to respond_to
+  def respond_to?(method)
+    !@_store[@_namespace.last].send(method).nil? || super
+  end
+
   # Removes ALL configuration parameters
   def reset!
     @_store = {:default => Configatron::Store.new}
   end
-  
+
   # Allows for the temporary overriding of parameters in a block.
   # Takes an optional Hash of parameters that will be applied before
   # the block gets called. At the end of the block, the temporary
@@ -27,14 +32,14 @@ class Configatron
   def temp(options = nil)
     begin
       temp_start(options)
-      yield
+      yield @_store[@_namespace.last]
     rescue Exception => e
       raise e
     ensure
       temp_end
     end
   end
-  
+
   def temp_start(options = nil)
     n_space = rand
     @_store[n_space] = @_store[@_namespace.last].deep_clone
@@ -43,11 +48,11 @@ class Configatron
       self.method_missing(:configure_from_hash, options)
     end
   end
-  
+
   def temp_end
     @_store.delete(@_namespace.pop)
   end
-  
+
   begin
     undef :inspect # :nodoc:
     undef :nil? # :nodoc:
@@ -55,5 +60,5 @@ class Configatron
   rescue Exception => e
   end
 
-  
-end
+
+end

data/lib/configatron/store.rb

@@ -6,7 +6,7 @@ class Configatron
     end
 
     alias_method :send!, :send
-    
+
     # Takes an optional Hash of parameters
     def initialize(options = {}, name = nil, parent = nil)
       @_name = name
@@ -16,7 +16,7 @@ class Configatron
       @_protected = []
       @_locked = false
     end
-    
+
     # Returns a Hash representing the configurations
     def to_hash
       h = Hash.new
@@ -24,9 +24,9 @@ class Configatron
         # Descend the tree and hashify each node
         h[k] = v.is_a?(Store) ? v.to_hash : v
       }
-      h 
+      h
     end
-    
+
     def heirarchy
       path = [@_name]
       parent = @_parent
@@ -38,13 +38,13 @@ class Configatron
       path.reverse!
       path.join('.')
     end
-    
+
     def configatron_keys
       return @_store.keys.collect{|k| k.to_s}.sort
     end
-    
+
     # Checks whether or not a parameter exists
-    # 
+    #
     # Examples:
     #   configatron.i.am.alive = 'alive!'
     #   configatron.i.am.exists?(:alive) # => true
@@ -52,7 +52,12 @@ class Configatron
     def exists?(name)
       @_store.has_key?(name.to_sym) || @_store.has_key?(name.to_s)
     end
-    
+
+    # respond_to to respond_to
+    def respond_to?(name)
+      exists?(name) || super
+    end
+
     def inspect
       path = [@_name]
       parent = @_parent
@@ -92,7 +97,7 @@ class Configatron
     # Allows for the configuration of the system from a YAML file.
     # Takes the path to the YAML file.  Also takes an optional parameter,
     # <tt>:hash</tt>, that indicates a specific hash that should be
-    # loaded from the file. 
+    # loaded from the file.
     def configure_from_yaml(path, opts = {})
       begin
         yml = ::Yamler.load(path)
@@ -119,7 +124,7 @@ class Configatron
       val = method_missing(name.to_sym)
       return val.is_a?(Configatron::Store) ? default_value : val
     end
-    
+
     # Removes a parameter. In the case of a nested parameter
     # it will remove all below it.
     def remove(name)
@@ -134,13 +139,17 @@ class Configatron
         self.send("#{name}=", default_value)
       end
     end
-    
+
     def method_missing(sym, *args) # :nodoc:
       if sym.to_s.match(/(.+)=$/)
         name = sym.to_s.gsub("=", '').to_sym
         raise Configatron::ProtectedParameter.new(name) if @_protected.include?(name) || methods_include?(name)
         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?
+      elsif block_given?
+        yield self.send(sym)
       elsif @_store.has_key?(sym)
         val = @_store[sym]
         if val.is_a?(Configatron::Proc)
@@ -151,19 +160,17 @@ class Configatron
           return res
         end
         return val
-      elsif sym.to_s.match(/(.+)\?/)
-        return !@_store[$1.to_sym].blank?
       else
         store = Configatron::Store.new({}, sym, self)
         @_store[sym] = store
         return store
       end
     end
-    
+
     def ==(other) # :nodoc:
       self.to_hash == other
     end
-    
+
     # Prevents a parameter from being reassigned. If called on a 'namespace' then
     # all parameters below it will be protected as well.
     def protect(name)
@@ -179,12 +186,12 @@ class Configatron
         @_protected << k
       end
     end
-    
+
     # Removes the protection of a parameter.
     def unprotect(name)
       @_protected.reject! { |e| e == name.to_sym }
     end
-    
+
     def unprotect_all!
       @_protected.clear
       @_store.keys.each do |k|
@@ -206,7 +213,7 @@ class Configatron
       raise ArgumentError, "Namespace #{name.inspect} does not exist" if namespace.nil?
       namespace.unlock!
     end
-    
+
     # = DeepClone
     #
     # == Version
@@ -274,7 +281,7 @@ class Configatron
         end
       end
     end
-    
+
     protected
     def lock!
       @_locked = true
@@ -285,12 +292,12 @@ class Configatron
       @_locked = false
       @_store.values.each { |store| store.unlock! if store.is_a?(Configatron::Store) }
     end
-    
+
     private
     def methods_include?(name)
       self.methods.include?(RUBY_VERSION > '1.9.0' ? name.to_sym : name.to_s)
     end
-    
+
     def parse_options(options)
       if options.is_a?(Hash)
         options.each do |k,v|
@@ -308,13 +315,13 @@ class Configatron
         return options
       end
     end
-    
+
     begin
       undef :test # :nodoc:
     rescue Exception => e
     end
-    
+
     SYCK_CONSTANT = (RUBY_VERSION.match(/^1\.9/) ? Syck::MergeKey : YAML::Syck::MergeKey)
-    
+
   end # Store
 end # Configatron

metadata

@@ -2,7 +2,7 @@
 name: configatron
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.7.2
+  version: 2.8.0
 platform: ruby
 authors: 
 - markbates
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -04:00
-default_executable: 
+date: 2011-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yamler
@@ -31,7 +30,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
 - LICENSE
 files: 
 - lib/configatron/configatron.rb
@@ -53,7 +51,6 @@ files:
 - generators/templates/configatron/production.rb
 - generators/templates/configatron/test.rb
 - generators/templates/initializers/configatron.rb
-has_rdoc: true
 homepage: http://www.metabates.com
 licenses: []
 
@@ -67,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 534994782528037126
+      hash: 2250820605778868147
       segments: 
       - 0
       version: "0"
@@ -80,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: magrathea
-rubygems_version: 1.5.3
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A powerful Ruby configuration system.