avro 1.7.3 → 1.7.4

data/avro.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "avro"
-  s.version = "1.7.3"
+  s.version = "1.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Apache Software Foundation"]
-  s.date = "2012-12-03"
+  s.date = "2013-02-21"
   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"]

data/lib/avro/io.rb

@@ -96,8 +96,9 @@ module Avro
       def read_string
         # A string is encoded as a long followed by that many bytes of
         # UTF-8 encoded character data.
-        # FIXME utf-8 encode this in 1.9
-        read_bytes
+        read_bytes.tap do |string|
+          string.force_encoding("UTF-8") if string.respond_to? :force_encoding
+        end
       end
 
       def read(len)
@@ -244,7 +245,7 @@ module Avro
           when 'record'
             return check_props(writers_schema, readers_schema, [:fullname])
           when 'error'
-            return check_props(writers_scheam, readers_schema, [:fullname])
+            return check_props(writers_schema, readers_schema, [:fullname])
           when 'request'
             return true
           when 'fixed'
@@ -314,7 +315,7 @@ module Avro
         when 'array';   read_array(writers_schema, readers_schema, decoder)
         when 'map';     read_map(writers_schema, readers_schema, decoder)
         when 'union';   read_union(writers_schema, readers_schema, decoder)
-        when 'record', 'errors', 'request';  read_record(writers_schema, readers_schema, decoder)
+        when 'record', 'error', 'request';  read_record(writers_schema, readers_schema, decoder)
         else
           raise AvroError, "Cannot read unknown schema type: #{writers_schema.type}"
         end
@@ -442,7 +443,7 @@ module Avro
           return read_map
         when 'union'
           return read_default_value(field_schema.schemas[0], default_value)
-        when 'record'
+        when 'record', 'error'
           read_record = {}
           field_schema.fields.each do |field|
             json_val = default_value[field.name]
@@ -453,7 +454,7 @@ module Avro
           return read_record
         else
           fail_msg = "Unknown type: #{field_schema.type}"
-          raise AvroError(fail_msg)
+          raise AvroError, fail_msg
         end
       end
 
@@ -565,7 +566,7 @@ module Avro
         when 'array';   write_array(writers_schema, datum, encoder)
         when 'map';     write_map(writers_schema, datum, encoder)
         when 'union';   write_union(writers_schema, datum, encoder)
-        when 'record', 'errors', 'request';  write_record(writers_schema, datum, encoder)
+        when 'record', 'error', 'request';  write_record(writers_schema, datum, encoder)
         else
           raise AvroError.new("Unknown type: #{writers_schema.type}")
         end

data/test/random_data.rb

@@ -58,7 +58,7 @@ class RandomData
         map[nextdata(Avro::Schema::PrimitiveSchema.new('string'))] = nextdata(schm.values, d+1)
       end
       map
-    when 'record'
+    when 'record', 'error'
       m = {}
       schm.fields.each do |field|
         m[field.name] = nextdata(field.type, d+1)

data/test/test_io.rb

@@ -73,6 +73,16 @@ EOS
     check_default(record_schema, '{"f": 11}', {"f" => 11})
   end
 
+  def test_error
+    error_schema = <<EOS
+      {"type": "error",
+       "name": "TestError",
+       "fields": [{"name": "message",
+                   "type": "string"}]}
+EOS
+    check_default(error_schema, '{"message": "boom"}', {"message" => "boom"})
+  end
+
   def test_enum
     enum_schema = '{"type": "enum", "name": "Test","symbols": ["A", "B"]}'
     check_default(enum_schema, '"B"', "B")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: avro
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 7
-  - 3
-  version: 1.7.3
+  - 4
+  version: 1.7.4
 platform: ruby
 authors: 
 - Apache Software Foundation
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-03 00:00:00 Z
+date: 2013-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby