cocina-models 0.99.2 → 0.99.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 359f5d4b2c40c778c96778e6595b629d62713b78ea933da12227cf6ece72d9c1
-  data.tar.gz: 8492b6d7101cae1c53c4854fa390f7a1d3812a87328b364f0ebb9466edb12d4b
+  metadata.gz: 7084352ad6644805e589d4326dc33d8fa24bf552e2477388f214a631787a6c1c
+  data.tar.gz: 9f79866b2045957d92b106951c56d1b9921c5f73e0c402cace570bfc5b1d1b8b
 SHA512:
-  metadata.gz: 424c7c15cb8ecd2e0831ce12c0fadf7bc40e99603213ff337fbd35a14252f58f33a248e1954eed55a1be253ee77be9f411517cb89537b9edc19c4d00941e0639
-  data.tar.gz: d7a01272dfad0e8dc7660af2db1ac9e50c784d91d870a0af5c71c0a02463dd7b4bc49b406e8f79725e1fe5294c6887b8a711dae5f00b233d58fc3f6c0dc61fe3
+  metadata.gz: 10d995ae9c4e178cab0217cda005fd017f94c07f46430e9e0553adbcc58f143602b7cf8c12c180c3d1f571be44f1acb27f045360a3dc0615158c3b794e4b1b5d
+  data.tar.gz: 172a116805b32a6ee40a1a14fde6e4f87b95359e59d1ee0604c0205bb33b19e3ff7fe20ce262742803b88e80794055c2aaeaa947767cb10cc6bde6ab8ba03c7c

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.99.2)
+    cocina-models (0.99.3)
       activesupport
-      commonmarker (= 2.0.1)
       deprecation
       dry-struct (~> 1.0)
       dry-types (~> 1.1)
@@ -12,7 +11,6 @@ PATH
       i18n
       jsonpath
       nokogiri
-      openapi3_parser
       openapi_parser (~> 1.0)
       super_diff
       thor
@@ -44,8 +42,6 @@ GEM
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (~> 1.0)
       rack (>= 1.5)
-    commonmarker (2.0.1)
-      rb_sys (~> 0.9)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     deprecation (1.1.0)
@@ -53,14 +49,15 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     drb (2.2.1)
-    dry-core (1.0.2)
+    dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
       logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.1.0)
-    dry-logic (1.5.0)
+    dry-inflector (1.2.0)
+    dry-logic (1.6.0)
+      bigdecimal
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
     dry-struct (1.6.0)
       dry-core (~> 1.0, < 2)
@@ -93,8 +90,6 @@ GEM
     nokogiri (1.18.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    openapi3_parser (0.10.0)
-      commonmarker (>= 1.0)
     openapi_parser (1.0.0)
     optimist (3.2.0)
     parallel (1.26.3)
@@ -107,7 +102,6 @@ GEM
     rack (3.1.8)
     rainbow (3.1.1)
     rake (13.2.1)
-    rb_sys (0.9.105)
     regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)

data/cocina-models.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'commonmarker', '2.0.1' # There is a breaking change in 2.0.2 with openapi3_parser
   spec.add_dependency 'deprecation'
   spec.add_dependency 'dry-struct', '~> 1.0'
   spec.add_dependency 'dry-types', '~> 1.1'
@@ -34,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'i18n' # for validating BCP 47 language tags, according to RFC 4646
   spec.add_dependency 'jsonpath' # used for date/time validation
   spec.add_dependency 'nokogiri'
-  spec.add_dependency 'openapi3_parser' # Parsing openapi doc
   # Match these version requirements to what committee wants,
   # so that our client (non-committee) users have the same dependencies.
   spec.add_dependency 'openapi_parser', '~> 1.0'

data/lib/cocina/generator/generator.rb

@@ -96,7 +96,9 @@ module Cocina
       end
 
       def schemas
-        @schemas ||= Openapi3Parser.load_file(options[:openapi]).components.schemas
+        @schemas ||= OpenAPIParser.parse(YAML.load_file(options[:openapi]), strict_reference_validation: true)
+                                  .find_object('#/components')
+                                  .schemas
       end
 
       def schema_for(schema_name, lite: false)

data/lib/cocina/generator/schema.rb

@@ -71,7 +71,7 @@ module Cocina
       end
 
       def validatable?
-        !schema_doc.node_context.document.paths["/validate/#{schema_doc.name}"].nil? && !lite
+        !schema_doc.root.paths.path["/validate/#{schema_doc.name}"].nil? && !lite
       end
 
       def properties
@@ -118,13 +118,13 @@ module Cocina
       end
 
       def schema_properties_for(doc)
-        doc.properties.map do |key, properties_doc|
+        Array(doc.properties).map do |key, properties_doc|
           clazz = property_class_for(properties_doc)
           clazz.new(properties_doc,
                     key: key,
-                    required: doc.requires?(key),
+                    required: doc.required&.include?(key),
                     relaxed: lite && clazz != SchemaValue,
-                    nullable: properties_doc.nullable?,
+                    nullable: properties_doc.nullable,
                     parent: self,
                     schemas: schemas)
         end

data/lib/cocina/generator/schema_array.rb

@@ -4,12 +4,17 @@ module Cocina
   module Generator
     # Class for generating from an openapi array
     class SchemaArray < SchemaBase
+      GENERIC_ITEMS_NAME = 'items'
+
       def generate
         "attribute :#{name.camelize(:lower)}, Types::Strict::Array.of(#{array_of_type}).default([].freeze)"
       end
 
       def array_of_type
-        schema_doc.items.name || dry_datatype(schema_doc.items)
+        items_name = schema_doc.items.name
+        return items_name unless items_name == GENERIC_ITEMS_NAME
+
+        dry_datatype(schema_doc.items)
       end
     end
   end

data/lib/cocina/generator/schema_base.rb

@@ -50,7 +50,7 @@ module Cocina
       end
 
       def deprecation
-        return '' unless schema_doc.deprecated?
+        return '' unless schema_doc.deprecated
 
         "# DEPRECATED\n"
       end

data/lib/cocina/generator/vocab.rb

@@ -51,7 +51,7 @@ module Cocina
       }.freeze
 
       def vocabs
-        type_properties = schemas.values.map { |schema| schema.properties['type'] }.compact
+        type_properties = schemas.values.map { |schema| schema.properties&.[]('type') }.compact
         type_properties.map(&:enum).flat_map(&:to_a)
                        .filter { |vocab| vocab.start_with?(BASE) }
                        .uniq

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.99.2'
+    VERSION = '0.99.3'
   end
 end

data/lib/cocina/models.rb

@@ -7,7 +7,6 @@ require 'dry-types'
 require 'json'
 require 'yaml'
 require 'openapi_parser'
-require 'openapi3_parser'
 require 'active_support'
 require 'active_support/core_ext'
 require 'thor'
@@ -40,6 +39,17 @@ loader.ignore("#{__dir__}/rspec.rb")
 loader.ignore("#{__dir__}/rspec")
 loader.setup
 
+module OpenAPIParser
+  module Schemas
+    # Patch OpenAPIParser::Schemas::Schema so it can tell us its name, the way Openapi3Parser schemas do.
+    class Schema
+      def name
+        object_reference.split('/').last
+      end
+    end
+  end
+end
+
 module Cocina
   # Provides Ruby objects for the repository and serializing them to/from JSON.
   module Models
@@ -191,7 +201,10 @@ module Cocina
 
     def self.druid_regex
       @druid_regex ||= begin
-        str = Openapi3Parser.load_file('openapi.yml').components.schemas['Druid'].pattern
+        str = OpenAPIParser.parse(YAML.load_file('openapi.yml'), strict_reference_validation: true)
+                           .find_object('#/components')
+                           .schemas['Druid']
+                           .pattern
         Regexp.new(str)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.99.2
+  version: 0.99.3
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: commonmarker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: openapi3_parser
-  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: openapi_parser
   requirement: !ruby/object:Gem::Requirement
@@ -564,7 +536,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Data models for the SDR