ddr-models 1.11.6 → 1.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3efb0abc090200e8bbf81d43c217595f1c9697c7
-  data.tar.gz: e68ed383bfd5d79052c0381424bdb47ad536b471
+  metadata.gz: 629034fc61b1462f5458cd9bcd4bf53208adfb75
+  data.tar.gz: 2202b8145c9340b1fd8daf341435d09c60a62ab6
 SHA512:
-  metadata.gz: dfc022a0397d4b62fe27685208d1ba9d67b744b7aa8642956aee4aaf4e97faeb175efc500a58d140b4edcf120e760fa43bce9664e0e9bedc35a383073213f0bf
-  data.tar.gz: 7dff6a4a6ca4045f61d325b0d46db338ff3d263f0cfadcb49540b17e362e608b2c5cb3ccecffec7d6ba4d2c77499757a2d4b5ae4ecbd7928666ae651d98c63b7
+  metadata.gz: 686be30cb8c22f36a995c7ec453844a8fc79e89b2f3f0c9323aefc6a426b0f56e4b791b707f86ee9d052ac7462b1507fd5423aa7c6da6651bf78cad093acefba
+  data.tar.gz: 7792c1ddfc02aeab76c1e6e31a097e79aac31ddb1c73e19f77c3087b33ae9810d951c676bdf6970128d03bd2f862693153abeb57737fc4991a401727c429436a

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.11.6"
+    VERSION = "1.11.7"
   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.11.6
+  version: 1.11.7
 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
@@ -565,6 +566,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