cocina-models 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb44299e9e86c9fdde5589710db813e3691add7bbf59b14d34ab6edf89cffa9b
-  data.tar.gz: a63852fd6c5a8369ff49236b4fea55504dfaa3e0944fcc74e6da03605031e504
+  metadata.gz: eaac4eacd465708a36f6f62f975cf1af58eb17015ada6ce45785564547ab4e0e
+  data.tar.gz: 521e3b949290b6f61fd8a2b83ed984ae2fc4a5e5598ea3eab3a42765cf311218
 SHA512:
-  metadata.gz: be279159d4b042bc5265db234d6f938bcecfafd5240c969a5f5f77af6acf7a00aadfad6076110f3674596f7354b435c526de2559067fbd53539907e209c28369
-  data.tar.gz: 1bab7879c6051415a51226b5abd983f38fdc883dd93d5053c39240a51943e1ca4baae19034929861edc4579fa7fdca0b4b61bd4a08aab5539ebd7bb45ee520b6
+  metadata.gz: 51b3220584a9ac5ddfb75522b1def45b1f6f661f4fdb6259582f162b91db7d6b558f4dc9e6a752d9d85b49d4e6b622827397ff5612a97de4e0bee6cc6408c2e6
+  data.tar.gz: 2c0b9891af645153ddeb6c4ad4dec22c1af8fb413c6a47f546baf641c4b7a2e404fcdc31fd0fcec0ed219d2e23bde03f54366ec35248f8c1af81c6280cc67baa

data/lib/cocina/models/admin_policy.rb

@@ -87,17 +87,7 @@ module Cocina
       attribute(:structural, Structural.default { Structural.new })
 
       def self.from_dynamic(dyn)
-        params = {
-          externalIdentifier: dyn['externalIdentifier'],
-          type: dyn['type'],
-          label: dyn['label'],
-          version: dyn['version']
-        }
-
-        # 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'))
-        AdminPolicy.new(params)
+        AdminPolicyBuilder.build(self, dyn)
       end
 
       def self.from_json(json)

data/lib/cocina/models/admin_policy_builder.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # This creates an AdminPolicy or a RequestAdminPolicy from dynamic attributes
+    class AdminPolicyBuilder
+      # @return [AdminPolicy,RequestAdminPolicy]
+      def self.build(klass, dyn)
+        params = {
+          type: dyn['type'],
+          label: dyn['label'],
+          version: dyn['version']
+        }
+        params[:externalIdentifier] = dyn['externalIdentifier'] if needs_id?(klass)
+
+        # params[:access] = Access.from_dynamic(dyn['access']) if dyn['access']
+        if dyn['administrative']
+          params[:administrative] = AdminPolicy::Administrative
+                                    .from_dynamic(dyn['administrative'])
+        end
+        params[:description] = Description.from_dynamic(dyn.fetch('description'))
+        klass.new(params)
+      end
+
+      def self.needs_id?(klass)
+        klass.attribute_names.include?(:externalIdentifier)
+      end
+    end
+  end
+end

data/lib/cocina/models/request_admin_policy.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # An request to create an AdminPolicy object.
+    # This is the same as AdminPolicy, except it doesn't have externalIdentifier.
+    class RequestAdminPolicy < Dry::Struct
+      attribute :type, Types::String.enum(*AdminPolicy::TYPES)
+      attribute :label, Types::Strict::String
+      attribute :version, Types::Coercible::Integer
+      attribute(:access, AdminPolicy::Access.default { AdminPolicy::Access.new })
+      attribute(:administrative, AdminPolicy::Administrative.default { AdminPolicy::Administrative.new })
+      # Allowing description to be omittable for now (until rolled out to consumers),
+      # but I think it's actually required for every DRO
+      attribute :description, Description.optional.default(nil)
+      attribute(:identification, AdminPolicy::Identification.default { AdminPolicy::Identification.new })
+      attribute(:structural, AdminPolicy::Structural.default { AdminPolicy::Structural.new })
+
+      def self.from_dynamic(dyn)
+        AdminPolicyBuilder.build(self, dyn)
+      end
+
+      def self.from_json(json)
+        from_dynamic(JSON.parse(json))
+      end
+    end
+  end
+end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.18.0'
+    VERSION = '0.19.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -177,6 +177,7 @@ files:
 - docs/schema.md
 - lib/cocina/models.rb
 - lib/cocina/models/admin_policy.rb
+- lib/cocina/models/admin_policy_builder.rb
 - lib/cocina/models/catalog_link.rb
 - lib/cocina/models/checkable.rb
 - lib/cocina/models/collection.rb
@@ -187,6 +188,7 @@ files:
 - lib/cocina/models/file.rb
 - lib/cocina/models/file_set.rb
 - lib/cocina/models/release_tag.rb
+- lib/cocina/models/request_admin_policy.rb
 - lib/cocina/models/request_collection.rb
 - lib/cocina/models/request_dro.rb
 - lib/cocina/models/types.rb