cocina-models 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10987f18b2d6489790ca3edbcead8ff6aa2fedfbca1bcb18d5606b8112c88f7e
-  data.tar.gz: 1431af2debd70299b4574997d842f0107ce356b44b67123deedf237b08f669b9
+  metadata.gz: 56996d980d118dcf4b8d40ceff5ec6fbff8b24abb997c4b9e0197bb528b8d079
+  data.tar.gz: fbd4dc60749aa56fb60334efb0841a707e676a86117129c0f792bbe7cb8e6efe
 SHA512:
-  metadata.gz: ff3ba29a4e6ca6a23bb55bdb12a2a4ef26852468155d812e9572a07b0711e6e22e549fbd186985e62b3b6e90deb501d938db62cf73c61823c80759a5d2b40fcc
-  data.tar.gz: a480849d853c21828d5830f6227d9e169a1f9cefac484038ebd6d0f0d661d9c40e44e217e15cd62f80a9efcfad2a51ad8c009fbe6048040475c21a5f4485228e
+  metadata.gz: 2d329215bcbe26594b87741cd14eeb17d6d3059812ac9049782c8f5c571cb1243abdb46ce16f0c664704b834fbdf3984f37813aa0fc339b98fa58bf79ff35e96
+  data.tar.gz: 16a11f6ee008decd17ffee1bd3329e3c8b9d67ed6350d536a9f1526ecce6d28ccddba4ceff688b2e24163b93c8859e4798e050106a747b8fef2574c9f62df140

data/.circleci/config.yml

@@ -0,0 +1,51 @@
+version: 2.1
+executors:
+  docker-publisher:
+    docker:
+    - image: circleci/buildpack-deps:stretch
+jobs:
+  test:
+    docker:
+    - image: circleci/ruby:2.7.0-node
+    steps:
+    - checkout
+    - run:
+        name: install bundler
+        command: gem install bundler -v 2.1.4
+    - run:
+        name: Install gem dependencies
+        command: bundle check || bundle install
+    - run:
+        name: Lint using rubocop
+        command: bundle exec rubocop
+    - run:
+        name: Setup Code Climate test-reporter
+        command: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
+    - run:
+        name: Run RSpec test suite
+        command: bundle exec rspec
+    - run:
+        name: upload test coverage report to Code Climate
+        command: ./cc-test-reporter after-build --coverage-input-type simplecov --exit-code $?
+    - run:
+        name: Validate API specification
+        command: |
+          sudo npm install -g openapi-enforcer-cli
+          result=$(openapi-enforcer validate openapi.yml)
+          [[ $result =~ "Document is valid" ]] && {
+          echo "Validation good"
+          exit 0
+          } || {
+          echo $result
+          exit 1
+          }
+
+workflows:
+  version: 2
+
+  test:
+    jobs:
+    - test

data/README.md

@@ -2,6 +2,7 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/472273351516ac01dce1/test_coverage)](https://codeclimate.com/github/sul-dlss/cocina-models/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/472273351516ac01dce1/maintainability)](https://codeclimate.com/github/sul-dlss/cocina-models/maintainability)
 [![Gem Version](https://badge.fury.io/rb/cocina-models.svg)](https://badge.fury.io/rb/cocina-models)
+[![OpenAPI Validator](http://validator.swagger.io/validator?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/master/openapi.yml)](http://validator.swagger.io/validator/debug?url=https://raw.githubusercontent.com/sul-dlss/cocina-models/master/openapi.yml)
 
 # Cocina::Models
 

data/cocina-models.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.74.0'
   spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov', '~> 0.17.0'
 end

data/exe/generator

@@ -4,6 +4,6 @@
 require 'bundler/setup'
 $LOAD_PATH.unshift 'lib'
 
-require 'cocina/generator'
+require 'cocina/models'
 
 Cocina::Generator::Generator.start(ARGV)

data/lib/cocina/generator.rb

@@ -1,16 +1,5 @@
 # frozen_string_literal: true
 
-require 'zeitwerk'
-require 'yaml'
-require 'active_support/core_ext/string'
-require 'thor'
-require 'openapi3_parser'
-require 'byebug'
-
-loader = Zeitwerk::Loader.new
-loader.push_dir(File.absolute_path("#{__FILE__}/../.."))
-loader.setup
-
 module Cocina
   # Module for generating Cocina models from openapi.
   module Generator

data/lib/cocina/models.rb

@@ -5,9 +5,12 @@ require 'zeitwerk'
 require 'dry-struct'
 require 'dry-types'
 require 'json'
+require 'yaml'
 require 'openapi_parser'
+require 'openapi3_parser'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'yaml'
+require 'active_support/core_ext/string'
+require 'thor'
 
 # Help Zeitwerk find some of our classes
 class CocinaModelsInflector < Zeitwerk::Inflector

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.31.0'
+    VERSION = '0.31.1'
   end
 end

data/openapi.yml

@@ -320,7 +320,7 @@ components:
               required:
                 - value
             - type: object
-            - required:
+              required:
                 - structuredValue
     Description:
       type: object

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.31.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -196,16 +196,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
 description: SDR data models that can be validated
 email:
 - jcoyne@justincoyne.com
@@ -214,12 +214,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".github/pull_request_template.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile

data/.travis.yml

@@ -1,23 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.3
-  - 2.6.4
-before_install: gem install bundler -v 2.1.4
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-
-notifications:
-  email: false
-
-env:
-  global:
-    - CC_TEST_REPORTER_ID=882e943342bed5285a6078be9a41b7738ae7ebd17458c08414581cbece99b8e6