THRIFT-276. rb: Ruby libraries should have one class per file
This monster of a patch moves all the classes into their own files and specs as appropriate. Additionally, it concentrates all the requires into thrift.rb, removing the need to require any other file. (Changes were made to the compiler to reflect this reduced requirement.)
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@761849 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/rb/script/proto_benchmark.rb b/lib/rb/script/proto_benchmark.rb
index 09adf81..4ff6a55 100644
--- a/lib/rb/script/proto_benchmark.rb
+++ b/lib/rb/script/proto_benchmark.rb
@@ -19,7 +19,7 @@
require File.dirname(__FILE__) + "/../spec/spec_helper.rb"
require "lib/thrift/serializer"
-require "lib/thrift/protocol/binaryprotocolaccelerated"
+require "lib/thrift/protocol/binary_protocol_accelerated"
require "benchmark"
# require "ruby-prof"
@@ -83,7 +83,7 @@
# f = File.new("/tmp/testfile", "w")
- # proto = Thrift::BinaryProtocolAccelerated.new(Thrift::IOStreamTransport.new(Thrift::MemoryBuffer.new, f))
+ # proto = Thrift::BinaryProtocolAccelerated.new(Thrift::IOStreamTransport.new(Thrift::MemoryBufferTransport.new, f))
# reporter.report("accelerated binary protocol, write (to disk)") do
# HOW_MANY.times do
# obj.write(proto)
@@ -93,7 +93,7 @@
# f.close
#
# f = File.new("/tmp/testfile", "r")
- # proto = Thrift::BinaryProtocolAccelerated.new(Thrift::IOStreamTransport.new(f, Thrift::MemoryBuffer.new))
+ # proto = Thrift::BinaryProtocolAccelerated.new(Thrift::IOStreamTransport.new(f, Thrift::MemoryBufferTransport.new))
# reporter.report("accelerated binary protocol, read (from disk)") do
# HOW_MANY.times do
# obj.read(proto)
@@ -103,7 +103,7 @@
#
# f = File.new("/tmp/testfile", "w")
# reporter.report("compact protocol, write (to disk)") do
- # proto = Thrift::CompactProtocol.new(Thrift::IOStreamTransport.new(Thrift::MemoryBuffer.new, f))
+ # proto = Thrift::CompactProtocol.new(Thrift::IOStreamTransport.new(Thrift::MemoryBufferTransport.new, f))
# HOW_MANY.times do
# obj.write(proto)
# end
@@ -113,7 +113,7 @@
#
# f = File.new("/tmp/testfile", "r")
# reporter.report("compact protocol, read (from disk)") do
- # proto = Thrift::CompactProtocol.new(Thrift::IOStreamTransport.new(f, Thrift::MemoryBuffer.new))
+ # proto = Thrift::CompactProtocol.new(Thrift::IOStreamTransport.new(f, Thrift::MemoryBufferTransport.new))
# HOW_MANY.times do
# obj.read(proto)
# end
diff --git a/lib/rb/script/read_struct.rb b/lib/rb/script/read_struct.rb
index fd2dfbe..831fcec 100644
--- a/lib/rb/script/read_struct.rb
+++ b/lib/rb/script/read_struct.rb
@@ -18,7 +18,6 @@
#
require "spec/spec_helper"
-require "lib/thrift/serializer"
path, factory_class = ARGV
diff --git a/lib/rb/script/write_struct.rb b/lib/rb/script/write_struct.rb
index b4bdec1..da14219 100644
--- a/lib/rb/script/write_struct.rb
+++ b/lib/rb/script/write_struct.rb
@@ -18,7 +18,6 @@
#
require "spec/spec_helper"
-require "lib/thrift/serializer"
path, factory_class = ARGV