ddr-models 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c436bc5ab832643b2e3fffdcca644117e1ed2d0
-  data.tar.gz: 404196a61622898165ba4c57e1ae6ba5449cd0e5
+  metadata.gz: 7caacfe946cae5ba9c4968c17709b12a90388a9c
+  data.tar.gz: 7c59213fb1bed5e7d97923f569e13b9e5ce05aed
 SHA512:
-  metadata.gz: 9bb9d06c858a6800d0de55215a248b29438d7ebe6d963214e7a8101b26117fd2ff0174db504909bf4f08238c46e7d167426954bc9d5ee7b43b9761cd4c6be88b
-  data.tar.gz: 6b2e1e5e7cff42e1aae254a17044e3976c9dee240e5b5e14fa10192d12284fff35316b4cd959e968adbfd61840bccd873890114cad2b51e9eee25d1ffbd40d3f
+  metadata.gz: b988e851b34c98c68b7c981c8e6c5d96655241a66168c9b9564c1237198cb88b512b5d911a409a317b14c0a7819338a92d8732fb5d54dcb30da15a9ec986a509
+  data.tar.gz: 3f5a984938e8600016ea1c0077d11ac7b9cd32cfb9541dea4a14ebe194a52749efeaa6e76dd02f730148c53aba3d0b958b64e6359ee305ae99fa282e5b8d4842

data/config/locales/groups.en.yml

@@ -2,5 +2,12 @@ en:
   groups:
     public: Public
     registered: Duke Community
+    duke:
+      staff: Duke Staff
+      faculty: Duke Faculty
+      student: Duke Students
+      affiliate: Duke Affiliates
+      alumni: Duke Alumni
+      emeritus: Duke Emeritus Faculty
 # Grouper group example:
 #    "duke:library:repository:ddr:archivists": Archivists          

data/lib/ddr/auth/remote_group_service.rb

@@ -2,6 +2,10 @@ module Ddr
   module Auth
     class RemoteGroupService < GroupService
 
+      AFFILIATIONS = %w( faculty student staff affiliate alumni emeritus )
+      AFFILIATION_GROUP_MAP = AFFILIATIONS.map { |a| [a, "duke.#{a}"] }.to_h
+      AFFILIATION_RE = Regexp.new('(%{a})(?=@duke\.edu)' % {a: AFFILIATIONS.join("|")})
+
       attr_reader :env
 
       def initialize(env = nil)
@@ -9,12 +13,12 @@ module Ddr
       end
 
       def append_groups
-        GrouperService.repository_group_names
+        GrouperService.repository_group_names + AFFILIATION_GROUP_MAP.values
       end
 
       def append_user_groups(user)
         if env && env.key?(Ddr::Auth.remote_groups_env_key)
-          remote_groups
+          remote_groups + affiliation_groups
         else
           GrouperService.user_group_names(user)
         end
@@ -30,6 +34,11 @@ module Ddr
         groups
       end
 
+      def affiliation_groups
+        affiliations = env["affiliation"] ? env["affiliation"].scan(AFFILIATION_RE).flatten : []
+        affiliations.map { |affiliation| AFFILIATION_GROUP_MAP[affiliation] }.compact
+      end
+
     end
   end
 end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "1.12.2"
+    VERSION = "1.12.3"
   end
 end

data/spec/services/remote_group_service_spec.rb

@@ -0,0 +1,16 @@
+module Ddr
+  module Auth
+    RSpec.describe RemoteGroupService do
+
+      subject { described_class.new(env) }
+
+      describe "affiliation_groups" do
+        let(:env) { {"affiliation" => "faculty@duke.edu;staff@duke.edu"} }
+        it "should return the groups for the affiliations" do
+          expect(subject.affiliation_groups).to match_array(["duke.faculty", "duke.staff"])
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Jim Coble
@@ -452,6 +452,7 @@ files:
 - spec/models/user_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/services/group_service_spec.rb
+- spec/services/remote_group_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_access_controllables.rb
 - spec/support/shared_examples_for_associations.rb
@@ -563,6 +564,7 @@ test_files:
 - spec/models/user_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/services/group_service_spec.rb
+- spec/services/remote_group_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples_for_access_controllables.rb
 - spec/support/shared_examples_for_associations.rb