ruby-conf 2.3.0 → 2.4.0

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p194@rubyconf --create
+rvm use ruby-1.9.3-p327@rubyconf --create

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
+    json (1.7.6)
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
@@ -20,7 +20,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.12.1)
     yard (0.8.3)
 
 PLATFORMS

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/lib/ruby-conf.rb

@@ -1,6 +1,9 @@
 #
 #
 # @author Hollin Wilkins & Curtis Schofield & Mason Bo-bay-son
+
+$RUBY_CONF = nil
+
 module Magic
   attr_accessor :__rc_chain
   def __rc_gather() "#{to_s}#{__rc_chain.nil? ? "" : " #{__rc_chain.__rc_gather}"}" end
@@ -131,7 +134,7 @@ class RubyConf < BasicObject
 
     def __rc_build_string(depth = 0)
       str = ""
-      str += "[#@__rc_name]\n" unless @__rc_parent
+      str += "[#{@__rc_name || "CONFIG"}]\n" unless @__rc_parent
       str += "\n"
       @__rc_attributes.keys.map{|k| k.to_s }.sort.each do |key|
         value = self[key]
@@ -145,7 +148,7 @@ class RubyConf < BasicObject
     def to_s() __rc_build_string end
     def to_str() to_s end
 
-    def __rc_build_inspect() "#{"[#@__rc_name] " unless @__rc_parent}#{@__rc_attributes.keys.map {|k| k.to_s }.sort.map { |key| "#{key}: #{self[key].is_a?(Config) ? "{ #{self[key].__rc_build_inspect} }" : self[key].inspect}" }.join(", ")}" end
+    def __rc_build_inspect() "#{"[#{@__rc_name || "CONFIG"}] " unless @__rc_parent}#{@__rc_attributes.keys.map {|k| k.to_s }.sort.map { |key| "#{key}: #{self[key].is_a?(Config) ? "{ #{self[key].__rc_build_inspect} }" : self[key].inspect}" }.join(", ")}" end
     def inspect() __rc_build_inspect end
   end
 
@@ -158,6 +161,16 @@ class RubyConf < BasicObject
       const = const.to_sym
       ::Object.const_set(const, config) if !::Object.const_defined?(const) || ::Object.const_get(const).is_a?(Config)
     end
+
+    if $RUBY_CONF.nil? && (name.nil? || name.to_s =~ /^(?:Rails)?Conf/)
+      $RUBY_CONF = if ::Object.const_defined?(:Rails)
+        cfg = config[:"#{::Rails.env}"] || config[:"#{::Rails.env}_conf"] || config[:"#{::Rails.env}_config"]
+        cfg && cfg.detach || config
+      else
+        config
+      end
+    end
+
     config
   end
 
@@ -166,4 +179,12 @@ class RubyConf < BasicObject
   def self.method_missing(name, *args) @@__rc_configs[name.to_sym] end
 
   def self.respond_to?(name) @@__rc_configs.key?(name.to_sym) end
+
+  def self.clear()
+    $RUBY_CONF = nil
+    @@__rc_configs.keys.each do |config|
+      remove_const(config.to_sym) if config.to_s[/^[A-Z]/] && const_defined?(config.to_sym)
+    end
+    @@__rc_configs.clear
+  end
 end

data/ruby-conf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-conf"
-  s.version = "2.3.0"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Curtis Schofield & Hollin Wilkins & Mason"]
-  s.date = "2012-12-24"
+  s.date = "2013-01-14"
   s.description = "rubyconf is a ruby configuration dsl that aims to make it simple to write and read configurations for ruby apps without a yaml or xml file"
   s.email = "blazingpair@blazingcloud.net"
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/blazingpair/ruby-conf"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "dsl (domain specific language) for config files in ruby"
 
   if s.respond_to? :specification_version then

data/spec/lib/ruby-conf_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 require 'ruby-conf'
 
 describe RubyConf do
+
+  before do
+    RubyConf.clear
+  end
+
   subject { RubyConf }
 
   describe "lambda arguments" do
@@ -28,7 +33,6 @@ describe RubyConf do
         var_args       ->(*args)          { "var|#{args.inspect}" }
         multi_args     ->(one,two)        { "multi|#{one.inspect}|#{two.inspect}" }
         multi_var_args ->(one,*two,three) { "multivar|#{one.inspect}|#{two.inspect}|#{three.inspect}" }
-
       end
 
       LambdaToString.to_s.should == "[LambdaToString]\n\nmulti_args: multi|nil|nil\n\nmulti_var_args: multivar|nil|[nil]|nil\n\nno_args: none\n\none_arg: one|nil\n\nvar_args: var|[nil]\n\n"
@@ -356,6 +360,55 @@ TEXT
         end.should raise_error NameError
 
       end
+    end
+  end
+
+  describe "Automatically sets the RAILS_CONF variable" do
+
+    it "sets the first unnamed config as default" do
+      $RUBY_CONF.should be_nil
+      first = RubyConf.define { ident "first" }
+      $RUBY_CONF.should_not be_nil
+      second = RubyConf.define { ident "second" }
+      $RUBY_CONF.should == first
+      $RUBY_CONF.ident.should == "first"
+    end
+
+    it "sets the proper config based on Rails environment and detaches, if it exists" do
+      module ::Rails
+        def self.env() "foo" end
+      end
+      ::Object.const_defined?(:Rails).should be_true
+
+      $RUBY_CONF.should be_nil
+      RubyConf.define do
+        foo { ident "correct" }
+        bar { ident "wrong" }
+      end
+      $RUBY_CONF.ident.should == "correct"
+
+      RubyConf.clear
+      $RUBY_CONF.should be_nil
+      RubyConf.define do
+        foo_conf { ident "correct" }
+        bar_conf { ident "wrong" }
+      end
+      $RUBY_CONF.ident.should == "correct"
+
+      RubyConf.clear
+      $RUBY_CONF.should be_nil
+      RubyConf.define do
+        foo_config { ident "correct" }
+        bar_config { ident "wrong" }
+      end
+      $RUBY_CONF.ident.should == "correct"
+
+      RubyConf.clear
+      $RUBY_CONF.should be_nil
+      RubyConf.define do
+        ident "correct"
+      end
+      $RUBY_CONF.ident.should == "correct"
 
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-conf
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3375656081623008669
+      hash: 121205113869847411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: dsl (domain specific language) for config files in ruby