ruby-conf 2.6.2 → 2.6.3

data/VERSION

@@ -1 +1 @@
-2.6.2
+2.6.3

data/lib/ruby-conf.rb

@@ -89,10 +89,22 @@ module RubyConf
     end
 
     def [](name, *args)
-      value = @__rc_attributes[name.to_sym]
+      name = name.to_sym
+      value = @__rc_attributes[name]
       if value.is_a?(Proc)
         args += [nil] * (value.arity.abs - args.size) if value.arity.abs > args.size
-        __rc_root.instance_exec(*args, &value)
+        @@stack ||= []
+        if @@stack.include?(name)
+          RubyConf.err("[ruby-conf] Detected recursive proc: #{name}")
+          "[RECURSIVE]"
+        else
+          @@stack << name
+          begin
+            __rc_root.instance_exec(*args, &value)
+          ensure
+            @@stack.delete(name)
+          end
+        end
       else
         value
       end
@@ -217,7 +229,7 @@ module RubyConf
           "[UNRESOLVED:#{e}]"
         end
         str += "#{key}: "
-        str += value.is_a?(Config) ? (value == self ? "[SELF]" : "{ #{value.__rc_build_inspect} }") : value.inspect
+        str += value.is_a?(RubyConf::Config) ? (value == self ? "[SELF]" : "{ #{value.__rc_build_inspect} }") : value.inspect
         str
       }.join(", ")
       istr

data/ruby-conf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-conf"
-  s.version = "2.6.2"
+  s.version = "2.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Curtis Schofield & Hollin Wilkins & Mason"]

data/spec/lib/ruby-conf_spec.rb

@@ -1,5 +1,9 @@
 require 'spec_helper'
 
+module RubyConf
+  def self.puts(*args) end
+end
+
 describe RubyConf do
 
   before do
@@ -57,8 +61,21 @@ var_args: var|[nil]
             end
           end
         end
+        other do
+          val "val"
+          inner do
+            value "correct"
+          end
+          self_refa ->{ self.inner.value }
+          self_refb ->{ self.val }
+        end
       end
 
+      other = RootTest.other.detach
+      other.inner.value.should == "correct"
+      other.self_refa.should == "correct"
+      other.self_refb.should == "val"
+
       RootTest.outer.middle.inner.val.should == "value"
 
       RootTest.__rc_parent.should be_nil
@@ -110,10 +127,12 @@ var_args: var|[nil]
     it "does it's best to print procs but will fail gracefully" do
       RubyConf.define :ProcStrings do
         valid ->{ "valid return" }
-        valid_args ->(a, b, c){ "all empty > a:#{a} b:#{b} c:#{c}" }
+        valid_args ->(a, b, c){ "all empty > a:#{a} b:#{b} c:#{c} <" }
         broken ->{ raise "oops" }
-        broken_args ->(a, b, c){ raise "oops: a:#{a} b:#{b} c:#{c}" }
+        broken_args ->(a, b, c){ raise "oops: a:#{a} b:#{b} c:#{c} <" }
         self_referential ->{self}
+        recursive_to_s ->{self.to_s.split("\n").join(" ")}
+        recursive_inspect ->{self.inspect}
       end
 
       tos = <<-STR
@@ -121,14 +140,16 @@ var_args: var|[nil]
 
 broken: [UNRESOLVED]
 broken_args: [UNRESOLVED]
+recursive_inspect: [ProcStrings] broken: "[UNRESOLVED:oops]", broken_args: "[UNRESOLVED:oops: a: b: c: <]", recursive_inspect: "[RECURSIVE]", recursive_to_s: "[ProcStrings]  broken: [UNRESOLVED] broken_args: [UNRESOLVED] recursive_inspect: [RECURSIVE] recursive_to_s: [RECURSIVE] self_referential: [SELF] valid: valid return valid_args: all empty > a: b: c: <", self_referential: [SELF], valid: "valid return", valid_args: "all empty > a: b: c: <"
+recursive_to_s: [ProcStrings]  broken: [UNRESOLVED] broken_args: [UNRESOLVED] recursive_inspect: [ProcStrings] broken: "[UNRESOLVED:oops]", broken_args: "[UNRESOLVED:oops: a: b: c: <]", recursive_inspect: "[RECURSIVE]", recursive_to_s: "[RECURSIVE]", self_referential: [SELF], valid: "valid return", valid_args: "all empty > a: b: c: <" recursive_to_s: [RECURSIVE] self_referential: [SELF] valid: valid return valid_args: all empty > a: b: c: <
 self_referential: [SELF]
 valid: valid return
-valid_args: all empty > a: b: c:
+valid_args: all empty > a: b: c: <
       STR
 
       ProcStrings.to_s.should == tos
       ProcStrings.to_str.should == tos
-      ProcStrings.inspect.should == '[ProcStrings] broken: "[UNRESOLVED:oops]", broken_args: "[UNRESOLVED:oops: a: b: c:]", self_referential: [SELF], valid: "valid return", valid_args: "all empty > a: b: c:"'
+      ProcStrings.inspect.should == "[ProcStrings] broken: \"[UNRESOLVED:oops]\", broken_args: \"[UNRESOLVED:oops: a: b: c: <]\", recursive_inspect: \"[ProcStrings] broken: \\\"[UNRESOLVED:oops]\\\", broken_args: \\\"[UNRESOLVED:oops: a: b: c: <]\\\", recursive_inspect: \\\"[RECURSIVE]\\\", recursive_to_s: \\\"[ProcStrings]  broken: [UNRESOLVED] broken_args: [UNRESOLVED] recursive_inspect: [RECURSIVE] recursive_to_s: [RECURSIVE] self_referential: [SELF] valid: valid return valid_args: all empty > a: b: c: <\\\", self_referential: [SELF], valid: \\\"valid return\\\", valid_args: \\\"all empty > a: b: c: <\\\"\", recursive_to_s: \"[ProcStrings]  broken: [UNRESOLVED] broken_args: [UNRESOLVED] recursive_inspect: [ProcStrings] broken: \\\"[UNRESOLVED:oops]\\\", broken_args: \\\"[UNRESOLVED:oops: a: b: c: <]\\\", recursive_inspect: \\\"[RECURSIVE]\\\", recursive_to_s: \\\"[RECURSIVE]\\\", self_referential: [SELF], valid: \\\"valid return\\\", valid_args: \\\"all empty > a: b: c: <\\\" recursive_to_s: [RECURSIVE] self_referential: [SELF] valid: valid return valid_args: all empty > a: b: c: <\", self_referential: [SELF], valid: \"valid return\", valid_args: \"all empty > a: b: c: <\""
     end
 
     it "prints out the config in a human readable way" do
@@ -409,9 +430,6 @@ TEXT
     end
 
     it "will autoload the first ruby-conf that it can find if none is provided" do
-      module RubyConf
-        def self.puts(*args) end
-      end
 
       dir = Dir["./**/test_conf.rb.tmpl"].first[/^(.*?)\/test_conf.rb.tmpl$/, 1]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-conf
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1471615913494062975
+      hash: -229567439722494491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: