configa 0.0.1 → 0.0.2

data/README.md

@@ -132,9 +132,33 @@ config.videos.tarantool.space
 #=> 1
 config.videos.tarantool.type
 #=> :em
+```
+
+All properties that defined higher in the tree will rewrite root properties:
+
+```yaml
+database:
+  adapter: sqlite
+  user: root
 
+development:
+  database:
+    db: dev_sqlite
+
+staging:
+  database:
+    adapter: mysql
+  internal_servers:
+    database:
+      db: internal_db
+  external_servers:
+    database:
+      db: external_db
+      user: external_root
 ```
 
+So you can see how for whole staging node we rewrite database adapter, then for each subnode we specify other properties.
+
 ## Contributing
 
 1. Fork it

data/lib/configa.rb

@@ -18,6 +18,10 @@ module Configa
       parser
     end
 
+    def to_s
+      @yaml
+    end
+
     def parser(env=nil)
       env ||= @base_env
       env = env.to_s
@@ -40,24 +44,28 @@ module Configa
       base = ymls.delete(@base_env)
       yaml = base
       ymls.each do |env, data|
-        yaml[env] = base.merge(data)
+        yaml[env] = data
       end
       yaml = merge_yaml(yaml)
-      ymls.each do |env, data|
-        yaml[env] = merge_yaml(yaml[env])
-      end
       yaml
     end
 
-    def merge_yaml(yaml)
-      root_keys = yaml.keys
+    # Tree traverse
+    def merge_yaml(yaml, cache={})
+      cache = cache.dup
+      yaml.each do |k,v|
+        next  unless Hash === v
+        cache[k] ||= {}
+        cache[k] = cache[k].merge v  if cache[k] != v
+      end
       yaml.each do |k,v|
         next  unless Hash === v
         v.each do |key, data|
-          if root_keys.include? key
-            yaml[k][key] = yaml[key].merge data
+          if cache[key]
+            yaml[k][key] = cache[key].merge data  if cache[key] != data
           end
         end
+        yaml[k] = merge_yaml(yaml[k], cache)
       end
       yaml
     end

data/lib/configa/version.rb

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

data/spec/config.yml

@@ -16,4 +16,15 @@ production:
   mysql:
     database: mysql_prod
     username: admin
-    password: strongone
+    password: strongone
+
+staging:
+  prestaging:
+    mysql:
+      username: test
+    users:
+      mysql:
+        database: users
+    blogs:
+      mysql:
+        database: blogs

data/spec/configa/configa_spec.rb

@@ -11,6 +11,11 @@ describe Configa do
       dev = configa.instance_variable_get(:"@yaml")["development"]
       dev["mysql"]["adapter"].must_equal mysql["adapter"]
       dev["mysql"]["database"].must_equal "mysql_dev"
+      proc{ configa.staging.prestaging.mysql.database}.must_raise Configa::UnknownKey
+      configa.staging.prestaging.mysql.adapter.must_equal "mysql"
+      configa.staging.prestaging.users.mysql.adapter.must_equal "mysql"
+      configa.staging.prestaging.users.mysql.username.must_equal "test"
+      configa.staging.prestaging.users.mysql.database.must_equal "users"
     end
 
     it "basic test for multi file config" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configa
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: