hashr 0.0.1 → 0.0.2

data/lib/hashr.rb

@@ -14,7 +14,8 @@ class Hashr < Hash
   end
 
   def initialize(data = {})
-    replace(deep_includize(deep_hasherize(deep_merge(self.class.definition, data))))
+    include_modules(data.delete(:_include)) if data
+    replace(deep_hasherize(deep_merge(self.class.definition, data)))
   end
 
   def []=(key, value)
@@ -38,6 +39,14 @@ class Hashr < Hash
 
   protected
 
+    def include_modules(modules)
+      Array(modules).each { |mod| meta_class.send(:include, mod) } if modules
+    end
+
+    def meta_class
+      class << self; self end
+    end
+
     def deep_merge(left, right)
       merger = proc { |key, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? self.class.new(v1.merge(v2, &merger)) : v2 }
       left.merge(right || {}, &merger)
@@ -45,17 +54,9 @@ class Hashr < Hash
 
     def deep_hasherize(hash)
       hash.inject(TEMPLATE.dup) do |result, (key, value)|
-        result.merge(key.to_sym => value.is_a?(Hash) ? deep_hasherize(value) : value)
-      end
-    end
-
-    def deep_includize(hash)
-      if modules = hash.delete(:_include)
-        meta_class = (class << hash; self end)
-        Array(modules).each { |mod| meta_class.send(:include, mod) }
-      end
-      hash.inject(hash) do |hash, (key, value)|
-        hash.merge(key => value.is_a?(Hash) ? deep_includize(value) : value)
+        result[key.to_sym] = value.is_a?(Hash) ? deep_hasherize(value) : value
+        result
       end
     end
 end
+

data/lib/hashr/version.rb

@@ -1,3 +1,3 @@
 class Hashr < Hash
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &2165879540 !ruby/object:Gem::Requirement
+  requirement: &2165867020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *2165879540
+  version_requirements: *2165867020
 description: Simple Hash extension targetted at configuration.
 email: svenfuchs@artweb-design.de
 executables: []