angry_hash 0.2.1 → 0.2.2

data/Changelog.md

@@ -1,3 +1,15 @@
+## 0.2.2
+
+Changes:
+  - `#to_normal_hash` can now return a hash with symbol keys. The default is still to use string keys as is default within `AngryHash`.
+
+## 0.2.1
+
+Changes:
+
+  - In `#merge` & friends `other` hash is now converted to an AngryHash before conversion.
+    This ensures subhashes in `other` but not `this` end up as AngryHashes in `this` after merging.
+
 ## 0.2.0
 
 Features:

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/angry_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{angry_hash}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lachie Cox"]
-  s.date = %q{2010-08-28}
+  s.date = %q{2010-08-30}
   s.description = %q{A stabler mash with different emphases. Used in plus2 projects AngryMob and Igor.}
   s.email = %q{lachie@plus2.com.au}
   s.extra_rdoc_files = [
@@ -41,7 +41,8 @@ Gem::Specification.new do |s|
      "examples/dup_eg.rb",
      "examples/eg_helper.rb",
      "examples/extension_tracking.rb",
-     "examples/merge_eg.rb"
+     "examples/merge_eg.rb",
+     "examples/normal_hash.eg.rb"
   ]
 
   if s.respond_to? :specification_version then

data/examples/normal_hash.eg.rb

@@ -0,0 +1,11 @@
+require 'eg_helper'
+
+eg 'to normal hash' do
+  ah = AngryHash[:a => 1, :b => {:c => :d}]
+  Assert( ah.to_normal_hash == {'a' => 1, 'b' => {'c' => :d}} )
+end
+
+eg 'to normal hash with symbol keys' do
+  ah = AngryHash[:a => 1, :b => {'c' => :d}]
+  Assert( ah.to_normal_hash(:symbols) == {:a => 1, :b => {:c => :d}} )
+end

data/lib/angry_hash.rb

@@ -99,24 +99,33 @@ class AngryHash < Hash
     self
   end
 
-  def to_normal_hash
-    __to_hash(self)
+  def to_normal_hash(keys=nil)
+    __to_hash(self,keys)
   end
-  def __to_hash(value,cycle_guard={})
+
+  def __to_hash(value,keys,cycle_guard={})
     return cycle_guard[value.hash] if cycle_guard.key?(value.hash)
 
     case value
     when Hash
       new_hash = cycle_guard[value.hash] = {}
 
-      value.inject(new_hash) do |hash,(k,v)|
-        hash[k] = __to_hash(v,cycle_guard)
-      hash
+      if keys == :symbols
+        # TODO DRY
+        value.inject(new_hash) do |hash,(k,v)|
+          hash[k.to_sym] = __to_hash(v,keys,cycle_guard)
+          hash
+        end
+      else
+        value.inject(new_hash) do |hash,(k,v)|
+          hash[k] = __to_hash(v,keys,cycle_guard)
+          hash
+        end
       end
     when Array
       new_array = cycle_guard[value.hash] = []
 
-      value.each {|v| new_array << __to_hash(v,cycle_guard)}
+      value.each {|v| new_array << __to_hash(v,keys,cycle_guard)}
     else
       value
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Lachie Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +10:00
+date: 2010-08-30 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -79,3 +79,4 @@ test_files:
 - examples/eg_helper.rb
 - examples/extension_tracking.rb
 - examples/merge_eg.rb
+- examples/normal_hash.eg.rb