dor-rights-auth 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c895adda420f96705ed01622032fbf43c1b733e4
+  data.tar.gz: a8e3f2516e6db25ad27e71c10ee222d5c1092c6a
+SHA512:
+  metadata.gz: beab4b017e6e1b83766572b2efe83d7ab006ca61bff8f70dd78e1921f5bab1744bc1ec7ec01e535f05d1ec57c1b42d6f5c7e76954853161192ece8ecc41140a3
+  data.tar.gz: 84ec859efe66b495bfd836953cd6ada723544c3c7be2a924150fb812ea7cf573aa9888546ec1a4c761f1df67099b766200309f1321cc07643d7faf3434b72e49

data/lib/dor/rights_auth.rb

@@ -1,9 +1,11 @@
 require 'nokogiri'
 require 'time'
 
+# We handle the ugly stuff, so you don't have to.
+
 module Dor
-  
-  # The Individual Right 
+
+  # The Individual Right
   Rights = Struct.new(:value, :rule)
 
   # Rights for an object or File
@@ -28,15 +30,18 @@ module Dor
   # end
 
   class RightsAuth
-    
+
     CONTAINS_STANFORD_XPATH = "contains(translate(text(), 'STANFORD', 'stanford'), 'stanford')"
 
-    attr_accessor :obj_lvl, :file, :embargoed
+    attr_accessor :obj_lvl, :file, :embargoed, :index_elements
+
+    # note: index_elements is only valid for the xml as parsed, not after subsequent manipulation
 
     def initialize
       @file = {}
+      @index_elements = {}
     end
-    
+
     # Returns true if the object is under embargo.
     # @return [Boolean]
     def embargoed?
@@ -68,7 +73,7 @@ module Dor
       return false unless @obj_lvl.agent.has_key? agent_name
       @obj_lvl.agent[agent_name].value && @obj_lvl.agent[agent_name].rule.nil?
     end
-    
+
     alias_method :allowed_read_agent?, :agent_unrestricted?
 
     # Returns true if the file is stanford-only readable AND has no rule attribute
@@ -78,23 +83,23 @@ module Dor
     # @return [Boolean]
     def stanford_only_unrestricted_file?(file_name)
       return stanford_only_unrestricted? if( @file[file_name].nil? || @file[file_name].group[:stanford].nil? )
-    
+
       @file[file_name].group[:stanford].value && @file[file_name].group[:stanford].rule.nil?
     end
 
     # Returns true if the file is world readable AND has no rule attribute
-    #   If world rights do not exist for this file, then object level rights are returned 
+    #   If world rights do not exist for this file, then object level rights are returned
     # @see #world_unrestricted?
     # @param [String] file_name Name of file that is tested for world rights
     # @return [Boolean]
     def world_unrestricted_file?(file_name)
       return world_unrestricted? if( @file[file_name].nil? || @file[file_name].world.nil? )
-    
+
       @file[file_name].world.value && @file[file_name].world.rule.nil?
     end
 
     alias_method :public_unrestricted_file?, :world_unrestricted_file?
-    
+
     # Returns whether an object-level world node exists, and the value of its rule attribute
     # @return [Array<(Boolean, String)>] First value: existance of node. Second Value: rule attribute, nil otherwise
     # @example Using multiple variable assignment to read both array elements
@@ -110,7 +115,7 @@ module Dor
     def stanford_only_rights
       [@obj_lvl.group[:stanford].value, @obj_lvl.group[:stanford].rule]
     end
-    
+
     # Returns whether an object-level agent node exists for the passed in agent, and the value of its rule attribute
     # @param [String] agent_name name of the app or thing that is tested for access
     # @return (see #world_rights)
@@ -121,7 +126,7 @@ module Dor
       return [false, nil] if(@obj_lvl.agent[agent_name].nil?)
       [@obj_lvl.agent[agent_name].value, @obj_lvl.agent[agent_name].rule]
     end
-    
+
     # Returns whether a file-level world node exists, and the value of its rule attribute
     #  If a world node does not exist for this file, then object-level world rights are returned
     # @see #world_rights
@@ -131,10 +136,10 @@ module Dor
     #   world_exists, world_rule = rights.world_rights_for_file('somefile')
     def world_rights_for_file(file_name)
       return world_rights if( @file[file_name].nil? || @file[file_name].world.nil? )
-    
+
       [@file[file_name].world.value, @file[file_name].world.rule]
     end
-    
+
     # Returns whether a file-level group/stanford node exists, and the value of its rule attribute
     #    If a group/stanford node does not exist for this file, then object-level group/stanford rights are returned
     # @see #stanford_only_rights
@@ -144,10 +149,10 @@ module Dor
     #   su_only_exists, su_only_rule = rights.stanford_only_rights_for_file('somefile')
     def stanford_only_rights_for_file(file_name)
       return stanford_only_rights if( @file[file_name].nil? || @file[file_name].group[:stanford].nil?)
-    
+
       [@file[file_name].group[:stanford].value, @file[file_name].group[:stanford].rule]
     end
-    
+
     # Returns whether a file-level agent-node exists, and the value of its rule attribute
     #    If an agent-node does not exist for this file, then object-level agent rights are returned
     # @param [String] file_name name of the file being tested
@@ -157,38 +162,164 @@ module Dor
     #   agent_exists, agent_rule = rights.agent_rights_for_file('filex', 'someapp')
     def agent_rights_for_file(file_name, agent_name)
       return agent_rights(agent_name) if( @file[file_name].nil?) # look at object level agent rights if the file-name is not stored
-      
+
       return [false, nil] if( @file[file_name].agent[agent_name].nil?) # file rules exist, but not for this agent
-    
+
       [@file[file_name].agent[agent_name].value, @file[file_name].agent[agent_name].rule]
     end
 
+    # Check formedness of rightsMetadata -- to be replaced with XSD once formalized, one fine day
+    # @param [Nokogiri::XML] the rightsMetadata document
+    # @return [Array]        list of things that are wrong with it
+    def RightsAuth.validate_lite(doc)
+      if (doc.nil? || doc.at_xpath("//rightsMetadata").nil?)
+          return ["no_rightsMetadata"]
+      end
+      errors = []
+      maindiscover = doc.at_xpath("//rightsMetadata/access[@type='discover' and not(file)]")
+      mainread     = doc.at_xpath("//rightsMetadata/access[@type='read'     and not(file)]")
+
+      if maindiscover.nil?
+        errors.push "no_discover_access", "no_discover_machine"
+      elsif maindiscover.at_xpath("./machine").nil?
+        errors.push "no_discover_machine"
+      elsif (maindiscover.at_xpath("./machine/world[not(@rule)]").nil? && maindiscover.at_xpath("./machine/none").nil?)
+        errors.push "discover_machine_unrecognized"
+      end
+      if mainread.nil?
+        errors.push "no_read_access", "no_read_machine"
+      elsif mainread.at_xpath("./machine").nil?
+        errors.push "no_read_machine"
+      else
+        ## TODO: deeper read validation?
+      end
+
+      errors
+    end
+
+    # Assemble various characterizing terms for index from XML
+    # @param [Nokogiri::XML] the rightsMetadata document
+    # @return [Array] Strings of interest to the Solr index
+    def RightsAuth.extract_index_terms(doc)
+      terms = []
+      machine = doc.at_xpath("//rightsMetadata/access[@type='read' and not(file)]/machine")
+      terms.push  "none_discover" if doc.at_xpath("//rightsMetadata/access[@type='discover']/machine/none")
+      terms.push "world_discover" if doc.at_xpath("//rightsMetadata/access[@type='discover']/machine/world[not(@rule)]")
+      return terms if machine.nil?
+
+      terms.push "has_group_rights" if machine.at_xpath("./group")
+      terms.push "has_rule" if machine.at_xpath(".//@rule")
+
+      if (machine.at_xpath("./group[not(@rule) and #{CONTAINS_STANFORD_XPATH}]"))
+        terms.push "group|stanford"
+      elsif (machine.at_xpath("./group[@rule and #{CONTAINS_STANFORD_XPATH}]"))
+        terms.push "group|stanford_with_rule"
+      elsif (machine.at_xpath("./group"))
+        terms.push "group|#{machine.at_xpath("./group").value.downcase}"
+      end
+
+      if (machine.at_xpath("./none"))
+        terms.push "none_read"
+      elsif (machine.at_xpath("./world[not(@rule)]"))
+        terms.push "world_read"
+      elsif (machine.at_xpath("./world/@rule"))
+        terms.push "world|#{machine.at_xpath("./world/@rule").value.downcase}"
+      end
+
+      # now some statistical generation
+      names = machine.element_children.collect { |node| node.name }
+      kidcount = names.each_with_object(Hash.new(0)){ |word,counts| counts[word] += 1 }
+      countphrase = kidcount.sort.collect{|k,v| "#{k}#{v}"}.join("|")
+      terms.push "profile:" + countphrase unless countphrase.empty?
+
+      filemachines = doc.xpath("//rightsMetadata/access[@type='read' and file]/machine")
+      unless filemachines.empty?
+        terms.push "has_file_rights", "file_rights_count|#{filemachines.count}"
+        counts = Hash.new(0)
+        filemachines.each { |filemachine|
+          filemachine.element_children.each { |node|
+            counts[node.name] += 1
+          }
+        }
+        counts.each { |k,v|
+          terms.push "file_has_#{k}", "file_rights_for_#{k}|#{v}"
+        }
+      end
+
+      terms
+    end
+
+    # Give the index what it needs
+    # @param [Nokogiri::XML] the rightsMetadata document
+    # @return [Hash] Strings of interest to the Solr index, including:
+    # {
+    #   :primary => '...',   # string of foremost rights category, if determinable
+    #   :errors  => [...],   # known error cases
+    #   :terms   => [...]    # array of non-error characterizations and stats strings
+    # }
+    def RightsAuth.extract_access_rights(doc)
+      errors = validate_lite(doc)
+      stuff = {
+        :primary => nil,
+        :errors  => errors,
+        :terms   => []
+      }
+
+      if (errors.include? "no_rightsMetadata")
+        stuff[:primary] = 'dark'
+        return stuff    # short circuit if no metadata -- no point going on
+      end
+
+      stuff[:terms] = extract_index_terms(doc)
+
+      if (stuff[:terms].include?("none_discover"))
+        stuff[:primary] = 'dark'
+      elsif (errors.include?("no_discover_access") || errors.include?("no_discover_machine"))
+        stuff[:primary] = 'dark'
+      elsif (errors.include?("no_read_machine") || stuff[:terms].include?("none_read"))
+        stuff[:primary] = 'citation'
+      elsif (stuff[:terms].include? "world_read")
+        stuff[:primary] = 'world'
+      elsif (stuff[:terms].include? "group|stanford")
+        stuff[:primary] = 'stanford'
+      elsif (stuff[:terms].include? "has_rule")
+        stuff[:primary] = 'complicated'
+      end
+      stuff
+    end
+
+
     # Create a Dor::RightsAuth object from xml
-    # @param [String] xml rightsMetadata xml that will be parsed to build a RightsAuth object
-    # @return Dor::RightsAuth created after parsing rightsMetadata xml
-    def RightsAuth.parse(xml)    
+    # @param [String|Nokogiri::XML::Document] xml rightsMetadata xml that will be parsed to build a RightsAuth object
+    # @param [Boolean] forindex, flag for requesting index_elements be parsed
+    # @return [Dor::RightsAuth] object created after parsing rightsMetadata xml
+    def RightsAuth.parse(xml, forindex=false)
       rights = Dor::RightsAuth.new
       rights.obj_lvl = EntityRights.new
       rights.obj_lvl.world = Rights.new
-    
-      doc = Nokogiri::XML(xml)
+
+      doc = xml.is_a?(Nokogiri::XML::Document) ? xml.clone : Nokogiri::XML(xml)
       if(doc.at_xpath("//rightsMetadata/access[@type='read' and not(file)]/machine/world"))
         rights.obj_lvl.world.value = true
         rule = doc.at_xpath("//rightsMetadata/access[@type='read' and not(file)]/machine/world/@rule")
-        rights.obj_lvl.world.rule = rule.value if(rule)        
+        rights.obj_lvl.world.rule = rule.value if(rule)
       else
-       rights.obj_lvl.world.value = false
+        rights.obj_lvl.world.value = false
       end
 
-      # TODO do we still need this??????    
+      # TODO do we still need this??????
       # if(doc.at_xpath("//rightsMetadata/access[@type='read' and not(file)]"))
       #   rights[:readable] = true
       # else
       #   rights[:readable] = false
       # end
-    
+
       rights.obj_lvl.group = { :stanford => Rights.new }
-    
+
+      if (forindex)
+        rights.index_elements = extract_access_rights(doc)
+      end
+
       if(doc.at_xpath("//rightsMetadata/access[@type='read' and not(file)]/machine/group[#{CONTAINS_STANFORD_XPATH}]"))
         rights.obj_lvl.group[:stanford].value = true
         rule = doc.at_xpath("//rightsMetadata/access[@type='read' and not(file)]/machine/group[#{CONTAINS_STANFORD_XPATH}]/@rule")
@@ -204,7 +335,7 @@ module Dor
         r.rule = node['rule']
         rights.obj_lvl.agent[node.content] = r
       end
-      
+
       # Initialze embargo_status to false
       rights.embargoed = false
       embargo_node = doc.at_xpath("//rightsMetadata/access[@type='read']/machine/embargoReleaseDate")
@@ -212,11 +343,11 @@ module Dor
         embargo_dt = Time.parse(embargo_node.content)
         rights.embargoed = true if(embargo_dt > Time.now)
       end
-        
-      access_with_files = doc.xpath( "//rightsMetadata/access[@type='read' and file]")
+
+      access_with_files = doc.xpath("//rightsMetadata/access[@type='read' and file]")
       access_with_files.each do |access_node|
-        stanford_access = Rights.new  
-        world_access = Rights.new
+        stanford_access = Rights.new
+        world_access    = 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")
@@ -224,7 +355,7 @@ module Dor
         else
           stanford_access.value = false
         end
-      
+
         if access_node.at_xpath("machine/world")
           world_access.value = true
           rule = access_node.at_xpath("machine/world/@rule")
@@ -232,7 +363,7 @@ module Dor
         else
           world_access.value = false
         end
-        
+
         file_agents = {}
         access_node.xpath("machine/agent").each do |node|
           r = Rights.new
@@ -240,20 +371,19 @@ module Dor
           r.rule = node['rule']
           file_agents[node.content] = r
         end
-      
+
         access_node.xpath('file').each do |f|
           file_rights = EntityRights.new
           file_rights.world = world_access
           file_rights.group = { :stanford => stanford_access }
           file_rights.agent = file_agents
-          
+
           rights.file[f.content] = file_rights
         end
       end
 
       rights
     end
-    
+
   end
 end
-

data/lib/dor/xsd/druid.xsd

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:simpleType name="druidstring">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[a-zA-Z]{2}[0-9]{3}[a-zA-Z]{2}[0-9]{4}"/>
+      <xs:whiteSpace value="collapse"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:schema>

data/lib/dor/xsd/druidlist.xsd

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dor="http://sul.stanford.edu">
+	<xs:include schemaLocation="druid.xsd"/>
+	<xs:element name="druidlist">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="druid" type="druidstring" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

data/lib/dor/xsd/humanlist.xsd

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dor="http://sul.stanford.edu">
+	<xs:include schemaLocation="rights_types.xsd"/>
+	<xs:element name="humanlist" type="maybehuman">
+	</xs:element>
+</xs:schema>

data/lib/dor/xsd/illustration.xml

@@ -0,0 +1,39 @@
+<rightsMetadata objectId="druid">
+  <copyright>
+    <human type="copyright">(c) 2009 by Jasper Wilcox. All rights reserved.</human>
+  </copyright>
+  <access type="discover"> <!-- This covers core metadata -- identity, descriptive, content and rights -->
+    <machine>
+      <world/>
+    </machine>
+  </access>
+  <access type="read">  <!-- applies to file contents of an object, e.g., viewing an image online or downloading a file -->
+    <human>This document is available only to the Stanford faculty, staff and student community</human>
+    <machine>
+      <world/>            <!-- either all (world) or nothing (none) would stand alone (apart from embargo date) -->
+      <none/>             <!-- else access would be some combination of the following -->
+      <policy>druid:hx551yt4502</policy>
+      <agent>application_id</agent>
+      <person type="sunetid">user_id</person>
+      <group>stanford</group>  <!-- special form for interpretation as the stanford:stanford privgroup -->
+      <group type="suWorkgroup">stanford:faculty</group>
+      <group type="suWorkgroup">stanford:student</group>
+      <embargoReleaseDate>2011-03-01</embargoReleaseDate>   <!-- informational for PURL use; set via embargoMetadata -->
+    </machine>
+  </access>
+  <access type="read">  <!-- alternate common read form -->
+    <machine>
+      <group>stanford</group>
+      <world rule="no-download"/>
+    </machine>
+  </access>
+  <access type="read">  <!-- file-specific rules -->
+    <file id="restricted.doc"/>
+    <group>stanford</group>
+  </access>
+  <use>
+    <human type="useAndReproduction">You may re-distribute this object, unaltered, with attribution to the author.</human>
+    <human type="creativeCommons">CC Attribution Non-Commercial license</human>
+    <machine type="creativeCommons">by-nc</machine>
+  </use>
+</rightsMetadata>

data/lib/dor/xsd/rights.xsd

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:include schemaLocation="rights_types.xsd"/>
+
+  <xs:element name="rightsMetadata">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice minOccurs="2" maxOccurs="unbounded">
+          <!-- without forced order, we cannot guarantee required elements without fully enumerating 120 combinations!-->
+          <xs:element name="access" type="discovertype"/>
+          <xs:element name="access" type="readtype"/>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="access"    type="readwithfile"/>
+            <xs:element name="copyright" type="copyrightusetype"/>
+            <xs:element name="use"       type="copyrightusetype"/>
+          </xs:choice>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="objectId" type="xs:string" use="required"/>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>

data/lib/dor/xsd/rights_basics.xsd

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+  <xs:simpleType name="trueemptytype">
+    <xs:restriction base="xs:string">
+      <xs:length value="0"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="accesstypeattribute">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="read" />
+      <xs:enumeration value="discover" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="accesstypeattributeread">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="read" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="accesstypeattributediscover">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="discover" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="collapsedstring">
+    <xs:restriction base="xs:string">
+      <xs:whiteSpace value="collapse"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="ruleoptionaltype">
+    <xs:attribute name="rule" type="xs:string"/>
+  </xs:complexType>
+  <xs:complexType name="rulerequiredtype">
+    <xs:attribute name="rule" type="xs:string" use="required"/>
+  </xs:complexType>
+  <xs:complexType name="typeoptionaltype">
+    <xs:attribute name="type" type="xs:string"/>
+  </xs:complexType>
+  <xs:complexType name="typerequiredtype">
+    <xs:attribute name="type" type="xs:string" use="required"/>
+  </xs:complexType>
+  <xs:complexType name="rulerequiredtypeoptional">
+    <xs:complexContent>
+      <xs:extension base="rulerequiredtype">
+        <xs:attribute name="type" type="xs:string"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="collapsedstringoptionaltype">
+    <xs:simpleContent>
+      <xs:extension base="collapsedstring">
+        <xs:attribute name="type" type="xs:string"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="collapsedstringrequiredtype">
+    <xs:simpleContent>
+      <xs:extension base="collapsedstring">
+        <xs:attribute name="type" type="xs:string" use="required"/>
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+</xs:schema>

data/lib/dor/xsd/rights_types.xsd

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:include schemaLocation="rights_basics.xsd"/>
+
+  <xs:complexType name="copyrightusetype">
+    <!--
+    TODO: consider get rid of human elements.  DESTROY ALL HUMANS!
+    TODO: use full URIs to designate rights values.
+    -->
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="human"   type="typeoptionaltype"/>
+        <xs:element name="machine" type="collapsedstringrequiredtype"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:complexType>
+
+<!-- the "machine" elements in "use" and "copyright"(?) are different than the others (no child elements) -->
+  <xs:complexType name="machinetype"><!-- For the deeper non-"use" machine elements -->
+    <xs:choice>
+      <xs:element name="none"  type="xs:string"/>
+      <xs:element name="world" type="xs:string"/>
+    </xs:choice>
+    <xs:attribute name="type" type="xs:string"/>
+  </xs:complexType>
+
+  <xs:complexType name="maybehuman">
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="human" type="typeoptionaltype"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="allornothing">
+    <xs:choice>
+      <xs:element name="none"  type="trueemptytype"/>
+      <xs:element name="world" type="trueemptytype"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="meatyoptions">
+    <xs:sequence>
+      <xs:choice minOccurs="1" maxOccurs="1">
+        <xs:element name="none"  type="trueemptytype"/>
+        <xs:element name="world" type="trueemptytype"/>
+        <xs:sequence> <!-- if one of the above, then NONE of the below -->
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="world"   type="rulerequiredtype"/>
+            <xs:element name="group"   type="ruleoptionaltype"/>
+            <xs:element name="human"   type="typeoptionaltype"/>
+            <xs:element name="person"  type="typerequiredtype"/>
+            <xs:element name="agent"   type="typeoptionaltype"/>
+            <xs:element name="embargoReleaseDate" type="xs:date"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:choice>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="readtype">
+    <xs:complexContent>
+      <xs:extension base="meatyoptions">
+        <xs:attribute name="type" type="accesstypeattributeread" use="required"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="discovertype">
+    <xs:complexContent>
+      <xs:extension base="meatyoptions">
+        <xs:attribute name="type" type="accesstypeattributediscover" use="required"/>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="readwithfile">
+    <xs:complexContent>
+      <xs:extension base="readtype">
+        <xs:sequence>
+          <xs:element name="file" type="accesstypeattributeread" minOccurs="1" maxOccurs="unbounded"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!--
+  <xs:complexType name="discovertype">
+    <xs:complexContent>
+      <xs:extension base="cyborgtype">
+        <xs:element name="machine" type="xs:string" minOccurs="1"/>
+      </xs:extension>
+      <xs:attribute name="type" type="accesstypeattributediscover" use="required"/>
+    </xs:complexContent>
+  </xs:complexType>
+-->
+
+</xs:schema>

metadata

@@ -1,138 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dor-rights-auth
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Willy Mene
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :runtime
+date: 2015-04-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  name: rspec
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :development
-  name: ruby-debug
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: lyberteam-gems-devel
-  requirement: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Parses rightsMetadata xml into a useable object
-email: 
+email:
 - wmene@stanford.edu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/dor/rights_auth.rb
+- lib/dor/xsd/druid.xsd
+- lib/dor/xsd/druidlist.xsd
+- lib/dor/xsd/humanlist.xsd
+- lib/dor/xsd/illustration.xml
+- lib/dor/xsd/rights.xsd
+- lib/dor/xsd/rights_basics.xsd
+- lib/dor/xsd/rights_types.xsd
 homepage: 
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parses rightsMetadata xml into a useable object
 test_files: []
-
 has_rdoc: