dor-services 4.19.2 → 4.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec35b3147fae9de88509f612f9e083cf3a7ec509
-  data.tar.gz: c46df0678532e827ff2a0c83df25719145d1ad36
+  metadata.gz: 4729eacae4302a64db9ac7e92b4f8adbc6e8311e
+  data.tar.gz: c87321714b6cde55d3a2b62c9125827c5b8bd8aa
 SHA512:
-  metadata.gz: a607e0bc8b61ee9fef7dfbce095c603169c13c86ac6a2a995d34c7a63e10ddb39da62da8aa13be2efe823876fb30b66239dc09d9294c2c4ffb4d1a6cc3325427
-  data.tar.gz: 5f2ebb71536096f21715366037226254f07a7691ad386187326bab5609d1ec25abe04130ecc70418349e89b135c640c5b4b94526555d871ddde57508f9d9a7b1
+  metadata.gz: 2065d971335d18534df20609c96fa684c56a0e31d895255279c301195cf04b86fbc63f7deeb8649705dd75f3080618ca91d07fca2e637b33207f2836d45ca4f3
+  data.tar.gz: a3ea926e1f85ed29e5dbb1bbc623fb9ce8082df73b71fb3122b0a59e20b6489beb598edd11de09a3a49629175e58fa9ab264a1f548d77929a8dabb2713165d68

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -107,7 +107,7 @@ module Dor
       end
     end
 
-    # @return [Fixnum] value of the most current versionId
+    # @return [String] value of the most current versionId
     def current_version_id
       current_version=current_version_node
       if current_version.nil?
@@ -151,11 +151,6 @@ module Dor
       self.content = ng_xml.to_s
     end
 
-    # @return [String] The value of the greatest versionId
-    def current_version_id
-      current_version_node[:versionId].to_s
-    end
-
     # @return [Boolean] returns true if the current version has a tag and a description, false otherwise
     def current_version_closeable?
       current = current_version_node
@@ -168,9 +163,9 @@ module Dor
 
     # @return [String] The tag for the newest version
     def current_tag
-      current_version_node[:tag].to_s  
+      current_version_node[:tag].to_s
     end
-    
+
     def tag_for_version(versionId)
       nodes=self.ng_xml.search('//version[@versionId=\''+versionId+'\']')
       if nodes.length == 1
@@ -179,6 +174,7 @@ module Dor
         ''
       end
     end
+
     # @return [String] The description for the specified version, or empty string if there is no description
     def description_for_version(versionId)
       nodes=self.ng_xml.search('//version[@versionId=\''+versionId+'\']')
@@ -188,7 +184,7 @@ module Dor
         ''
       end
     end
-    
+
     # @return [String] The description for the current version
     def current_description
       desc_node=current_version_node.at_xpath('description')
@@ -197,7 +193,29 @@ module Dor
       end
       ''
     end
-    
+
+    # Compares the current_version with the passed in known_version (usually SDRs version)
+    #   If the known_version is greater than the current version, then all version nodes greater than the known_version are removed,
+    #   then the current_version is incremented.  This repairs the case where a previous call to open a new verison
+    #   updates the versionMetadata datastream, but versioningWF is not initiated.  Prevents the versions from getting
+    #   out of synch with SDR
+    #
+    # @param [Integer] known_version object version you wish to synch to, usually SDR's version
+    # @param [Hash] opts optional parameters
+    # @option opts [String] :description describes the version change
+    # @option opts [Symbol] :significance which part of the version tag to increment
+    def sync_then_increment_version known_version, opts = {}
+      cv = current_version_id.to_i
+      raise Dor::Exception.new("Cannot sync to a version greater than current: #{cv}, requested #{known_version}") if cv < known_version
+
+      while cv != known_version &&
+        current_version_node.remove
+        cv = current_version_id.to_i
+      end
+
+      increment_version(opts[:description], opts[:significance])
+    end
+
     private
 
     # @return [Nokogiri::XML::Node] Node representing the current version
@@ -210,5 +228,6 @@ module Dor
       tags = find_by_terms(:version, :tag)
       tags.map{|t| VersionTag.parse(t.value)}.max
     end
+
   end
 end

data/lib/dor/models/versionable.rb

@@ -1,3 +1,5 @@
+require 'dor/utils/sdr_client'
+
 module Dor
   module Versionable
     extend ActiveSupport::Concern
@@ -24,9 +26,10 @@ module Dor
       raise Dor::Exception, 'Object already opened for versioning' if(new_version_open?)
       raise Dor::Exception, 'Object currently being accessioned' if(Dor::WorkflowService.get_active_lifecycle('dor', pid, 'submitted'))
 
+      sdr_version = Sdr::Client.current_version pid
 
       vmd_ds = datastreams['versionMetadata']
-      vmd_ds.increment_version
+      vmd_ds.sync_then_increment_version sdr_version
       vmd_ds.content = vmd_ds.ng_xml.to_s
       vmd_ds.save unless self.new_object?
 

data/lib/dor/utils/sdr_client.rb

@@ -0,0 +1,23 @@
+module Sdr
+
+  module Client
+    class << self
+
+      # @param [String] druid id of the object you want the version of
+      # @returns [Integer] the current version from SDR
+      def current_version druid
+        sdr_client = Dor::Config.sdr.rest_client
+        xml = sdr_client["objects/#{druid}/current_version"].get
+
+        begin
+          doc = Nokogiri::XML xml
+          raise if doc.root.name != 'currentVersion'
+          return Integer(doc.text)
+        rescue => e
+          raise "Unable to parse XML from SDR current_version API call: #{xml}"
+        end
+      end
+
+    end
+  end
+end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.19.2'
+  VERSION = '4.20.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.19.2
+  version: 4.20.0
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -611,6 +611,7 @@ files:
 - lib/dor/services/tei2dc.xslt
 - lib/dor/utils/ng_tidy.rb
 - lib/dor/utils/predicate_patch.rb
+- lib/dor/utils/sdr_client.rb
 - lib/dor/utils/solr_doc_helper.rb
 - lib/dor/utils/utc_date_field_mapper.rb
 - lib/dor/version.rb