configatron 4.1.0 → 4.1.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 4.1.1
+
+* Fix delayed attributes
+
 === 4.1.0
 
 * Fix bugs from BasicObject fallout

data/README.md

@@ -3,7 +3,7 @@
 
 Configatron makes configuring your applications and scripts incredibly easy. No longer is a there a need to use constants or global variables. Now you can use a simple and painless system to configure your life. And, because it's all Ruby, you can do any crazy thing you would like to!
 
-One of the more important changes to V3 is that it now resembles more a `Hash` style interface. You can use `[]`, `fetch`, `each`, etc... Actually the hash notation is more robust since the dot notation won't work for some property names. See section "Differences between dot and hash notation" for more details.
+One of the more important changes to V3 is that it now resembles more a `Hash` style interface. You can use `[]`, `fetch`, `each`, etc... Actually the hash notation is a bit more robust since the dot notation won't work for a few property names (a few public methods from `Configatron::Store` itself).
 
 ## Installation
 
@@ -78,7 +78,7 @@ configatron.email.pop.port # => 110
 
 ### Method vs hash access
 
-As a note, method (`configatron.foo`) access will be shadowed by public methods defined on the configatron object. (The configatron object descends from [`BasicObject`](http://apidock.com/ruby/BasicObject) and includes `Kernel`, so it should have a pretty bare set of methods.)
+As a note, method (`configatron.foo`) access will be shadowed by public methods defined on the configatron object. (The configatron object descends from [`BasicObject`](http://apidock.com/ruby/BasicObject) and adds a few methods to resemble the `Hash` API and to play nice with `puts`, so it should have a pretty bare set of methods.)
 
 If you need to use keys that are themselves method names, you can just use hash access (`configatron['foo']`).
 

data/lib/configatron/deep_clone.rb

@@ -35,30 +35,32 @@ module Configatron::DeepClone
   #  You can redistribute it and/or modify it under the same terms of Ruby's license;
   #  either the dual license version in 2003, or any later version.
   def self.deep_clone( obj=self, cloned={} )
-    if obj.kind_of?(Configatron::RootStore)
+    if Configatron::RootStore === obj
       # We never actually want to have multiple copies of our
       # Configatron::RootStore (and every Store has a reference).
       return obj
-    elsif cloned.has_key?( obj.object_id )
-      return cloned[obj.object_id]
+    elsif cloned.key?( obj.__id__ )
+      return cloned[obj.__id__]
     else
       begin
         cl = obj.clone
       rescue Exception
         # unclonnable (TrueClass, Fixnum, ...)
-        cloned[obj.object_id] = obj
+        cloned[obj.__id__] = obj
         return obj
       else
-        cloned[obj.object_id] = cl
-        cloned[cl.object_id] = cl
-        if cl.is_a?( Hash )
-          cl.clone.each { |k,v|
+        cloned[obj.__id__] = cl
+        cloned[cl.__id__] = cl
+        case
+        when Configatron::Store === cl then return cl
+        when Hash === cl
+          cl.clone.each do |k,v|
             cl[k] = deep_clone( v, cloned )
-          }
-        elsif cl.is_a?( Array )
-          cl.collect! { |v|
+          end
+        when Array === cl
+          cl.collect! do |v|
             deep_clone( v, cloned )
-          }
+          end
         end
         cl.instance_variables.each do |var|
           v = cl.instance_eval( var.to_s )

data/lib/configatron/root_store.rb

@@ -3,7 +3,6 @@ require 'singleton'
 # This is the root configatron object, and contains methods which
 # operate on the entire configatron hierarchy.
 class Configatron::RootStore < BasicObject
-  include ::Kernel
   include ::Singleton
   extend ::Forwardable
 
@@ -21,7 +20,7 @@ class Configatron::RootStore < BasicObject
   end
 
   def method_missing(name, *args, &block)
-    store.public_send(name, *args, &block)
+    store.__send__(name, *args, &block)
   end
 
   def reset!

data/lib/configatron/store.rb

@@ -2,7 +2,6 @@ require 'forwardable'
 
 class Configatron
   class Store < BasicObject
-    include ::Kernel
     extend ::Forwardable
 
     def initialize(root_store, name='configatron', attributes={})
@@ -14,7 +13,7 @@ class Configatron
     def [](key)
       val = fetch(key.to_sym) do
         if @root_store.locked?
-          raise ::Configatron::UndefinedKeyError.new("Key not found: #{key} (for locked #{self})")
+          ::Kernel.raise ::Configatron::UndefinedKeyError.new("Key not found: #{key} (for locked #{self})")
         end
         ::Configatron::Store.new(@root_store, "#{@name}.#{key}")
       end
@@ -23,22 +22,22 @@ class Configatron
 
     def store(key, value)
       if @root_store.locked?
-        raise ::Configatron::LockedError.new("Cannot set key #{key} for locked #{self}")
+        ::Kernel.raise ::Configatron::LockedError.new("Cannot set key #{key} for locked #{self}")
       end
       @attributes[key.to_sym] = value
     end
 
     def fetch(key, default_value = nil, &block)
       val = @attributes[key.to_sym]
-      if val.nil?
-        if block_given?
+      if val == nil
+        if block
           val = block.call
         elsif default_value
           val = default_value
         end
         store(key, val)
       end
-      if val.is_a?(::Configatron::Proc)
+      if ::Configatron::Proc === val
         val = val.call
       end
       return val
@@ -50,7 +49,7 @@ class Configatron
 
     def configure_from_hash(hash)
       hash.each do |key, value|
-        if value.is_a?(::Hash)
+        if ::Hash === value
           self[key].configure_from_hash(value)
         else
           store(key, value)
@@ -65,7 +64,7 @@ class Configatron
     def inspect
       f_out = []
       @attributes.each do |k, v|
-        if v.is_a?(::Configatron::Store)
+        if ::Configatron::Store === v
           v.inspect.each_line do |line|
             if line.match(/\n/)
               line.each_line do |l|
@@ -85,25 +84,23 @@ class Configatron
     end
 
     def method_missing(name, *args, &block)
-      # Needed to allow 'puts'ing of a configatron.
-      if name == :to_ary
-        raise ::NoMethodError.new("Called :to_ary")
-      end
-
-      # In case of Configatron bugs, prevent method_missing infinite
-      # loops.
-      if @method_missing
-        raise ::NoMethodError.new("Bug in configatron; ended up in method_missing while running: #{name.inspect}")
-      end
-      @method_missing = true
       do_lookup(name, *args, &block)
-    ensure
-      @method_missing = false
     end
 
     # Needed for deep_clone to actually clone this object
     def clone
-      self.class.new(@root_store, @name, @attributes)
+      Store.new(@root_store, @name, @attributes.clone)
+    end
+
+    # So that puts works (it expects the object to respond to to_ary)
+    def to_ary
+      nil
+    end
+
+    # So that we keep backward-compatibility in case people are using nil? to check
+    # configatron settings:
+    def nil?
+      false
     end
 
     private
@@ -120,7 +117,7 @@ class Configatron
           if self.has_key?(key)
             return self[key]
           else
-            raise ::Configatron::UndefinedKeyError.new($1)
+            ::Kernel.raise ::Configatron::UndefinedKeyError.new($1)
           end
         else
           return self[name]

data/lib/configatron/version.rb

@@ -1,3 +1,3 @@
 class Configatron
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/lib/generators/configatron/install/templates/configatron/defaults.rb

@@ -3,5 +3,5 @@
 # Example:
 #   configatron.emails.welcome.subject = 'Welcome!'
 #   configatron.emails.sales_reciept.subject = 'Thanks for your order'
-# 
-#   configatron.file.storage = :s3
+#
+#   configatron.file.storage = :s3

data/lib/generators/configatron/install/templates/configatron/development.rb

@@ -1,4 +1,4 @@
 # Override your default settings for the Development environment here.
-# 
+#
 # Example:
-#   configatron.file.storage = :local
+#   configatron.file.storage = :local

data/lib/generators/configatron/install/templates/configatron/production.rb

@@ -1,4 +1,4 @@
 # Override your default settings for the Production environment here.
-# 
+#
 # Example:
-#   configatron.file.storage = :s3
+#   configatron.file.storage = :s3

data/lib/generators/configatron/install/templates/configatron/test.rb

@@ -1,4 +1,4 @@
 # Override your default settings for the Test environment here.
-# 
+#
 # Example:
-#   configatron.file.storage = :local
+#   configatron.file.storage = :local

data/lib/generators/configatron/install/templates/initializers/configatron.rb

@@ -1,4 +1,2 @@
 require 'configatron'
-require 'configatron/integrations/rails'
-
 Configatron::Integrations::Rails.init

data/test/functional/configatron.rb

@@ -51,15 +51,19 @@ class Critic::Functional::ConfigatronTest < Critic::Functional::Test
     end
 
     it 'raises an error when accessing non-existing values' do
-      refute_nil(@kernel.a)
-      refute_nil(@kernel.a.b)
-      refute_nil(@kernel.a.b.c)
+      assert @kernel.a != nil
+      assert @kernel.a.b != nil
+      assert @kernel.a.b.c != nil
       assert_equal('DD', @kernel.a.b.c.d)
       assert_raises(Configatron::UndefinedKeyError) do
         @kernel.unknown
       end
     end
 
+    it 'responds to nil? for backward compatibility' do
+      refute_nil @kernel.a
+    end
+
     it 'raises an error when trying to set a non-existing key' do
       assert_raises(Configatron::LockedError) do
         @kernel.unknown = 'known'

data/test/functional/delayed.rb

@@ -0,0 +1,18 @@
+require_relative '_lib'
+
+class Critic::Functional::DelayedTest < Critic::Functional::Test
+  before do
+    @kernel = Configatron::RootStore.new
+  end
+
+  describe 'delayed' do
+    before do
+      @kernel.a = Configatron::Delayed.new { @kernel.b }
+      @kernel.b = "expected"
+    end
+
+    it 'works independent of the order' do
+      assert_equal('expected', @kernel.a)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,7 @@ files:
 - test/functional/_lib.rb
 - test/functional/_lib/scripts/core.rb
 - test/functional/configatron.rb
+- test/functional/delayed.rb
 - test/functional/loading.rb
 - test/functional/minitest.rb
 - test/unit/_lib.rb
@@ -137,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 201983176826574058
+      hash: 2777108850332874749
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 201983176826574058
+      hash: 2777108850332874749
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -158,6 +159,7 @@ test_files:
 - test/functional/_lib.rb
 - test/functional/_lib/scripts/core.rb
 - test/functional/configatron.rb
+- test/functional/delayed.rb
 - test/functional/loading.rb
 - test/functional/minitest.rb
 - test/unit/_lib.rb