avro-builder 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 357f3e243725cab3c4a9d595b9dc5354516a59c2
-  data.tar.gz: 54c370ee125d1840cbba0bce0879e6f806655c69
+  metadata.gz: 9c0ae91d30be185125e91fccc2f02c08106f155a
+  data.tar.gz: 99daec1be8f8027c10b264883988ff78ea58d68e
 SHA512:
-  metadata.gz: 6ab7ebf14ce0260287ca1bf23fb3b60ca13eeb276543bc67c391dc63be4b407f554133eec462b062336c715ad8b82bd09140e9eccebb1b4e824e2531607e5ed9
-  data.tar.gz: cc50e28935cc9ff1c7d58ac6518e44ffcf02a225e32eb8d8b0b9f66cf47a2efd7e1171b78d060663ff26a7b015f07782997d349453d098cb0c243719ab7c9872
+  metadata.gz: 5f2c5a8e95c3a0cadce29089225169ab0f8656a0a96728f33e50428684de826e062ffbb89147d02fdf0008a815ef01f98eb7fd4a92b184e1c47b24fe4c2d1fd8
+  data.tar.gz: 240cbf70f74ce19db34ac8ba17f1d5fe16bd6c6eda09b6df14139b580d4f03b487f7c6deedbf40abbd6579d6a67588691c5686cc376ff20c0a51d178584b6496

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
 before_install:
   - gem update --system
 before_script:
@@ -10,4 +10,4 @@ before_script:
 script:
   - bundle exec rubocop
   - bundle exec appraisal avro-official rspec
-  - bundle exec appraisal avro-salsify-fork rspec
+  - bundle exec appraisal avro-patches rspec

data/Appraisals

@@ -1,7 +1,7 @@
 appraise 'avro-official' do
-  gem 'avro', '1.8.1'
+  gem 'avro', '1.8.2'
 end
 
-appraise 'avro-salsify-fork' do
-  gem 'avro-salsify-fork', '1.9.0.0', require: 'avro'
+appraise 'avro-patches' do
+  gem 'avro-patches'
 end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # avro-builder changelog
 
+## v0.16.0
+- Add support for providing an explicit `namespace` on `extend`. 
+- Default lookup to current namespace before falling back on global search. 
+
 ## v0.15.0
 - Add support for declaring types as abstract.
 

data/README.md

@@ -283,12 +283,13 @@ are more limited.
 The official Ruby `avro` gem does not yet support logical types:
 [AVRO-1695](https://issues.apache.org/jira/browse/AVRO-1695).
 
-There is a `avro-salsify-fork` gem released from this
-[fork](https://github.com/salsify/avro) that includes changes to support
-encoding and decoding logical types. To use this gem, reference it in your Gemfile:
+There is a [avro-patches](https://github.com/salsify/avro-patches) gem that patches
+the official Avro Ruby gem to support
+encoding and decoding logical types. To use this gem, reference it in your Gemfile
+instead of the official Avro gem:
 
 ```ruby
-gem 'avro-salsify-fork', require: 'avro'
+gem 'avro-patches'
 ```
 
 A logical type can be specified for a field using the `logical_type` attribute:
@@ -381,6 +382,40 @@ record using `extends <record_name>`. This adds all of the fields from
 the referenced record to the current record. The current record may override
 fields in the record that it extends.
 
+```
+record :original do
+  required :first, :string
+  required :second, :int
+end
+
+record :extended do
+  extends :original
+  optional :first, :string
+end
+```
+
+Additionally you can provide a `namespace` to `extends` if necessary to remove ambiguity.
+
+```
+namespace 'com.newbie'
+
+record :original, namespace: 'com.og' do
+  required :first, :string
+  required :second, :int
+end
+
+record :original do
+  required :first, :string
+  required :second, :int
+end
+
+record :extended do
+  extends :original, namespace: 'com.og'
+  optional :first, :string
+end
+```
+
+
 ## Schema Store
 
 The `Avro::Builder::SchemaStore` can be used to load DSL files and return cached

data/avro-builder.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'avro/builder/version'
@@ -28,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'json_spec'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'salsify_rubocop', '~> 0.47.0'
+  spec.add_development_dependency 'salsify_rubocop', '~> 0.48.0'
   spec.add_development_dependency 'overcommit'
 end

data/gemfiles/avro_official.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.8.1"
+gem "avro", "1.8.2"
 
 gemspec :path => "../"

data/gemfiles/{avro_salsify_fork.gemfile → avro_patches.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "avro-salsify-fork", "1.9.0.0", :require => "avro"
+gem "avro-patches"
 
 gemspec :path => "../"

data/lib/avro/builder/dsl.rb

@@ -118,7 +118,15 @@ module Avro
       end
 
       def eval_file(name)
-        file_path = find_file(name)
+        file_path = if namespace
+                      begin
+                        find_file([namespace, name].join('.'))
+                      rescue FileNotFoundError
+                        find_file(name)
+                      end
+                    else
+                      find_file(name)
+                    end
         instance_eval(File.read(file_path), file_path)
       end
     end

data/lib/avro/builder/file_handler.rb

@@ -19,6 +19,8 @@ module Avro
         File.read(find_file(name))
       end
 
+      FileNotFoundError = Class.new(StandardError)
+
       def find_file(name)
         # Ensure that the file_name that is searched for begins with a slash (/)
         # and ends with a .rb extension. Additionally, if the name contains
@@ -31,7 +33,7 @@ module Avro
           end
         end.uniq
         raise "Multiple matches: #{matches}" if matches.size > 1
-        raise "File not found #{file_name}" if matches.empty?
+        raise FileNotFoundError.new("File not found #{file_name}") if matches.empty?
 
         matches.first
       end

data/lib/avro/builder/types/record_type.rb

@@ -53,8 +53,8 @@ module Avro
 
         # Adds fields from the record with the specified name to the current
         # record.
-        def extends(name)
-          fields.merge!(cache.lookup_named_type(name, namespace).duplicated_fields)
+        def extends(name, options = {})
+          fields.merge!(cache.lookup_named_type(name, options.delete(:namespace) || namespace).duplicated_fields)
         end
 
         def to_h(reference_state = SchemaSerializerReferenceState.new)

data/lib/avro/builder/version.rb

@@ -1,5 +1,5 @@
 module Avro
   module Builder
-    VERSION = '0.15.0'.freeze
+    VERSION = '0.16.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro-builder
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: 0.48.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.0
+        version: 0.48.0
 - !ruby/object:Gem::Dependency
   name: overcommit
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/avro_official.gemfile
-- gemfiles/avro_salsify_fork.gemfile
+- gemfiles/avro_patches.gemfile
 - lib/avro/builder.rb
 - lib/avro/builder/aliasable.rb
 - lib/avro/builder/anonymous_types.rb