map 4.1.0 → 4.2.0

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '4.1.0' unless defined?(Version)
+  Version = '4.2.0' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -683,20 +683,21 @@ class Map < Hash
 
   def set(*args)
     if args.size == 1 and args.first.is_a?(Hash)
-      options = args.shift
+      spec = args.shift
     else
-      options = {}
+      spec = {}
       value = args.pop
       keys = args
-      options[keys] = value
+      spec[keys] = value
     end
 
-    options.each do |keys, value|
+    spec.each do |keys, value|
       keys = Array(keys).flatten
 
       collection = self
       if keys.size <= 1
-        collection[keys.first] = value
+        key = keys.first
+        collection[key] = value
         next
       end
 
@@ -721,7 +722,55 @@ class Map < Hash
       collection[key] = value
     end
 
-    return options.values
+    return spec.values
+  end
+
+  def rm(*args)
+    paths, path = args.partition{|arg| arg.is_a?(Array)}
+    paths.push(path)
+
+    paths.each do |path|
+      if path.size == 1
+        delete(*path)
+        next
+      end
+
+      branch, leaf = path[0..-2], path[-1]
+      collection = get(branch)
+
+      case collection
+        when Hash
+          key = leaf
+          collection.delete(key)
+        when Array
+          index = leaf
+          collection.delete_at(index)
+        else
+          raise(IndexError, "(#{ collection.inspect }).rm(#{ path.inspect })")
+      end
+    end
+    paths
+  end
+
+  def forcing(forcing=nil, &block)
+    @forcing ||= nil
+
+    if block
+      begin
+        previous = @forcing
+        @forcing = forcing
+        block.call()
+      ensure
+        @forcing = previous
+      end
+    else
+      @forcing
+    end
+  end
+
+  def forcing?(forcing=nil)
+    @forcing ||= nil
+    @forcing == forcing
   end
 
   def apply(other)

data/map.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "map"
-  spec.version = "4.1.0"
+  spec.version = "4.2.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "map"
   spec.description = "description: map kicks the ass"
@@ -19,6 +19,7 @@ Gem::Specification::new do |spec|
  "lib/map/struct.rb",
  "map.gemspec",
  "test",
+ "test/leak.rb",
  "test/lib",
  "test/lib/testing.rb",
  "test/map_test.rb"]

data/test/leak.rb

@@ -0,0 +1,60 @@
+require 'map'
+
+##
+#
+  gc =
+    lambda do
+      10.times{ GC.start }
+    end
+
+  leak =
+    lambda do
+      100.times do
+        m = Map.new
+
+        1000.times do |i|
+          m[rand.to_s] = rand
+        end
+      end
+
+      gc.call()
+    end
+
+##
+#
+
+
+  leak.call()
+  before = Process.size
+
+
+  leak.call()
+  after = Process.size
+
+  delta = [after.first - before.first, after.last - before.last]
+
+  p :before => before 
+  p :after => after 
+  p :delta => delta
+
+
+##
+#
+  BEGIN {
+
+    module Process
+      def self.size pid = Process.pid 
+        stdout = `ps wwwux -p #{ pid }`.split(%r/\n/)
+        vsize, rsize = stdout.last.split(%r/\s+/)[4,2].map{|i| i.to_i}
+      end
+
+      def self.vsize
+        size.first.to_i
+      end
+
+      def self.rsize
+        size.last.to_i
+      end
+    end
+
+  }

data/test/map_test.rb

@@ -494,6 +494,36 @@ Testing Map do
     end
   end
 
+  testing 'that maps a clever little rm operator' do
+    map = Map.new
+    map.set :a, :b, 42
+    map.set :x, :y, 42
+    map.set :x, :z, 42
+    map.set :array, [0,1,2]
+
+    assert{ map.rm(:x, :y) }
+    assert{ map.get(:x) =~ {:z => 42} }
+    
+    assert{ map.rm(:a, :b) }
+    assert{ map.get(:a) =~ {} }
+
+    assert{ map.rm(:array, 0) }
+    assert{ map.get(:array) == [1,2] }
+    assert{ map.rm(:array, 1) }
+    assert{ map.get(:array) == [1] }
+    assert{ map.rm(:array, 0) }
+    assert{ map.get(:array) == [] }
+
+    assert{ map.rm(:array) }
+    assert{ map.get(:array).nil? }
+
+    assert{ map.rm(:a) }
+    assert{ map.get(:a).nil? }
+
+    assert{ map.rm(:x) }
+    assert{ map.get(:x).nil? }
+  end
+
 protected
   def new_int_map(n = 1024)
     map = assert{ Map.new }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 4
-  - 1
+  - 2
   - 0
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -06:00
+date: 2011-06-08 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - lib/map/options.rb
 - lib/map/struct.rb
 - map.gemspec
+- test/leak.rb
 - test/lib/testing.rb
 - test/map_test.rb
 has_rdoc: true