ddr-models 2.0.0.rc3 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11a42d52d26394cfb4c5b2ce83b07a376a038ca5
-  data.tar.gz: 7126eba821b4752622f03747c12194ee5298ba37
+  metadata.gz: 020b6e60553192eb502a3aba93595a4b98efc94c
+  data.tar.gz: 867e06bb256fd8d50df22ca7b129fa853aa24c86
 SHA512:
-  metadata.gz: dc0839497afa48bb0a7fe0c0eda51678f8a9218fab2b7cf1b4c9f1e5c4d20d715b7e9e94bb910028b5aa8b13984a6cfe0bec1c4345811c91d2a01d268e920ee5
-  data.tar.gz: 730e4a441a4b8e2f2894226b09b463ef63812d9b50b9afdbfef0e40851e73c2e3e8754e6621921c9d4006ecb2f243dda41e0173851a1fcb42294a08880d9d503
+  metadata.gz: fd13a10378603fba054c18241403870e2d73859774116a1b3a1580d641075e1e962e518a2bee882ae364590ef310f3ef76ecaaaf89efd4421f868e380bff0b1c
+  data.tar.gz: 328a95d896b257a194be234d473a86e3cd2a3917f6e540e021f1ae59495fc26b5651ee84a2b9d1d391e71e71f76e94e8c1c34dd2ee5c820b1d57fe2664323f22

data/lib/ddr/auth/role_based_access_controls_enforcement.rb

@@ -17,15 +17,15 @@ module Ddr
         @current_ability ||= AbilityFactory.call(current_user, request.env)
       end
 
-      # List of PIDs for policies on which any of the current user's agent has a role in policy scope
+      # List of URIs for policies on which any of the current user's agent has a role in policy scope
       def policy_role_policies
-        @policy_role_policies ||= Array.new.tap do |pids|
+        @policy_role_policies ||= Array.new.tap do |uris|
           filters = current_ability.agents.map do |agent|
             "#{Ddr::IndexFields::POLICY_ROLE}:\"#{agent}\""
           end.join(" OR ")
           query = "#{Ddr::IndexFields::ACTIVE_FEDORA_MODEL}:Collection AND (#{filters})"
-          results = ActiveFedora::SolrService.query(query, rows: Collection.count, fl: "id")
-          results.each_with_object(pids) { |r, memo| memo << r["id"] }
+          results = ActiveFedora::SolrService.query(query, rows: Collection.count, fl: Ddr::IndexFields::INTERNAL_URI)
+          results.each_with_object(uris) { |r, memo| memo << r[Ddr::IndexFields::INTERNAL_URI] }
         end
       end
 

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.0.0.rc3"
+    VERSION = "2.0.0.rc4"
   end
 end

data/spec/controllers/including_role_based_access_controls_enforcement_spec.rb

@@ -31,17 +31,17 @@ RSpec.describe ApplicationController, type: :controller do
       collections[2].roles.grant type: "Viewer", agent: "foo:bar", scope: "policy"
       collections[2].save
     end
-    it "should return a list of PIDs for collections on which the current ability has a role" do
-      expect(subject.policy_role_policies).to match_array([collections[0].pid, collections[1].pid])
+    it "should return a list of internal URIs for collections on which the current ability has a role" do
+      expect(subject.policy_role_policies).to match_array([collections[0].internal_uri, collections[1].internal_uri])
     end
   end
 
   describe "#policy_role_filters" do
     before do
-      allow(subject).to receive(:policy_role_policies) { ["test:13", "test:45"] }
+      allow(subject).to receive(:policy_role_policies) { ["info:fedora/test:13", "info:fedora/test:45"] }
     end
-    it "should include clauses for is_governed_by relationships to the #policy_role_policies PIDs" do
-      expect(subject.policy_role_filters).to eq("_query_:\"{!raw f=#{Ddr::IndexFields::IS_GOVERNED_BY}}test:13\" OR _query_:\"{!raw f=#{Ddr::IndexFields::IS_GOVERNED_BY}}test:45\"")
+    it "should include clauses for is_governed_by relationships to the #policy_role_policies" do
+      expect(subject.policy_role_filters).to eq("_query_:\"{!raw f=#{Ddr::IndexFields::IS_GOVERNED_BY}}info:fedora/test:13\" OR _query_:\"{!raw f=#{Ddr::IndexFields::IS_GOVERNED_BY}}info:fedora/test:45\"")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails