confrider 0.0.1 → 0.0.2

data/.gitignore

@@ -9,3 +9,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rvmrc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confrider (0.0.1)
+    confrider (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,6 +1,42 @@
 # Confrider
 
-TODO: Write a gem description
+Configuration managment system with i18n like syntax
+
+## Usage
+
+### little helper(to render yaml files with ERB)
+
+    require "erb"
+    require "yaml"
+    def load_yml(yml_path)
+      YAML.load(ERB.new(File.read(yml_path)).result(binding))
+    end
+
+### settings.yml (example)
+
+    app:
+      name: some app name
+      version: <%= File.read('VERSION') %>
+      subnamespace:
+        another_key: value
+
+### using Confrider
+
+    $cfg = Confrider.from_hash(load_yml('/path/to/settings.yml'))
+    # or short form
+    $cfg = Confrider(load_yml('/path/to/settings.yml'))
+    $cfg['app.name'] # => 'some app name'
+    $cfg['app.version'] # will be rendered through ERB
+    $cfg['app.subnamespace'] # => {'another_key' => 'value'}
+    $cfg['app.subnamespace.another_key'] # => 'value'
+    $cfg['non.existent.key'] # => nil
+    $cfg['non.existent.key', 'default'] # => 'default'
+
+### deep merge hashes
+
+    # load additional hash that will be deeply merged
+    $cfg.from_hash(load_yml('/path/to/settings_local.yml'))
+
 
 ## Installation
 
@@ -16,10 +52,6 @@ Or install it yourself as:
 
     $ gem install confrider
 
-## Usage
-
-TODO: Write usage instructions here
-
 ## Contributing
 
 1. Fork it
@@ -27,3 +59,4 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+ 

data/lib/confrider/core.rb

@@ -1,29 +1,38 @@
 class Confrider::Core
-  def initialize(hash)
+  def initialize
     @vault = {}
-    save_hash(nil, hash)
   end
 
   def [](key, default_value = nil)
     @vault.fetch(key, default_value)
   end
 
+  def from_hash(hash)
+    save_hash(nil, hash)
+  end
+
+  def normalize_keys(*keys)
+    keys.join('.').gsub(/^\./, '')
+  end
+
+  private
+
   def save(key, value)
     @vault[key] = value
   end
 
   def save_hash(key, hash)
-    @vault[key] = hash if key
+    if key
+      @vault[key] ||= {}
+      @vault[key].deep_merge!(hash)
+    end
     hash.each do |inner_key, value|
       normalized_key = normalize_keys(key, inner_key)
-      case value
-        when Hash then save_hash(normalized_key, value)
-        else save(normalized_key, value)
+      if value.is_a? Hash
+        save_hash(normalized_key, value)
+      else
+        save(normalized_key, value)
       end
     end
   end
-
-  def normalize_keys(*keys)
-    keys.join('.').gsub(/^\./, '')
-  end
 end

data/lib/confrider/deep_merge.rb

@@ -0,0 +1,18 @@
+# ported from active_support/core_ext/hash/deep_merge
+
+class Hash
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  def deep_merge(other_hash)
+    dup.deep_merge!(other_hash)
+  end
+
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  # Modifies the receiver in place.
+  def deep_merge!(other_hash)
+    other_hash.each_pair do |k,v|
+      tv = self[k]
+      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+    end
+    self
+  end
+end

data/lib/confrider/version.rb

@@ -1,3 +1,3 @@
 module Confrider
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/confrider.rb

@@ -1,8 +1,15 @@
 require 'confrider/version'
+require 'confrider/deep_merge'
 require 'confrider/core'
 
 module Confrider
   def self.from_hash(hash)
-    Confrider::Core.new hash
+    Confrider::Core.new.tap do |o|
+      o.from_hash hash
+    end
   end
 end
+
+def Confrider(hash)
+  Confrider.from_hash(hash)
+end

data/spec/lib/confrider/core_spec.rb

@@ -1,23 +1,37 @@
 require 'spec_helper'
 
 describe Confrider::Core do
-  let(:cfg) { Confrider::Core.new :foo => 'bar' }
+  let(:cfg) { Confrider::Core.new.tap { |o| o.from_hash :foo => 'bar'} }
 
-  context '#initialize' do
+  describe '#initialize' do
     it 'should init @vault' do
-      cfg.instance_variable_get('@vault').should be
+      cfg.instance_variable_get('@vault').should be_a Hash
     end
   end
 
-  context '#save_hash' do
-    let(:cfg) { Confrider::Core.new 'foo' => {'bar' => {'baz' => 'value'}} }
+  describe '#from_hash' do
+    let(:cfg) do
+      Confrider::Core.new.tap do |o|
+        o.from_hash 'foo' => {'bar' => {'baz' => 'value'}}
+      end
+    end
 
     it 'should flatten hash keys' do
       cfg['foo.bar.baz'].should == 'value'
     end
+
+    it 'should merge nested hashes' do
+      cfg.from_hash 'foo' => {'bar' => {'kii' => 'kiivalue'}}
+      cfg['foo.bar.baz'].should == 'value'
+      cfg['foo.bar.kii'].should == 'kiivalue'
+
+      # hash should be merged
+      cfg['foo.bar'].should include('kii' => 'kiivalue')
+      cfg['foo.bar'].should include('baz' => 'value')
+    end
   end
 
-  context '#[]' do
+  describe '#[]' do
     it 'should return value' do
       cfg['foo'].should == 'bar'
     end
@@ -27,7 +41,7 @@ describe Confrider::Core do
     end
   end
 
-  context '#normalize_keys' do
+  describe '#normalize_keys' do
     it 'should join keys with "."' do
       cfg.normalize_keys('q', 'a', 'z').should == 'q.a.z'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confrider
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-19 00:00:00.000000000 Z
+date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,6 +44,7 @@ files:
 - confrider.gemspec
 - lib/confrider.rb
 - lib/confrider/core.rb
+- lib/confrider/deep_merge.rb
 - lib/confrider/version.rb
 - spec/lib/confrider/core_spec.rb
 - spec/lib/confrider/version_spec.rb
@@ -63,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2599701976609297857
+      hash: -3148026561097312103
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,10 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2599701976609297857
+      hash: -3148026561097312103
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: manage config options like i18n