gaston 0.2.1 → 0.3.0

data/lib/gaston/parse.rb

@@ -16,7 +16,8 @@ class Gaston
       @env = env
       @hash = files.inject({}) do |hash, file|
         parse(file)
-        hash.merge(deep_merge_hash(default_values, env_values))
+        h = deep_merge(hash, default_values)
+        deep_merge(h, env_values)
       end
     end
 
@@ -50,28 +51,30 @@ class Gaston
       @parse[@env] || {}
     end
 
-    # Deep merge on hash.
+    # _why deep merge
     #
-    # First hash will receive merge from second hash.
+    # @return Hash
     #
-    # @param [ Hash ]
-    # @param [ Hash ]
+    # @since 0.2.1
     #
-    # @return [ Hash]
-    #
-    # @since 0.0.2
-    #
-    def deep_merge_hash(hash1,hash2)
-      hash2.each_key do |k1|
-        if hash1.key?(k1) && hash2[k1].is_a?(Hash)
-          deep_merge_hash(hash1[k1],hash2[k1])
+    def deep_merge(store, other)
+      m = proc do |key, o, n|
+        if o.is_a?(Hash)
+          o.merge(n,&m)
         else
-          hash1[k1] = hash2[k1]
+          store[key] = n
         end
       end
-      hash1
+      store.merge(other, &m)
     end
 
+    # Parse yaml or json file.
+    #
+    # @param [ String ]
+    #
+    # @return [ Hash ]
+    #
+    # @since 0.2.0
     def parse(file)
       erb = ERB.new(File.read(file)).result
       if File.extname(file) == '.json'

data/lib/gaston/store.rb

@@ -8,13 +8,12 @@ class Gaston
     #
     # @since 0.0.1
     #
-    def initialize(hash)
-      hash ||= {}
+    def initialize(hash={})
       hash.each do |key, value|
         if hash.respond_to? key
           warn "#{key} method already exists on Hash, value: #{value}"
         else
-          value.is_a?(Hash) ? self[key] = Gaston::Store.new(value) : self[key] = value
+          value.is_a?(Hash) ? self[key] = self.class.new(value) : self[key] = value
         end
       end
     end
@@ -28,7 +27,7 @@ class Gaston
     def method_missing(method, *args, &block)
       return self[method.to_s] if has_key? method.to_s
       return self[method.to_sym] if has_key? method.to_sym
-      super(method, *args, &block)
+      super
     end
 
     # Implement respond_to?
@@ -36,7 +35,7 @@ class Gaston
     # @since 0.0.1
     #
     def respond_to?(method)
-      has_key?(method.to_s) || has_key?(method.to_sym) || super(method)
+      has_key?(method.to_s) || has_key?(method.to_sym) || super
     end
 
   end # Store

data/lib/gaston/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class Gaston
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaston
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec