configue 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2a6932c57f41d3a8e0face2437eb0ed9c6c9577
-  data.tar.gz: 4efa8934701bd705a9c79030782465f2a8a93813
+  metadata.gz: fe53fc0c3969215bf80141f59536a4027c80009c
+  data.tar.gz: 6048c54717f66a3c840cc1f4d6af57cffb488c27
 SHA512:
-  metadata.gz: 61a7c799b95237f0278b333a85fb460f17790106940145e22c8a34f3e26fe2a04c5cd62762bac6988a04ec716a06c3da21ed829d5ac747ecb3d8db6afb923674
-  data.tar.gz: d00f683e0554cde0dd4f43ce81f947a2133f96146d7fe8e6061017190feae6ad6aefd649620dd161b4b5b9856b477727d58e1c59730ada7800f205021155a05e
+  metadata.gz: fffd57a26f941018cb692adb873071164c7a7df8f00811da59e1701f273279edd42072ee210be137338bf7e56fc7bf0631bca726918dc17ab29356fab8ef335d
+  data.tar.gz: 9588c1c6d5c29df1dea602ad9a66667705d5010bc2e15f27526c08ac495ff908e4cd4204ab37697d24dad832d2ac75799acec104e15b86d49ae5973c7de52968

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2014 hosim <github.hosim@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # Configue
 Configue is a configuration / settings solution that uses YAML files.
-It is almost a fork of SettingsLogic.
+It is almost a fork of [SettingsLogic](https://github.com/binarylogic/settingslogic).
 Configue can read multiple YAML files and you can use big configuration data
 simply.
 
@@ -20,30 +20,28 @@ end
 ### Write your settings in YAML file
 ```yaml
 # config/accounts/admin_users.yml
-config:
-  accounts:
-    admin_users:
-      - grumpy
-      - sneezy
+accounts:
+  admin_users:
+    - grumpy
+    - sneezy
 ```
 
 You can make multiple settings files.
 
 ```yaml
 # config/accounts/test_users.yml
-config:
-  accounts:
-    test_users:
-      - sleepy
-      - dopey
+accounts:
+  test_users:
+    - sleepy
+    - dopey
 ```
 
 ### Access your settings
 ```
->> MyConf.config.accounts.admin_users
+>> MyConf.accounts.admin_users
 => ["grumpy", "sneezy"]
 
->> MyConf.config.accounts.test_users
+>> MyConf.accounts.test_users
 => ["sleepy", "dopey"]
 ```
 
@@ -81,7 +79,9 @@ test:
       - foo
       - woo
 ```
+
 and define a class for the settings
+
 ```ruby
 class MyConf < Configue::Container
   config.source_dir "#{File.dirname(__FILE__)}/config/settings"
@@ -89,7 +89,9 @@ class MyConf < Configue::Container
   config.namespace :test
 end
 ```
+
 you can access it in the following manner:
+
 ```
 >> MyConf.foo.baa
 => ["boo", "foo", "woo"]

data/configue.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
-  s.version       = "0.1.1"
+  s.version       = "0.1.2"
   s.license       = "MIT" 
 
   s.add_development_dependency 'rspec'

data/lib/configue.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 require "configue/setting"
+require "configue/node"
 require "configue/container"
-require "configue/inner_hash"
 

data/lib/configue/container.rb

@@ -1,33 +1,75 @@
 # coding: utf-8
 
-require "forwardable"
+require "configue/container_adapter"
 require "configue/criteria"
 
 module Configue
-  class Container
-    extend Forwardable
-
-    def_delegators :@node, :keys, :key?, :has_key?, :[]
-
-    def initialize(hash)
-      @node = hash
-    end
+  # +Configue::Container+ is a setting solution using a YAML file.
+  #
+  # When you have such configuration files:
+  #
+  #    # config/accounts/admin_users.yml
+  #    accounts:
+  #      admin_users:
+  #        - grumpy
+  #        - sneezy
+  #
+  #    # config/accounts/test_users.yml
+  #    accounts:
+  #      test_users:
+  #        - sleepy
+  #        - dopey
+  #
+  # this could be:
+  #
+  #    class Foo < Configue::Container
+  #      config.source_dir "#{File.dirname(__FILE__)}/config"
+  #    end
+  #
+  #    Foo.accounts.admin_users
+  #    # => ["grumpy", "sneezy"]
+  #
+  #    Foo.accounts.test_users
+  #    # => ["sleepy", "dopey"]
+  #
+  class Container < Node
 
+    # When you do not know the setting has keys that you want to
+    # specify and want to avoid +NoMethodError+, you could use
+    # +query+ and +retrieve+.
+    #
+    #   Foo.query("accounts.admin_users").retrieve
+    #   # => ["grumpy", "sneezy"]
+    #
+    #   Foo.query("users.admin_users").retrieve
+    #   # => nil
+    #
+    #   Foo.query[:accounts][:admin_users].retrieve
+    #   # => ["grumpy", "sneezy"]
+    #
     def query(key=nil)
-      q = Criteria.new(@node)
+      q = Criteria.new(self)
       q = key.split('.').each.inject(q) {|c, k| c[k] } if key
       q
     end
 
     class << self
+      # +config+ allows you to access the object for setting container.
       def config
-        @setting ||= Setting.new(self)
+        @config_access_name = "config"
+        @setting ||= Setting.new(ContainerAdapter.new(self))
+      end
+
+      def config_setting
+        @config_access_name = "config_setting"
+        @setting ||= Setting.new(ContainerAdapter.new(self))
       end
-      alias_method :config_setting, :config
 
       private
       def method_missing(name, *args, &block)
-        @instance ||= new(@setting.load_source)
+        # makes @instance in this line.
+        @setting.load!
+
         if @instance.key?(name)
           @instance[name]
         else

data/lib/configue/container_adapter.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+module Configue
+  class ContainerAdapter
+    def initialize(container_class)
+      @class = container_class
+    end
+
+    def new_container(hash)
+      self.instance = @class.new(hash)
+    end
+
+    def instance
+      @class.instance_variable_get(:@instance)
+    end
+
+    def instance=(arg)
+      raise TypeError unless arg.respond_to?(:[]) or arg.respond_to?(:keys)
+
+      @class.instance_variable_set(:@instance, arg)
+      sig = class << @class; self; end
+      arg.keys.each do |k|
+        next unless k.to_s =~ /\A\w[\w0-9]*\z/
+        sig.__send__(:define_method, k, -> { arg[k] })
+      end
+      arg
+    end
+
+    def config_method_name
+      @class.instance_variable_get(:@config_access_name)
+    end
+  end
+end

data/lib/configue/criteria.rb

@@ -13,14 +13,14 @@ module Configue
 
     def retrieve
       @path.each.inject(@hash) do |h, key|
-        return nil unless h.is_a?(Hash) and h.has_key?(key)
+        return nil unless h.respond_to?(:has_key?) and h.has_key?(key)
         h[key]
       end
     end
 
     def exist?
       @path.each.inject(@hash) do |h, key|
-        return false unless h.is_a?(Hash) and h.has_key?(key)
+        return false unless h.respond_to?(:has_key?) and h.has_key?(key)
         h[key]
       end
       true

data/lib/configue/merger.rb

@@ -0,0 +1,22 @@
+# coding: utf-8
+
+module Configue
+  module Merger
+    def merge(hash1, hash2)
+      return hash2 unless hash1
+      return hash1 unless hash2
+
+      merger = ->(key, h1, h2) {
+        if h1.is_a?(Hash) and h2.is_a?(Hash)
+          h1.merge(h2, &merger)
+        else
+          h2
+        end
+      }
+
+      hash1.merge(hash2, &merger)
+    end
+
+    module_function :merge
+  end
+end

data/lib/configue/node.rb

@@ -0,0 +1,48 @@
+# coding: utf-8
+
+module Configue
+  class Node
+    def initialize(hash)
+      raise TypeError unless hash.respond_to?(:[])
+
+      sig = class << self; self; end
+      @hash = hash.each.inject({}) do |h, (k, v)|
+        sig.__send__(:define_method, k, ->{ self[k] })
+        h[k.to_s] = v; h
+      end
+      self
+    end
+
+    def [](key)
+      k = key.to_s
+      v = @hash[k]
+      @hash[k] = self.class.new(v) if v.is_a?(Hash)
+      @hash[k]
+    end
+
+    def fetch(key)
+      k = key.to_s
+      v = @hash[key]
+      @hash[k] = self.class.new(v) if v.is_a?(Hash)
+      @hash.fetch(k)
+    end
+
+    def key?(key)
+      k = key.to_s
+      @hash.key?(k)
+    end
+    alias_method :has_key?, :key?
+
+    def keys
+      @hash.keys
+    end
+
+    def to_hash
+      @hash.dup
+    end
+
+    def to_s
+      @hash.to_s
+    end
+  end
+end

data/lib/configue/setting.rb

@@ -1,11 +1,13 @@
 # coding: utf-8
 
+require "configue/merger"
+require "configue/source_loader"
 require "configue/yaml_loader"
 
 module Configue
   class Setting
     def initialize(owner_class)
-      @owner_class = owner_class
+      @owner = owner_class
       @loader = YamlLoader.new
     end
 
@@ -28,9 +30,9 @@ module Configue
     end
 
     def source_dir(*dirs)
-      @source_dirs ||= []
-      @source_dirs += dirs unless dirs.empty?
-      @source_dirs
+      @sources ||= []
+      @sources += dirs.map {|d| {dir: d}} unless dirs.empty?
+      @sources
     end
 
     def source_dir=(dir)
@@ -41,42 +43,43 @@ module Configue
       end
     end
 
-    def load_source
-      hash = load_sources
+    def source_file(*files)
+      @sources ||= []
+      @sources += files.map {|f| {file: f}} unless files.empty?
+      @sources
+    end
 
-      space = namespace.to_s
-      unless space.empty?
-        base = base_namespace.to_s
-        result = InnerHash.new
-        result.deep_merge!(hash[base]) if base_namespace
-        result.deep_merge!(hash[space]) if hash[space]
-        hash = result
-      end
-      hash
+    def load!
+      @owner.instance ? @owner.instance : @owner.new_container(load_sources)
     end
 
     private
     def load_sources
-      @source_dirs.each.inject(InnerHash.new) do |root, dir|
-        Dir.glob("#{dir}/**/*.#{@loader.extention}") do |path|
-          source = @loader.load(path)
-          if namespace and source[namespace.to_s]
-            namespaced_hash(root, source)
-          else
-            root.deep_merge!(source)
-          end
-        end
-        root
-      end
+      loader = SourceLoader.new(@loader, @sources, @namespace, @base_namespace)
+      hash = loader.load
+      hash = namespaced_hash(hash) if namespace
+      hash
     end
 
-    def namespaced_hash(root, hash)
-      base = base_namespace.to_s
+    def namespaced_hash(hash)
       space = namespace.to_s
+      base = base_namespace.to_s
+      result = {}
+      result = Merger.merge(result, hash[base]) if base_namespace
+      result = Merger.merge(result, hash[space]) if hash.key?(space)
+      result
+    end
 
-      root.deep_merge!(base => hash[base]) if ! base.empty? and hash[base]
-      root.deep_merge!(space => hash[space])
-      root
+    def method_missing(name, *args, &block)
+      access_name = @owner.config_method_name
+      return super unless access_name
+
+      instance = self.load!
+      if instance[access_name]
+        instance[access_name].__send__(name, *args, &block)
+      else
+        super
+      end
     end
   end
 end

data/lib/configue/source_loader.rb

@@ -0,0 +1,44 @@
+# coding: utf-8
+
+require "configue/merger"
+
+module Configue
+  class SourceLoader
+    def initialize(loader, sources, namespace=nil, base_namespace=nil)
+      @loader = loader
+      @sources = sources
+      @namespace = namespace.to_s if namespace
+      @basespace = base_namespace.to_s if base_namespace
+    end
+
+    def load
+      @sources.each do |src|
+        src.each {|k, v| __send__("load_#{k}", v) }
+      end
+      @hash
+    end
+
+    protected
+    def load_dir(dir)
+      Dir.glob("#{dir}/**/*.#{@loader.extention}") do |file|
+        load_file(file)
+      end
+    end
+
+    def load_file(file)
+      source = @loader.load(file)
+      if @namespace and source[@namespace]
+        namespaced_hash(source)
+      else
+        @hash = Merger.merge(@hash, source)
+      end
+    end
+
+    def namespaced_hash(hash)
+      if @basespace and hash.key?(@basespace)
+        @hash = Merger.merge(@hash, @basespace => hash[@basespace])
+      end
+      @hash = Merger.merge(@hash, @namespace => hash[@namespace])
+    end
+  end
+end

data/spec/{configue/basic_spec.rb → basic_spec.rb}

@@ -1,9 +1,9 @@
 # coding: utf-8
-require File.expand_path("../../spec_helper", __FILE__)
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Configue::Container" do
   context "when reading a single yaml file" do
-    require "#{File.dirname(__FILE__)}/../single_yaml_conf"
+    require File.expand_path("../samples/single_yaml_conf", __FILE__)
 
     context "1st level" do
       it_should_behave_like "an InnerHash instance",
@@ -22,7 +22,7 @@ describe "Configue::Container" do
   end
 
   context "when reading multiple yaml files" do
-    require "#{File.dirname(__FILE__)}/../multiple_yaml_conf"
+    require File.expand_path("../samples/multiple_yaml_conf", __FILE__)
 
     context "1st level" do
       it_should_behave_like "an InnerHash instance",
@@ -46,4 +46,20 @@ describe "Configue::Container" do
         {"ding" => ["dong", "dang"], "tick" => ["tack", "toe"]}
     end
   end
+
+  context "when reading a single yaml with source_file" do
+    require File.expand_path("../samples/single_source_conf", __FILE__)
+
+    context "1st level" do
+      it_should_behave_like "an InnerHash instance",
+        SingleSourceConf,
+        {"config" => ["accounts"]}
+    end
+
+    context "2nd level" do
+      it_should_behave_like "an InnerHash instance",
+        SingleSourceConf["config"],
+        {"accounts" => ["admin_users"]}
+    end
+  end
 end

data/spec/config_spec.rb

@@ -0,0 +1,20 @@
+# coding: utf-8
+require File.expand_path("../spec_helper", __FILE__)
+
+describe "Configue::Container" do
+  context "when a top key is 'config' in the setting files" do
+    require File.expand_path("../samples/config_conf", __FILE__)
+
+    context "1st level" do
+      it_should_behave_like "an InnerHash instance",
+        ConfigConf,
+        {"config" => ["accounts"]}
+    end
+
+    context "2nd level" do
+      it_should_behave_like "an InnerHash instance",
+        ConfigConf["config"],
+        {"accounts" => ["admin_users", "test_users"]}
+    end
+  end
+end

data/spec/configue/merger_spec.rb

@@ -0,0 +1,114 @@
+# coding: utf-8
+require File.expand_path("../../spec_helper", __FILE__)
+
+describe Configue::Merger do
+  describe ".merge" do
+    context "when merging a hash with another hash" do
+      let(:former) do
+        {
+          a: {
+            aa: {
+              aaa: 1,
+              aab: 2,
+            },
+            ab: {
+              aba: 1,
+              abb: 2,
+            },
+          },
+        }
+      end
+
+      let(:latter) do
+        {
+          a: {
+            aa: {
+              aac: 3,
+            },
+            ab: {
+              abc: 3,
+            },
+          },
+          b: {
+            ba: {
+              baa: 1,
+            },
+          },
+        }
+      end
+
+      let(:expected) do
+        {
+          a: {
+            aa: {
+              aaa: 1,
+              aab: 2,
+              aac: 3,
+            },
+            ab: {
+              aba: 1,
+              abb: 2,
+              abc: 3,
+            },
+          },
+          b: {
+            ba: {
+              baa: 1,
+            },
+          },
+        }
+      end
+
+      it "returns a merged hash" do
+        actual = Configue::Merger.merge(former, latter)
+        expect(actual).to eq expected
+      end
+    end
+
+    context "when the latter is nil" do
+      let(:former) do
+        {
+          a: {
+            aa: 1,
+          },
+        }
+      end
+
+      let(:expected) do
+        {
+          a: {
+            aa: 1,
+          },
+        }
+      end
+
+      it "returns the former hash remaining without change" do
+        actual = Configue::Merger.merge(former, nil)
+        expect(actual).to eq expected
+      end
+    end
+
+    context "when the former is nil" do
+      let(:latter) do
+        {
+          a: {
+            aa: 9,
+          },
+        }
+      end
+
+      let(:expected) do
+        {
+          a: {
+            aa: 9,
+          },
+        }
+      end
+
+      it "returns the latter remaining without change" do
+        actual = Configue::Merger.merge(nil, latter)
+        expect(actual).to eq expected
+      end
+    end
+  end
+end

data/spec/{configue/namespace_spec.rb → namespace_spec.rb}

@@ -1,9 +1,9 @@
 # coding: utf-8
-require File.expand_path("../../spec_helper", __FILE__)
+require File.expand_path("../spec_helper", __FILE__)
 
 describe "Configue::Container" do
   context "when specifing 'namespace'" do
-    require "#{File.dirname(__FILE__)}/../namespace_conf"
+    require File.expand_path("../samples/namespace_conf", __FILE__)
 
     context "1st level" do
       it_should_behave_like "an InnerHash instance",
@@ -25,7 +25,7 @@ describe "Configue::Container" do
   end
 
   context "when specifing 'namespace' and 'base_namespace'" do
-    require "#{File.dirname(__FILE__)}/../base_namespace_conf"
+    require File.expand_path("../samples/base_namespace_conf", __FILE__)
 
     context "1st level" do
       it_should_behave_like "an InnerHash instance",

data/spec/samples/config/admin.yml

@@ -0,0 +1,6 @@
+config:
+  accounts:
+    admin_users:
+      - grumpy
+      - sneezy
+

data/spec/samples/config/test.yml

@@ -0,0 +1,6 @@
+config:
+  accounts:
+    test_users:
+      - sleepy
+      - dopey
+

data/spec/samples/config_conf.rb

@@ -0,0 +1,6 @@
+# coding: utf-8
+
+class ConfigConf < Configue::Container
+  config.source_dir "#{File.dirname(__FILE__)}/config"
+  config.load!
+end

data/spec/samples/signs/config.yml

@@ -0,0 +1,4 @@
+"a top key with some spaces":
+  "a key with some spaces": OK
+"!@#$%^&*()_+":
+  "+_)(*&^%$#@!": OK

data/spec/samples/signs_conf.rb

@@ -0,0 +1,5 @@
+# coding: utf-8
+
+class SignsConf < Configue::Container
+  config.source_dir "#{File.dirname(__FILE__)}/signs"
+end

data/spec/samples/single_source_conf.rb

@@ -0,0 +1,7 @@
+# coding: utf-8
+require "configue"
+
+class SingleSourceConf < Configue::Container
+  config.source_file "#{File.dirname(__FILE__)}/config/admin.yml"
+  config.load!
+end

data/spec/signs_spec.rb

@@ -0,0 +1,51 @@
+# coding: utf-8
+require File.expand_path("../spec_helper", __FILE__)
+
+describe "Configue::Container" do
+  context "when reading a yaml file with keys included signs" do
+    require File.expand_path("../samples/signs_conf", __FILE__)
+
+    context "1st level" do
+      describe ".keys" do
+        it "returns keys described in the setting file" do
+          actual = SignsConf.keys
+          expect(actual).to match_array(["a top key with some spaces", "!@#$%^&*()_+"])
+        end
+      end
+
+      describe ".[]" do
+        it "returns a value associated with the parameter" do
+          actual = SignsConf["a top key with some spaces"].to_hash
+          expected = {"a key with some spaces" => "OK"}
+          expect(actual).to eq expected
+
+          actual = SignsConf["!@#$%^&*()_+"].to_hash
+          expected = {"+_)(*&^%$#@!" => "OK"}
+          expect(actual).to eq expected
+        end
+      end
+    end
+
+    context "2nd level" do
+      describe ".keys" do
+        it "returns keys described in the setting file" do
+          actual = SignsConf["a top key with some spaces"].keys
+          expect(actual).to match_array(["a key with some spaces"])
+
+          actual = SignsConf["!@#$%^&*()_+"].keys
+          expect(actual).to match_array(["+_)(*&^%$#@!"])
+        end
+      end
+
+      describe ".[]" do
+        it "returns a value associated with the parameter" do
+          actual = SignsConf["a top key with some spaces"]["a key with some spaces"]
+          expect(actual).to eq "OK"
+
+          actual = SignsConf["!@#$%^&*()_+"]["+_)(*&^%$#@!"]
+          expect(actual).to eq "OK"
+        end
+      end
+    end
+  end
+end

data/spec/support/inner_hash.rb

@@ -39,7 +39,7 @@ shared_examples_for "an InnerHash instance" do |object, hash|
     context "when specifing the existing key names" do
       it "returns a Hash value" do
         hash.each do |key, value|
-          expect(object[key]).to be_a(Hash) if value
+          expect(object[key]).to be_a(Configue::Node) if value
         end
       end
 
@@ -55,7 +55,7 @@ shared_examples_for "an InnerHash instance" do |object, hash|
     context "when specifing the existing key names in symbol" do
       it "returns a Hash value" do
         hash.each do |key, value|
-          expect(object[key.to_sym]).to be_a(Hash) if value
+          expect(object[key.to_sym]).to be_a(Configue::Node) if value
         end
       end
 
@@ -73,7 +73,7 @@ shared_examples_for "an InnerHash instance" do |object, hash|
     context "when call methods which names are existing in the setting(s)" do
       it "returns a Hash value" do
         hash.each do |key, value|
-          expect(object.__send__(key)).to be_a(Hash) if value
+          expect(object.__send__(key)).to be_a(Configue::Node) if value
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configue
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - hosim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -32,29 +32,42 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- MIT-LICENSE
 - README.md
 - Rakefile
 - configue.gemspec
 - lib/configue.rb
 - lib/configue/container.rb
+- lib/configue/container_adapter.rb
 - lib/configue/criteria.rb
-- lib/configue/inner_hash.rb
+- lib/configue/merger.rb
+- lib/configue/node.rb
 - lib/configue/setting.rb
+- lib/configue/source_loader.rb
 - lib/configue/yaml_loader.rb
-- spec/base_namespace_conf.rb
-- spec/configue/basic_spec.rb
-- spec/configue/namespace_spec.rb
-- spec/multiple_yaml/foo/baa.yml
-- spec/multiple_yaml/foo/bar/ding.yml
-- spec/multiple_yaml/foo/bar/tick.yml
-- spec/multiple_yaml/foo/pee.yml
-- spec/multiple_yaml_conf.rb
-- spec/namespace/base/pee/kaa/conf.yml
-- spec/namespace/dev/pee/kaa/conf.yml
-- spec/namespace/test/pee/kaa/conf.yml
-- spec/namespace_conf.rb
-- spec/single_yaml/conf.yml
-- spec/single_yaml_conf.rb
+- spec/basic_spec.rb
+- spec/config_spec.rb
+- spec/configue/merger_spec.rb
+- spec/namespace_spec.rb
+- spec/samples/base_namespace_conf.rb
+- spec/samples/config/admin.yml
+- spec/samples/config/test.yml
+- spec/samples/config_conf.rb
+- spec/samples/multiple_yaml/foo/baa.yml
+- spec/samples/multiple_yaml/foo/bar/ding.yml
+- spec/samples/multiple_yaml/foo/bar/tick.yml
+- spec/samples/multiple_yaml/foo/pee.yml
+- spec/samples/multiple_yaml_conf.rb
+- spec/samples/namespace/base/pee/kaa/conf.yml
+- spec/samples/namespace/dev/pee/kaa/conf.yml
+- spec/samples/namespace/test/pee/kaa/conf.yml
+- spec/samples/namespace_conf.rb
+- spec/samples/signs/config.yml
+- spec/samples/signs_conf.rb
+- spec/samples/single_source_conf.rb
+- spec/samples/single_yaml/conf.yml
+- spec/samples/single_yaml_conf.rb
+- spec/signs_spec.rb
 - spec/spec_helper.rb
 - spec/support/inner_hash.rb
 homepage: https://github.com/hosim/configue
@@ -82,19 +95,28 @@ signing_key:
 specification_version: 4
 summary: A simple configuration solution
 test_files:
-- spec/base_namespace_conf.rb
-- spec/configue/basic_spec.rb
-- spec/configue/namespace_spec.rb
-- spec/multiple_yaml/foo/baa.yml
-- spec/multiple_yaml/foo/bar/ding.yml
-- spec/multiple_yaml/foo/bar/tick.yml
-- spec/multiple_yaml/foo/pee.yml
-- spec/multiple_yaml_conf.rb
-- spec/namespace/base/pee/kaa/conf.yml
-- spec/namespace/dev/pee/kaa/conf.yml
-- spec/namespace/test/pee/kaa/conf.yml
-- spec/namespace_conf.rb
-- spec/single_yaml/conf.yml
-- spec/single_yaml_conf.rb
+- spec/basic_spec.rb
+- spec/config_spec.rb
+- spec/configue/merger_spec.rb
+- spec/namespace_spec.rb
+- spec/samples/base_namespace_conf.rb
+- spec/samples/config/admin.yml
+- spec/samples/config/test.yml
+- spec/samples/config_conf.rb
+- spec/samples/multiple_yaml/foo/baa.yml
+- spec/samples/multiple_yaml/foo/bar/ding.yml
+- spec/samples/multiple_yaml/foo/bar/tick.yml
+- spec/samples/multiple_yaml/foo/pee.yml
+- spec/samples/multiple_yaml_conf.rb
+- spec/samples/namespace/base/pee/kaa/conf.yml
+- spec/samples/namespace/dev/pee/kaa/conf.yml
+- spec/samples/namespace/test/pee/kaa/conf.yml
+- spec/samples/namespace_conf.rb
+- spec/samples/signs/config.yml
+- spec/samples/signs_conf.rb
+- spec/samples/single_source_conf.rb
+- spec/samples/single_yaml/conf.yml
+- spec/samples/single_yaml_conf.rb
+- spec/signs_spec.rb
 - spec/spec_helper.rb
 - spec/support/inner_hash.rb

data/lib/configue/inner_hash.rb

@@ -1,53 +0,0 @@
-# coding: utf-8
-
-module Configue
-  class InnerHash < Hash
-    def initialize(source_hash=nil)
-      deep_merge!(source_hash) if source_hash
-    end
-
-    def deep_merge!(other)
-      deep_update(other)
-
-      sig = class << self; self; end
-      other.keys.each do |k|
-        sig.__send__(:define_method, k, ->{ self[k] })
-      end
-      self
-    end
-
-    def fetch(key, *args); super(key.to_s, *args); end
-    def delete(key); super(key.to_s); end
-    def key?(key); super(key.to_s); end
-    alias_method :has_key?, :key?
-
-    alias_method :_get_value, :[]
-    alias_method :_set_value, :[]=
-    private :_get_value
-    private :_set_value
-
-    def [](key)
-      value = _get_value(key.to_s)
-      value = self.class.new(value) if value.is_a? Hash
-      yield value if block_given?
-      value
-    end
-
-    def []=(key, value)
-      v = value
-      v = self.class.new(v) if v.is_a? Hash
-      _set_value(key.to_s, v)
-    end
-
-    protected
-    def deep_update(other_hash, &b)
-      other_hash.each do |k, v|
-        if v.is_a?(Hash)
-          v = self.key?(k) ? self[k].deep_update(v) : self.class.new(v)
-        end
-        self[k] = v
-      end
-      self
-    end
-  end
-end