configatron 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dc9cfe0ed3b4c2c0c90b325d4b837e4aed30d8b
-  data.tar.gz: 6bd11604cc4abf42aa461f33970e0935580774a7
+  metadata.gz: ade0eaacbaca6d1751e811972975ce00ccd7336e
+  data.tar.gz: 37087c12805c28940771cf27746b1c1858c115a0
 SHA512:
-  metadata.gz: 8f4c42d22a0fa92b539c716aa2fcb53e3b837cf843f6fde91114823d8a5f2eb9c022d1712af686fadab9a3d1604ae746f2f64d626d4c4fa298b9d192f6e18823
-  data.tar.gz: 6ba36b1929bf8fad1774f10c309b145f3cddd01371a2d2b81213dc92f3d7446a03d18255425c8ffbf48649100c3535e54dfa39a080e37ad8f9200c60be7125cc
+  metadata.gz: 901770f4fa820125723c7b4631cad49b74da6e0b4c0f44ff7f1dda511f172b7da947ae6e630dca94f3c7d0fb9a4282cf688d5bc01f76a94d654ad5e0ee4c4992
+  data.tar.gz: 9c6c28a946279c0cff614b99ce8a676f9c71039a7c9b70cbd4256b2c4d9ac8d6aeb7ab15728efd0777a94fca20bfd1312a703ab219d5638d2004f8024bc8a313

data/.travis.yml

@@ -5,4 +5,4 @@ rvm:
   - 2.1.0
   - 2.1.1
 install: bundle install
-script: bundle exec rake
+script: bundle exec rake test

data/History.txt

@@ -0,0 +1,26 @@
+=== 4.0.0 (WIP)
+
+This is largely a restructuring of existing functionality, making it
+simpler and more consistent. The tests have also been fully
+refactored.
+
+Added the following:
+
+* A Minitest integration at Configatron::Integrations::Minitest
+* Key errors while locked return the name of the relevant configatron
+* Configatron::RootStore is now the intended way to start a new configatron hiearchy. (You should likely not initialize a Configatron::Store yourself.)
+
+Deprecated the following:
+
+* Initializing a Configatron::Store with a custom hash
+* Calling .nil?/.empty? on a Configatron::Store
+* Calling locking, temp, or reset methods directly on a Configatron::Store (moved instead to Configatron::RootStore)
+* A DeepClone module is no longer defined at the top-level
+* Removed Configatron::KernelStore
+
+Other backwards-incompatible changes:
+
+* Renamespaced Configatron::Rails under Configatron::Integrations::Rails.
+* Moved locking and temp methods to exist just on Configatron::RootStore.
+* Configatron::Store.inspect no longer takes a name
+* key? will now return true for sub-Configatron::Stores

data/Rakefile

@@ -3,7 +3,11 @@ require 'rake/testtask'
 
 Bundler::GemHelper.install_tasks
 
-Rake::TestTask.new(:default) do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
+Rake::TestTask.new do |t|
+  t.libs = ["lib"]
+  # t.warning = true
+  t.verbose = true
+  t.test_files = FileList['test/**/*.rb'].reject do |file|
+    file.end_with?('_lib.rb') || file.include?('/_lib/')
+  end
+end

data/configatron.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "mocha"
+  gem.add_development_dependency "subprocess"
   gem.add_development_dependency "minitest", '>=5.2.3'
 end

data/lib/configatron.rb

@@ -1,5 +1,24 @@
 require 'singleton'
 require 'configatron/version'
-require 'configatron/kernel'
-require 'configatron/core'
-require 'configatron/rails'
+
+require 'configatron/deep_clone'
+require 'configatron/errors'
+require 'configatron/root_store'
+require 'configatron/store'
+
+# Proc *must* load before dynamic/delayed, or else Configatron::Proc
+# will refer to the global ::Proc
+require 'configatron/proc'
+require 'configatron/delayed'
+require 'configatron/dynamic'
+
+class Configatron
+end
+
+# NO_EXT gets defined when you require "configatron/core", which
+# signals that you don't want any extensions. It'd be nice to have a
+# better internal signaling mechanism (could use environment
+# variables, but then they become part of the public interface).
+unless defined?(Configatron::NO_EXT)
+  require 'configatron/ext/kernel'
+end

data/lib/configatron/core.rb

@@ -1,6 +1,6 @@
-require_relative "deep_clone"
-require_relative "store"
-require_relative "errors"
-require_relative "proc"
-require_relative "dynamic"
-require_relative "delayed"
+class Configatron
+  # Signals that we should not load the extensions.
+  NO_EXT = true
+end
+
+require 'configatron'

data/lib/configatron/deep_clone.rb

@@ -1,8 +1,8 @@
-module DeepClone
+module Configatron::DeepClone
   # = DeepClone
   #
   # == Version
-  #  1.2006.05.23 (change of the first number means Big Change)
+  #  1.2006.05.23.configatron.1 (change of the first number means Big Change)
   #
   # == Description
   #  Adds deep_clone method to an object which produces deep copy of it. It means
@@ -34,9 +34,12 @@ module DeepClone
   # == Licence
   #  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 deep_clone( obj=self, cloned={} )
-    if cloned.has_key?( obj.object_id )
+  def self.deep_clone( obj=self, cloned={} )
+    if obj.kind_of?(Configatron::RootStore)
+      # 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]
     else
       begin
@@ -66,4 +69,4 @@ module DeepClone
       end
     end
   end
-end
+end

data/lib/configatron/ext/kernel.rb

@@ -0,0 +1,5 @@
+module Kernel
+  def configatron
+    Configatron::RootStore.instance
+  end
+end

data/lib/configatron/integrations.rb

@@ -0,0 +1,7 @@
+module Configatron
+  module Integrations
+  end
+end
+
+require 'configatron/integrations/minitest'
+require 'configatron/integrations/rails'

data/lib/configatron/integrations/minitest.rb

@@ -0,0 +1,29 @@
+# Include in a minitest to restore the global configatron object to
+# its global state afterwards. Particularly useful if you'd like to test
+# your application with various config settings.
+#
+# ```ruby
+# class Test::Suite < Minitest::Unit
+#   include Configatron::Integrations::Minitest
+#
+#   it 'works' do
+#     configatron.unlock! do
+#       configatron.some.setting = true
+#     end
+#
+#     [...]
+#   end
+# ```
+module Configatron::Integrations
+  module Minitest
+    def before_setup
+      configatron.temp_start
+      super
+    end
+
+    def before_teardown
+      super
+      configatron.temp_end
+    end
+  end
+end

data/lib/configatron/{rails.rb → integrations/rails.rb}

@@ -1,4 +1,4 @@
-class Configatron
+class Configatron::Integrations
   # Helpful for making using configatron with Rails even easier!
   #
   # To get started you can use the generator to generate

data/lib/configatron/root_store.rb

@@ -0,0 +1,52 @@
+# This is the root configatron object, and contains methods which
+# operate on the entire configatron hierarchy.
+class Configatron::RootStore
+  include Singleton
+
+  attr_reader :store
+
+  # Have one global RootStore instance, but allow people to create
+  # their own parallel ones if they desire.
+  class << self
+    public :new
+  end
+
+  def initialize
+    @locked = false
+    reset!
+  end
+
+  def method_missing(name, *args, &block)
+    store.send(name, *args, &block)
+  end
+
+  def reset!
+    @store = Configatron::Store.new(self)
+  end
+
+  def temp(&block)
+    temp_start
+    yield
+    temp_end
+  end
+
+  def temp_start
+    @temp = Configatron::DeepClone.deep_clone(@store)
+  end
+
+  def temp_end
+    @store = @temp
+  end
+
+  def locked?
+    @locked
+  end
+
+  def lock!
+    @locked = true
+  end
+
+  def unlock!
+    @locked = false
+  end
+end

data/lib/configatron/store.rb

@@ -1,36 +1,29 @@
 require 'forwardable'
 
 class Configatron
-  class Store# < BasicObject
+  class Store
     extend ::Forwardable
 
-    def initialize(attributes = {})
-      @__locked = false
-      @attributes = attributes || {}
-      @attributes.send(:extend, DeepClone)
-    end
-
-    def lock!(value=true)
-      @__locked = value
-    end
+    def initialize(root_store, name='configatron')
+      @root_store = root_store
+      @name = name
 
-    def reset!
-      @attributes.clear
+      @attributes = {}
     end
 
     def [](key)
       val = fetch(key.to_sym) do
-        if @__locked
-          raise Configatron::UndefinedKeyError.new("Key Not Found: #{key}")
+        if @root_store.locked?
+          raise Configatron::UndefinedKeyError.new("Key not found: #{key} (for locked #{self})")
         end
-        ::Configatron::Store.new
+        Configatron::Store.new(@root_store, "#{@name}.#{key}")
       end
       return val
     end
 
     def store(key, value)
-      if @__locked
-        raise Configatron::LockedError.new("Locked! Can not set key #{key}!")
+      if @root_store.locked?
+        raise Configatron::LockedError.new("Cannot set key #{key} for locked #{self}")
       end
       @attributes[key.to_sym] = value
     end
@@ -51,13 +44,8 @@ class Configatron
       return val
     end
 
-    def nil?
-      @attributes.empty?
-    end
-
     def key?(key)
-      val = self[key.to_sym]
-      !val.is_a?(Configatron::Store)
+      @attributes.key?(key.to_sym)
     end
 
     def configure_from_hash(hash)
@@ -70,22 +58,53 @@ class Configatron
       end
     end
 
-    def temp(&block)
-      temp_start
-      yield
-      temp_end
+    # Needed to allow 'puts'ing of a configatron.
+    def to_ary
+      raise NoMethodError
     end
 
-    def temp_start
-      @__temp = @attributes.deep_clone
+    def to_s
+      @name
     end
 
-    def temp_end
-      @attributes = @__temp
+    def inspect
+      f_out = []
+      @attributes.each do |k, v|
+        if v.is_a?(Configatron::Store)
+          v.inspect.each_line do |line|
+            if line.match(/\n/)
+              line.each_line do |l|
+                l.strip!
+                f_out << l
+              end
+            else
+              line.strip!
+              f_out << line
+            end
+          end
+        else
+          f_out << "#{@name}.#{k} = #{v.inspect}"
+        end
+      end
+      f_out.compact.sort.join("\n")
     end
 
     def method_missing(name, *args, &block)
-      if block_given?
+      # 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
+
+    private
+
+    def do_lookup(name, *args, &block)
+      if block
         yield self[name]
       else
         name = name.to_s
@@ -104,36 +123,12 @@ class Configatron
       end
     end
 
-    def inspect(name = 'configatron')
-      f_out = []
-      @attributes.each do |k, v|
-        if v.is_a?(Configatron::Store)
-          v.inspect("#{name}.#{k}").each_line do |line|
-            if line.match(/\n/)
-              line.each_line do |l|
-                l.strip!
-                f_out << l
-              end
-            else
-              line.strip!
-              f_out << line
-            end
-          end
-        else
-          f_out << "#{name}.#{k} = #{v.inspect}"
-        end
-      end
-      f_out.compact.sort.join("\n")
-  end
-
     alias :[]= :store
-    alias :blank? :nil?
     alias :has_key? :key?
 
     def_delegator :@attributes, :values
     def_delegator :@attributes, :keys
     def_delegator :@attributes, :each
-    def_delegator :@attributes, :empty?
     def_delegator :@attributes, :to_h
     def_delegator :@attributes, :to_hash
     def_delegator :@attributes, :delete

data/lib/configatron/version.rb

@@ -1,3 +1,3 @@
 class Configatron
-  VERSION = "3.2.0"
+  VERSION = "4.0.0"
 end

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

@@ -1,2 +1,2 @@
 require 'configatron'
-Configatron::Rails.init
+Configatron::Integrations::Rails.init

data/test/_lib.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'bundler/setup'
+
+ENV['MT_NO_EXPECTATIONS'] = 'true'
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'mocha/setup'
+
+require 'configatron'
+
+module Critic
+  class Test < ::MiniTest::Spec
+    def setup
+      # Put any stubs here that you want to apply globally
+    end
+  end
+end

data/test/functional/_lib.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../../_lib', __FILE__)
+
+module Critic::Functional
+  module Stubs
+  end
+
+  class Test < Critic::Test
+    include Stubs
+  end
+end

data/test/functional/_lib/scripts/core.rb

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+if defined?(configatron)
+  raise "`configatron` method was defined at load-time!"
+end
+
+require 'configatron/core'
+
+if defined?(configatron)
+  raise "Loaded configatron/core but `configatron` was defined!"
+end

data/test/functional/configatron.rb

@@ -0,0 +1,76 @@
+require_relative '_lib'
+
+class Critic::Functional::ConfigatronTest < Critic::Functional::Test
+  before do
+    @kernel = Configatron::RootStore.new
+  end
+
+  describe 'temp' do
+    before do
+      @kernel.a = 'A'
+      @kernel.b = 'B'
+    end
+
+    it 'allows for temporary setting of values' do
+      assert_equal('A', @kernel.a)
+      assert_equal('B', @kernel.b)
+      @kernel.temp do
+        @kernel.a = 'AA'
+        @kernel.c = 'C'
+        assert_equal('AA', @kernel.a)
+        assert_equal('B', @kernel.b)
+        assert_equal('C', @kernel.c)
+      end
+      assert_equal('A', @kernel.a)
+      assert_equal('B', @kernel.b)
+      assert_equal(false, @kernel.key?(:c))
+    end
+
+    describe 'start/end' do
+      it 'allows for temporary setting of values' do
+        assert_equal('A', @kernel.a)
+        assert_equal('B', @kernel.b)
+        @kernel.temp_start
+        @kernel.a = 'AA'
+        @kernel.c = 'C'
+        assert_equal('AA', @kernel.a)
+        assert_equal('B', @kernel.b)
+        assert_equal('C', @kernel.c)
+        @kernel.temp_end
+        assert_equal('A', @kernel.a)
+        assert_equal('B', @kernel.b)
+        assert_equal(false, @kernel.key?(:c))
+      end
+    end
+  end
+
+  describe 'lock!' do
+    before do
+      @kernel.a.b.c.d = 'DD'
+      @kernel.lock!
+    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_equal('DD', @kernel.a.b.c.d)
+      assert_raises(Configatron::UndefinedKeyError) do
+        @kernel.unknown
+      end
+    end
+
+    it 'raises an error when trying to set a non-existing key' do
+      assert_raises(Configatron::LockedError) do
+        @kernel.unknown = 'known'
+      end
+    end
+  end
+
+  describe 'name' do
+    it 'assigns an appropriate nested name' do
+      name = @kernel.foo.bar.baz.to_s
+      assert_equal(name, 'configatron.foo.bar.baz')
+    end
+  end
+end

data/test/functional/loading.rb

@@ -0,0 +1,10 @@
+require_relative '_lib'
+require 'subprocess'
+
+class Critic::Functional::ConfigatronTest < Critic::Functional::Test
+  describe 'loading' do
+    it 'does not define top-level configatron method if loading configatron/core' do
+      Subprocess.check_call([File.expand_path('../_lib/scripts/core.rb', __FILE__)])
+    end
+  end
+end

data/test/unit/_lib.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../../_lib', __FILE__)
+
+module Critic::Unit
+  module Stubs
+  end
+
+  class Test < Critic::Test
+    include Stubs
+  end
+end

data/test/unit/configatron/proc.rb

@@ -0,0 +1,24 @@
+require_relative '../_lib'
+
+class Critic::Unit::ProcTest < Critic::Unit::Test
+  before do
+    @proc = Configatron::Proc.new {rand}
+  end
+
+  describe '#call' do
+    it 'executes the block and returns the results' do
+      stubs(:rand).returns(4)
+      assert_equal(4, @proc.call)
+    end
+
+    it 'caches the result if finalize? return true' do
+      @proc.stubs(:finalize?).returns(true)
+      assert_equal(@proc.call, @proc.call)
+    end
+
+    it 'does not cache the result if finalize? returns false' do
+      @proc.stubs(:finalize?).returns(false)
+      refute_equal(@proc.call, @proc.call)
+    end
+  end
+end

data/test/unit/configatron/root_store.rb

@@ -0,0 +1,20 @@
+require_relative '../_lib'
+
+class Critic::Unit::KernelTest < Critic::Unit::Test
+  before do
+    @kernel = Configatron::RootStore.new
+  end
+
+  describe 'delegation' do
+    it 'passes on to Configatron::Store' do
+      @kernel.a.b.c.d = 'D'
+      assert_equal('D', @kernel.a.b.c.d)
+    end
+  end
+
+  describe 'global configatron' do
+    it 'returns an instance of Configatron::RootStore' do
+      assert_equal(true, configatron.kind_of?(Configatron::RootStore))
+    end
+  end
+end

data/test/unit/configatron/store.rb

@@ -0,0 +1,149 @@
+require_relative '../_lib'
+
+class Critic::Unit::StoreTest < Critic::Unit::Test
+  before do
+    @store = Configatron::Store.new(Configatron::RootStore.new)
+    @store.foo = 'bar'
+  end
+
+  describe "[]" do
+    it 'returns the value if there is one' do
+      assert_equal('bar', @store[:foo])
+      assert_equal('bar', @store['foo'])
+    end
+
+    it 'returns a new Configatron::Store object if there is no value' do
+      assert_kind_of(Configatron::Store, @store[:unknown])
+      assert_kind_of(Configatron::Store, @store['unknown'])
+    end
+
+    describe 'Configatron::Proc' do
+      it 'executes the proc' do
+        @store.a = Configatron::Proc.new {1+1}
+        assert_equal(2, @store.a)
+      end
+
+    end
+  end
+
+  describe '[]=' do
+    it "sets the value" do
+      @store[:foo] = "bar"
+      assert_equal("bar", @store[:foo])
+      assert_equal("bar", @store["foo"])
+
+      @store[:baz] = "bazzy"
+      assert_equal("bazzy", @store[:baz])
+      assert_equal("bazzy", @store["baz"])
+    end
+  end
+
+  describe "fetch" do
+    it "returns the value" do
+      assert_equal("bar", @store.fetch(:foo))
+      assert_equal("bar", @store.fetch("foo"))
+    end
+
+    it "sets and returns the value of the default_value if no value is found" do
+      assert_equal("bar!!", @store.fetch(:bar, "bar!!"))
+      assert_equal("bar!!", @store.bar)
+    end
+
+    it "sets and returns the value of the block if no value is found" do
+      @store.fetch(:bar) do
+        "bar!"
+      end
+      assert_equal("bar!", @store.bar)
+    end
+  end
+
+  describe "key?" do
+    it "returns true if there is a key" do
+      assert_equal(false, @store.key?(:bar))
+      @store.bar = "bar"
+      assert_equal(true, @store.key?(:bar))
+    end
+
+    it "returns true if the key is a Configatron::Store" do
+      assert_equal(false, @store.key?(:bar))
+      @store.bar = Configatron::Store.new(Configatron::RootStore)
+      assert_equal(true, @store.key?(:bar))
+    end
+  end
+
+  describe "has_key?" do
+    it "returns true if there is a key" do
+      assert_equal(false, @store.has_key?(:bar))
+      @store.bar = "bar"
+      assert_equal(true, @store.has_key?(:bar))
+    end
+
+    it "returns true if the key is a Configatron::Store" do
+      assert_equal(false, @store.has_key?(:bar))
+      @store.bar = Configatron::Store.new(Configatron::RootStore)
+      assert_equal(true, @store.has_key?(:bar))
+    end
+  end
+
+  describe "method_missing" do
+    it "returns the value if there is one" do
+      assert_equal("bar", @store.foo)
+    end
+
+    it "returns a Configatron::Store if there is no value" do
+      assert_kind_of(Configatron::Store, @store.bar)
+    end
+
+    it "works with deeply nested values" do
+      @store.a.b.c.d = "DD"
+      assert_equal("DD", @store.a.b.c.d)
+    end
+
+    describe 'with bang' do
+      it "raises an exception if the key doesn't exist" do
+        assert_raises(Configatron::UndefinedKeyError) do
+          @store.a.b!
+        end
+      end
+
+      it "returns the value" do
+        @store.a.b = 'B'
+        assert_equal('B', @store.a.b!)
+      end
+    end
+  end
+
+  describe "configuring" do
+    describe "configure_from_hash" do
+      it "allows setup from a hash" do
+        @store.configure_from_hash(one: 1, a: {b: {c: {d: "DD"}}})
+        assert_equal(1, @store.one)
+        assert_equal("DD", @store.a.b.c.d)
+      end
+    end
+
+    describe "with a block" do
+      before do
+        @store.a.b = 'B'
+      end
+
+      it "yields up the store to configure with" do
+        @store.a do |a|
+          a.c = 'CC'
+        end
+        assert_equal('B', @store.a.b)
+        assert_equal('CC', @store.a.c)
+      end
+    end
+  end
+
+  describe '#inspect' do
+    it 'returns a printable inspect' do
+      store = Configatron::Store.new(Configatron::RootStore.new)
+
+      store.a.b = 'B'
+      store.c.d = 'C'
+      assert_equal(%{configatron.a.b = "B"\nconfigatron.c.d = "C"}, store.inspect)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Mark Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: subprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +79,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- History.txt
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -76,9 +91,12 @@ files:
 - lib/configatron/delayed.rb
 - lib/configatron/dynamic.rb
 - lib/configatron/errors.rb
-- lib/configatron/kernel.rb
+- lib/configatron/ext/kernel.rb
+- lib/configatron/integrations.rb
+- lib/configatron/integrations/minitest.rb
+- lib/configatron/integrations/rails.rb
 - lib/configatron/proc.rb
-- lib/configatron/rails.rb
+- lib/configatron/root_store.rb
 - lib/configatron/store.rb
 - lib/configatron/version.rb
 - lib/generators/configatron/install/install_generator.rb
@@ -87,11 +105,15 @@ files:
 - lib/generators/configatron/install/templates/configatron/production.rb
 - lib/generators/configatron/install/templates/configatron/test.rb
 - lib/generators/configatron/install/templates/initializers/configatron.rb
-- test/configatron/kernel_test.rb
-- test/configatron/proc_test.rb
-- test/configatron/store_test.rb
-- test/configatron_test.rb
-- test/test_helper.rb
+- test/_lib.rb
+- test/functional/_lib.rb
+- test/functional/_lib/scripts/core.rb
+- test/functional/configatron.rb
+- test/functional/loading.rb
+- test/unit/_lib.rb
+- test/unit/configatron/proc.rb
+- test/unit/configatron/root_store.rb
+- test/unit/configatron/store.rb
 homepage: https://github.com/markbates/configatron
 licenses:
 - MIT
@@ -112,13 +134,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A powerful Ruby configuration system.
 test_files:
-- test/configatron/kernel_test.rb
-- test/configatron/proc_test.rb
-- test/configatron/store_test.rb
-- test/configatron_test.rb
-- test/test_helper.rb
+- test/_lib.rb
+- test/functional/_lib.rb
+- test/functional/_lib/scripts/core.rb
+- test/functional/configatron.rb
+- test/functional/loading.rb
+- test/unit/_lib.rb
+- test/unit/configatron/proc.rb
+- test/unit/configatron/root_store.rb
+- test/unit/configatron/store.rb

data/lib/configatron/kernel.rb

@@ -1,21 +0,0 @@
-require 'singleton'
-class Configatron::KernelStore < BasicObject
-  include ::Singleton
-
-  attr_reader :store
-
-  def initialize
-    @store = ::Configatron::Store.new
-  end
-
-  def method_missing(name, *args, &block)
-    store.send(name, *args, &block)
-  end
-
-end
-
-module Kernel
-  def configatron
-    Configatron::KernelStore.instance
-  end
-end

data/test/configatron/kernel_test.rb

@@ -1,24 +0,0 @@
-require 'test_helper'
-
-describe Configatron::KernelStore do
-
-  let(:store) { Configatron::KernelStore.instance }
-
-  it 'passes on to Configatron::Store' do
-    configatron.a.b.c.d = 'D'
-    configatron.a.b.c.d.must_equal 'D'
-  end
-
-end
-
-describe Kernel do
-
-  describe 'configatron' do
-
-    it 'returns an instance of Configatron::Store' do
-      configatron.kind_of?(Configatron::Store).must_equal true
-    end
-
-  end
-
-end

data/test/configatron/proc_test.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-
-describe Configatron::Proc do
-
-  let(:store) { Configatron::Store.new }
-  let(:proc) { Configatron::Proc.new {rand} }
-
-  describe '#call' do
-
-    it 'executes the block and returns the results' do
-      stubs(:rand).returns(4)
-      proc.call.must_equal 4
-    end
-
-    it 'caches the result if finalize? return true' do
-      proc.stubs(:finalize?).returns(true)
-      proc.call.must_equal proc.call
-    end
-
-    it 'does not cache the result if finalize? returns false' do
-      proc.stubs(:finalize?).returns(false)
-      proc.call.wont_equal proc.call
-    end
-
-  end
-
-end

data/test/configatron/store_test.rb

@@ -1,256 +0,0 @@
-require 'test_helper'
-
-describe Configatron::Store do
-
-  let(:store) { Configatron::Store.new }
-
-  context "[]" do
-
-    let(:store) { Configatron::Store.new(foo: "bar") }
-
-    it "returns the value if there is one" do
-      store[:foo].must_equal "bar"
-      store["foo"].must_equal "bar"
-    end
-
-    it "returns a new Configatron::Store object if there is no value" do
-      store[:unknown].must_be_kind_of Configatron::Store
-      store["unknown"].must_be_kind_of Configatron::Store
-    end
-
-    context 'Configatron::Proc' do
-
-      it 'executes the proc' do
-        store.a = Configatron::Proc.new {1+1}
-        store.a.must_equal 2
-      end
-
-    end
-
-  end
-
-  context "[]=" do
-
-    it "sets the value" do
-      store[:foo] = "bar"
-      store[:foo].must_equal "bar"
-      store["foo"].must_equal "bar"
-
-      store[:baz] = "bazzy"
-      store[:baz].must_equal "bazzy"
-      store["baz"].must_equal "bazzy"
-    end
-
-  end
-
-  context "fetch" do
-
-    let(:store) { Configatron::Store.new(foo: "bar") }
-
-    it "returns the value" do
-      store.fetch(:foo).must_equal "bar"
-      store.fetch("foo").must_equal "bar"
-    end
-
-    it "sets and returns the value of the default_value if no value is found" do
-      store.fetch(:bar, "bar!!").must_equal "bar!!"
-      store.bar.must_equal "bar!!"
-    end
-
-    it "sets and returns the value of the block if no value is found" do
-      store.fetch(:bar) do
-        "bar!"
-      end.must_equal "bar!"
-      store.bar.must_equal "bar!"
-    end
-
-  end
-
-  context "nil?" do
-
-    it "returns true if there is no value set" do
-      store.foo.must_be_nil
-      store.foo = "bar"
-      store.foo.wont_be_nil
-    end
-
-  end
-
-  context "empty?" do
-
-    it "returns true if there is no value set" do
-      store.foo.must_be_empty
-      store.foo = "bar"
-      store.foo.wont_be_empty
-    end
-
-  end
-
-  context "key?" do
-
-    it "returns true if there is a key" do
-      store.key?(:foo).must_equal false
-      store.foo = "bar"
-      store.key?(:foo).must_equal true
-    end
-
-    it "returns false if the key is a Configatron::Store" do
-      store.key?(:foo).must_equal false
-      store.foo = Configatron::Store.new
-      store.key?(:foo).must_equal false
-    end
-
-  end
-
-  context "has_key?" do
-
-    it "returns true if there is a key" do
-      store.has_key?(:foo).must_equal false
-      store.foo = "bar"
-      store.has_key?(:foo).must_equal true
-    end
-
-    it "returns false if the key is a Configatron::Store" do
-      store.has_key?(:foo).must_equal false
-      store.foo = Configatron::Store.new
-      store.has_key?(:foo).must_equal false
-    end
-
-  end
-
-  context "method_missing" do
-
-    let(:store) { Configatron::Store.new(foo: "bar") }
-
-    it "returns the value if there is one" do
-      store.foo.must_equal "bar"
-    end
-
-    it "returns a Configatron::Store if there is no value" do
-      store.bar.must_be_kind_of Configatron::Store
-    end
-
-    it "works with deeply nested values" do
-      store.a.b.c.d = "DD"
-      store.a.b.c.d.must_equal "DD"
-    end
-
-    context 'with bang' do
-
-      it "raises an exception if the key doesn't exist" do
-        lambda {store.a.b!}.must_raise Configatron::UndefinedKeyError
-      end
-
-      it "returns the value" do
-        store.a.b = 'B'
-        store.a.b!.must_equal 'B'
-      end
-
-    end
-
-  end
-
-  context "lock!" do
-
-    before do
-      store.a.b.c.d = 'DD'
-      store.lock!
-    end
-
-    it "raises an error when accessing non-existing values" do
-      store.a.wont_be_nil
-      store.a.b.wont_be_nil
-      store.a.b.c.wont_be_nil
-      store.a.b.c.d.must_equal "DD"
-      proc {store.unknown}.must_raise(Configatron::UndefinedKeyError)
-    end
-
-    it "raises an error when trying to set a non-existing key" do
-      proc {store.unknown = "known"}.must_raise(Configatron::LockedError)
-    end
-
-  end
-
-  context "temp" do
-
-    before do
-      store.a = 'A'
-      store.b = 'B'
-    end
-
-    it "allows for temporary setting of values" do
-      store.a.must_equal 'A'
-      store.b.must_equal 'B'
-      store.temp do
-        store.a = 'AA'
-        store.c = 'C'
-        store.a.must_equal 'AA'
-        store.b.must_equal 'B'
-        store.c.must_equal 'C'
-      end
-      store.a.must_equal 'A'
-      store.b.must_equal 'B'
-      store.c.must_be_nil
-    end
-
-    context "start/end" do
-
-      it "allows for temporary setting of values" do
-        store.a.must_equal 'A'
-        store.b.must_equal 'B'
-        store.temp_start
-        store.a = 'AA'
-        store.c = 'C'
-        store.a.must_equal 'AA'
-        store.b.must_equal 'B'
-        store.c.must_equal 'C'
-        store.temp_end
-        store.a.must_equal 'A'
-        store.b.must_equal 'B'
-        store.c.must_be_nil
-      end
-
-    end
-
-  end
-
-  context "configuring" do
-
-    context "configure_from_hash" do
-
-      it "allows setup from a hash" do
-        store.configure_from_hash(one: 1, a: {b: {c: {d: "DD"}}})
-        store.one.must_equal 1
-        store.a.b.c.d.must_equal "DD"
-      end
-
-    end
-
-    context "with a block" do
-
-      before do
-        store.a.b = 'B'
-      end
-
-      it "yields up the store to configure with" do
-        store.a do |a|
-          a.c = 'CC'
-        end
-        store.a.b.must_equal 'B'
-        store.a.c.must_equal 'CC'
-      end
-
-    end
-
-  end
-
-  context '#inspect' do
-
-    it 'returns a printable inspect' do
-      store.a.b = 'B'
-      store.c.d = 'C'
-      store.inspect.must_equal %{configatron.a.b = "B"\nconfigatron.c.d = "C"}
-    end
-  end
-
-end

data/test/configatron_test.rb

@@ -1,5 +0,0 @@
-require 'test_helper'
-
-describe Configatron do
-
-end

data/test/test_helper.rb

@@ -1,15 +0,0 @@
-require 'bundler/setup'
-
-require 'configatron' # and any other gems you need
-
-require 'minitest/autorun'
-require "mocha/setup"
-require 'mocha/mini_test'
-
-class MiniTest::Spec
-
-  class << self
-    alias :context :describe
-  end
-
-end