josh-multimap 0.9.0 → 0.9.1

data/lib/fuzzy_nested_multimap.rb

@@ -3,7 +3,21 @@ require 'nested_multimap'
 # FuzzyNestedMultimap is an extension on top of NestedMultimap
 # that allows fuzzy matching.
 class FuzzyNestedMultimap < NestedMultimap
-  WILD_REGEXP = /.*/.freeze
+  def self.[](*args) #:nodoc:
+    map = super
+    map.instance_variable_set('@fuzz', {})
+    map
+  end
+
+  def initialize(default = []) #:nodoc:
+    @fuzz = {}
+    super
+  end
+
+  def initialize_copy(original) #:nodoc:
+    @fuzz = original.instance_variable_get('@fuzz').dup
+    super
+  end
 
   # call-seq:
   #   multimap[*keys] = value      => value
@@ -16,18 +30,22 @@ class FuzzyNestedMultimap < NestedMultimap
   def store(*args)
     keys  = args.dup
     value = keys.pop
-    key   = keys.shift || WILD_REGEXP
+    key   = keys.shift
 
     raise ArgumentError, 'wrong number of arguments (1 for 2)' unless value
 
-    case key
-    when Regexp
+    unless key.respond_to?(:=~)
+      raise ArgumentError, "unsupported key: #{args.first.inspect}"
+    end
+
+    if key.is_a?(Regexp)
+      @fuzz[value] = key
       if keys.empty?
-        hash_each_pair { |k, l| l << value if key =~ k }
+        hash_each_pair { |k, l| l << value if k =~ key }
         self.default << value
       else
         hash_each_pair { |k, _|
-          if key =~ k
+          if k =~ key
             args[0] = k
             super(*args)
           end
@@ -36,11 +54,35 @@ class FuzzyNestedMultimap < NestedMultimap
         self.default = self.class.new(default) unless default.is_a?(self.class)
         default[*keys.dup] = value
       end
-    when String
-      super(*args)
     else
-      raise ArgumentError, "unsupported key: #{args.first.inspect}"
+      super(*args)
     end
   end
   alias_method :[]=, :store
+
+  def freeze #:nodoc:
+    @fuzz.clear
+    @fuzz = nil
+    super
+  end
+
+  undef :index, :invert
+
+  protected
+    def update_container(key) #:nodoc:
+      super do |container|
+        if container.is_a?(self.class)
+          container.each_container_with_default do |c|
+            c.delete_if do |value|
+              (requirement = @fuzz[value]) && key !~ requirement
+            end
+          end
+        else
+          container.delete_if do |value|
+            (requirement = @fuzz[value]) && key !~ requirement
+          end
+        end
+        yield container
+      end
+    end
 end

data/lib/multimap.rb

@@ -77,8 +77,14 @@ class Multimap < Hash
     super
     clear
     original.each_pair { |key, container| self[key] = container }
+    self.default = original.default.dup
   end
 
+  #--
+  # Setting a default proc is not supported
+  #++
+  undef :default_proc
+
   # call-seq:
   #   map[key] = value        => value
   #   map.store(key, value)   => value
@@ -307,7 +313,7 @@ class Multimap < Hash
   #   map = Multimap["n" => 100, "m" => 100, "d" => [200, 300]]
   #   map.invert #=> Multimap[100 => ["n", "m"], 200 => "d", 300 => "d"]
   def invert
-    h = Multimap.new(default.dup)
+    h = self.class.new(default.dup)
     each_pair { |key, value| h[value] = key }
     h
   end

data/lib/nested_multimap.rb

@@ -16,20 +16,21 @@ class NestedMultimap < Multimap
   #   map["a"] = 102
   #   map   #=> {"a"=>{"b"=>[100, 101, 102], default => [100, 102]}}
   def store(*args)
-    value = args.pop
-    key   = args.shift
     keys  = args
+    value = args.pop
 
     raise ArgumentError, 'wrong number of arguments (1 for 2)' unless value
 
-    if keys.length > 0
-      update_container(key) do |container|
+    if keys.length > 1
+      update_container(keys.shift) do |container|
         container = self.class.new(container) unless container.is_a?(self.class)
         container[*keys] = value
         container
       end
+    elsif keys.length == 1
+      super(keys.first, value)
     else
-      super(key, value)
+      self << value
     end
   end
   alias_method :[]=, :store

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josh-multimap
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Joshua Peek