dor-services 5.3.1 → 5.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f006d110ed66d7b3fcde6749b7a52d867637f124
-  data.tar.gz: e393c3917969413c2cd9832f6a2c359b6eadcd04
+  metadata.gz: b4612df0551e79474ccb0e568de29cf05c42f6f7
+  data.tar.gz: cf816af8f863af33f717fc63e9ec4ede906eb758
 SHA512:
-  metadata.gz: baa38904fa1e4fa8b38b9caa1d42f65f6bd08848775dc735ecb31e2b11d807d450bc0e1d05ffd2c7a2f1c7cb0320f003530b1097f5628d484b02c05cd90cc74b
-  data.tar.gz: a9a8b7913940c7762afbb24b4ac7c79154507ecb7c1338a17085d9ddb40f560ee214568f77d9348dee6372f3819ff5291d08cab592fc9e879a75e684a9848540
+  metadata.gz: 91ada9a335362058cf16d42eb6fcd9e99542fc288577bd1cf1942004985302747dd19df89690c94ed0f476cd392f4a3e19b0426414ebc251969ae1a139849eed
+  data.tar.gz: 0341a7e1b9590783c3df4fd5d50fdc8872aecf4da3966375b2d35127edfccb42b61ec0b09347fe637d102147b6723da3ed551980dd8650854c037eb94ac8df3b

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -40,18 +40,22 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
     node ? [node['source'], node.text].join(':') : nil
   end
 
+  # @param  [String, Nil] New value, or nil/empty string to delete sourceId node
+  # @return [String, Nil] The same value, as per Ruby convention for assignment operators
+  # @note The actual values assigned will have leading/trailing whitespace stripped.
   def sourceId=(value)
     node = find_by_terms(:sourceId).first
-    unless value.present?   # so setting it to '' is the same as removal: worth documenting maybe?
+    unless value.present? # so setting it to '' is the same as removal: worth documenting maybe?
       node.remove unless node.nil?
       return nil
     end
-    (source, val) = value.split(/:/, 2)
-    raise ArgumentError, "Source ID must follow the format namespace:value, not '#{value}'" unless source.present? && val.present?
+    parts = value.split(':').map(&:strip)
+    # parts = value.split(/:/, 2).map(&:strip) # if we needed to allow colons in values or bunched colon separators
+    raise ArgumentError, "Source ID must follow the format 'namespace:value', not '#{value}'" unless
+      parts.length == 2 && parts[0].present? && parts[1].present?
     node ||= ng_xml.root.add_child('<sourceId/>').first
-    node['source'] = source
-    node.content = val
-    node
+    node['source'] = parts[0]
+    node.content = parts[1]
   end
 
   def tags

data/lib/dor/models/identifiable.rb

@@ -90,9 +90,20 @@ module Dor
       end
     end
 
-    def set_source_id(source_id)
+    # Convenience method
+    def source_id
+      identityMetadata.sourceId
+    end
+
+    # Convenience method
+    # @param  [String] source_id the new source identifier
+    # @return [String] same value, as per Ruby assignment convention
+    # @raise  [ArgumentError] see IdentityMetadataDS for logic
+    def source_id=(source_id)
       identityMetadata.sourceId = source_id
     end
+    alias_method :set_source_id, :source_id=
+    deprecate set_source_id: 'Use source_id= instead'
 
     def add_other_Id(type, val)
       if identityMetadata.otherId(type).length > 0
@@ -144,7 +155,6 @@ module Dor
       if dupe_existing_tag
         raise "An existing tag (#{dupe_existing_tag}) is the same, consider using update_tag?"
       end
-
       normalized_tag
     end
 
@@ -153,11 +163,9 @@ module Dor
     # @return [Array] the tag split into an array via ':'
     def validate_tag_format(tag_str)
       tag_arr = split_tag_to_arr(tag_str)
-
       if tag_arr.length < 2
         raise ArgumentError, "Invalid tag structure: tag '#{tag_str}' must have at least 2 elements"
       end
-
       if tag_arr.detect {|str| str.empty?}
         raise ArgumentError, "Invalid tag structure: tag '#{tag_str}' contains empty elements"
       end

data/lib/dor/models/processable.rb

@@ -103,7 +103,7 @@ module Dor
       Dor::WorkflowService.get_milestones('dor', pid)
     end
 
-    # @return [Hash] including :current_version, :status_code and :status_time
+    # @return [Hash{Symbol => Object}] including :current_version, :status_code and :status_time
     def status_info
       current_version = '1'
       begin
@@ -146,9 +146,8 @@ module Dor
       result
     end
 
-    # return the text translation of the status code, minus any trailing parenthetical explanation
-    # e.g. 'In accessioning (described)' and 'In accessioning (described, published)' both come back
-    # as 'In accessioning'
+    # @return [String] text translation of the status code, minus any trailing parenthetical explanation
+    # e.g. 'In accessioning (described)' and 'In accessioning (described, published)' both return 'In accessioning'
     def simplified_status_code_disp_txt(status_code)
       STATUS_CODE_DISP_TXT[status_code].gsub(/\(.*\)$/, '').strip
     end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.3.1'
+  VERSION = '5.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.3.2
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora