config_plus 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599e3bd010d176091ffe984b74c85369558386fe
-  data.tar.gz: b558ba580faf0701f777d0003c3757a113c84ac1
+  metadata.gz: 93199817135b965a48712d1c659c03c93f6cd27b
+  data.tar.gz: b6f9ddced4e4e05a876b4d78aafa6552b5589b2e
 SHA512:
-  metadata.gz: 121668b57e69c4119f6a3e267f88215f12c779983d7712b2980e11cfafc18bc32b2af02177a03f6e485b1aba8456f4b2263c1a66ac9f9f26772fffb9e8bb0177
-  data.tar.gz: 66ca9d59b7b6db91ba7c57f75904071af8fd584f20c80b8342fba905bbeb5febacf304f169122ef3aa49609ce7db4fd2574f8ea951ff74a2d9ff62dceef59fcb
+  metadata.gz: 49e59f9dc8bd1b3a5cd5d3ba14cc07eba8a3e38154d71198a37f95f7a3744a1e8cb874f93bd39c68e47f20f4fa776789290aff56486380d31694385b836ab1fe
+  data.tar.gz: 594a37efbd171daf932e102f021abde34b221a31ddcf5b6b5baf6cc70a58298a76d52edbcd0b635aecf187eeb810bb5e8b26d50649d4bbb0479ec4c6b634cfaa

data/lib/config_plus/base.rb

@@ -4,17 +4,16 @@ module ConfigPlus
 
     # Sets up configuration of ++ConfigPlus++ and loads data
     #
-    # When a YAML file path is specified with
-    # ++source++ (or ++root_dir++) setting as below,
-    # configuration data would be loaded from the file.
+    # Set a YAML file path to ++source++ property and you can
+    # access its data with ++ConfigPlus.root++.
     #
     #  ConfigPlus.configure do |conf|
     #    conf.source = '/path/to/yaml/file.yml'
     #  end
     #
-    # When a directory path is specified, configuration
-    # would be loaded from all YAML files under the
-    # specified directory.
+    # When you set a directory path to ++source++,
+    # you get configuration data that is merged every contents
+    # of YAML files under the directory you specify.
     #
     def configure
       yield config if block_given?
@@ -37,48 +36,50 @@ module ConfigPlus
       load
     end
 
+    def included(base)
+      method_name = self.config.config_method
+      return unless method_name
+      own = self::Helper.config_for(base, self.root)
+      inheritance = inherited_config_of(base)
+
+      [base, base.singleton_class].each do |obj|
+        obj.instance_eval do
+          config = inheritance ?
+            ::ConfigPlus::Merger.merge(inheritance, own || {}) : own
+          config = ::ConfigPlus::Node.new(config)
+          define_method method_name, -> { config }
+        end
+      end
+    end
+
     protected
 
     def config
-      @config ||= ::ConfigPlus::Config.new
+      @config ||= self::Config.new
     end
 
     private
 
-    # loads a configuration data as a hash object
+    # Loads a configuration data as a hash object
     # from files specified with ++source++ or 
     # ++root_dir++ settings.
     #
     def load
       hash = config.loader.load
-      @root = ::ConfigPlus::Node.new(hash)
+      @root = self::Node.new(hash)
     end
-  end
-
-  def self.included(base)
-    method_name = self.config.config_method
-    return unless method_name
-    variable_name = "@#{method_name}"
-    helper = ::ConfigPlus::Helper
-    own = helper.config_for(base, ::ConfigPlus.root)
 
-    inheritance = base.ancestors.select {|klass|
-      klass != base and
-      klass != ConfigPlus and
-      klass.ancestors.include?(ConfigPlus)
-    }.reverse.each.inject({}) {|hsh, klass|
-      h = klass.public_send(method_name)
-      h = helper.config_for(klass, ::ConfigPlus.root) unless
-        h or h.is_a?(Hash)
-      Merger.merge(hsh, h)
-    }
-
-    [base, base.singleton_class].each do |obj|
-      obj.instance_eval do
-        config = inheritance ? inheritance.merge(own || {}) : own
-        config = ::ConfigPlus::Node.new(config)
-        define_method method_name, -> { config }
-      end
+    def inherited_config_of(klass)
+      klass.ancestors.select {|clazz|
+        clazz != klass and
+        clazz != self and
+        clazz.ancestors.include?(self)
+      }.reverse.each.inject({}) {|hsh, clazz|
+        h = clazz.public_send(self.config.config_method)
+        h = self::Helper.config_for(clazz, self.root) unless
+          h or h.is_a?(Hash)
+        self::Merger.merge(hsh, h)
+      }
     end
   end
 end

data/lib/config_plus/version.rb

@@ -1,3 +1,3 @@
 module ConfigPlus
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - m4oda