avro-builder 0.17.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a91ca8206639d20fe48b9ef6f634493a08af34afe223ad06d12c3e930f45bc91
-  data.tar.gz: 12ed60307f215d22416ffc2f2d33966ff4481e4cfadb4c011275e811dc6fcfa4
+  metadata.gz: dec624f01d72838e79c5d671db5e8e5df329fecc72bb2cb4b782a5f50f591936
+  data.tar.gz: 02d143c8181c2e196b3d488a086104c528d45b843be9319d4a1766716056b63a
 SHA512:
-  metadata.gz: 2db9b4753353a9a1e8ecc4c90c5127d21fc4f13f985ce1ab6c5e387cc153691f5a27deb7f2784d92413dace0052c214c0f640779a296f6cfdcceb266c6ec9152
-  data.tar.gz: 96565b0a5bccb29930970c992e6f09dabb2c9af640a912ffaffe0c0e53f65820a1378fb7a4799585f9e45337d71c293476b87742c2ebd7060320f5bde8300ab3
+  metadata.gz: 22c5c781421196c20ec4232ec0341d0c10420a5dbb6e7a9b9ddf4864f7372419763f9a7d36671fb323e94a077dc1fdffb76df6347bfe71d961fff2255951abbb
+  data.tar.gz: 0dc6f9d230c3719e268fa433798f440402d169f63eb8b522a73641e94769792c6a66c0cd9dda145cc5cc2faa4ae44b66723690afd8995d7b4eb43ae8adfb125c

data/.circleci/config.yml

@@ -0,0 +1,77 @@
+version: 2.1
+jobs:
+  lint:
+    docker:
+      - image: salsify/ruby_ci:2.6.6
+    working_directory: ~/avro-builder
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v2-gems-ruby-2.6.6-{{ checksum "avro-builder.gemspec" }}-{{ checksum "Gemfile" }}
+            - v2-gems-ruby-2.6.6-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v2-gems-ruby-2.6.6-{{ checksum "avro-builder.gemspec" }}-{{ checksum "Gemfile" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
+      - run:
+          name: Run Rubocop
+          command: bundle exec rubocop
+  test:
+    parameters:
+      gemfile:
+        type: string
+      ruby-version:
+        type: string
+    docker:
+      - image: salsify/ruby_ci:<< parameters.ruby-version >>
+    environment:
+      CIRCLE_TEST_REPORTS: "test-results"
+      BUNDLE_GEMFILE: << parameters.gemfile >>
+    working_directory: ~/avro-builder
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v2-gems-ruby-<< parameters.ruby-version >>-{{ checksum "avro-builder.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+            - v2-gems-ruby-<< parameters.ruby-version >>-
+      - run:
+          name: Install Gems
+          command: |
+            if ! bundle check --path=vendor/bundle; then
+              bundle install --path=vendor/bundle --jobs=4 --retry=3
+              bundle clean
+            fi
+      - save_cache:
+          key: v2-gems-ruby-<< parameters.ruby-version >>-{{ checksum "avro-builder.gemspec" }}-{{ checksum "<< parameters.gemfile >>" }}
+          paths:
+            - "vendor/bundle"
+            - "gemfiles/vendor/bundle"
+      - run:
+          name: Run Tests
+          command: |
+            bundle exec rspec --format RspecJunitFormatter --out $CIRCLE_TEST_REPORTS/rspec/junit.xml --format progress spec
+      - store_test_results:
+          path: "test-results"
+workflows:
+  build:
+    jobs:
+      - lint
+      - test:
+          matrix:
+            parameters:
+              gemfile:
+                - "gemfiles/avro_1.9.gemfile"
+                - "gemfiles/avro_1.10.gemfile"
+              ruby-version:
+              - "2.6.6"
+              - "2.7.2"
+              - "3.0.0"

data/.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
       - Exclude
   NewCops: disable
   Exclude:
-    - "gemfiles/*"
+    - "gemfiles/**/*"
 
 Style/RaiseArgs:
   EnforcedStyle: compact

data/.ruby-version

@@ -1 +1 @@
-2.5.8
+2.6.6

data/Appraisals

@@ -1,26 +1,9 @@
 # frozen_string_literal: true
 
-appraise 'avro-1.8.2' do
-  gem 'avro', '1.8.2'
+appraise 'avro-1.9' do
+  gem 'avro', '1.9.2'
 end
 
-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'
-end
-
-appraise 'avro-patches-1.x' do
-  gem 'avro-patches', '>= 1.0.0'
+appraise 'avro-1.10' do
+  gem 'avro', '1.10.1'
 end

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # avro-builder changelog
 
+## v1.0.0
+- Drop support for Avro < 1.9.
+- Drop support for Ruby < 2.6.
+- Add Ruby 3.0 support.
+- Bug fix: Use multi_json to encode schemas and ensure that a JSON encoder
+  is always present.
+
 ## v0.17.0
 - Add support for enum defaults introduced in Avro v1.10.0.
 

data/README.md

@@ -1,9 +1,9 @@
 # Avro::Builder
 
-[![Build Status](https://travis-ci.org/salsify/avro-builder.svg?branch=master)][travis]
+[![Build Status](https://circleci.com/gh/salsify/avro-builder.svg?style=svg)][circleci]
 [![Gem Version](https://badge.fury.io/rb/avro-builder.svg)](https://badge.fury.io/rb/avro-builder)
 
-[travis]: http://travis-ci.org/salsify/avro-builder
+[circleci]: https://circleci.com/gh/salsify/avro-builder
 
 `Avro::Builder` provides a Ruby DSL to create [Apache Avro](https://avro.apache.org/docs/current/) Schemas.
 
@@ -283,18 +283,6 @@ The DSL supports setting a logical type on any type except a union. The logical
 types defined in the Avro [spec](https://avro.apache.org/docs/1.8.1/spec.html#Logical+Types)
 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-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-patches'
-```
-
 A logical type can be specified for a field using the `logical_type` attribute:
 
 ```ruby

data/avro-builder.gemspec

@@ -20,7 +20,10 @@ 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.11'
+  spec.required_ruby_version = '>= 2.6'
+
+  spec.add_runtime_dependency 'avro', '>= 1.9.0', '< 1.11'
+  spec.add_runtime_dependency 'multi_json'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler', '~> 2.0'
@@ -29,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its'
-  spec.add_development_dependency 'salsify_rubocop', '~> 0.85.0'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'salsify_rubocop', '~> 1.0.1'
   spec.add_development_dependency 'simplecov'
 end

data/gemfiles/{avro_1.10.0.gemfile → avro_1.10.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.10.0"
+gem "avro", "1.10.1"
 
 gemspec path: "../"

data/gemfiles/{avro_1.9.1.gemfile → avro_1.9.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "avro", "1.9.1"
+gem "avro", "1.9.2"
 
 gemspec path: "../"

data/lib/avro/builder/dsl.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'avro'
+require 'multi_json'
 require 'avro/builder/errors'
 require 'avro/builder/dsl_options'
 require 'avro/builder/dsl_attributes'
@@ -77,7 +78,7 @@ module Avro
       # Return the last schema object processed as an Avro JSON schema
       def to_json(validate: true, pretty: true)
         hash = to_h
-        (pretty ? JSON.pretty_generate(hash) : hash.to_json).tap do |json|
+        MultiJson.dump(hash, { pretty: pretty }).tap do |json|
           # Uncomment the next line to debug:
           # puts json
           # Parse the schema to validate before returning

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

@@ -12,6 +12,7 @@ module Avro
                       :load_paths, :dependencies, :filetype
 
         def initialize(name: :generate, dependencies: [])
+          super()
           @name = name
           @task_namespace = :avro
           @task_desc = 'Generate Avro schema files from Avro::Builder DSL'

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

@@ -13,7 +13,8 @@ module Avro
         dsl_attribute :doc
         dsl_attribute_alias :type_doc, :doc
 
-        def initialize(name = nil, options: {}, cache:, field: nil, &block)
+        def initialize(name = nil, cache:, options: {}, field: nil, &block) # rubocop:disable Lint/MissingSuper
+          # TODO: Fix missing call to super
           @avro_type_name = :record
           @name = name
           @cache = cache

data/lib/avro/builder/version.rb

@@ -2,6 +2,6 @@
 
 module Avro
   module Builder
-    VERSION = '0.17.0'
+    VERSION = '1.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro-builder
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-08 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.11'
@@ -26,10 +26,24 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.11'
+- !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'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +142,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: salsify_rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.85.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -163,12 +191,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -178,12 +206,8 @@ 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
+- gemfiles/avro_1.10.gemfile
+- gemfiles/avro_1.9.gemfile
 - lib/avro/builder.rb
 - lib/avro/builder/aliasable.rb
 - lib/avro/builder/anonymous_types.rb
@@ -230,15 +254,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Ruby DSL to create Avro schemas

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-  - 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/gemfiles/avro_1.8.2.gemfile

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

data/gemfiles/avro_1.9.0.gemfile

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

data/gemfiles/avro_patches_0.x.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "avro", "1.8.2"
-gem "avro-patches", "< 1.0.0"
-
-gemspec path: "../"

data/gemfiles/avro_patches_1.x.gemfile

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