hash-initializer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c546f1d927cf15383abdc00af089666eadd3a46
-  data.tar.gz: 4393e60dc200c66e63e8580c94e08efa337e2677
+  metadata.gz: 2776e940d986a5716d5de404d7eb06da8eed9200
+  data.tar.gz: 813e2dcf325bb64f6869c070a5b9a4ddf2ae4aa7
 SHA512:
-  metadata.gz: 42f271242154d02fe796a8dc3cdae2ed8002290b3bef329c6afe0773fc0ba3441f30b77663eec00baa0ddf7e5cf63c8bb95635984141b38817cc9ad096225d8f
-  data.tar.gz: d45564b4312c683698e3a8b417773a63c2ac94ae1261fddd62547e68ea22882640d5e4ed032e8a82dded5de07990b32682e0d57eb583cad60836850b8f962696
+  metadata.gz: bb1de11208a0c1445f708a418ae86416119922e6bb07f91501596603ce6962ca55a308727e55c70d43d6392f1914fe691a8e680895e8b1b0af1d5ef27942267b
+  data.tar.gz: 733650fd90f5db9dae7298d2951cbcbd16c7f8fed17a435935eec9a8807fead5bb5c3a0e3ca935643d651663a10d4cc390e9262ec8020edb4d0f4aab208effa9

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/hash-initializer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hash-initializer 0.1.1 ruby lib
+# stub: hash-initializer 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hash-initializer".freeze
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jits".freeze]
-  s.date = "2017-12-11"
+  s.date = "2017-12-12"
   s.description = "I heard you like hashes within your hashes, so I made a thing to initialise hashes within your hashes (and more!)".freeze
   s.email = "nospam@jits.co.uk".freeze
   s.extra_rdoc_files = [

data/lib/hash_initializer.rb

@@ -12,9 +12,8 @@ module HashInitializer
 
     return {} if levels.empty?
 
-    Hash.new do |h,k|
-      h[k] = build_levels(levels)
-    end
+    defaults_proc = build_levels(levels)
+    Hash.new(&defaults_proc)
   end
 
   private
@@ -28,24 +27,17 @@ module HashInitializer
   end
 
   def build_levels levels
-    return Hash.new if levels.one? && levels.first == :hash
-
-    last = build_level(nil, levels.last)
-
-    levels
-      .reverse
-      .drop(1)
-      .reduce(last, &method(:build_level))
-  end
+    return Proc.new { |h,k| h[k] = Hash.new } if levels.one? && levels.first == :hash
 
-  def build_level previous, level
+    level = levels.first
     case level
     when :hash
-      Hash.new { |h,k| h[k] = previous }
+      inner_proc = build_levels(levels.drop(1))
+      Proc.new { |h,k| h[k] = Hash.new(&inner_proc) }
     when :array
-      Array.new
+      Proc.new { |h,k| h[k] = Array.new }
     else
-      level
+      Proc.new { |h,k| h[k] = level }
     end
   end
 

data/spec/hash_initializer_spec.rb

@@ -104,6 +104,28 @@ RSpec.describe HashInitializer do
     end
   end
 
+  context 'Hash with hash values with hash values' do
+    subject do
+      HashInitializer[
+        :hash,
+          :hash
+      ]
+    end
+
+    it 'should initialise a new hash with the expected levels of default values' do
+      expect(subject[:foo][:bar]).to eq Hash.new
+      expect(subject[:foo][:bar][:baz]).to eq nil
+      subject[:foo][:bar][:baz] = 1
+      expect(subject[:foo][:bar][:baz]).to eq 1
+
+      expect(subject[:foo][:bar][:bob]).to eq nil
+
+      expect(subject[:aaa]).to eq Hash.new
+      expect(subject[:aaa][:bar]).to eq Hash.new
+      expect(subject[:aaa][:bar][:baz]).to eq nil
+    end
+  end
+
   context 'Hash with hash values with hash values with default float values' do
     subject do
       HashInitializer[
@@ -119,6 +141,32 @@ RSpec.describe HashInitializer do
       expect(subject[:foo][:bar][:baz]).to eq 2.5
 
       expect(subject[:foo][:bar][:bob]).to eq 1.0
+
+      expect(subject[:aaa]).to eq Hash.new
+      expect(subject[:aaa][:bar]).to eq Hash.new
+      expect(subject[:aaa][:bar][:baz]).to eq 1.0
+    end
+  end
+
+  context 'Hash with hash values with hash values with array values' do
+    subject do
+      HashInitializer[
+        :hash,
+          :hash,
+            :array
+      ]
+    end
+
+    it 'should initialise a new hash with the expected levels of default values' do
+      expect(subject[:foo][:bar][:baz]).to eq []
+      subject[:foo][:bar][:baz] << 'a'
+      expect(subject[:foo][:bar][:baz]).to eq ['a']
+
+      expect(subject[:foo][:bar][:bob]).to eq []
+
+      expect(subject[:aaa]).to eq Hash.new
+      expect(subject[:aaa][:bar]).to eq Hash.new
+      expect(subject[:aaa][:bar][:baz]).to eq []
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash-initializer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jits
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec