static_config 0.0.1 → 0.0.2

data/lib/static_config/reader/environment.rb

@@ -16,13 +16,37 @@ module StaticConfig
       def update(data, env_name, env_value)
         if env_name =~ /^#{@env_prefix}_(.*)/
           parts = $1.downcase.split(/_/)
-          last_part = parts.pop
-          parts.inject(data) { |h, k| h[k] ||= {} }[last_part] = env_value
+          value = convert(env_value)
+          build(data, parts, value)
         end
         data
       rescue => e
         raise "Unable to fit #{env_name} into #{data.inspect}"
       end
+
+      def build(data, keys, value)
+        first, *rest = keys
+        while !rest.empty?
+          build(data[first] ||= {}, rest, value)
+          first += '_' + rest.shift
+        end
+        data[first] = value
+      end
+
+      def convert env_value
+        case env_value
+        when /^\d+$/
+          env_value.to_i
+        when /^(\d*\.\d+)|(\d+\.\d*)$/
+          env_value.to_f
+        when 'true'
+          true
+        when 'false'
+          false
+        else
+          env_value
+        end
+      end
     end
   end
 end

data/lib/static_config/version.rb

@@ -1,3 +1,3 @@
 module StaticConfig
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/static_config/reader/environment_spec.rb

@@ -2,15 +2,49 @@ require 'spec_helper'
 require 'static_config/reader/environment'
 
 describe StaticConfig::Reader::Environment do
-  before do
-    ENV['MY_CONFIG_DEV_KEY'] = 'value'
+  def self.has_env(e)
+    before do
+      @original_env ||= {}
+      e.each do |key, value|
+        @original_env[key], ENV[key] = ENV[key], value
+      end
+    end
+    after do
+      e.each do |key, _|
+        ENV[key] = @original_env[key]
+      end
+    end
   end
-  after do
-    ENV['MY_CONFIG_DEV_KEY'] = nil
-  end
-  let(:subject) { described_class.read(opts) }
 
+  let(:subject) { described_class.read(opts) }
   def opts ; { :env_prefix => 'MY_CONFIG' } ; end
-  it('reads environment') { should == { 'dev' => { 'key' => 'value' } } }
+
+  context do
+    has_env 'MY_CONFIG_TEST' => 'value'
+    it('reads environment') { should == { 'test' => 'value' } }
+  end
+
+  context do
+    has_env 'MY_CONFIG_A_B_C' => 'D'
+    it { subject['a_b_c'].should == 'D' }
+    it { subject['a']['b_c'].should == 'D' }
+    it { subject['a_b']['c'].should == 'D' }
+    it { subject['a']['b']['c'].should == 'D' }
+  end
+
+  context do
+    has_env({
+      'MY_CONFIG_INT' => '123',
+      'MY_CONFIG_TRUE' => 'true',
+      'MY_CONFIG_FALSE' => 'false',
+      'MY_CONFIG_FLOAT' => '123.45',
+      'MY_CONFIG_STRING' => 'string',
+    })
+    it { subject['int'].should == 123 }
+    it { subject['true'].should == true }
+    it { subject['false'].should == false }
+    it { subject['float'].should == 123.45 }
+    it { subject['string'].should == 'string' }
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: static_config
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Matt Burke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 Z
+date: 2011-09-12 00:00:00 Z
 dependencies: []
 
 description: Load configuration from yaml and/or environment variables