dor-rights-auth 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3461a34cc8edcf7b4362d1c6c58304bbe43a82fbd9edd16452ec02cf8a40204
-  data.tar.gz: 826e6ef53e3fec66cb97b1ab385793b9727ddc82bd81be1add9c46d285183303
+  metadata.gz: 60b3d1ae87e3950792e247f96ea41245ef998ff8db8c17f081eb310faec851dd
+  data.tar.gz: 531ea2c07aff3cb9a9a87076123ac43be63f4e0a834c4c5677ad7f4c3756bba0
 SHA512:
-  metadata.gz: 196996c12540e5e17907865aabdff51c36afca65d59781d6cf08660d7c422b8bd26fefd699bc211c02ffc51e97ada62331fc19a701f5b39c5a9e15b90a1248f0
-  data.tar.gz: 9dd9fa090720a1f4cdf5f9673513153ae3d41a63b57aaac99385353f26c9e4d3e1fa0e8309d863d1c0f01ab29302a4b4def2ee0730336ee72ace62f920ab9477
+  metadata.gz: cc78bc626716818af2369ee0221de05418d1feaf65a87249594497b353b01010825c13bcc6a0ca4e6f26bfe1558bde6e49b8f8cc2fd6a28acd8dfaa8a1fb51cf
+  data.tar.gz: 5db61b24e0a5e24a46e264b610144d58af26bc0b5538799d8811e4aece667dcc30e23e6bd58efbc04958e4189048a514a7d5322d8f016811083685ba5c691029

data/lib/dor/rights_auth.rb

@@ -170,6 +170,12 @@ module Dor
       @file[file_name].group[:stanford].value && (stanford_rule.nil? || stanford_rule != NO_DOWNLOAD_RULE)
     end
 
+    def cdl_rights_for_file(file_name)
+      return controlled_digital_lending? if @file[file_name].nil? || @file[file_name].controlled_digital_lending.nil?
+
+      @file[file_name].controlled_digital_lending.value
+    end
+
     # Returns whether an object-level world node exists, and the value of its rule attribute
     # @return [Array<(Boolean, String)>] First value: existence of node. Second Value: rule attribute, nil otherwise
     # @example Using multiple variable assignment to read both array elements
@@ -514,6 +520,7 @@ module Dor
       access_with_files.each do |access_node|
         stanford_access = Rights.new
         world_access    = Rights.new
+        controlled_digital_lending = Rights.new
         if access_node.at_xpath("machine/group[#{CONTAINS_STANFORD_XPATH}]")
           stanford_access.value = true
           rule = access_node.at_xpath("machine/group[#{CONTAINS_STANFORD_XPATH}]/@rule")
@@ -527,6 +534,14 @@ module Dor
           stanford_access.value = false
         end
 
+        if access_node.at_xpath('machine/cdl')
+          controlled_digital_lending.value = true
+          rule = access_node.at_xpath('machine/cdl/@rule')
+          controlled_digital_lending.rule = rule.value if rule
+        else
+          controlled_digital_lending.value = false
+        end
+
         if access_node.at_xpath('machine/world')
           world_access.value = true
           rule = access_node.at_xpath('machine/world/@rule')
@@ -566,7 +581,7 @@ module Dor
           file_rights.group = { :stanford => stanford_access }
           file_rights.agent = file_agents
           file_rights.location = file_locations
-
+          file_rights.controlled_digital_lending = controlled_digital_lending
           rights.file[f.content] = file_rights
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-rights-auth
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Willy Mene
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri