gaston 0.0.1 → 0.0.2

data/lib/gaston.rb

@@ -6,6 +6,7 @@ class Gaston
   include Singleton
   require 'gaston/configuration'
   require 'gaston/store'
+  require 'gaston/parse'
 
   # Parse yml config files, merge them, and store into
   # gaston::Store
@@ -13,14 +14,15 @@ class Gaston
   # @since 0.0.1
   #
   def store
-    @store ||= Gaston::Store.new (files.inject({}) {|hash, config|
-      parse = YAML.load_file(config)[env]
-      hash.merge(parse) if parse
-    })
+    @store ||= Gaston::Store.new(hash_from_files)
   end
 
   class << self
 
+    # Access to Gaston::Store.
+    #
+    # @since 0.0.1
+    #
     def retrieve
       self.instance.store
     end
@@ -62,4 +64,14 @@ class Gaston
     Gaston::Configuration.env.to_sym
   end
 
+  # Return one merged hash from yaml config files.
+  #
+  # @return [ Hash ]
+  #
+  # @since 0.0.2
+  #
+  def hash_from_files
+    @hash_from_files ||= Gaston::Parse.new(files, env).to_hash
+  end
+
 end # Gaston

data/lib/gaston/parse.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+class Gaston
+  class Parse
+
+    # Initialize Parsing.
+    #
+    # @param [ Array ] List of yaml files.
+    # @param [ Symbol ] Environment.
+    #
+    # @since 0.0.2
+    #
+    def initialize(files, env)
+      @env = env
+      @hash = files.inject({}) do |hash, file|
+        @parse = YAML.load_file(file) || {}
+        hash.merge(deep_merge_hash(default_values, env_values))
+      end
+    end
+
+    # @return [ Hash ]
+    #
+    # @since 0.0.2
+    #
+    def to_hash
+      @hash
+    end
+
+    private
+
+    # Default values from yaml.
+    #
+    # @return [ Hash ]
+    #
+    # @since 0.0.2
+    #
+    def default_values
+      @parse[:gaston] || {}
+    end
+
+    # Env values from hash.
+    #
+    # @return [ Hash ]
+    #
+    # @since 0.0.2
+    #
+    def env_values
+      @parse[@env] || {}
+    end
+
+    # Deep merge on hash.
+    #
+    # First hash will receive merge from second hash.
+    #
+    # @param [ Hash ]
+    # @param [ Hash ]
+    #
+    # @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])
+        else
+          hash1[k1] = hash2[k1]
+        end
+      end
+      hash1
+    end
+  end
+end

data/lib/gaston/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaston
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20411480 !ruby/object:Gem::Requirement
+  requirement: &17328900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +21,7 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *20411480
+  version_requirements: *17328900
 description: ! '[Dead simple Ruby config store.]'
 email: jboyer@af83.com
 executables: []
@@ -31,9 +30,9 @@ extra_rdoc_files: []
 files:
 - lib/gaston.rb
 - lib/gaston/configuration.rb
+- lib/gaston/parse.rb
 - lib/gaston/store.rb
 - lib/gaston/version.rb
-has_rdoc: true
 homepage: https://github.com/chatgris/gaston
 licenses: []
 post_install_message: 
@@ -54,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ! '[Dead simple Ruby config store.]'