cocina-models 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be949cfe01f8591a3672f1aa22abd38d318334fd516d032eafc686ed59dec0a
-  data.tar.gz: de24e56fc74e0e1beb891d68020f12b75075015557310be867775b6727ee722b
+  metadata.gz: 6e23b0e03fa39eb46ba0dd2f99befd2a1eea00a1294c44da2717892ede74a2c3
+  data.tar.gz: 1149930ef7b568cdd28b96447148d58dd9e83846133a7316a317c179dbd6330a
 SHA512:
-  metadata.gz: 04edda64c833c0b8a3646c2d7b845a7741220809c7b3e6b6a6451a59c9dbc1b0df6370ab72d814c54b72b4e855d772152a0278dc1f99821bd20e7e00cb34ce97
-  data.tar.gz: e514ee482591acf73c3cb13ecc69cd20d368c720715f56086d0515d5925e7164d3200ec90b2310bc14a4d4b1822edff45a9f7df43875da13da612faf1ae45c63
+  metadata.gz: 0cc112f49830c1b00a20fcad1c15d21e9563ba09fdf84406d55d5cbfb9e73a9612e7056b62d63629841b1c690f9fa06541e2a3a2c37d6f8f5995edc52ffa6342
+  data.tar.gz: cc12548903b6b5b1befc9a236611473f30af7323994f36de49822ad31f318770d1ecc8070344552b19019984b3899c2073bacead487ba9670123c17460873583

data/.rubocop.yml

@@ -18,4 +18,4 @@ RSpec/MultipleExpectations:
   Enabled: false
 
 RSpec/ExampleLength:
-  Max: 9
+  Max: 12

data/lib/cocina/models.rb

@@ -4,6 +4,7 @@ require 'cocina/models/version'
 require 'zeitwerk'
 require 'dry-struct'
 require 'dry-types'
+require 'json'
 
 # Help Zeitwerk find some of our classes
 class CocinaModelsInflector < Zeitwerk::Inflector

data/lib/cocina/models/admin_policy.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Cocina
   module Models
     # An admin policy object.

data/lib/cocina/models/catalog_link.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # Metadata for a catalog link
+    class CatalogLink < Dry::Struct
+      attribute :catalog, Types::Strict::String
+      attribute :catalogRecordId, Types::Strict::String
+
+      def self.from_dynamic(dyn)
+        params = {
+          catalog: dyn['catalog'],
+          catalogRecordId: dyn['catalogRecordId']
+        }
+        CatalogLink.new(params)
+      end
+    end
+  end
+end

data/lib/cocina/models/collection.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Cocina
   module Models
     # A digital repository collection.  See http://sul-dlss.github.io/cocina-models/maps/Collection.json
@@ -39,7 +37,18 @@ module Cocina
         end
       end
 
+      # Identification sub-schema for the Collection
       class Identification < Dry::Struct
+        attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
+
+        def self.from_dynamic(dyn)
+          params = {}
+          if dyn['catalogLinks']
+            params[:catalogLinks] = dyn['catalogLinks']
+                                    .map { |link| CatalogLink.from_dynamic(link) }
+          end
+          params
+        end
       end
 
       class Structural < Dry::Struct
@@ -68,6 +77,7 @@ module Cocina
         # params[:access] = Access.from_dynamic(dyn['access']) if dyn['access']
         params[:administrative] = Administrative.from_dynamic(dyn['administrative']) if dyn['administrative']
         params[:description] = Description.from_dynamic(dyn.fetch('description'))
+        params[:identification] = Identification.from_dynamic(dyn['identification']) if dyn['identification']
         Collection.new(params)
       end
 

data/lib/cocina/models/description.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Cocina
   module Models
     # Descriptive metadata.  See http://sul-dlss.github.io/cocina-models/maps/Description.json

data/lib/cocina/models/dro.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Cocina
   module Models
     # A digital repository object.  See http://sul-dlss.github.io/cocina-models/maps/DRO.json
@@ -52,7 +50,19 @@ module Cocina
         end
       end
 
+      # Identification sub-schema for the DRO
       class Identification < Dry::Struct
+        attribute :sourceId, Types::Strict::String.meta(omittable: true)
+        attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
+        def self.from_dynamic(dyn)
+          params = {}
+          params[:sourceId] = dyn['sourceId'] if dyn['sourceId']
+          if dyn['catalogLinks']
+            params[:catalogLinks] = dyn['catalogLinks']
+                                    .map { |link| CatalogLink.from_dynamic(link) }
+          end
+          params
+        end
       end
 
       # Structural sub-schema for the DRO
@@ -80,6 +90,7 @@ module Cocina
       attribute(:identification, Identification.default { Identification.new })
       attribute(:structural, Structural.default { Structural.new })
 
+      # rubocop:disable Metrics/AbcSize
       def self.from_dynamic(dyn)
         params = {
           externalIdentifier: dyn['externalIdentifier'],
@@ -90,10 +101,12 @@ module Cocina
 
         params[:access] = Access.from_dynamic(dyn['access']) if dyn['access']
         params[:administrative] = Administrative.from_dynamic(dyn['administrative']) if dyn['administrative']
-        params[:structural] = Structural.from_dynamic(dyn['structural']) if dyn['structural']
         params[:description] = Description.from_dynamic(dyn.fetch('description'))
+        params[:identification] = Identification.from_dynamic(dyn['identification']) if dyn['identification']
+        params[:structural] = Structural.from_dynamic(dyn['structural']) if dyn['structural']
         DRO.new(params)
       end
+      # rubocop:enable Metrics/AbcSize
 
       def self.from_json(json)
         from_dynamic(JSON.parse(json))

data/lib/cocina/models/file.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Cocina
   module Models
     # Metadata for a file.  See http://sul-dlss.github.io/cocina-models/maps/File.json

data/lib/cocina/models/file_set.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Cocina
   module Models
     # Metadata for a File Set.  See http://sul-dlss.github.io/cocina-models/maps/Fileset.json

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -177,6 +177,7 @@ files:
 - docs/schema.md
 - lib/cocina/models.rb
 - lib/cocina/models/admin_policy.rb
+- lib/cocina/models/catalog_link.rb
 - lib/cocina/models/checkable.rb
 - lib/cocina/models/collection.rb
 - lib/cocina/models/description.rb