multiset 0.4.0 → 0.4.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDBiNjk1YzU0M2U4ZTEzYzdlZjQwZTdhOWY3OGQ5MWI5MzJiNGY1OA==
+  data.tar.gz: !binary |-
+    MDMwNjFmMTkzZjhmYjY0OTE3MzJjZDE2YTliZGE4NTdkZjVkMjM4MQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YjdlOWFjMDBhY2E5YzllYzgzNjNmNjM0YWVjOTcyNGYyOWU2ZmZhNmFkYjdh
+    MDkyYmIzMzg5NzVjNGRlODU1OGE5ZGUzZDhkOTUzNWY0ZGJmMjY4ZjI1Njcz
+    NDNkOGU0OTEwZTYwNGE3ZjhlNmNjZTFjMzZiNTJiNDQ2MzdjODc=
+  data.tar.gz: !binary |-
+    NWRkNDVmMDg4Y2Q3ODMyMzkxMjliNGIwM2ZhNDBiNTdlZDVkMTc4M2U1MjMy
+    ZDJmZTlmODRjOTNhMjMzOTlmY2MxOTc2MjNlMDg0MzBjOGMyZWQ3YmM1NTBh
+    ZGU2OTUwOWU5ODMzYTZhOTFmNTQ0ZjIxZThkNzYwZjQ2ZTIwYzQ=

data/History.txt

@@ -204,3 +204,13 @@
   * Multiset#minmax_by
   * Multiset#sort
   * Multiset#sort_by
+
+=== 0.4.1 / 2013-12-02
+
+(ja)
+* Multiset#each_**** および Multimap#each_**** が、ブロックなしで呼び出された場合にEnumeratorを返すようにした。
+  （ドキュメントに書いたのに実装を忘れてました…）
+
+(en)
+* Multiset#each_**** and Multimap#each_**** returns an Enumerator if called without a block.
+  (Forgot implementation although documented...)

data/README.txt

@@ -25,7 +25,7 @@ Multisets are typically used for counting elements and their appearances in coll
  
  # Counting the appearances of characters in a string
  m = Multiset.new
- "abracadabra".each_char do |c| # replace with 'each_byte' in Ruby 1.8.6 or before
+ "abracadabra".each_char do |c| # replace with 'each_byte' in Ruby 1.8.6 or earlier
    m << c
  end
  p m
@@ -35,7 +35,7 @@ Multisets are typically used for counting elements and their appearances in coll
  Multiset.new("abracadabra".split(//))
  # => #<Multiset:#5 "a", #2 "b", #2 "r", #1 "c", #1 "d">
  
- # The same, but available with Ruby 1.8.7 or after
+ # The same, but available with Ruby 1.8.7 or later
  Multiset.new("abracadabra".each_char)
  # => #<Multiset:#5 "a", #2 "b", #2 "r", #1 "c", #1 "d">
 

data/lib/multimap.rb

@@ -17,7 +17,7 @@ require "multiset"
 #(see Ruby documentation for "Hash" class),
 #multimap can contain two or more items for a key.
 #
-#Most methods' names are same as those of Hash class, and all other than
+#Most methods’ names are same as those of Hash class, and all other than
 #a few methods in Hash class is implemented on Multimap class.
 
 class Multimap
@@ -217,13 +217,17 @@ class Multimap
   # Iterates for each pair of a key and a value in <code>self</code>.
   # Returns <code>self</code>.
   def each_pair
-    cleanup
-    @assoc.each_pair do |key, value_list|
-      value_list.each do |single_value|
-        yield key, single_value
+    if block_given?
+      cleanup
+      @assoc.each_pair do |key, value_list|
+        value_list.each do |single_value|
+          yield key, single_value
+        end
       end
+      self
+    else
+      Enumerator.new(self, :each_pair)
     end
-    self
   end
   alias :each :each_pair
   
@@ -236,13 +240,17 @@ class Multimap
   # (key, one value associated with the key, numbers of that value
   # associated with the key). Returns <code>self</code>.
   def each_pair_with
-    cleanup
-    @assoc.each_pair do |key, value_list|
-      value_list.each_pair do |a_value, count|
-        yield key, a_value, count
+    if block_given?
+      cleanup
+      @assoc.each_pair do |key, value_list|
+        value_list.each_pair do |a_value, count|
+          yield key, a_value, count
+        end
       end
+      self
+    else
+      Enumerator.new(self, :each_pair_with)
     end
-    self
   end
   
   # <code>self</code>のすべてのキーと、そのキーに割り当てられた
@@ -272,9 +280,14 @@ class Multimap
   # 
   # Iterates for each value in <code>self</code>. Returns <code>self</code>.
   def each_value(&block) # :yields: single_value
-    cleanup
-    @assoc.each_value do |value_list|
-      value_list.each &block
+    if block_given?
+      cleanup
+      @assoc.each_value do |value_list|
+        value_list.each &block
+      end
+      self
+    else
+      Enumerator.new(self, :each_value)
     end
   end
   

data/lib/multiset.rb

@@ -3,7 +3,7 @@
 
 require "enumerator"
 require "multimap"
-VERSION = "0.4.0"
+VERSION = "0.4.1"
 
 #==概要(Basic information)
 #
@@ -18,7 +18,7 @@ VERSION = "0.4.0"
 # Unlike ordinary set(see Ruby documentation for "set" library),
 # multiset can contain two or more same items.
 #
-# Most methods' names are same as those of Set class, and all other than
+# Most methods’ names are same as those of Set class, and all other than
 # a few methods in Set class is implemented on Multiset class.
 #
 # * <code>Set[:a,:b,:c,:b,:b,:c] => #<Set: {:b, :c, :a}></code>
@@ -583,10 +583,14 @@ class Multiset
   # a Multiset with 100 times "a" will call the given block for 100 times for Multiset#each,
   # while only once for Multiset#each_pair.
   def each
-    @entries.each_pair do |item, count|
-      count.times{ yield item }
+    if block_given?
+      @entries.each_pair do |item, count|
+        count.times{ yield item }
+      end
+      self
+    else
+      Enumerator.new(self, :each)
     end
-    self
   end
   
   # <code>self</code>に含まれるすべての要素について、重複を許さずに繰り返します。
@@ -597,8 +601,12 @@ class Multiset
   # Returns <code>self</code>.
   # An Enumerator will be returned if no block is given.
   def each_item(&block) # :yields: item
-    @entries.each_key(&block)
-    self
+    if block
+      @entries.each_key(&block)
+      self
+    else
+      @entries.each_key
+    end
   end
   
   # <code>self</code>に含まれるすべての要素（重複なし）とその個数について繰り返します。
@@ -609,8 +617,12 @@ class Multiset
   # Returns <code>self</code>.
   # An Enumerator will be returned if no block is given.
   def each_with_count(&block) # :yields: item, count
-    @entries.each_pair(&block)
-    self
+    if block
+      @entries.each_pair(&block)
+      self
+    else
+      @entries.each_pair
+    end
   end
   alias :each_pair :each_with_count
   

data/spec/multiset_spec.rb

@@ -201,6 +201,28 @@ describe Multiset do
       result[:count_sum].should == 10
     end
     
+    it "should return an Enumerator with Multiset#each_****" do
+      @ms.each.should be_kind_of(Enumerator)
+      @ms.each_item.should be_kind_of(Enumerator)
+      @ms.each_pair.should be_kind_of(Enumerator)
+      @ms.each_with_count.should be_kind_of(Enumerator)
+    end
+    
+    it "should return an Enumerator with Multiset#each_**** whose behavior is the same as original method" do
+      e = @ms.each
+      e.to_a.should == @ms.to_a
+      
+      e = @ms.each_item
+      a = []; @ms.each_item{ |x| a << x }
+      b = []; e.each{ |x| b << x }
+      b.should == a
+      
+      e = @ms.each_with_count
+      a = []; @ms.each_with_count{ |x, i| a << [x, i] }
+      b = []; e.each{ |x, i| b << [x, i] }
+      b.should == a
+    end
+    
     it "should return a new Multiset by the specified condition with Multiset#map / Multiset#collect" do
       @ms.map{ |item| item * 2 }.should == Multiset.new(%w'aa aa bb bb bb bb cc dd dd dd')
     end
@@ -298,7 +320,7 @@ describe Multiset do
       tmp.should == Multiset.new(%w'b b b c c d')
       
       tmp = @ms1.dup
-      tmp.delete_all("e") # nothing deleted because `tmp' does not contain "e"
+      tmp.delete_all("e") # nothing deleted because ``tmp'' does not contain "e"
       tmp.should == @ms1
     end
   end
@@ -391,6 +413,37 @@ describe Multimap do
       @mm[:b] = ["foo", "bar", "hoge", "hoge", "bar"]
     end
     
+    it "should return an Enumerator with Multimap#each_****" do
+      @mm.each.should be_kind_of(Enumerator)
+      @mm.each_pair.should be_kind_of(Enumerator)
+      @mm.each_key.should be_kind_of(Enumerator)
+      @mm.each_value.should be_kind_of(Enumerator)
+      @mm.each_pair_list.should be_kind_of(Enumerator)
+      @mm.each_pair_with.should be_kind_of(Enumerator)
+    end
+    
+    it "should return an Enumerator with Multimap#each_**** whose behavior is the same as original method" do
+      e = @mm.each_key
+      a = []; @mm.each_key{ |k| a << k }
+      b = []; e.each{ |k| b << k }
+      b.should == a
+      
+      e = @mm.each_value
+      a = []; @mm.each_value{ |v| a << v }
+      b = []; e.each{ |v| b << v }
+      b.should == a
+      
+      e = @mm.each_pair_list
+      a = []; @mm.each_pair_list{ |k, v| a << [k, v] }
+      b = []; e.each{ |k, v| b << [k, v] }
+      b.should == a
+      
+      e = @mm.each_pair_with
+      a = []; @mm.each_pair_with{ |k, v, c| a << [k, v, c] }
+      b = []; e.each{ |k, v, c| b << [k, v, c] }
+      b.should == a
+    end
+    
     it "should be correctly iterated by 'each_pair'" do
       tmp_a = []
       tmp_b = []

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: multiset
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - H.Hiro(Maraigue)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
 description: ! "Unlike ordinary set(see Ruby documentation for \"set\" library), multiset
   can contain two or more same items.\n\n Set[:a,:b,:c,:b,:b,:c] # => #<Set: {:b,
   :c, :a}>\n Multiset[:a,:b,:c,:b,:b,:c] # => #<Multiset:#3 :b, #2 :c, #1 :a>\n\nMultisets
@@ -66,6 +61,7 @@ files:
 - .gemtest
 homepage: http://maraigue.hhiro.net/multiset/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -73,22 +69,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: multiset
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Unlike ordinary set(see Ruby documentation for "set" library), multiset can
   contain two or more same items
 test_files: []