configatron 2.12.0 → 2.13.0

data/README.md

@@ -223,8 +223,8 @@ Enjoy!
 * Mark Bates
 * Kurtis Rainbolt-Greene
 * Rob Sanheim
-* Cody Maggard
 * Greg Brockman
+* Cody Maggard
 * Jean-Denis Vauguet
 * Torsten Schönebaum
 * Mat Brown

data/lib/configatron.rb

@@ -1,12 +1,17 @@
+# You can require 'configure/core' directly to avoid loading
+# configatron's monkey patches (and you can then set
+# `Configatron.disable_monkey_patchs = true` to enforce this). If you
+# do so, no `configatron` top-level method will be defined for
+# you. You can access the configatron object by Configatron.instance.
+
 base = File.join(File.dirname(__FILE__), 'configatron')
-require 'yamler'
-require 'fileutils'
-require File.join(base, 'configatron')
-require File.join(base, 'store')
-require File.join(base, 'errors')
+require File.join(base, 'core')
+
+if Configatron.disable_monkey_patching
+  raise "Cannot require 'configatron' directly, since monkey patching has been disabled. Run `Configatron.disable_monkey_patching = false` to re-enable it, or always require 'configatron/core' to load Configatron."
+end
+
 require File.join(base, 'core_ext', 'kernel')
 require File.join(base, 'core_ext', 'object')
 require File.join(base, 'core_ext', 'string')
 require File.join(base, 'core_ext', 'class')
-require File.join(base, 'rails')
-require File.join(base, 'proc')

data/lib/configatron/{configatron.rb → core.rb}

@@ -1,14 +1,23 @@
+require 'fileutils'
 require 'singleton'
 require 'logger'
+require 'yamler'
+
+base = File.dirname(__FILE__)
+
+require File.join(base, 'store')
+require File.join(base, 'errors')
+require File.join(base, 'rails')
+require File.join(base, 'proc')
 
 class Configatron
   include Singleton
 
   alias_method :send!, :send
-  
+
   class << self
 
-    attr_accessor :strict
+    attr_accessor :strict, :disable_monkey_patching
 
     def log
       unless @logger
@@ -29,7 +38,7 @@ class Configatron
     @_namespace = [:default]
     reset!
   end
-  
+
   # Forwards the method call onto the 'namespaced' Configatron::Store
   def method_missing(sym, *args, &block)
     @_store[@_namespace.last].send(sym, *args, &block)

data/lib/configatron/core_ext/object.rb

@@ -1,5 +1,5 @@
 class Object # :nodoc:
-  
+
   def send_with_chain(methods, *args) # :nodoc:
     obj = self
     [methods].flatten.each {|m| obj = obj.send(m, *args)}

data/lib/configatron/store.rb

@@ -148,7 +148,8 @@ 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_lookup($1.to_sym).blank?
+        object = _store_lookup($1.to_sym)
+        return !_object_blank?(object)
       elsif block_given?
         yield self.send(sym)
       elsif @_store.has_key?(sym)
@@ -353,6 +354,10 @@ class Configatron
       end
     end
 
+    def _object_blank?(object) # ported ActiveSupport method
+      object.respond_to?(:empty?) ? object.empty? : !object
+    end
+
     begin
       undef :test # :nodoc:
     rescue Exception => e

data/lib/configatron/version.rb

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

data/spec/lib/class_spec.rb

@@ -22,24 +22,25 @@ module N
 end
 
 describe Class do
-  
-  describe 'to_configatron' do
-    
-    it 'should return a Configatron::Store object based on the name of the class' do
-      Foo.to_configatron.should be_kind_of(Configatron::Store)
-      Foo.to_configatron.bar.should == :bar
-      A::B::C.to_configatron.d.should == 'D'
-    end
-    
-    it 'should take an array to prepend to the object' do
-      Foo.to_configatron(:cachetastic).bar.should == 'cachetastic-fubar'
-      N::O.to_configatron(:l, 'm').p.should == 'P'
-    end
-    
-    it 'should convert a string to a Store object' do
-      'A::B::C'.to_configatron.d.should == configatron.a.b.c.d
+
+  if Class.respond_to?(:to_configatron)
+    describe 'to_configatron' do
+
+      it 'should return a Configatron::Store object based on the name of the class' do
+        Foo.to_configatron.should be_kind_of(Configatron::Store)
+        Foo.to_configatron.bar.should == :bar
+        A::B::C.to_configatron.d.should == 'D'
+      end
+
+      it 'should take an array to prepend to the object' do
+        Foo.to_configatron(:cachetastic).bar.should == 'cachetastic-fubar'
+        N::O.to_configatron(:l, 'm').p.should == 'P'
+      end
+
+      it 'should convert a string to a Store object' do
+        'A::B::C'.to_configatron.d.should == configatron.a.b.c.d
+      end
     end
-    
   end
-  
-end
+
+end

data/spec/lib/configatron_spec.rb

@@ -30,9 +30,9 @@ describe "configatron" do
     configatron.foo.test = 'hi!'
     configatron.foo.test.should == 'hi!'
   end
-  
+
   describe "respond_to" do
-    
+
     it 'should respond_to respond_to?' do
       configatron.test.should be_nil
       configatron.test = 'hi!'
@@ -46,11 +46,11 @@ describe "configatron" do
       configatron.foo.respond_to?(:test).should be_true
       configatron.foo.respond_to?(:plop).should be_false
     end
-    
+
   end
-  
+
   describe 'block assignment' do
-    
+
     it 'should pass the store to the block' do
       configatron.test do |c|
         c.should === configatron.test
@@ -179,7 +179,7 @@ describe "configatron" do
   end
 
   describe 'lock' do
-    
+
     before :each do
       configatron.letters.a = 'A'
       configatron.letters.b = 'B'
@@ -212,7 +212,7 @@ describe "configatron" do
     end
 
     describe 'then unlock' do
-      
+
       before :each do
         configatron.unlock(:letters)
       end
@@ -228,9 +228,9 @@ describe "configatron" do
       it 'should raise an ArgumentError if unknown namespace is unlocked' do
         lambda { configatron.unlock(:numbers).should raise_error(ArgumentError) }
       end
-      
+
     end
-    
+
   end
 
   describe 'temp' do
@@ -374,14 +374,14 @@ describe "configatron" do
         configatron.food.list.should == [:apple, :banana, :tomato, :brocolli, :spinach]
       end
     end
-    
+
     it "should handle complex yaml" do
       configatron.complex_development.bucket.should be_nil
       configatron.configure_from_yaml(File.join(File.dirname(__FILE__), 'complex.yml'))
       configatron.complex_development.bucket.should == 'develop'
       configatron.complex_development.access_key_id.should == 'access_key'
     end
-    
+
   end
 
   it 'should return a parameter' do
@@ -566,47 +566,48 @@ configatron.one = 1
 
   end
 
-  describe :blank? do
+  if Object.new.respond_to?(:blank?)
+    describe :blank? do
 
-    context "uninitialized option" do
-      specify { configatron.foo.bar.should be_blank }
-    end
+      context "uninitialized option" do
+        specify { configatron.foo.bar.should be_blank }
+      end
 
-    context "nil option" do
-      before { configatron.foo.bar = nil }
-      specify { configatron.foo.bar.should be_blank }
-    end
+      context "nil option" do
+        before { configatron.foo.bar = nil }
+        specify { configatron.foo.bar.should be_blank }
+      end
 
-    context "false option" do
-      before { configatron.foo.bar = false }
-      specify { configatron.foo.bar.should be_blank }
-    end
+      context "false option" do
+        before { configatron.foo.bar = false }
+        specify { configatron.foo.bar.should be_blank }
+      end
 
-    context "empty string option" do
-      before { configatron.foo.bar = "" }
-      specify { configatron.foo.bar.should be_blank }
-    end
+      context "empty string option" do
+        before { configatron.foo.bar = "" }
+        specify { configatron.foo.bar.should be_blank }
+      end
 
-    context "empty hash option" do
-      before { configatron.foo.bar = {} }
-      specify { configatron.foo.bar.should be_blank }
-    end
+      context "empty hash option" do
+        before { configatron.foo.bar = {} }
+        specify { configatron.foo.bar.should be_blank }
+      end
 
-    context "empty array option" do
-      before { configatron.foo.bar = [] }
-      specify { configatron.foo.bar.should be_blank }
-    end
+      context "empty array option" do
+        before { configatron.foo.bar = [] }
+        specify { configatron.foo.bar.should be_blank }
+      end
+
+      context "defined option" do
+        before { configatron.foo.bar = 'asd' }
+        subject { configatron.foo.bar }
+        it { should_not be_blank }
+        it { should == 'asd' }
+      end
 
-    context "defined option" do
-      before { configatron.foo.bar = 'asd' }
-      subject { configatron.foo.bar }
-      it { should_not be_blank }
-      it { should == 'asd' }
     end
-    
   end
 
-
   describe "boolean test" do
 
     context "nil option" do
@@ -625,5 +626,5 @@ configatron.one = 1
     end
 
   end
-  
+
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
+  prerelease: 
 platform: ruby
 authors:
 - Mark Bates
@@ -13,15 +14,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yamler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 description: A powerful Ruby configuration system.
@@ -41,7 +44,7 @@ files:
 - Rakefile
 - configatron.gemspec
 - lib/configatron.rb
-- lib/configatron/configatron.rb
+- lib/configatron/core.rb
 - lib/configatron/core_ext/class.rb
 - lib/configatron/core_ext/kernel.rb
 - lib/configatron/core_ext/object.rb
@@ -70,26 +73,33 @@ files:
 - spec/support/rails.rb
 homepage: http://www.metabates.com
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1505577042870860442
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1505577042870860442
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A powerful Ruby configuration system.
 test_files:
 - spec/configatron/proc_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 7ad275e874cd8d84144f386f237517860fdfe0d9
-  data.tar.gz: 05020e5145f79ee869a6738a75b4ac3d14db2cf7
-SHA512:
-  metadata.gz: 15c5147856dd716772faf24d8ddfec36132fe55813988475528dcf2faf3e2221525dc87fb1be027f15a82bb9dd922f8c0cc01921efd22f25c8b868da86d851d1
-  data.tar.gz: ba5f57da5bcc09e13ba7bae188e94ecdcea75de67ca248cee9fd208709b02390d1b2e2cab8a9df59dab37cd0c85fd657dec77dc18da5a700cd1e357830999994