avro-salsify-fork 1.9.0.4 → 1.9.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4148d1a482eea909deae7631c18e93db4a7907c2
-  data.tar.gz: 70e111ad5d85ee5ca788b8385fed629d4f37fb3b
+  metadata.gz: 8e59f4f6d198e67587336ff1a67ac04506ac3ce8
+  data.tar.gz: 9518b4306d5aaf364d4fe9802fbe37193368795a
 SHA512:
-  metadata.gz: e85db5cae3501913da2497112689d8fa433bf1d48d7f937842b0927deda3d55eaf9c4beb0b26b274cb2d8fac79bdfc820e5e343ec774ddc0a14d508dca7a8105
-  data.tar.gz: bbe69d3e6679d4f2c20aea2ca4dc09d63f30b1a75dd40de60b390e500f272a70c7aa34d904f83479965c730c40bdab61846eadbf5ff3f46bceb260440665c912
+  metadata.gz: f490f2b392b80340fed5d7c495a0180e535b28709130185763a77411b9ea963bd15be9ed187d8193919bfcb7395e2c447ee0ea436213b32e37630db1852f9aa1
+  data.tar.gz: 666ed344ce16350f075aed6a32856ac7b07d0f5814a11d1ed582d38f472baaa9276141ac9172a0681989339204ae6e2dc490f75174bf554e96c36d518d6f6e3d

data/Rakefile

@@ -16,7 +16,7 @@
 
 require 'rubygems'
 require 'echoe'
-VERSION = '1.9.0.4'
+VERSION = '1.9.0.5'
 Echoe.new('avro-salsify-fork', VERSION) do |p|
   p.author = "Apache Software Foundation / Salsify Engineering"
   p.email = "engineering@salsify.com"

data/avro-salsify-fork.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: avro-salsify-fork 1.9.0.4 ruby lib
+# stub: avro-salsify-fork 1.9.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "avro-salsify-fork".freeze
-  s.version = "1.9.0.4"
+  s.version = "1.9.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Apache Software Foundation / Salsify Engineering".freeze]
-  s.date = "2017-01-30"
+  s.date = "2017-02-17"
   s.description = "Avro is a data serialization and RPC format.\nThis release contains the changes submitted in https://github.com/apache/avro/pull/116\nto support logical types in the Ruby gem.".freeze
   s.email = "engineering@salsify.com".freeze
   s.extra_rdoc_files = ["CHANGELOG".freeze, "LICENSE".freeze, "lib/avro.rb".freeze, "lib/avro/data_file.rb".freeze, "lib/avro/io.rb".freeze, "lib/avro/ipc.rb".freeze, "lib/avro/logical_types.rb".freeze, "lib/avro/protocol.rb".freeze, "lib/avro/schema.rb".freeze, "lib/avro/schema_compatibility.rb".freeze, "lib/avro/schema_normalization.rb".freeze, "lib/avro/schema_validator.rb".freeze]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.licenses = ["Apache License 2.0 (Apache-2.0)".freeze]
   s.rdoc_options = ["--line-numbers".freeze, "--title".freeze, "Avro-salsify-fork".freeze]
   s.rubyforge_project = "avro-salsify-fork".freeze
-  s.rubygems_version = "2.6.8".freeze
+  s.rubygems_version = "2.6.10".freeze
   s.summary = "Apache Avro for Ruby with logical types patch".freeze
   s.test_files = ["test/test_datafile.rb".freeze, "test/test_fingerprints.rb".freeze, "test/test_help.rb".freeze, "test/test_io.rb".freeze, "test/test_logical_types.rb".freeze, "test/test_protocol.rb".freeze, "test/test_schema.rb".freeze, "test/test_schema_compatibility.rb".freeze, "test/test_schema_normalization.rb".freeze, "test/test_schema_validator.rb".freeze, "test/test_socket_transport.rb".freeze]
 

data/lib/avro/schema.rb

@@ -343,7 +343,7 @@ module Avro
       attr_reader :size
       def initialize(name, space, size, names=nil, logical_type=nil)
         # Ensure valid cto args
-        unless size.is_a?(Fixnum) || size.is_a?(Bignum)
+        unless size.is_a?(Integer)
           raise AvroError, 'Fixed Schema requires a valid integer for size property.'
         end
         super(:fixed, name, space, names, logical_type)

data/lib/avro/schema_validator.rb

@@ -86,13 +86,13 @@ module Avro
         when :string, :bytes
           fail TypeMismatchError unless datum.is_a?(String)
         when :int
-          fail TypeMismatchError unless datum.is_a?(Fixnum) || datum.is_a?(Bignum)
+          fail TypeMismatchError unless datum.is_a?(Integer)
           result.add_error(path, "out of bound value #{datum}") unless INT_RANGE.cover?(datum)
         when :long
-          fail TypeMismatchError unless datum.is_a?(Fixnum) || datum.is_a?(Bignum)
+          fail TypeMismatchError unless datum.is_a?(Integer)
           result.add_error(path, "out of bound value #{datum}") unless LONG_RANGE.cover?(datum)
         when :float, :double
-          fail TypeMismatchError unless [Float, Fixnum, Bignum].any?(&datum.method(:is_a?))
+          fail TypeMismatchError unless [Float, Integer].any?(&datum.method(:is_a?))
         when :fixed
           if datum.is_a? String
             message = "expected fixed with size #{expected_schema.size}, got \"#{datum}\" with size #{datum.size}"
@@ -171,7 +171,11 @@ module Avro
       private
 
       def actual_value_message(value)
-        avro_type = ruby_to_avro_type(value.class)
+        avro_type = if value.class == Integer
+                      ruby_integer_to_avro_type(value)
+                    else
+                      ruby_to_avro_type(value.class)
+                    end
         if value.nil?
           avro_type
         else
@@ -189,6 +193,10 @@ module Avro
           Hash => 'record'
         }.fetch(ruby_class, ruby_class)
       end
+
+      def ruby_integer_to_avro_type(value)
+        INT_RANGE.cover?(value) ? 'int' : 'long'
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro-salsify-fork
 version: !ruby/object:Gem::Version
-  version: 1.9.0.4
+  version: 1.9.0.5
 platform: ruby
 authors:
 - Apache Software Foundation / Salsify Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: avro-salsify-fork
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Apache Avro for Ruby with logical types patch