ddr-models 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c437a6befa6c652bbb9efaffd96796d3f2a8346f
-  data.tar.gz: d55ee2d38f56561bcdeef7034cca35af51373506
+  metadata.gz: c761f5250439f6f0cfc16eb0b2b34b93dfc202fb
+  data.tar.gz: fc0a12a51d85b46adf71cfe1183e929552b3363e
 SHA512:
-  metadata.gz: 51f211884ee392439ecbd5793b8d5f26e388e250644259a64d6913f3018c93f47cc9ac4f3595ca549ff13e440758aad65db8a1842fa6bfb6e92d45012465b94b
-  data.tar.gz: 1117c2227c8cc96afd9c9c3a1153111dd15b64bfaa5e0f4c1a1647703406a2db60eb171e0e1f824d776e25dae7322f41bc15e23e9d111ddb89ae89f6df5f29af
+  metadata.gz: d18ef50d92eb13acf7ca8d81e5c0d5fc4c01764c6fe1fdf3cbabd0690d4167cf5aa6d68d21a4b77c27b6a366618c8ef36a9ee11a20574b436746d7dbeeb7e371
+  data.tar.gz: 0594dc9217ff806a7132cc106b723b5b6cbb1ca58cc2ad9b020995f8ac7ef1ddaacd08dd807d143696a40a40e85778dcaa21fe17f22c0e4850502b43fab698e2

data/lib/ddr/auth/ability_definitions/collection_ability_definitions.rb

@@ -3,7 +3,7 @@ module Ddr
     class CollectionAbilityDefinitions < AbilityDefinitions
 
       def call
-        if member_of? Groups::COLLECTION_CREATORS
+        if member_of? Ddr::Auth.collection_creators_group
           can :create, ::Collection
         end
       end

data/lib/ddr/auth/auth_context.rb

@@ -60,7 +60,7 @@ module Ddr::Auth
     #   This is separate from whether the context is authenticated in superuser scope.
     # @return [Boolean]
     def authorized_to_act_as_superuser?
-      member_of? Groups::SUPERUSERS
+      member_of? Ddr::Auth.superuser_group
     end
 
     # Return the combined user and group agents for this context.

data/lib/ddr/auth/dynamic_groups.rb

@@ -1,13 +1,7 @@
 module Ddr::Auth
   class DynamicGroups
 
-    ALL = [ Groups::PUBLIC,
-            Groups::REGISTERED,
-            Groups::DUKE_ALL,
-            Groups::SUPERUSERS,
-            Groups::COLLECTION_CREATORS ] +
-          AffiliationGroups::ALL
-    ALL.freeze
+    ALL = ([Groups::PUBLIC, Groups::REGISTERED, Groups::DUKE_ALL] + AffiliationGroups::ALL).freeze
 
     # @param auth_context [AuthContext]
     # @return [Array<Group>]

data/lib/ddr/auth/groups.rb

@@ -13,25 +13,12 @@ module Ddr
       DUKE_ALL = Group.new "duke.all", label: "Duke NetIDs" do |auth_context|
         auth_context.duke_agent?
       end
-      
-      SUPERUSERS = Group.new "ddr.superusers", label: "Superusers" do |auth_context|
-        auth_context.ismemberof.include? Ddr::Auth.superuser_group
-      end
-      
-      COLLECTION_CREATORS = Group.new "ddr.collection_creators",
-                                      label: "Collection Creators" do |auth_context|
-        auth_context.ismemberof.include? Ddr::Auth.collection_creators_group
-      end
 
       # Return the list of all groups available for use in the repository,
       #   i.e., that can be used to assert access controls.
       # @return [Array<Group>] the groups
       def self.all
-        [ PUBLIC,
-          REGISTERED,
-          DUKE_ALL ] +
-          AffiliationGroups::ALL +
-          Ddr::Auth.grouper_gateway.repository_groups
+        DynamicGroups::ALL + Ddr::Auth.grouper_gateway.repository_groups
       end
 
       # @param auth_context [AuthContext]

data/lib/ddr/models/solr_document.rb

@@ -266,7 +266,7 @@ module Ddr
           query = ActiveFedora::SolrService.construct_query_for_pids([admin_policy_pid])
           results = ActiveFedora::SolrService.query(query)
           doc = results.map { |result| ::SolrDocument.new(result) }.first
-          doc[Ddr::IndexFields::RESEARCH_HELP_CONTACT].first
+          doc[Ddr::IndexFields::RESEARCH_HELP_CONTACT]
         end
       end
 

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.0.0.rc1"
+    VERSION = "2.0.0.rc2"
   end
 end

data/spec/auth/ability_spec.rb

@@ -57,16 +57,19 @@ module Ddr::Auth
     end
 
     describe "Collection abilities" do
+      before do
+        allow(Ddr::Auth).to receive(:collection_creators_group) { "collection_creators" }
+      end
       describe "when the user is a collection creator" do
         before do
-          allow(auth_context).to receive(:member_of?).with(Groups::COLLECTION_CREATORS) { true }
+          allow(auth_context).to receive(:member_of?).with("collection_creators") { true }
         end
         it { should be_able_to(:create, Collection) }
       end
 
       describe "when the user is not a collection creator" do
         before do
-          allow(auth_context).to receive(:member_of?).with(Groups::COLLECTION_CREATORS) { false }
+          allow(auth_context).to receive(:member_of?).with("collection_creators") { false }
         end
         it { should_not be_able_to(:create, Collection) }
       end

data/spec/auth/groups_spec.rb

@@ -9,8 +9,6 @@ module Ddr::Auth
         it { should include(Groups::PUBLIC) }
         it { should_not include(Groups::REGISTERED) }
         it { should_not include(Groups::DUKE_ALL) }
-        it { should_not include(Groups::SUPERUSERS) }
-        it { should_not include(Groups::COLLECTION_CREATORS) }
         it "should not include affiliation groups" do
           expect(subject.any? { |g| AffiliationGroups::ALL.include?(g) }).to be false
         end
@@ -21,8 +19,6 @@ module Ddr::Auth
         it { should include(Groups::PUBLIC) }
         it { should include(Groups::REGISTERED) }
         it { should_not include(Groups::DUKE_ALL) }
-        it { should_not include(Groups::SUPERUSERS) }
-        it { should_not include(Groups::COLLECTION_CREATORS) }
         it "should not include affiliation groups" do
           expect(subject.any? { |g| AffiliationGroups::ALL.include?(g) }).to be false
         end
@@ -33,8 +29,6 @@ module Ddr::Auth
         it { should include(Groups::PUBLIC) }
         it { should include(Groups::REGISTERED) }
         it { should include(Groups::DUKE_ALL) }
-        it { should_not include(Groups::SUPERUSERS) }
-        it { should_not include(Groups::COLLECTION_CREATORS) }
 
         describe "with affiliations" do
           before do
@@ -61,26 +55,7 @@ module Ddr::Auth
         end
       end
 
-      describe "superusers" do
-        let(:auth_context) { FactoryGirl.build(:auth_context) }
-        before do
-          allow(Ddr::Auth).to receive(:superuser_group) { "superusers" }
-          allow(auth_context).to receive(:ismemberof) { [ Ddr::Auth.superuser_group ] }
-        end
-        it { should include(Groups::SUPERUSERS) }
-      end
-
-      describe "collection creators" do
-        let(:auth_context) { FactoryGirl.build(:auth_context) }
-        before do
-          allow(Ddr::Auth).to receive(:collection_creators_group) { "collection_creators" }
-          allow(auth_context).to receive(:ismemberof) { [ Ddr::Auth.collection_creators_group ] }
-        end
-        it { should include(Groups::COLLECTION_CREATORS) }
-      end
-
     end
 
-
   end
 end

data/spec/models/solr_document_spec.rb

@@ -102,26 +102,26 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
 
   describe "contacts" do
     before do
-      allow(YAML).to receive(:load_file) { { 'a' => { 'name' => 'Contact A', 'short_name' => 'A' },
-                                             'b' => { 'name' => 'Contact B', 'short_name' => 'B' } } }
+      allow(YAML).to receive(:load_file) { { 'xa' => { 'name' => 'Contact A', 'short_name' => 'A' },
+                                             'yb' => { 'name' => 'Contact B', 'short_name' => 'B' } } }
       Ddr::Contacts.load_contacts
     end
     describe "#research_help" do
       context "object has research help contact" do
-        before { subject[Ddr::IndexFields::RESEARCH_HELP_CONTACT] = 'b' }
+        before { subject[Ddr::IndexFields::RESEARCH_HELP_CONTACT] = 'yb' }
         it "should return the object's research help contact" do
-          expect(subject.research_help.slug).to eq('b')
+          expect(subject.research_help.slug).to eq('yb')
         end
       end
       context "object does not have research help contact" do
         context "collection has research help contact" do
-          let(:apo_solr_response) { [{"system_create_dtsi"=>"2015-03-10T15:20:16Z", "system_modified_dtsi"=>"2015-03-10T15:21:50Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Collection", "id"=>"changeme:224", "object_profile_ssm"=>["{\"datastreams\":{\"DC\":{\"dsLabel\":\"Dublin Core Record for this object\",\"dsVersionID\":\"DC1.0\",\"dsCreateDate\":\"2015-03-10T15:20:16Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":\"http://www.openarchives.org/OAI/2.0/oai_dc/\",\"dsControlGroup\":\"X\",\"dsSize\":341,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+DC+DC1.0\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"0555f020bbfc94c07745f530af4195fed9cf4e4ba539a30727f2d2d5743627be\"},\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":417,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7c2621534cd1cb28d9cfa7e45bb128a1f3c05028e29def4dea479be9596d7d\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":80,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bbba526a1ca47f19dfe110f25a0a721bda481dc414f7ec89e3f02c5562eaa9a2\"},\"rightsMetadata\":{\"dsLabel\":null,\"dsVersionID\":\"rightsMetadata.0\",\"dsCreateDate\":\"2015-03-10T15:20:17Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":550,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+rightsMetadata+rightsMetadata.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"210d5a228bd96e22b20723de1dd20ea8d897252063713d0815369c49045c5c05\"},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"defaultRights\":{\"dsLabel\":null,\"dsVersionID\":\"defaultRights.0\",\"dsCreateDate\":\"2015-03-10T15:21:50Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":634,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+defaultRights+defaultRights.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"1a2d9e665228d5e3cbf5f8ddd0d641172c20f98b4e05d62f741b7b9010696ad0\"}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/afmodel:Collection\",\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-03-10T15:20:16Z\",\"objLastModDate\":\"2015-03-10T15:20:18Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "title_tesim"=>["Test Collection"], "edit_access_person_ssim"=>["coblej@duke.edu"], "inheritable_read_access_group_ssim"=>["public"], "is_governed_by_ssim"=>["info:fedora/changeme:224"], "has_model_ssim"=>["info:fedora/afmodel:Collection"], "title_ssi"=>"Test Collection", "internal_uri_ssi"=>"info:fedora/changeme:224", Ddr::IndexFields::RESEARCH_HELP_CONTACT=>["a"], "_version_"=>1495270331036729344, "timestamp"=>"2015-03-10T15:21:50.793Z"}] }
+          let(:apo_solr_response) { [{"system_create_dtsi"=>"2015-03-10T15:20:16Z", "system_modified_dtsi"=>"2015-03-10T15:21:50Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Collection", "id"=>"changeme:224", "object_profile_ssm"=>["{\"datastreams\":{\"DC\":{\"dsLabel\":\"Dublin Core Record for this object\",\"dsVersionID\":\"DC1.0\",\"dsCreateDate\":\"2015-03-10T15:20:16Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":\"http://www.openarchives.org/OAI/2.0/oai_dc/\",\"dsControlGroup\":\"X\",\"dsSize\":341,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+DC+DC1.0\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"0555f020bbfc94c07745f530af4195fed9cf4e4ba539a30727f2d2d5743627be\"},\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":417,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7c2621534cd1cb28d9cfa7e45bb128a1f3c05028e29def4dea479be9596d7d\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":80,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bbba526a1ca47f19dfe110f25a0a721bda481dc414f7ec89e3f02c5562eaa9a2\"},\"rightsMetadata\":{\"dsLabel\":null,\"dsVersionID\":\"rightsMetadata.0\",\"dsCreateDate\":\"2015-03-10T15:20:17Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":550,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+rightsMetadata+rightsMetadata.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"210d5a228bd96e22b20723de1dd20ea8d897252063713d0815369c49045c5c05\"},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"defaultRights\":{\"dsLabel\":null,\"dsVersionID\":\"defaultRights.0\",\"dsCreateDate\":\"2015-03-10T15:21:50Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":634,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+defaultRights+defaultRights.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"1a2d9e665228d5e3cbf5f8ddd0d641172c20f98b4e05d62f741b7b9010696ad0\"}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/afmodel:Collection\",\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-03-10T15:20:16Z\",\"objLastModDate\":\"2015-03-10T15:20:18Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "title_tesim"=>["Test Collection"], "edit_access_person_ssim"=>["coblej@duke.edu"], "inheritable_read_access_group_ssim"=>["public"], "is_governed_by_ssim"=>["info:fedora/changeme:224"], "has_model_ssim"=>["info:fedora/afmodel:Collection"], "title_ssi"=>"Test Collection", "internal_uri_ssi"=>"info:fedora/changeme:224", Ddr::IndexFields::RESEARCH_HELP_CONTACT=>"xa", "_version_"=>1495270331036729344, "timestamp"=>"2015-03-10T15:21:50.793Z"}] }
           before do
             allow(subject).to receive(:admin_policy_pid).and_return('changeme:224')
             allow(ActiveFedora::SolrService).to receive(:query).and_return(apo_solr_response)
           end
           it "should return the collection's research help contact" do
-            expect(subject.research_help.slug).to eq("a")
+            expect(subject.research_help.slug).to eq("xa")
           end
         end
         context "collection does not have research help contact" do

data/spec/support/shared_examples_for_auth_contexts.rb

@@ -61,18 +61,26 @@ module Ddr::Auth
           expect(subject.member_of?(group2)).to be false
         end
       end
+      describe "when given nil" do
+        it "should be false" do
+          expect(subject.member_of?(nil)).to be false
+        end
+      end
     end
 
     describe "#authorized_to_act_as_superuser?" do
+      before do
+        allow(Ddr::Auth).to receive(:superuser_group) { "superusers" }
+      end
       describe "when a member of the superusers group" do
         before do
-          allow(subject).to receive(:groups) { [ Groups::SUPERUSERS ] }
+          allow(subject).to receive(:member_of?).with("superusers") { true }
         end
         its(:authorized_to_act_as_superuser?) { should be true }
       end
       describe "when not a member of the superusers group" do
         before do
-          allow(subject).to receive(:groups) { [ Groups::PUBLIC ] }
+          allow(subject).to receive(:member_of?).with("superusers") { false }
         end
         its(:authorized_to_act_as_superuser?) { should be false }
       end

metadata

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