avro 1.7.5 → 1.7.7

data/Manifest

@@ -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

data/Rakefile

@@ -23,7 +23,7 @@ Echoe.new('avro', VERSION) do |p|
   p.summary = "Apache Avro for Ruby"
   p.description = "Avro is a data serialization and RPC format"
   p.url = "http://hadoop.apache.org/avro/"
-  p.runtime_dependencies = %w[yajl-ruby]
+  p.runtime_dependencies = %w[multi_json]
 end
 
 t = Rake::TestTask.new(:interop)

data/avro.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = "avro"
-  s.version = "1.7.5"
+  s.version = "1.7.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Apache Software Foundation"]
-  s.date = "2013-08-19"
+  s.date = "2014-07-18"
   s.description = "Avro is a data serialization and RPC format"
   s.email = "avro-dev@hadoop.apache.org"
-  s.extra_rdoc_files = ["CHANGELOG", "lib/avro.rb", "lib/avro/collect_hash.rb", "lib/avro/data_file.rb", "lib/avro/io.rb", "lib/avro/ipc.rb", "lib/avro/protocol.rb", "lib/avro/schema.rb"]
-  s.files = ["CHANGELOG", "Manifest", "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", "lib/avro/protocol.rb", "lib/avro/schema.rb", "test/random_data.rb", "test/sample_ipc_client.rb", "test/sample_ipc_http_client.rb", "test/sample_ipc_http_server.rb", "test/sample_ipc_server.rb", "test/test_datafile.rb", "test/test_help.rb", "test/test_io.rb", "test/test_protocol.rb", "test/test_socket_transport.rb", "test/tool.rb", "test/test_schema.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/avro.rb", "lib/avro/data_file.rb", "lib/avro/io.rb", "lib/avro/ipc.rb", "lib/avro/protocol.rb", "lib/avro/schema.rb"]
+  s.files = ["CHANGELOG", "Manifest", "Rakefile", "avro.gemspec", "interop/test_interop.rb", "lib/avro.rb", "lib/avro/data_file.rb", "lib/avro/io.rb", "lib/avro/ipc.rb", "lib/avro/protocol.rb", "lib/avro/schema.rb", "test/random_data.rb", "test/sample_ipc_client.rb", "test/sample_ipc_http_client.rb", "test/sample_ipc_http_server.rb", "test/sample_ipc_server.rb", "test/test_datafile.rb", "test/test_help.rb", "test/test_io.rb", "test/test_protocol.rb", "test/test_socket_transport.rb", "test/tool.rb", "test/test_schema.rb"]
   s.homepage = "http://hadoop.apache.org/avro/"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Avro"]
+  s.rdoc_options = ["--line-numbers", "--title", "Avro"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "avro"
   s.rubygems_version = "1.8.15"
@@ -23,11 +23,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 0"])
     else
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_dependency(%q<multi_json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
+    s.add_dependency(%q<multi_json>, [">= 0"])
   end
 end

data/lib/avro.rb

@@ -5,16 +5,16 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'yajl'
+require 'multi_json'
 require 'set'
 require 'digest/md5'
 require 'net/http'
@@ -34,7 +34,6 @@ module Avro
   end
 end
 
-require 'avro/collect_hash'
 require 'avro/schema'
 require 'avro/io'
 require 'avro/data_file'

data/lib/avro/data_file.rb

@@ -20,9 +20,10 @@ module Avro
   module DataFile
     VERSION = 1
     MAGIC = "Obj" + [VERSION].pack('c')
-    MAGIC_SIZE = MAGIC.size
+    MAGIC.force_encoding('BINARY') if MAGIC.respond_to?(:force_encoding)
+    MAGIC_SIZE = MAGIC.respond_to?(:bytesize) ? MAGIC.bytesize : MAGIC.size
     SYNC_SIZE = 16
-    SYNC_INTERVAL = 1000 * SYNC_SIZE
+    SYNC_INTERVAL = 4000 * SYNC_SIZE
     META_SCHEMA = Schema.parse('{"type": "map", "values": "bytes"}')
     VALID_ENCODINGS = ['binary'] # not used yet
 
@@ -98,6 +99,7 @@ module Avro
         @encoder = IO::BinaryEncoder.new(@writer)
         @datum_writer = datum_writer
         @buffer_writer = StringIO.new('', 'w')
+        @buffer_writer.set_encoding('BINARY') if @buffer_writer.respond_to?(:set_encoding)
         @buffer_encoder = IO::BinaryEncoder.new(@buffer_writer)
         @block_count = 0
 
@@ -181,7 +183,7 @@ module Avro
           # write number of items in block and block size in bytes
           encoder.write_long(block_count)
           to_write = codec.compress(buffer_writer.string)
-          encoder.write_long(to_write.size)
+          encoder.write_long(to_write.respond_to?(:bytesize) ? to_write.bytesize : to_write.size)
 
           # write block contents
           writer.write(to_write)

data/lib/avro/protocol.rb

@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,7 +22,7 @@ module Avro
 
     attr_reader :name, :namespace, :types, :messages, :md5
     def self.parse(protocol_string)
-      json_data = Yajl.load(protocol_string)
+      json_data = MultiJson.load(protocol_string)
 
       if json_data.is_a? Hash
         name = json_data['protocol']
@@ -58,7 +58,7 @@ module Avro
     end
 
     def to_s
-      Yajl.dump to_avro
+      MultiJson.dump to_avro
     end
 
     def ==(other)
@@ -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

data/lib/avro/schema.rb

@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +33,7 @@ module Avro
     LONG_MAX_VALUE = (1 << 63) - 1
 
     def self.parse(json_string)
-      real_parse(Yajl.load(json_string), {})
+      real_parse(MultiJson.load(json_string), {})
     end
 
     # Build Avro Schema from data parsed out of JSON string.
@@ -165,7 +165,7 @@ module Avro
     end
 
     def to_s
-      Yajl.dump to_avro
+      MultiJson.dump to_avro
     end
 
     class NamedSchema < Schema

data/test/test_datafile.rb

@@ -108,9 +108,9 @@ JSON
     end
 
     %w[fixed enum record error array map union].each do |s|
-      reader = Yajl.load(writer_schema)
+      reader = MultiJson.load(writer_schema)
       reader['fields'] = reader['fields'].reject{|f| f['type']['type'] == s}
-      Avro::DataFile.open('data.avr', 'r', Yajl.dump(reader)) do |dr|
+      Avro::DataFile.open('data.avr', 'r', MultiJson.dump(reader)) do |dr|
         dr.each_with_index do |obj, i|
           reader['fields'].each do |field|
             assert_equal data[i][field['name']], obj[field['name']]

data/test/test_io.rb

@@ -308,8 +308,8 @@ EOS
 
      # test that the round-trip didn't mess up anything
     # NB: I don't think we should do this. Why enforce ordering?
-    assert_equal(Yajl.load(str),
-                  Yajl.load(parsed_string))
+    assert_equal(MultiJson.load(str),
+                  MultiJson.load(parsed_string))
 
     # test __eq__
     assert_equal(schema, Avro::Schema.parse(str))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: avro
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 7
-  - 5
-  version: 1.7.5
+  - 7
+  version: 1.7.7
 platform: ruby
 authors: 
 - Apache Software Foundation
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-19 00:00:00 Z
+date: 2014-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,8 +27,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: multi_json
+  prerelease: false
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
 description: Avro is a data serialization and RPC format
 email: avro-dev@hadoop.apache.org
 executables: []
@@ -40,7 +40,6 @@ extensions: []
 extra_rdoc_files: 
 - CHANGELOG
 - lib/avro.rb
-- lib/avro/collect_hash.rb
 - lib/avro/data_file.rb
 - lib/avro/io.rb
 - lib/avro/ipc.rb
@@ -53,7 +52,6 @@ files:
 - 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
@@ -77,7 +75,6 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --line-numbers
-- --inline-source
 - --title
 - Avro
 require_paths: 

data/lib/avro/collect_hash.rb

@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Enumerable
-  def collect_hash
-    inject(Hash.new) do |memo, i|
-      k, v = yield(i)
-      memo[k] = v if k
-      memo
-    end
-  end
-end