dor-services 9.4.0 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 496d07425ebd926eb69390d391aae0adfa646e365559152389b6ab75bd8c6f83
-  data.tar.gz: d76539bcc0b0516998343292cde5679071cb4cab7e8e7b6c3838801ac8158dfa
+  metadata.gz: f696769ddd2ceb91345d4d0b7aa5b3ebdfa1b84a3c990055187f058b2d422a66
+  data.tar.gz: 0d354e436399a02330fdd07db2fae0b0eddfa14c710d93807aadb925dfa57c0f
 SHA512:
-  metadata.gz: 70cc7de352cf5b9dfa40da2e54d29c016e3d04f30736a1775cb8c302d0cd77b6f7250d29f13a43ae536c1dabc2e9ae56ab38d1bba6091e92497b32decac965c8
-  data.tar.gz: da9531081f100de69b0cf6af3e5900ff532128245a00c47c4f618d19209c00b1ab7a10d878ad242b57913e9b3c7f2b4db8bb01d66191183bafdcf4a1acc815c9
+  metadata.gz: 4a645755fe069b45ed3f07f02b742990acc25234214f3968e997b5c76475b70df1c3bccc400f6831aab1fc2a6770d409b3cedcb65f4dd7a36e38fdf0e2752bbe
+  data.tar.gz: 88a519d69bea0c6a08ea8ce6569468778e10431595e759f8e38ee4c049674125cef29f0425f83f59597ba3b62bd4c7d348c5bc5115b5213167414e1991626db4

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -8,6 +8,7 @@ module Dor
     # ids for previous and current catkeys
     CATKEY_TYPE_ID = 'catkey'
     PREVIOUS_CATKEY_TYPE_ID = 'previous_catkey'
+    BARCODE_TYPE_ID = 'barcode'
 
     set_terminology do |t|
       t.root(path: 'identityMetadata')
@@ -144,6 +145,25 @@ module Dor
       otherId(PREVIOUS_CATKEY_TYPE_ID)
     end
 
+    def barcode
+      otherId(BARCODE_TYPE_ID).first
+    end
+
+    # Convenience method to set the barcode
+    # @param  [String] val the new barcode
+    # @return [String] same value, as per Ruby assignment convention
+    def barcode=(val)
+      if val.blank? # if we are setting the barcode to blank, remove the node from XML
+        remove_other_Id(BARCODE_TYPE_ID)
+      elsif barcode.blank? # if there is no current barcode, then add it
+        add_other_Id(BARCODE_TYPE_ID, val)
+      else # if there is a current barcode, update the current barcode to the new value
+        update_other_Id(BARCODE_TYPE_ID, val)
+      end
+
+      val
+    end
+
     # Helper method to get the release tags as a nodeset
     # @return [Nokogiri::XML::NodeSet] all release tags and their attributes
     def release_tags

data/lib/dor/models/abstract.rb

@@ -76,7 +76,7 @@ module Dor
 
     delegate :full_title, :stanford_mods, to: :descMetadata
     delegate :rights, to: :rightsMetadata
-    delegate :catkey, :catkey=, :source_id, :source_id=,
+    delegate :catkey, :catkey=, :source_id, :source_id=, :barcode, :barcode=,
              :objectId, :objectId=, :objectCreator, :objectCreator=,
              :objectLabel, :objectLabel=, :objectType, :objectType=,
              :other_ids=, :otherId, :release_tags, :previous_catkeys,

data/lib/dor/models/admin_policy_object.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
+require 'deprecation'
+
 module Dor
   class AdminPolicyObject < Dor::Abstract
+    extend Deprecation
     has_many :things, property: :is_governed_by, class_name: 'ActiveFedora::Base'
     has_object_type 'adminPolicy'
     has_metadata name: 'administrativeMetadata', type: Dor::AdministrativeMetadataDS, label: 'Administrative Metadata'
@@ -29,11 +32,13 @@ module Dor
     def agreement
       agreement_object ? agreement_object.pid : ''
     end
+    deprecation_deprecate agreement: 'use #agreement_object_id instead'
 
     def agreement=(val)
       raise ArgumentError, 'agreement must have a valid druid' if val.blank?
 
       self.agreement_object = Dor.find val.to_s, cast: true
     end
+    deprecation_deprecate :agreement= => 'use #agreement_object_id= instead'
   end
 end

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '9.4.0'
+  VERSION = '9.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 9.4.0
+  version: 9.5.0
 platform: ruby
 authors:
 - Michael Klein
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora