configatron 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f474cf450b19844154759cec03c3423912555cb8
-  data.tar.gz: 038d893595745eaf98f6d0b31daf04c795a83bdf
+  metadata.gz: 84ff6f84518b18e89af32df3249a42d4adde63c6
+  data.tar.gz: ed208d199f8334bda0b371098eeaf9f035f390a1
 SHA512:
-  metadata.gz: 3d40cf23c2fa1fe15c29311d08d6a92d2afaba80a84e7b09010b7326147bc28221b66ef1bf037e562be42b1bca03a5b21b7aec9d7e094bac2e6c45da4ac3723e
-  data.tar.gz: bb9ec9e8ebb599af692f84e24e89bac8505709bcc52f52b46ccc644c113630c5c1dde64223df3561417debb2133748e07688c83813acae78f0087910fd490b03
+  metadata.gz: 68368a752c61057a128b2a84f610e1d384a2ac198ab104689ec7129fb1723a4183dc864550914a08394fee2bf0301b2a3a33c3cd18ba11cc0ae30fd9ff95df5e
+  data.tar.gz: 178b8532496c4c85ef94a478073283d333ca37be95ecaa9c811bd996c54a9e0181a0cdbb73cd6970e3d4d6b9500d35f2bcdd4529fc46b82b78da45e9bc6fe9d5

data/.travis.yml

@@ -3,5 +3,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
 install: bundle install
 script: bundle exec rake

data/Gemfile

@@ -7,3 +7,4 @@ gemspec
 # gem 'rb-fsevent'
 # gem "guard"
 # gem 'guard-minitest'
+gem 'm', github: "unmanbearpig/m"

data/README.md

@@ -49,7 +49,7 @@ configatron.database.url # => "postgres://localhost/foo"
 
 Voila! Simple as can be.
 
-Now you're saying, what if I want to have a 'default' set of options, but then override them later, based on other information? Simple again. Let's use our above example. We've configured our `database.url` option to be @postgres://localhost/foo@. The problem with that is that is our production database url, not our development url. Fair enough, all you have to do is redeclare it:
+Now you're saying, what if I want to have a 'default' set of options, but then override them later, based on other information? Simple again. Let's use our above example. We've configured our `database.url` option to be `postgres://localhost/foo`. The problem with that is that is our production database url, not our development url. Fair enough, all you have to do is redeclare it:
 
 ```ruby
 configatron.database.url = "postgres://localhost/foo_development"

data/configatron.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "mocha"
+  gem.add_development_dependency "minitest", '>=5.2.3'
 end

data/lib/configatron/core.rb

@@ -1,3 +1,6 @@
 require_relative "deep_clone"
 require_relative "store"
-require_relative "errors"
+require_relative "errors"
+require_relative "proc"
+require_relative "dynamic"
+require_relative "delayed"

data/lib/configatron/delayed.rb

@@ -0,0 +1,2 @@
+class Configatron::Delayed < Configatron::Proc
+end

data/lib/configatron/dynamic.rb

@@ -0,0 +1,7 @@
+class Configatron::Dynamic < Configatron::Proc
+
+  def finalize?
+    false
+  end
+
+end

data/lib/configatron/proc.rb

@@ -0,0 +1,30 @@
+class Configatron
+
+  class Proc
+
+    attr_accessor :execution_count
+    attr_accessor :block
+
+    def initialize(&block)
+      self.execution_count = 0
+      self.block = block
+    end
+
+    def call
+      unless @val
+        val = self.block.call
+        self.execution_count += 1
+        if finalize?
+          @val = val
+        end
+      end
+      return val || @val
+    end
+
+    def finalize?
+      true
+    end
+
+  end
+
+end

data/lib/configatron/store.rb

@@ -15,12 +15,13 @@ class Configatron
     end
 
     def [](key)
-      fetch(key.to_sym) do
+      val = fetch(key.to_sym) do
         if @__locked
           raise Configatron::UndefinedKeyError.new("Key Not Found: #{key}")
         end
         ::Configatron::Store.new
       end
+      return val
     end
 
     def store(key, value)
@@ -40,6 +41,9 @@ class Configatron
         end
         store(key, val)
       end
+      if val.is_a?(Configatron::Proc)
+        val = val.call
+      end
       return val
     end
 

data/lib/configatron/version.rb

@@ -1,3 +1,3 @@
 class Configatron
-  VERSION = "3.0.2"
+  VERSION = "3.1.0"
 end

data/test/configatron/proc_test.rb

@@ -0,0 +1,27 @@
+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

@@ -18,6 +18,16 @@ describe Configatron::Store do
       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

data/test/test_helper.rb

@@ -3,6 +3,8 @@ require 'bundler/setup'
 require 'configatron' # and any other gems you need
 
 require 'minitest/autorun'
+require "mocha/setup"
+require 'mocha/mini_test'
 
 class MiniTest::Spec
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Mark Bates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.3
 description: A powerful Ruby configuration system.
 email:
 - mark@markbates.com
@@ -45,8 +73,11 @@ files:
 - lib/configatron.rb
 - lib/configatron/core.rb
 - lib/configatron/deep_clone.rb
+- lib/configatron/delayed.rb
+- lib/configatron/dynamic.rb
 - lib/configatron/errors.rb
 - lib/configatron/kernel.rb
+- lib/configatron/proc.rb
 - lib/configatron/rails.rb
 - lib/configatron/store.rb
 - lib/configatron/version.rb
@@ -57,6 +88,7 @@ files:
 - 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
@@ -86,6 +118,7 @@ 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