MessagePackPure::Unpacker.readメソッドを削除

nayutaya · Mar 8, 2010 · 8eb3c9d · 8eb3c9d
1 parent 15223a0
commit 8eb3c9d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/lib/msgpack_pure/core.rb b/lib/msgpack_pure/core.rb
@@ -14,6 +14,7 @@ def self.pack(value)
 
   def self.unpack(binary)
     io = StringIO.new(binary, "r")
-    return Unpacker.read(io)
+    unpacker = Unpacker.new(io)
+    return unpacker.read
   end
 end
diff --git a/lib/msgpack_pure/unpacker.rb b/lib/msgpack_pure/unpacker.rb
@@ -15,11 +15,6 @@ def initialize(io)
 
   attr_reader :io
 
-  def self.read(io)
-    unpacker = self.new(io)
-    return unpacker.read
-  end
-
   def read
     type = self.unpack_uint8
 

diff --git a/test/unpacker_test.rb b/test/unpacker_test.rb
@@ -8,7 +8,6 @@
 class UnpackerTest < Test::Unit::TestCase
   def setup
     @klass = MessagePackPure::Unpacker
-    @module = MessagePackPure::Unpacker
   end
 
   def test_initialize
@@ -134,7 +133,7 @@ def test_read__fixarray
       i
     }
     io.rewind
-    assert_equal(array, @module.read(io))
+    assert_equal(array, @klass.new(io).read)
   end
 
   def test_read__array16
@@ -147,7 +146,7 @@ def test_read__array16
       i
     }
     io.rewind
-    assert_equal(array, @module.read(io))
+    assert_equal(array, @klass.new(io).read)
   end
 
   def test_read__array32
@@ -160,7 +159,7 @@ def test_read__array32
       i
     }
     io.rewind
-    assert_equal(array, @module.read(io))
+    assert_equal(array, @klass.new(io).read)
   end
 
   def test_read__fixmap
@@ -177,7 +176,7 @@ def test_read__fixmap
       memo
     }
     io.rewind
-    assert_equal(hash, @module.read(io))
+    assert_equal(hash, @klass.new(io).read)
   end
 
   def test_read__map16
@@ -194,7 +193,7 @@ def test_read__map16
       memo
     }
     io.rewind
-    assert_equal(hash, @module.read(io))
+    assert_equal(hash, @klass.new(io).read)
   end
 
   def test_read__map32
@@ -211,7 +210,7 @@ def test_read__map32
       memo
     }
     io.rewind
-    assert_equal(hash, @module.read(io))
+    assert_equal(hash, @klass.new(io).read)
   end
 
   private