dor-services 9.2.1 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39bd6a1c73843860a182c886b4075b6a6c7216c69cec108467d76e72bbba658d
-  data.tar.gz: c49fbea2b7311b3bd80640b90c764ad54bbf959b27f4f8994c4d3a9c38ccb403
+  metadata.gz: 5015214a6f687ad0a64a9ea35914ac2984cf7efbd16cf7e60baea93f306d4d2f
+  data.tar.gz: 279ee95befcb33f476fde1d5f159c8a45b4b6d3333ef367a444bc6a076900401
 SHA512:
-  metadata.gz: a9e04dcdc34a7d0df4265b77e08f5b20756325418ccfee501216c813bdbb5393f5295633e5f2b41e7898e1a87ca5a5cc3d42e63a6ca6d421de00b3fb281dd2fb
-  data.tar.gz: 826b55305ff535e531a0531dd0673e82a5df710343121329fe2443bd642dd45771cea326ecf956da1973447a32f10946e9341806ea596a9e2d014ffa9129e6ba
+  metadata.gz: 466bea3e00aad80400d0e7be95c28275a1396be4ba139fed6f1b41f6d7f19edd1976dbc7f091ff1ecfd101276d491ebb48a9b91069889a845abed9a438094eaa
+  data.tar.gz: f34079d71a227261b7d9d587b9501ff4fc537adada8a69c0b520bd002f0fde2737e0e632b376b2f191bb527d875887bbda0536ca0b6f95b9835273f1e2f6df08

data/lib/dor-services.rb

@@ -92,7 +92,6 @@ module Dor
     autoload :OpenDataLicenseService
     autoload :SearchService
     autoload :SuriService
-    autoload :TagService
   end
 
   eager_load!

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -69,16 +69,6 @@ module Dor
     end
     alias source_id= sourceId=
 
-    def tags
-      tag
-    end
-
-    # helper method to get just the content type tag
-    def content_type_tag
-      content_tag = tags.select { |tag| tag.include?('Process : Content Type') }
-      content_tag.size == 1 ? content_tag[0].split(':').last.strip : ''
-    end
-
     def otherId(type = nil)
       result = find_by_terms(:otherId).to_a
       if type.nil?
@@ -193,30 +183,6 @@ module Dor
         add_solr_value(solr_doc, "#{name}_id", id, :symbol, [])
       end
 
-      # do some stuff to make tags in general and project tags specifically more easily searchable and facetable
-      find_by_terms(:tag).each do |tag|
-        (prefix, rest) = tag.text.split(/:/, 2)
-        prefix = prefix.downcase.strip.gsub(/\s/, '_')
-        unless rest.nil?
-          # this part will index a value in a field specific to the tag, e.g. registered_by_tag_*,
-          # book_tag_*, project_tag_*, remediated_by_tag_*, etc.  project_tag_* and registered_by_tag_*
-          # definitley get used, but most don't.  we can limit the prefixes that get solrized if things
-          # get out of hand.
-          add_solr_value(solr_doc, "#{prefix}_tag", rest.strip, :symbol, [])
-        end
-
-        # solrize each possible prefix for the tag, inclusive of the full tag.
-        # e.g., for a tag such as "A : B : C", this will solrize to an _ssim field
-        # that contains ["A",  "A : B",  "A : B : C"].
-        tag_parts = tag.text.split(/:/)
-        progressive_tag_prefix = ''
-        tag_parts.each_with_index do |part, index|
-          progressive_tag_prefix += ' : ' if index > 0
-          progressive_tag_prefix += part.strip
-          add_solr_value(solr_doc, 'exploded_tag', progressive_tag_prefix, :symbol, [])
-        end
-      end
-
       solr_doc
     end
 

data/lib/dor/models/abstract.rb

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

data/lib/dor/models/etd.rb

@@ -22,10 +22,11 @@ module Dor
                    :regactiondttm, :documentaccess, :submit_date, :symphonyStatus,
                    datastream: 'properties', multiple: false
 
-    has_attributes :citation_verified, :abstract_provided, :dissertation_uploaded,
-                   :supplemental_files_uploaded, :permissions_provided,
-                   :permission_files_uploaded, :rights_selected,
-                   :cc_license_selected, :submitted_to_registrar,
+    has_attributes :citation_verified, :abstract_provided, :format_reviewed,
+                   :dissertation_uploaded, :supplemental_files_uploaded,
+                   :permissions_provided, :permission_files_uploaded,
+                   :rights_selected, :cc_license_selected,
+                   :submitted_to_registrar,
                    datastream: 'workflow', multiple: false
 
     has_metadata name: 'properties', type: ActiveFedora::SimpleDatastream, versionable: false do |m|
@@ -77,6 +78,7 @@ module Dor
     has_metadata name: 'workflow', type: ActiveFedora::SimpleDatastream, versionable: false do |m|
       m.field 'citation_verified', :string
       m.field 'abstract_provided', :string
+      m.field 'format_reviewed', :string
       m.field 'dissertation_uploaded', :string
       m.field 'supplemental_files_uploaded', :string
       m.field 'permissions_provided', :string

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 9.2.1
+  version: 9.3.0
 platform: ruby
 authors:
 - Michael Klein
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -450,7 +450,6 @@ files:
 - lib/dor/services/open_data_license_service.rb
 - lib/dor/services/search_service.rb
 - lib/dor/services/suri_service.rb
-- lib/dor/services/tag_service.rb
 - lib/dor/static_config.rb
 - lib/dor/static_config/fedora_config.rb
 - lib/dor/static_config/solr_config.rb
@@ -484,7 +483,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library

data/lib/dor/services/tag_service.rb

@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-module Dor
-  # Manage tags on an object
-  class TagService
-    def self.add(item, tag)
-      new(item).add(tag)
-    end
-
-    def self.remove(item, tag)
-      new(item).remove(tag)
-    end
-
-    def self.update(item, old_tag, new_tag)
-      new(item).update(old_tag, new_tag)
-    end
-
-    def initialize(item)
-      @item = item
-    end
-
-    # Add an administrative tag to an item, you will need to seperately save the item to write it to fedora
-    # @param tag [string] The tag you wish to add
-    def add(tag)
-      normalized_tag = validate_and_normalize_tag(tag, identity_metadata.tags)
-      identity_metadata.add_value(:tag, normalized_tag)
-    end
-
-    def remove(tag)
-      normtag = normalize_tag(tag)
-      tag_nodes
-        .select { |node| normalize_tag(node.content) == normtag }
-        .each { identity_metadata.ng_xml_will_change! }
-        .each(&:remove)
-        .any?
-    end
-
-    def update(old_tag, new_tag)
-      normtag = normalize_tag(old_tag)
-      tag_nodes
-        .select { |node| normalize_tag(node.content) == normtag }
-        .each { identity_metadata.ng_xml_will_change! }
-        .each { |node| node.content = normalize_tag(new_tag) }
-        .any?
-    end
-
-    private
-
-    attr_reader :item
-    def identity_metadata
-      item.identityMetadata
-    end
-
-    def tag_nodes
-      identity_metadata.ng_xml.search('//tag')
-    end
-
-    # turns a tag string into an array with one element per tag part.
-    # split on ":", disregard leading and trailing whitespace on tokens.
-    def split_tag_to_arr(tag_str)
-      tag_str.split(':').map(&:strip)
-    end
-
-    # turn a tag array back into a tag string with a standard format
-    def normalize_tag_arr(tag_arr)
-      tag_arr.join(' : ')
-    end
-
-    # take a tag string and return a normalized tag string
-    def normalize_tag(tag_str)
-      normalize_tag_arr(split_tag_to_arr(tag_str))
-    end
-
-    # take a proposed tag string and a list of the existing tags for the object being edited.  if
-    # the proposed tag is valid, return it in normalized form.  if not, raise an exception with an
-    # explanatory message.
-    def validate_and_normalize_tag(tag_str, existing_tag_list)
-      tag_arr = validate_tag_format(tag_str)
-
-      # note that the comparison for duplicate tags is case-insensitive, but we don't change case as part of the normalized version
-      # we return, because we want to preserve the user's intended case.
-      normalized_tag = normalize_tag_arr(tag_arr)
-      dupe_existing_tag = existing_tag_list.detect { |existing_tag| normalize_tag(existing_tag).casecmp(normalized_tag) == 0 }
-      raise "An existing tag (#{dupe_existing_tag}) is the same, consider using update_tag?" if dupe_existing_tag
-
-      normalized_tag
-    end
-
-    # Ensure that an administrative tag meets the proper mininum format
-    # @param tag_str [String] the tag
-    # @return [Array] the tag split into an array via ':'
-    def validate_tag_format(tag_str)
-      tag_arr = split_tag_to_arr(tag_str)
-      raise ArgumentError, "Invalid tag structure: tag '#{tag_str}' must have at least 2 elements" if tag_arr.length < 2
-      raise ArgumentError, "Invalid tag structure: tag '#{tag_str}' contains empty elements" if tag_arr.detect(&:empty?)
-
-      tag_arr
-    end
-  end
-end