dor-rights-auth 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411e5433cabba2ab3f47558c514c1c2c8093c0c9803a8a81987ae47736f13523
-  data.tar.gz: 7658e3e17dd9933ca60e76f1a26933722e4b5aa5e296623124923e006a087aad
+  metadata.gz: f73159863d58e9e7ff4a9117a959114a2eafb8473267609b893855336450c128
+  data.tar.gz: 4469a748cc9f5137f940570d9da78a5404e285f676e05e70b8618f08c99ca580
 SHA512:
-  metadata.gz: 422dc8fe2ffe4974595f552dd289cd362779d0234e73d91200f468e96e4ad13883e685d00c17f892292261bb3527cf256ec462e6ccec5ee3b5e0302b77a44f9f
-  data.tar.gz: cac9eaf44ae089b5b61350c72a5e873e37c1b13bc9d7735af0d78ced1e7071307dea827fbe3e8e7b94fafd72c6f9bc26aff950d3b763249f2946a75b5a1679c7
+  metadata.gz: 6906433f1b1ad52ab4d8fe164435f8eceaeab182b3d1d0268bd7870fb4d7bf4796c1dc5eb260c77eda04c6243934a77e2fe10148c818e79e14682978bec1677e
+  data.tar.gz: 3dcd28a093e1d1573d5152192e6335e5cc030a10e282b740dc2b7f49329115aa98122aa90d6d4304c785c6af78e555d7b4b7abae6d2f8759ec7b5f451c7d5172

data/lib/dor/rights_auth.rb

@@ -37,13 +37,14 @@ module Dor
     CONTAINS_STANFORD_XPATH = "contains(translate(text(), 'STANFORD', 'stanford'), 'stanford')"
     NO_DOWNLOAD_RULE = 'no-download'
 
-    attr_accessor :obj_lvl, :file, :embargoed, :index_elements
+    attr_accessor :obj_lvl, :file, :embargoed, :embargo_release_date, :index_elements
 
     # NOTE: index_elements is only valid for the xml as parsed, not after subsequent manipulation
 
     def initialize
       @file = {}
       @index_elements = {}
+      @embargoed = false
     end
 
     # Returns true if the object is under embargo.
@@ -423,12 +424,12 @@ module Dor
     # rights that make more sense at the object level (e.g. 'dark').
     def self.primary_access_rights(index_terms, errors)
       has_rule = index_terms.include? 'has_rule'
-      if index_terms.include?('none_discover')
+      if index_terms.include?('none_discover') ||
+         errors.include?('no_discover_access') ||
+         errors.include?('no_discover_machine')
         'dark'
       elsif index_terms.include?('cdl_none')
         'controlled digital lending'
-      elsif errors.include?('no_discover_access') || errors.include?('no_discover_machine')
-        'dark'
       elsif errors.include?('no_read_machine') || index_terms.include?('none_read')
         'citation'
       elsif index_terms.include? 'world_read'
@@ -508,12 +509,11 @@ module Dor
         end
       end
 
-      # Initialze embargo_status to false
-      rights.embargoed = false
       embargo_node = doc.at_xpath("//rightsMetadata/access[@type='read']/machine/embargoReleaseDate")
       if embargo_node
         embargo_dt = Time.parse(embargo_node.content)
         rights.embargoed = true if embargo_dt > Time.now
+        rights.embargo_release_date = embargo_dt
       end
 
       access_with_files = doc.xpath("//rightsMetadata/access[@type='read' and file]")

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: dor-rights-auth
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Willy Mene
 - Joe Atzberger
 - Johnathan Martin
 - Naomi Dushay
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2023-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,35 +56,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,7 +98,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,10 +141,11 @@ files:
 - lib/dor/xsd/rights.xsd
 - lib/dor/xsd/rights_basics.xsd
 - lib/dor/xsd/rights_types.xsd
-homepage: 
+homepage:
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -159,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Parses rightsMetadata xml into a useable object
 test_files: []