configlet 1.2.0 → 1.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.3.0 / 2010-05-24
+
+* Add support for lazy defaults.
+
 === 1.2.0 / 2010-05-11
 
 * Change Configlet.for to Configlet.config.

data/README.rdoc

@@ -36,6 +36,12 @@ defaults:
       default :host  => "thunk.local"
     end
 
+Defaults can be lazy, too: Just use a lambda. The default will be
+resolved the first time its value is grabbed.
+
+    default :db => lambda { "db://whatever/#{Rails.env}" } # or...
+    default(:db) { "db://whatever/#{Rails.env}" }
+
 Configlet is a module, so +include+ or +extend+ it wherever you
 want. It extends itself for your convenience.
 
@@ -45,7 +51,7 @@ want. It extends itself for your convenience.
 
 == License
 
-Copyright 2010 John Barnette (jbarnette@rubyforge.org)
+Copyright 2010 John Barnette (code@jbarnette.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -5,7 +5,7 @@ Hoe.plugins.delete :rubyforge
 Hoe.plugin :doofus, :git
 
 Hoe.spec "configlet" do
-  developer "John Barnette", "jbarnette@rubyforge.org"
+  developer "John Barnette", "code@jbarnette.com"
 
   self.extra_rdoc_files = Dir["*.rdoc"]
   self.history_file     = "CHANGELOG.rdoc"

data/lib/configlet.rb

@@ -13,7 +13,7 @@ module Configlet
 
   # Duh.
 
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 
   I = lambda { |v| v } #:nodoc:
 
@@ -27,7 +27,13 @@ module Configlet
   # <tt>defaults["severity"]</tt> if the env var isn't set.
 
   def [] key
-    mungers[key.to_s].call ENV[envify(key)] || defaults[key.to_s]
+    key = key.to_s
+
+    if Proc === value = ENV[envify(key)] || defaults[key]
+      defaults[key] = value = value.call # resolve lambda defaults
+    end
+
+    mungers[key].call value
   end
 
   # Set an environment value. +key+ is translated to an unfriendly
@@ -41,9 +47,24 @@ module Configlet
   # vars, so a default for the <tt>THUNK_SECRET</tt> could be set
   # as <tt>Configlet.default :secret => "sssssh"</tt> (assuming a
   # <tt>"thunk"</tt> prefix).
-
-  def default hash
-    hash.each { |k, v| defaults[k.to_s] = v }
+  #
+  # If a default value is a lambda, it'll be resolved the first time
+  # the config value is retrieved, and the result of calling the
+  # lambda will be the new default value.
+  #
+  # If a single string or symbol is provided instead of a hash, the
+  # method block form may be used to provide a delayed default. This
+  # is just sugar over providing a lambda:
+  #
+  #    default(:foo) { Rails.env } # is the same as
+  #    default :foo => lambda { Rails.env }
+
+  def default args, &block
+    if Hash === args
+      args.each { |k, v| defaults[k.to_s] = v }
+    elsif block_given?
+      defaults[args.to_s] = block
+    end
   end
 
   def defaults #:nodoc:

data/test/test_configlet.rb

@@ -33,6 +33,23 @@ class TestConfiglet < MiniTest::Unit::TestCase
     assert_equal "bar", @cfg["foo"]
   end
 
+  def test_default_lambda
+    l = lambda { "bar" }
+    @cfg.default :foo => l
+
+    assert_equal(l, @cfg.defaults["foo"])
+    assert_equal "bar", @cfg["foo"]
+    assert_equal "bar", @cfg.defaults["foo"]
+  end
+
+  def test_default_method_block
+    block = lambda { "bar" }
+    @cfg.default :foo, &block
+
+    assert_equal block, @cfg.defaults["foo"]
+    assert_equal "bar", @cfg[:foo]
+  end
+
   def test_get
     ENV["FOO"] = "bar"
     assert_equal "bar", @cfg[:foo]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: configlet
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - John Barnette
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 -07:00
+date: 2010-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ description: |-
   different projects. Seriously, go find a real configuration library
   and use it instead.
 email: 
-- jbarnette@rubyforge.org
+- code@jbarnette.com
 executables: []
 
 extensions: []
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: configlet
-rubygems_version: 1.3.7.pre.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A stupid simple wrapper for environment variables