angry_hash 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/angry_hash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{angry_hash}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lachie Cox"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-06-02}
   s.description = %q{A stabler mash with different emphases. Used in plus2 projects AngryMob and Igor.}
   s.email = %q{lachie@plus2.com.au}
   s.files = [

data/examples/dup_eg.rb

@@ -66,3 +66,23 @@ eg 'duping copies symbols' do
   Assert( ! ah2.database.isg_sandbox_v5.server.nil? )
   Assert( ah2.database.isg_sandbox_v5.server == @original['database']['isg_sandbox_v5']['server'] )
 end
+
+module Extendo
+  def as_dag
+    dag = dup
+    dag
+  end
+end
+
+eg 'duping from ext' do
+  ah = AngryHash[ @original ]
+  ah.extend(Extendo)
+
+  ah2 = ah.as_dag
+
+  Show( AngryHash.shooper )
+  Show( ah.__id__ )
+  Show( ah2.__id__ )
+  
+  Show( ah2 )
+end

data/lib/angry_hash.rb

@@ -1,4 +1,7 @@
 class AngryHash < Hash
+  def self.shooper
+    "mooper"
+  end
 
   def self.[](other)
     super(__convert(other))
@@ -164,54 +167,38 @@ class AngryHash < Hash
 
 
   # duplicating convert
-  def self.__convert(hash,cycle_watch={})
+  def self.__convert(hash,cycle_watch=[])
     new_hash = hash.inject(AngryHash.new) do |hash,(k,v)|
       hash.regular_writer( __convert_key(k), __convert_value(v,cycle_watch) )
       hash
     end
 
-    #puts "re-extend? #{AngryHash === hash} #{hash.__extending_modules.inspect if (AngryHash === hash)}"
-    #if AngryHash === hash && hash.__extended?
-      #puts "rex"
-      #hash.__extending_modules.each {|mod| puts "rexmod=#{mod}"; new_hash.extend(mod)}
-    #end
-
     new_hash
   end
 
-  #def __extending_modules
-    #@extending_modules ||= []
-  #end
-  #def __extended?
-    #!__extending_modules.empty?
-  #end
-  #def extend(mod)
-    #puts "extending with #{mod}"
-    #__extending_modules << mod
-    #puts "extending mods: #{__extending_modules.inspect}"
-    #super
-  #end
-  
+  def self.__convert_value(v,cycle_watch=[])
+    id = v.__id__
 
+    return if cycle_watch.include? id
 
-  def self.__convert_value(v,cycle_watch={})
-    return if cycle_watch.key?(v.__id__)
+    begin
+      cycle_watch << id
 
-    original_v = v
-    v = v.to_hash if v.respond_to?(:to_hash)
+      original_v = v
+      v = v.to_hash if v.respond_to?(:to_hash)
 
-    case v
-    when Hash
-      cycle_watch[original_v.__id__] = true
-      __convert(v,cycle_watch)
-    when Array
-      cycle_watch[original_v.__id__] = true
-      v.map {|vv| __convert_value(vv,cycle_watch)}
-    when Fixnum,Symbol,NilClass,TrueClass,FalseClass,Float
-      v
-    else
-      cycle_watch[original_v.__id__] = true
-      v.dup
+      case v
+      when Hash
+        __convert(v,cycle_watch)
+      when Array
+        v.map {|vv| __convert_value(vv,cycle_watch)}
+      when Fixnum,Symbol,NilClass,TrueClass,FalseClass,Float
+        v
+      else
+        v.dup
+      end
+    ensure
+      cycle_watch.pop
     end
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Lachie Cox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +10:00
+date: 2010-06-02 00:00:00 +10:00
 default_executable: 
 dependencies: []