cocina-models 0.99.1 → 0.99.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86609a02da21c8f42f2244ef7f947b1eff8cc4063feef12118b2f605fe516ddd
-  data.tar.gz: 7c5d25fbfdab8c87f414c8ecd000e047c2387a26949c460427071e82167c3ec6
+  metadata.gz: 7084352ad6644805e589d4326dc33d8fa24bf552e2477388f214a631787a6c1c
+  data.tar.gz: 9f79866b2045957d92b106951c56d1b9921c5f73e0c402cace570bfc5b1d1b8b
 SHA512:
-  metadata.gz: 54d32dd0dff4963df008172bf36f0c229e903375ad4c14f7a00fb3c892e5cc8322751baaf61ef52f14c78503af64b2ac0a8103fe39d92c849113b6d7a03d32cd
-  data.tar.gz: 20328dcaeeed98b9baa20966dda3c73930731627db9fd4eab242ec5894424e3973a75b7826d09c26f0f8a4c9e29536fbd76a47417f6b9bb506b1887c1168e428
+  metadata.gz: 10d995ae9c4e178cab0217cda005fd017f94c07f46430e9e0553adbcc58f143602b7cf8c12c180c3d1f571be44f1acb27f045360a3dc0615158c3b794e4b1b5d
+  data.tar.gz: 172a116805b32a6ee40a1a14fde6e4f87b95359e59d1ee0604c0205bb33b19e3ff7fe20ce262742803b88e80794055c2aaeaa947767cb10cc6bde6ab8ba03c7c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.99.1)
+    cocina-models (0.99.3)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -11,7 +11,6 @@ PATH
       i18n
       jsonpath
       nokogiri
-      openapi3_parser
       openapi_parser (~> 1.0)
       super_diff
       thor
@@ -20,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.2)
+    activesupport (8.0.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -32,18 +31,17 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ast (2.4.2)
     attr_extras (7.1.0)
     base64 (0.2.0)
     benchmark (0.4.0)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     byebug (11.1.3)
     committee (5.0.0)
       json_schema (~> 0.14, >= 0.14.3)
       openapi_parser (~> 1.0)
       rack (>= 1.5)
-    commonmarker (1.1.5)
-      rb_sys (~> 0.9)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     deprecation (1.1.0)
@@ -51,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)
@@ -72,27 +71,25 @@ GEM
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
-    edtf (3.1.1)
-      activesupport (>= 3.0, < 8.0)
+    edtf (3.2.0)
+      activesupport (>= 3.0, < 9.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    json (2.8.2)
+    json (2.9.1)
     json_schema (0.21.0)
     jsonpath (1.1.5)
       multi_json
     language_server-protocol (3.17.0.3)
-    logger (1.6.1)
+    logger (1.6.4)
     mini_portile2 (2.8.8)
-    minitest (5.25.2)
+    minitest (5.25.4)
     multi_json (1.15.0)
-    nokogiri (1.16.7)
+    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)
@@ -105,8 +102,7 @@ GEM
     rack (3.1.8)
     rainbow (3.1.1)
     rake (13.2.1)
-    rb_sys (0.9.103)
-    regexp_parser (2.9.2)
+    regexp_parser (2.10.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -119,20 +115,20 @@ GEM
     rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
+    rspec-support (3.13.2)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.68.0)
+    rubocop (1.69.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.36.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
@@ -148,7 +144,7 @@ GEM
     rubocop-rspec_rails (2.29.1)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    securerandom (0.3.2)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -162,7 +158,10 @@ GEM
     thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.3)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
     zeitwerk (2.7.1)
 
 PLATFORMS

data/cocina-models.gemspec

@@ -33,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.1'
+    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.1
+  version: 0.99.3
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-27 00:00:00.000000000 Z
+date: 2025-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,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
@@ -550,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