confparser 0.0.1.1 → 0.0.1.2

data/lib/confparser.rb

@@ -13,26 +13,31 @@
 autoload :StringIO, 'stringio'
 
 class ConfParser < Hash
-  class Section < Hash
-    attr_reader :parent
-
-    def initialize (parent)
-      super()
-      @parent = parent
-    end
+  module Template
+    def self.included (obj)
+      obj.class_eval {
+        attr_reader :parent
+        alias __get__ []
+        private :__get__
 
-    alias __get__ []
-    def [] (name)
-      __get__(name).tap {|x|
-        if x.is_a?(String)
-          x.gsub!(/\$\((.+?)\)/) {|n|
-            (self[$1] || parent[$1]).to_s
+        def [] (name)
+          __get__(name).tap {|x|
+            x.gsub!(/\$\((.+?)\)/) {|n|
+              (self[$1] || parent[$1]).to_s
+            } if x.is_a?(String)
           }
         end
       }
     end
+  end
 
-    private :__get__
+  class Section < Hash
+    include Template
+
+    def initialize (parent)
+      super()
+      @parent = parent
+    end
   end
 
   class << self
@@ -54,8 +59,10 @@ class ConfParser < Hash
     end
   end
 
+  include Template
+
   def initialize (io)
-    section, key, lineno = nil, nil, 0
+    @parent, section, key, lineno = {}, nil, nil, 0
 
     io.each_line {|line|
       lineno += 1
@@ -89,17 +96,4 @@ class ConfParser < Hash
     }
     io.close
   end
-
-  alias __get__ []
-  def [] (name)
-    __get__(name).tap {|x|
-      if x.is_a?(String)
-        x.gsub!(/\$\((.+?)\)/) {|n|
-          (self[$1]).to_s
-        }
-      end
-    }
-  end
-
-    private :__get__
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 1
-  - 1
-  version: 0.0.1.1
+  - 2
+  version: 0.0.1.2
 platform: ruby
 authors: 
 - shura