confrider 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confrider (0.1.0)
+    confrider (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/confrider.rb

@@ -1,6 +1,5 @@
 require 'confrider/version'
-# don't load confrider/deep_merge if it was already loaded from active_support
-require 'confrider/deep_merge' unless {}.respond_to? :deep_merge
+require 'confrider/vault'
 require 'confrider/core'
 
 module Confrider

data/lib/confrider/core.rb

@@ -1,37 +1,39 @@
-class Confrider::Core
-  def initialize
-    @vault = {}
-  end
-
-  def [](key, default_value = nil)
-    @vault.fetch(key, default_value)
-  end
+module Confrider
+  class Core
+    def initialize
+      @vault = Confrider::Vault.new
+    end
 
-  def from_hash(hash)
-    save_hash(nil, hash)
-  end
+    def [](key, default_value = nil)
+      @vault.fetch(key, default_value)
+    end
 
-  def normalize_keys(*keys)
-    keys.join('.').gsub(/^\./, '')
-  end
+    def from_hash(hash)
+      save_hash(nil, hash)
+    end
 
-  private
+    def normalize_keys(*keys)
+      keys.join('.').gsub(/^\./, '')
+    end
 
-  def save(key, value)
-    @vault[key] = value
-  end
+    private
 
-  def save_hash(key, hash)
-    if key
-      @vault[key] ||= {}
-      @vault[key].deep_merge!(hash)
+    def save(key, value)
+      @vault[key] = value
     end
-    hash.each do |inner_key, value|
-      normalized_key = normalize_keys(key, inner_key)
-      if value.is_a? Hash
-        save_hash(normalized_key, value)
-      else
-        save(normalized_key, value)
+
+    def save_hash(key, hash)
+      if key
+        @vault[key] ||= Confrider::Vault.new
+        @vault[key].deep_merge!(hash)
+      end
+      hash.each do |inner_key, value|
+        normalized_key = normalize_keys(key, inner_key)
+        if value.is_a? Hash
+          save_hash(normalized_key, value)
+        else
+          save(normalized_key, value)
+        end
       end
     end
   end

data/lib/confrider/vault.rb

@@ -0,0 +1,18 @@
+module Confrider
+  class Vault < Hash
+    # from active_support/core_ext/hash/deep_merge
+    def deep_merge(other_hash)
+      dup.deep_merge!(other_hash)
+    end
+
+    # Returns a new hash with +self+ and +other_hash+ merged recursively.
+    # Modifies the receiver in place.
+    def deep_merge!(other_hash)
+      other_hash.each_pair do |k,v|
+        tv = self[k]
+        self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? self.class.new(tv).deep_merge(v) : v
+      end
+      self
+    end
+  end
+end

data/lib/confrider/version.rb

@@ -1,3 +1,3 @@
 module Confrider
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confrider
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,7 +61,7 @@ files:
 - confrider.gemspec
 - lib/confrider.rb
 - lib/confrider/core.rb
-- lib/confrider/deep_merge.rb
+- lib/confrider/vault.rb
 - lib/confrider/version.rb
 - spec/lib/confrider/core_spec.rb
 - spec/lib/confrider/version_spec.rb
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2987699669290260824
+      hash: -2114950261282892609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,10 +90,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2987699669290260824
+      hash: -2114950261282892609
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: manage config options like i18n

data/lib/confrider/deep_merge.rb

@@ -1,18 +0,0 @@
-# ported from active_support/core_ext/hash/deep_merge
-
-class Hash
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  def deep_merge(other_hash)
-    dup.deep_merge!(other_hash)
-  end
-
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  # Modifies the receiver in place.
-  def deep_merge!(other_hash)
-    other_hash.each_pair do |k,v|
-      tv = self[k]
-      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
-    end
-    self
-  end
-end