hydra-access-controls 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7ec1b3adb389dc48bd7289d972644827be5eb2
-  data.tar.gz: 9f8137ca800cfa87d14ab4eeebe68d1a55b9280d
+  metadata.gz: a9ab5ff5dd113d153750288e038a75ab36d53ed9
+  data.tar.gz: db5e2a8772177b3e2df411f1dc711a807a0209b8
 SHA512:
-  metadata.gz: cbdbde25b685579b8f9685d65c9f6ef9d84669ff1db988c1ca5eac3a6d66f6a271e9fbf686856de5292c122d0a5538617133591f78c1de4ef4d85ae1918831a6
-  data.tar.gz: 37e07d96b2fe872966d00eb2fda3e87c7d7b30be1e664ac23e07a0760cae70bf05303da96eec601b96706141e86494b392502427a497a7e90d5bbb0477d5f631
+  metadata.gz: 23003e32b9a7a0db212091222726077bd2f1c336ab1f5d037296a945fe58b653f60fe2e71c6f2f840c0886e161679d58e436abc6597fbf2d932e42985129a567
+  data.tar.gz: d0ae6b4160474dd0500c383e7c66ec3b424926f351f7cb4c2a27b548b9cbe1a990db1481966e7911a3ccff5fcb94ca2e3378089c515a91cbeb14da4519003d27

data/lib/hydra/datastream/rights_metadata.rb

@@ -98,7 +98,7 @@ module Hydra
         type = selector.keys.first.to_sym
         actor = selector.values.first
         if new_access_level.nil?
-          xpath = self.class.terminology.xpath_for(:access, type, actor)
+          xpath = xpath(type, actor)
           nodeset = self.find_by_terms(xpath)
           if nodeset.empty?
             return "none"
@@ -224,10 +224,22 @@ module Hydra
         return unless ng_xml
         type = selector.keys.first.to_sym
         actor = selector.values.first
-        xpath = self.class.terminology.xpath_for(:access, type, actor)
+        xpath = xpath(type, actor)
         nodes_to_purge = self.find_by_terms(xpath)
         nodes_to_purge.each {|node| node.remove}
       end
+
+      # @param [Symbol] type (:group, :person)
+      # @param [String,TrueClass] actor the user we want to find. If actor is true, then don't query.
+      def xpath(type, actor)
+        raise ArgumentError, "Type must either be ':group' or ':person'. You provided: '#{type.inspect}'" unless [:group, :person].include?(type)
+        path = "//oxns:access/oxns:machine/oxns:#{type}"
+        if actor.is_a? String
+          clean_actor = actor.gsub("'", '')
+          path += "[text() = '#{clean_actor}']" 
+        end
+        path
+      end
       
     end
   end

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -120,7 +120,8 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
       policy_pids = (1..8).map {|n| "test:policy#{n}"}
       subject.should_receive(:policies_with_access).and_return(policy_pids)
       subject.apply_gated_discovery(@solr_parameters, @user_parameters)
-      @solr_parameters[:fq].first.should include(" OR (#{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy1 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy2 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy3 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy4 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy5 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy6 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy7 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy8)")
+      governed_field = ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)
+      @solr_parameters[:fq].first.should include(" OR (_query_:\"{!raw f=#{governed_field}}info:fedora/test:policy1\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy2\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy3\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy4\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy5\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy6\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy7\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy8\")")
     end
     it "should not change anything if there are no clauses to add" do
       subject.stub(:policy_clauses).and_return(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Chris Beer