dor-services 8.5.0 → 8.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61f15c16dd2f9137b47772916d0a6e44cbb374c88e4370e891ff51e8338feaf3
-  data.tar.gz: fe8b53c9d1f31e4dd3e1f3ab91878a4d2f8e2cd999332e31d2d4004e4e4f152f
+  metadata.gz: a4ca8c1eccdd421044aafd1d3eee2de4e7492ca0c66f30e25bfd5befac06e832
+  data.tar.gz: b231f5ec8b86bfcc3160359911005b10f65bb5696f8b0428bdd554c7fcf113f6
 SHA512:
-  metadata.gz: 1abaab49ac04961de4ee7a95ef5e3b9c10cb0fe331da1c88f20989c11cda7705878deb346bd7d1c16aac1ded1e0b2564138a3a043ad0a0d7c5931a76cf800b95
-  data.tar.gz: 06f071e7d3e82b8bd2bac465b3667a2b09a010160f0cfe4ca847af56b906d5bcccb4a5c8eafe19ef0b470a73f3e62e7fc7b09ec981dc9be7144429fca5f9b0e3
+  metadata.gz: def0a4ffb45a50adcd1c805a55b9902ea86770838567eebf2b010bc01d4bf67e959c250589d0b74893c644c0c15737f6ba3d65e64012bc0fa4e7c2ed6f21cfa4
+  data.tar.gz: 929a1adcd6f2743f0666198429bd66b576a9e8ce52a95b2793f54fd7305cb725f537c42f0f415072a90299eded2bf4148c9a83b997f3be0462eddb5f59e58863

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -154,6 +154,22 @@ module Dor
       otherId(PREVIOUS_CATKEY_TYPE_ID)
     end
 
+    # Helper method to get the release tags as a nodeset
+    # @return [Nokogiri::XML::NodeSet] all release tags and their attributes
+    def release_tags
+      release_tags = ng_xml.xpath('//release')
+      return_hash = {}
+      release_tags.each do |release_tag|
+        hashed_node = release_tag_node_to_hash(release_tag)
+        if !return_hash[hashed_node[:to]].nil?
+          return_hash[hashed_node[:to]] << hashed_node[:attrs]
+        else
+          return_hash[hashed_node[:to]] = [hashed_node[:attrs]]
+        end
+      end
+      return_hash
+    end
+
     def to_solr(solr_doc = {}, *args)
       solr_doc = super(solr_doc, *args)
 
@@ -208,5 +224,29 @@ module Dor
     def prefix
       ''
     end
+
+    private
+
+    # Convert one release element into a Hash
+    # @param rtag [Nokogiri::XML::Element] the release tag element
+    # @return [Hash{:to, :attrs => String, Hash}] in the form of !{:to => String :attrs = Hash}
+    def release_tag_node_to_hash(rtag)
+      to = 'to'
+      release = 'release'
+      when_word = 'when' # TODO: Make to and when_word load from some config file instead of hardcoded here
+      attrs = rtag.attributes
+      return_hash = { to: attrs[to].value }
+      attrs.tap { |a| a.delete(to) }
+      attrs[release] = rtag.text.casecmp('true') == 0 # save release as a boolean
+      return_hash[:attrs] = attrs
+
+      # convert all the attrs beside :to to strings, they are currently Nokogiri::XML::Attr
+      (return_hash[:attrs].keys - [to]).each do |a|
+        return_hash[:attrs][a] = return_hash[:attrs][a].to_s if a != release
+      end
+
+      return_hash[:attrs][when_word] = Time.parse(return_hash[:attrs][when_word]) # convert when to a datetime
+      return_hash
+    end
   end # class
 end

data/lib/dor/models/abstract.rb

@@ -121,7 +121,7 @@ module Dor
     delegate :catkey, :catkey=, :source_id, :source_id=,
              :objectId, :objectId=, :objectCreator, :objectCreator=,
              :objectLabel, :objectLabel=, :objectType, :objectType=,
-             :other_ids=, :otherId, :tag=, :tags,
+             :other_ids=, :otherId, :tag=, :tags, :release_tags,
              :previous_catkeys, :content_type_tag, to: :identityMetadata
 
     def read_rights=(rights)

data/lib/dor/release_tags/identity_metadata.rb

@@ -56,22 +56,6 @@ module Dor
         return_tags
       end
 
-      # Helper method to get the release tags as a nodeset
-      # @return [Nokogiri::XML::NodeSet] all release tags and their attributes
-      def release_tags
-        release_tags = item.identityMetadata.ng_xml.xpath('//release')
-        return_hash = {}
-        release_tags.each do |release_tag|
-          hashed_node = release_tag_node_to_hash(release_tag)
-          if !return_hash[hashed_node[:to]].nil?
-            return_hash[hashed_node[:to]] << hashed_node[:attrs]
-          else
-            return_hash[hashed_node[:to]] = [hashed_node[:attrs]]
-          end
-        end
-        return_hash
-      end
-
       # Take a hash of tags as obtained via Dor::Item.release_tags and returns the newest tag for each namespace
       # @param tags [Hash] a hash of tags obtained via Dor::Item.release_tags or matching format
       # @return [Hash] a hash of latest tags for each to value
@@ -81,27 +65,7 @@ module Dor
 
       private
 
-      # Convert one release element into a Hash
-      # @param rtag [Nokogiri::XML::Element] the release tag element
-      # @return [Hash{:to, :attrs => String, Hash}] in the form of !{:to => String :attrs = Hash}
-      def release_tag_node_to_hash(rtag)
-        to = 'to'
-        release = 'release'
-        when_word = 'when' # TODO: Make to and when_word load from some config file instead of hardcoded here
-        attrs = rtag.attributes
-        return_hash = { to: attrs[to].value }
-        attrs.tap { |a| a.delete(to) }
-        attrs[release] = rtag.text.casecmp('true') == 0 # save release as a boolean
-        return_hash[:attrs] = attrs
-
-        # convert all the attrs beside :to to strings, they are currently Nokogiri::XML::Attr
-        (return_hash[:attrs].keys - [to]).each do |a|
-          return_hash[:attrs][a] = return_hash[:attrs][a].to_s if a != release
-        end
-
-        return_hash[:attrs][when_word] = Time.parse(return_hash[:attrs][when_word]) # convert when to a datetime
-        return_hash
-      end
+      delegate :release_tags, to: :item
 
       # Take a hash of tags as obtained via Dor::Item.release_tags and returns all self tags
       # @param tags [Hash] a hash of tags obtained via Dor::Item.release_tags or matching format

data/lib/dor/version.rb

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

metadata

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