avro-salsify-fork 1.9.0.0 → 1.9.0.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 10581df409add0b6efecc5a7ec1336d76f804bd8
-  data.tar.gz: c70b31c60f39bf3afafe1954ba20f5c1a05a5877
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmE2MTc2YmEzZjFiZGM4Y2MwOWY0MmM0NDRmZWNiY2Y5YzA0NDg5Ng==
+  data.tar.gz: !binary |-
+    M2ZjZWRlNWQ2NDVkODljZjk4MGQ3YmY4Y2VhMDQ4NzMyMzhmNGFhZA==
 SHA512:
-  metadata.gz: 4e73b37934084fb6bba702a1c1162dc79a186340a30a659c5466e347381cc038ed05cd1d72504eabf9e09fc31a9f3914bb85f77fdda6736ad266fc0aec283204
-  data.tar.gz: 1900450ee208f5b5eb819ebf27306380fb1393bb9bff13e295e81ed2787fc92c0a76994ee01ef729b9893da759e78e4e1ac0d642602fd2356bf16c97da60e394
+  metadata.gz: !binary |-
+    NjA2N2JmM2MzYWM1MWQzOGNmNzg0NDM3Nzk3NDQ4NDRiYzY5N2I1YjZhNmZm
+    ZGQyYzJjZjAxNjBhNjFhZGQ0YTk2NTNhNmMzY2NlMmU0MTMwOGUyMTQ2ZDU2
+    Y2U1NDI5OGMxZmM2OGUyOTliMmY5ZTQ2MjI2OTdmYWNhZTlmM2M=
+  data.tar.gz: !binary |-
+    NDFhOTMyOTY1OTcxZGE0YzgzOGE4ZmU1Njk0ZTUwZjY0ODk4ZmZlYjUyYzg4
+    N2RmNDBmNjMwMTM4ODMzMTRiMTQyOTc4OTU5NmZjMjg2YjkzMGNjNTQxNjFj
+    Mjc3YzViMzY3NzM2MzVmMWRlNTRlNTA0Nzc5ZWIzZDYwZTkwYmQ=

data/Rakefile

@@ -16,7 +16,7 @@
 
 require 'rubygems'
 require 'echoe'
-VERSION = '1.9.0.0'
+VERSION = '1.9.0.1'
 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,35 +1,35 @@
 # -*- encoding: utf-8 -*-
-# stub: avro-salsify-fork 1.9.0.0 ruby lib
+# stub: avro-salsify-fork 1.9.0.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "avro-salsify-fork".freeze
-  s.version = "1.9.0.0"
+  s.name = "avro-salsify-fork"
+  s.version = "1.9.0.1"
 
-  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 = "2016-08-26"
-  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_normalization.rb".freeze]
-  s.files = ["CHANGELOG".freeze, "LICENSE".freeze, "Manifest".freeze, "NOTICE".freeze, "Rakefile".freeze, "avro-salsify-fork.gemspec".freeze, "avro.gemspec".freeze, "interop/test_interop.rb".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_normalization.rb".freeze, "test/case_finder.rb".freeze, "test/random_data.rb".freeze, "test/sample_ipc_client.rb".freeze, "test/sample_ipc_http_client.rb".freeze, "test/sample_ipc_http_server.rb".freeze, "test/sample_ipc_server.rb".freeze, "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_normalization.rb".freeze, "test/test_socket_transport.rb".freeze, "test/tool.rb".freeze]
-  s.homepage = "https://github.com/salsify/avro".freeze
-  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.6".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_normalization.rb".freeze, "test/test_socket_transport.rb".freeze]
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Apache Software Foundation / Salsify Engineering"]
+  s.date = "2016-08-29"
+  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."
+  s.email = "engineering@salsify.com"
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "lib/avro.rb", "lib/avro/data_file.rb", "lib/avro/io.rb", "lib/avro/ipc.rb", "lib/avro/logical_types.rb", "lib/avro/protocol.rb", "lib/avro/schema.rb", "lib/avro/schema_normalization.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "NOTICE", "Rakefile", "avro-salsify-fork.gemspec", "avro.gemspec", "interop/test_interop.rb", "lib/avro.rb", "lib/avro/data_file.rb", "lib/avro/io.rb", "lib/avro/ipc.rb", "lib/avro/logical_types.rb", "lib/avro/protocol.rb", "lib/avro/schema.rb", "lib/avro/schema_normalization.rb", "test/case_finder.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_fingerprints.rb", "test/test_help.rb", "test/test_io.rb", "test/test_logical_types.rb", "test/test_protocol.rb", "test/test_schema.rb", "test/test_schema_normalization.rb", "test/test_socket_transport.rb", "test/tool.rb"]
+  s.homepage = "https://github.com/salsify/avro"
+  s.licenses = ["Apache License 2.0 (Apache-2.0)"]
+  s.rdoc_options = ["--line-numbers", "--title", "Avro-salsify-fork"]
+  s.rubyforge_project = "avro-salsify-fork"
+  s.rubygems_version = "2.4.8"
+  s.summary = "Apache Avro for Ruby with logical types patch"
+  s.test_files = ["test/test_datafile.rb", "test/test_fingerprints.rb", "test/test_help.rb", "test/test_io.rb", "test/test_logical_types.rb", "test/test_protocol.rb", "test/test_schema.rb", "test/test_schema_normalization.rb", "test/test_socket_transport.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<multi_json>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 0"])
     else
-      s.add_dependency(%q<multi_json>.freeze, [">= 0"])
+      s.add_dependency(%q<multi_json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<multi_json>.freeze, [">= 0"])
+    s.add_dependency(%q<multi_json>, [">= 0"])
   end
 end

data/lib/avro/io.rb

@@ -543,7 +543,7 @@ module Avro
       def write_data(writers_schema, logical_datum, encoder)
         datum = writers_schema.type_adapter.encode(logical_datum)
 
-        unless Schema.validate(writers_schema, datum)
+        unless Schema.validate(writers_schema, datum, encoded = true)
           raise AvroTypeError.new(writers_schema, datum)
         end
 

data/lib/avro/schema.rb

@@ -94,7 +94,13 @@ module Avro
     end
 
     # Determine if a ruby datum is an instance of a schema
-    def self.validate(expected_schema, datum)
+    def self.validate(expected_schema, logical_datum, encoded = false)
+      datum = if encoded
+                logical_datum
+              else
+                expected_schema.type_adapter.encode(logical_datum)
+              end
+
       case expected_schema.type_sym
       when :null
         datum.nil?
@@ -181,7 +187,9 @@ module Avro
     end
 
     def to_avro(names=nil)
-      {'type' => type}
+      props = {'type' => type}
+      props['logicalType'] = logical_type if logical_type
+      props
     end
 
     def to_s

data/test/random_data.rb

@@ -27,15 +27,17 @@ class RandomData
   end
 
   def nextdata(schm, d=0)
+    return logical_nextdata(schm, d=0) unless schm.type_adapter.eql?(Avro::LogicalTypes::Identity)
+
     case schm.type_sym
     when :boolean
       rand > 0.5
     when :string
       randstr()
     when :int
-      rand(Avro::Schema::INT_MAX_VALUE - Avro::Schema::INT_MIN_VALUE) + Avro::Schema::INT_MIN_VALUE
+      rand_int
     when :long
-      rand(Avro::Schema::LONG_MAX_VALUE - Avro::Schema::LONG_MIN_VALUE) + Avro::Schema::LONG_MIN_VALUE
+      rand_long
     when :float
       (-1024 + 2048 * rand).round.to_f
     when :double
@@ -79,6 +81,15 @@ class RandomData
     end
   end
 
+  def logical_nextdata(schm, _d=0)
+    case schm.logical_type
+    when 'date'
+      Avro::LogicalTypes::IntDate.decode(rand_int)
+    when 'timestamp-millis', 'timestamp-micros'
+      Avro::LogicalTypes::TimestampMicros.decode(rand_long)
+    end
+  end
+
   CHARPOOL = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'
   BYTEPOOL = '12345abcd'
 
@@ -87,4 +98,12 @@ class RandomData
     rand(length+1).times { str << chars[rand(chars.size)] }
     str
   end
+
+  def rand_int
+    rand(Avro::Schema::INT_MAX_VALUE - Avro::Schema::INT_MIN_VALUE) + Avro::Schema::INT_MIN_VALUE
+  end
+
+  def rand_long
+    rand(Avro::Schema::LONG_MAX_VALUE - Avro::Schema::LONG_MIN_VALUE) + Avro::Schema::LONG_MIN_VALUE
+  end
 end

data/test/test_io.rb

@@ -84,6 +84,17 @@ EOS
     check_default(record_schema, '{"f": 11}', {"f" => 11})
   end
 
+  def test_record_with_logical_type
+    record_schema = <<EOS
+      {"type": "record",
+       "name": "Test",
+       "fields": [{"name": "ts",
+                   "type": {"type": "long",
+                            "logicalType": "timestamp-micros"}}]}
+EOS
+    check(record_schema)
+  end
+
   def test_error
     error_schema = <<EOS
       {"type": "error",
@@ -385,7 +396,7 @@ EOS
 
   def checkser(schm, randomdata)
     datum = randomdata.next
-    assert validate(schm, datum)
+    assert validate(schm, datum), 'datum is not valid for schema'
     w = Avro::IO::DatumWriter.new(schm)
     writer = StringIO.new "", "w"
     w.write(datum, Avro::IO::BinaryEncoder.new(writer))

data/test/test_schema.rb

@@ -132,6 +132,21 @@ class TestSchema < Test::Unit::TestCase
     }
   end
 
+  def test_to_avro_includes_logical_type
+    schema = Avro::Schema.parse <<-SCHEMA
+      {"type": "record", "name": "has_logical", "fields": [
+        {"name": "dt", "type": {"type": "int", "logicalType": "date"}}]
+      }
+    SCHEMA
+
+    assert_equal schema.to_avro, {
+      'type' => 'record', 'name' => 'has_logical',
+      'fields' => [
+        {'name' => 'dt', 'type' => {'type' => 'int', 'logicalType' => 'date'}}
+      ]
+    }
+  end
+
   def test_unknown_named_type
     error = assert_raise Avro::UnknownSchemaError do
       Avro::Schema.parse <<-SCHEMA

metadata

@@ -1,33 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: avro-salsify-fork
 version: !ruby/object:Gem::Version
-  version: 1.9.0.0
+  version: 1.9.0.1
 platform: ruby
 authors:
 - Apache Software Foundation / Salsify Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  Avro is a data serialization and RPC format.
+description: ! 'Avro is a data serialization and RPC format.
+
   This release contains the changes submitted in https://github.com/apache/avro/pull/116
-  to support logical types in the Ruby gem.
+
+  to support logical types in the Ruby gem.'
 email: engineering@salsify.com
 executables: []
 extensions: []
@@ -81,24 +82,24 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--line-numbers"
-- "--title"
+- --line-numbers
+- --title
 - Avro-salsify-fork
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: avro-salsify-fork
-rubygems_version: 2.6.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Apache Avro for Ruby with logical types patch