configa 0.0.6 → 0.0.8

data/lib/configa/version.rb

@@ -1,3 +1,3 @@
 module Configa
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/lib/configa.rb

@@ -2,6 +2,9 @@ require "configa/version"
 require "yaml"
 
 module Configa
+  class UnknownEnvironment < StandardError; end
+  class UnknownKey < StandardError; end
+
   extend self
 
   def new(path, opts={})
@@ -18,7 +21,7 @@ module Configa
 
       @default_env = opts[:env]
 
-      parser
+      parser(@base_env)
     end
 
     def to_s
@@ -26,12 +29,12 @@ module Configa
     end
 
     def parser(env=nil)
-      env ||= @base_env
-      env = env.to_s
       load_yaml(env)
       load_yaml(@default_env.to_s) if @default_env
+
       @yaml = merge_yamls
       @yaml = @yaml[@default_env.to_s] || {} if @default_env
+
       @yaml = magic(@yaml)
     end
 
@@ -45,13 +48,13 @@ module Configa
     end
 
     def merge_yamls
-      ymls = @yamls.dup
-      base = ymls.delete(@base_env)
-      yaml = base.dup
-      ymls.each do |env, data|
-        yaml[env] = base.merge data
+      base = @yamls[@base_env]
+      yaml = dup(base)
+      @yamls.each do |env, data|
+        next if env == @base_env
+        yaml[env.dup] = dup(base.merge data)
       end
-      yaml = merge_yaml(yaml)
+      merge_yaml(yaml)
       yaml
     end
 
@@ -60,7 +63,7 @@ module Configa
       yaml.each do |k,v|
         next  unless Hash === v
         cache[k] ||= {}
-        cache[k] = cache[k].merge v  if cache[k] != v
+        cache[k] = v  if cache[k] != v
       end
       yaml.each do |k,v|
         next  unless Hash === v
@@ -107,15 +110,19 @@ module Configa
       path = File.join(@base_dir, name.to_s + @base_extname)
       unless @yaml[name.to_s] || @yamls[name.to_s]
         if File.exist?(path)
-          parser(name)
+          parser(name.to_s)
         end
       end
       @yaml.send(name, *args, &blk)
     rescue
       raise Configa::UnknownEnvironment, "Unknown environment '#{name}', and file '#{path}' doesn't exist also"
     end
-  end
 
-  class UnknownEnvironment < StandardError; end
-  class UnknownKey < StandardError; end
+  private
+
+    def dup(hash)
+      marshal = Marshal.dump(hash)
+      Marshal.load(marshal)
+    end
+  end
 end

data/spec/base.yml

@@ -8,4 +8,8 @@ tarantool:
   host: localhost
   port: 13013
 
-storage: "tmp"
+storage: "tmp"
+
+common:
+  tarantool:
+    space: 3

data/spec/configa/configa_spec.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 require 'spec_helper'
 
+# To be refactored ;)
+
 describe Configa do
 
   describe Configa::MagicContainer do
@@ -74,6 +76,7 @@ describe Configa do
       @config.development.users.tarantool.space.must_equal 1
       @config.development.users.tarantool.port.must_equal 13013
       @config.development.users.tarantool.host.must_equal "212.11.3.1"
+      @config.development.common.tarantool.host.must_equal "212.11.3.1"
     end
   end
 
@@ -92,4 +95,39 @@ describe Configa do
       @config.production.mysql(:username, :database, hash: true).must_equal({ username: "admin", database: "mysql_prod" })
     end
   end
+
+  describe "simple_base" do
+    before do
+      path = File.expand_path("../../simple_base.yml", __FILE__)
+      @config = Configa.new(path)
+    end
+
+    it "should read base properties and raise error on non existing one" do
+      @config.tarantool.type.must_equal :block
+      @config.common.tarantool.space.must_equal 3
+      @config.common.tarantool.type.must_equal :block
+      proc{ @config.common.tarantool.host }.must_raise Configa::UnknownKey
+    end
+
+    it "should load simple_dev env without rewriting base properties" do
+      @config.simple_dev.common.tarantool.space.must_equal 3
+      @config.common.tarantool.type.must_equal :block
+      proc{ @config.common.tarantool.host }.must_raise Configa::UnknownKey
+      @config.simple_dev.common.tarantool.type.must_equal :em
+    end
+  end
+
+  describe Configa::MagicContainer do
+    before do
+      path = File.expand_path("../../simple_base.yml", __FILE__)
+      @container = Configa::MagicContainer.new(path)
+    end
+
+    it "should parse second file without rewriting data in base" do
+      yamls_was = @container.instance_variable_get(:"@yamls")
+      @container.parser('simple_dev')
+      yamls_now = @container.instance_variable_get(:"@yamls")
+      yamls_was["simple_base"].must_equal yamls_now["simple_base"]
+    end
+  end
 end

data/spec/simple_base.yml

@@ -0,0 +1,6 @@
+tarantool:
+  type: :block
+
+common:
+  tarantool:
+    space: 3

data/spec/simple_dev.yml

@@ -0,0 +1,3 @@
+tarantool:
+  type: :em
+  host: localhost

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configa
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -31,6 +31,8 @@ files:
 - spec/configa/configa_spec.rb
 - spec/development.yml
 - spec/production.yml
+- spec/simple_base.yml
+- spec/simple_dev.yml
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -62,4 +64,6 @@ test_files:
 - spec/configa/configa_spec.rb
 - spec/development.yml
 - spec/production.yml
+- spec/simple_base.yml
+- spec/simple_dev.yml
 - spec/spec_helper.rb