Author: martinkl
Date: Thu Jul 3 15:02:13 2014
New Revision: 1607665
URL: http://svn.apache.org/r1607665
Log:
AVRO-1536. Ruby: Remove monkeypatching of Enumerable. Contributed by Willem van
Bergen.
Removed:
avro/trunk/lang/ruby/lib/avro/collect_hash.rb
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/ruby/Manifest
avro/trunk/lang/ruby/lib/avro.rb
avro/trunk/lang/ruby/lib/avro/protocol.rb
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1607665&r1=1607664&r2=1607665&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Thu Jul 3 15:02:13 2014
@@ -63,6 +63,9 @@ Trunk (not yet released)
AVRO-1535. Java: Make the name .X to refer to X in the null namespace.
This permits aliases to names in the null namespace. (cutting)
+ AVRO-1536. Ruby: Remove monkeypatching of Enumerable.
+ (Willem van Bergen via martinkl)
+
BUG FIXES
AVRO-1446. C#: Correctly handle system errors in RPC.
Modified: avro/trunk/lang/ruby/Manifest
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/ruby/Manifest?rev=1607665&r1=1607664&r2=1607665&view=diff
==============================================================================
--- avro/trunk/lang/ruby/Manifest (original)
+++ avro/trunk/lang/ruby/Manifest Thu Jul 3 15:02:13 2014
@@ -4,7 +4,6 @@ Rakefile
avro.gemspec
interop/test_interop.rb
lib/avro.rb
-lib/avro/collect_hash.rb
lib/avro/data_file.rb
lib/avro/io.rb
lib/avro/ipc.rb
Modified: avro/trunk/lang/ruby/lib/avro.rb
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/ruby/lib/avro.rb?rev=1607665&r1=1607664&r2=1607665&view=diff
==============================================================================
--- avro/trunk/lang/ruby/lib/avro.rb (original)
+++ avro/trunk/lang/ruby/lib/avro.rb Thu Jul 3 15:02:13 2014
@@ -34,7 +34,6 @@ module Avro
end
end
-require 'avro/collect_hash'
require 'avro/schema'
require 'avro/io'
require 'avro/data_file'
Modified: avro/trunk/lang/ruby/lib/avro/protocol.rb
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/ruby/lib/avro/protocol.rb?rev=1607665&r1=1607664&r2=1607665&view=diff
==============================================================================
--- avro/trunk/lang/ruby/lib/avro/protocol.rb (original)
+++ avro/trunk/lang/ruby/lib/avro/protocol.rb Thu Jul 3 15:02:13 2014
@@ -104,7 +104,7 @@ module Avro
hsh['types'] = types.map{|t| t.to_avro(names) } if types
if messages
- hsh['messages'] = messages.collect_hash{|k,t| [k, t.to_avro(names)] }
+ hsh['messages'] = messages.inject({}) {|h, (k,t)| h[k] =
t.to_avro(names); h }
end
hsh
