avro-builder 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e267815d4861bd162c41d979fe7fb01cbf1eae34
-  data.tar.gz: 0fa219ea3e3a0e9e910a8e1b8561c2f631d95406
+SHA256:
+  metadata.gz: 200291b14e045c942db013af4e3288ff6f6fd58bd72dec71d07dcd5b3dd8feaa
+  data.tar.gz: 41ec29b767c1133feb64c91766681b58dd98696e27ee4be504a27a6201ee4950
 SHA512:
-  metadata.gz: c82e897dd09c912d0420de406a3f9bdf2047c71fe0d600ca4ea91fcb5b02a636008ff5f9528d6918fc5dc411f05db96b1b5e74a130458b7192c83b15b9408986
-  data.tar.gz: dffe438a10e65431cad92043d79b5091a05cbb34fbad08ea365435311bf17330c1d2e0b42797e718b5bdfad2e02ef0d931e9d6c6d9e3d3df52f3b7c0203494ad
+  metadata.gz: affd413784160d10c371d1d70547d58332d388726d31a727b242c85823a068e5d9e97d12a999ee96bcdd6db2796cbd6ea2f70566ccdd707bd3e21995373aac3c
+  data.tar.gz: d94ffa43cd149edf03046b17368d56d2b3229cc46ad92e3f1dd7588f056078ec4e6679f3157968989e319db7d25f10d461f25cca3e651d8fcb07b66d0531a004

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /gemfiles/*.lock
+/gemfiles/.bundle

data/.rubocop.yml

@@ -1,5 +1,13 @@
 inherit_gem:
   salsify_rubocop: conf/rubocop.yml
 
+AllCops:
+  inherit_mode:
+    merge:
+      - Exclude
+  NewCops: disable
+  Exclude:
+    - "gemfiles/*"
+
 Style/RaiseArgs:
   EnforcedStyle: compact

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.3
+2.5.8

data/.travis.yml

@@ -1,13 +1,16 @@
 language: ruby
 rvm:
-  - 2.4.5
-  - 2.5.5
-  - 2.6.3
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+before_install: gem install bundler -v 2.0.1 --no-document
 before_script:
   - bundle exec appraisal install --jobs=3
 script:
   - bundle exec rubocop
   - bundle exec appraisal avro-1.8.2 rspec
   - bundle exec appraisal avro-1.9.0 rspec
+  - bundle exec appraisal avro-1.9.1 rspec
+  - bundle exec appraisal avro-1.10.0 rspec
   - bundle exec appraisal avro-patches-0.x rspec
   - bundle exec appraisal avro-patches-1.x rspec

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise 'avro-1.8.2' do
   gem 'avro', '1.8.2'
 end
@@ -6,6 +8,14 @@ appraise 'avro-1.9.0' do
   gem 'avro', '1.9.0'
 end
 
+appraise 'avro-1.9.1' do
+  gem 'avro', '1.9.1'
+end
+
+appraise 'avro-1.10.0' do
+  gem 'avro', '1.10.0'
+end
+
 appraise 'avro-patches-0.x' do
   gem 'avro', '1.8.2'
   gem 'avro-patches', '< 1.0.0'

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # avro-builder changelog
 
+## v0.16.2
+- Allow avro version up to v1.10.x. Support will be added for new
+  functionality in Avro v1.10 in a later release.
+
 ## v0.16.1
 - Require avro version prior to v1.10.0.
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in avro-builder.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'appraisal/task'

data/avro-builder.gemspec

@@ -1,6 +1,6 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'avro/builder/version'
 
@@ -20,15 +20,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'avro', '>= 1.7.0', '< 1.10.0'
+  spec.add_runtime_dependency 'avro', '>= 1.7.0', '< 1.11'
 
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'json_spec'
+  spec.add_development_dependency 'overcommit'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'json_spec'
+  spec.add_development_dependency 'salsify_rubocop', '~> 0.85.0'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'salsify_rubocop', '~> 0.48.0'
-  spec.add_development_dependency 'overcommit'
 end

data/gemfiles/avro_1.10.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "avro", "1.10.0"
+
+gemspec path: "../"

data/gemfiles/avro_1.9.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "avro", "1.9.1"
+
+gemspec path: "../"

data/lib/avro/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'avro/builder/version'
 require 'avro/builder/dsl'
 require 'avro/builder/schema_store'

data/lib/avro/builder/aliasable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'avro/builder/dsl_attributes'
 
 module Avro

data/lib/avro/builder/anonymous_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/definition_cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 
@@ -22,9 +24,7 @@ module Avro
         key_str = Avro::Name.make_fullname(key.to_s, namespace && namespace.to_s)
         object = schema_objects[key_str]
 
-        if object.nil? && !schema_names.include?(key.to_s)
-          object = builder.import(key)
-        end
+        object = builder.import(key) if object.nil? && !schema_names.include?(key.to_s)
 
         raise DefinitionNotFoundError.new(key) if object.nil? && namespace.nil?
 
@@ -59,6 +59,7 @@ module Avro
 
       def store_by_fullname(object, fullname = object.fullname)
         raise DuplicateDefinitionError.new(fullname, object, schema_objects[fullname]) if schema_objects.key?(fullname)
+
         schema_objects.store(fullname, object)
       end
 

data/lib/avro/builder/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'avro'
 require 'avro/builder/errors'
 require 'avro/builder/dsl_options'
@@ -96,6 +98,7 @@ module Avro
       def type_macro(name, type_object, options = {})
         raise "#{type_object.inspect} must be a type object" unless type_object.is_a?(Types::Type)
         raise "namespace cannot be included in name: #{name}" if name.to_s.index('.')
+
         type_clone = type_object.clone
         type_clone.send(:abstract=, true)
         cache.add_type_by_name(type_clone, name, options[:namespace] || namespace)

data/lib/avro/builder/dsl_attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/dsl_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'avro/builder/type_factory'
 require 'avro/builder/aliasable'
 
@@ -12,7 +14,7 @@ module Avro
       include Avro::Builder::Aliasable
       include Avro::Builder::AnonymousTypes
 
-      INTERNAL_ATTRIBUTES = %i(optional_field).to_set.freeze
+      INTERNAL_ATTRIBUTES = [:optional_field].to_set.freeze
 
       # These attributes may be set as options or via a block in the DSL
       dsl_attributes :doc, :default, :order

data/lib/avro/builder/file_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     # TODO: eventually this should be refactored into something standalone

data/lib/avro/builder/fixed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/namespaceable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     class Railtie < Rails::Railtie
@@ -7,7 +9,7 @@ module Avro
       end
 
       rake_tasks do
-        load File.expand_path('../rake/rails_avro_generate_task.rake', __FILE__)
+        load File.expand_path('rake/rails_avro_generate_task.rake', __dir__)
       end
     end
   end

data/lib/avro/builder/rake/avro_generate_task.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rake/tasklib'
 require 'avro/builder'
 
@@ -31,6 +33,7 @@ module Avro
             desc task_desc
             task(name.to_sym => dependencies) do
               raise '"root" must be specified for Avro DSL files' unless root
+
               Avro::Builder.add_load_path(*[root, load_paths].flatten)
               Dir["#{root}/**/*.rb"].each do |dsl_file|
                 puts "Generating Avro schema from #{dsl_file}"

data/lib/avro/builder/rake/rails_avro_generate_task.rake

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'avro/builder/rake/avro_generate_task'
-Avro::Builder::Rake::AvroGenerateTask.new(dependencies: %i(environment))
+Avro::Builder::Rake::AvroGenerateTask.new(dependencies: [:environment])

data/lib/avro/builder/record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/schema_serializer_reference_state.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 

data/lib/avro/builder/schema_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     # This class implements a schema store that loads Avro::Builder

data/lib/avro/builder/type_factory.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
 
     # This concern is used by classes that create new Type instances.
     module TypeFactory
 
-      NAMED_TYPES = %w(enum fixed record).map(&:freeze).to_set.freeze
-      COMPLEX_TYPES = %w(array enum fixed map record union).map(&:freeze).to_set.freeze
+      NAMED_TYPES = ['enum', 'fixed', 'record'].map(&:freeze).to_set.freeze
+      COMPLEX_TYPES = ['array', 'enum', 'fixed', 'map', 'record', 'union'].map(&:freeze).to_set.freeze
       BUILTIN_TYPES = Avro::Schema::PRIMITIVE_TYPES.union(COMPLEX_TYPES).freeze
 
       private

data/lib/avro/builder/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'avro/builder/types/type'
 require 'avro/builder/types/complex_type'
 require 'avro/builder/types/type_referencer'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'avro/builder/namespaceable'
 require 'avro/builder/aliasable'
 require 'avro/builder/types/named_error_handling'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types
@@ -6,7 +8,7 @@ module Avro
       class RecordType < Avro::Builder::Types::NamedType
         include Avro::Builder::AnonymousTypes
 
-        DSL_METHODS = %i(required optional extends).to_set.freeze
+        DSL_METHODS = [:required, :optional, :extends].to_set.freeze
 
         dsl_attribute :doc
         dsl_attribute_alias :type_doc, :doc

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types
@@ -82,9 +84,7 @@ module Avro
 
         def validate_required_attribute!(attribute_name)
           value = public_send(attribute_name)
-          if value.nil? || value.respond_to?(:empty?) && value.empty?
-            required_attribute_error!(attribute_name)
-          end
+          required_attribute_error!(attribute_name) if value.nil? || value.respond_to?(:empty?) && value.empty?
         end
 
         attr_accessor :field, :cache

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'avro/builder/type_factory'
 
 module Avro

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
     module Types
@@ -5,7 +7,7 @@ module Avro
         include Avro::Builder::Types::ComplexType
         include Avro::Builder::Types::TypeReferencer
 
-        NULL_TYPE = 'null'.freeze
+        NULL_TYPE = 'null'
 
         dsl_attribute :types do |*types|
           if !types.empty?

data/lib/avro/builder/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Avro
   module Builder
-    VERSION = '0.16.1'.freeze
+    VERSION = '0.16.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro-builder
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Salsify Engineering
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -19,7 +19,7 @@ dependencies:
         version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.7.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -50,72 +50,72 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: json_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: overcommit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: json_spec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -134,16 +134,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: 0.85.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.0
+        version: 0.85.0
 - !ruby/object:Gem::Dependency
-  name: overcommit
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,8 +178,10 @@ files:
 - avro-builder.gemspec
 - bin/console
 - bin/setup
+- gemfiles/avro_1.10.0.gemfile
 - gemfiles/avro_1.8.2.gemfile
 - gemfiles/avro_1.9.0.gemfile
+- gemfiles/avro_1.9.1.gemfile
 - gemfiles/avro_patches_0.x.gemfile
 - gemfiles/avro_patches_1.x.gemfile
 - lib/avro/builder.rb
@@ -220,7 +222,7 @@ homepage: https://github.com/salsify/avro-builder.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -235,9 +237,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Ruby DSL to create Avro schemas
 test_files: []