dor-services 6.1.9 → 6.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b991c31cad3717b256ce0ca34f19691b8a442db09cf57abd0d28bcf0d3ef940
-  data.tar.gz: 66b87eadae65039999dca598d97aede259fd77bbf27da705bd3187e9dd637c4b
+  metadata.gz: 8c28629949bc2280f652b6f9d434942692b3de689b5eaf2f99a7ab1ede80a563
+  data.tar.gz: 5e3b2b04483ddf1c2e54bd6c22516b0fd45e91019eca538eb8fdee728d684879
 SHA512:
-  metadata.gz: ae71faaf085d3f8a3546001e660f45f10ad5a738e7378996bcfe20bc7d17cdcff6a50ea1cef5b1b04f27ecb811cf6446141dea7fc3c860ed86a788766ca4eff6
-  data.tar.gz: e683864ba1c5fb3ec1063bd444f0f4036da27dc14a63b7e1964df2035bf9562943e83a1a2e93620ff63ecab9abf0adb1935e339b048f947205a9863451b17179
+  metadata.gz: 6fc3230a1710782ff4e433b0149051ef6d704e912c7756e075b12fa1e51ead7125c77e9e6af4f50445ef08b296002ef1a9755aa404daf83d96855592f5a8255d
+  data.tar.gz: 3d444e25cc256457fdd516e207a1a2f3808b9fa01b7c891dffc939fab0bb38822c97ad334ada727f1441d94af58e4b1d3f5d98ce2fc275903fe29a24fc9a7dc2

data/lib/dor/models/concerns/releaseable.rb

@@ -35,6 +35,11 @@ module Dor
       releases.released_for(skip_live_purl: skip_live_purl)
     end
 
+    # Helper method to get the release tags as a nodeset
+    # @return [Nokogiri::XML::NodeSet] all release tags and their attributes
+    delegate :release_tags, to: :releases
+    deprecation_deprecate release_tags: 'use ReleaseTagService#release_tags instead'
+
     def releases
       @releases ||= ReleaseTagService.for(self)
     end

data/lib/dor/services/release_tag_service.rb

@@ -20,7 +20,7 @@ module Dor
       released_hash = {}
 
       # Get the most recent self tag for all targets and retain their result since most recent self always trumps any other non self tags
-      latest_self_tags = newest_release_tag self_release_tags(release_nodes)
+      latest_self_tags = newest_release_tag self_release_tags(release_tags)
       latest_self_tags.each do |key, payload|
         released_hash[key] = { 'release' => payload['release'] }
       end
@@ -48,7 +48,7 @@ module Dor
     # Take an item and get all of its release tags and all tags on collections it is a member of it
     # @return [Hash] a hash of all tags
     def release_tags_for_item_and_all_governing_sets
-      return_tags = release_nodes || {}
+      return_tags = release_tags || {}
       item.collections.each do |collection|
         next if collection.id == item.id # recursive, so parents of parents are found, but we need to avoid an infinite loop if the collection references itself (i.e. bad data)
 
@@ -57,28 +57,10 @@ module Dor
       return_tags
     end
 
-    private
-
-    # Helper method to get the release nodes as a nodeset
-    # @return [Nokogiri::XML::NodeSet] of all release tags and their attributes
-    def release_nodes
-      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
-
     # 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 = identityMetadata.ng_xml.xpath('//release')
+      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)
@@ -91,6 +73,8 @@ module Dor
       return_hash
     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}

data/lib/dor/version.rb

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

metadata

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