hydra-access-controls 6.4.0.pre2 → 6.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f2c828c01a662e99c864d3a3188f83ffa0a2d3
-  data.tar.gz: 5b305407bd3d90d231c7c5098de035608dabb6d1
+  metadata.gz: 08285f91280c40edeb4fc605b7d953b44a70d1f5
+  data.tar.gz: 9f59a3412954e6e8f615bea4fa597e1017fa2158
 SHA512:
-  metadata.gz: 80c97916451cd6546514a2b18d36c8c6025696d5b09dfa0644eae31fb3c39770ccd1938423ebf9174daae3430e012386e9feec511a566d886541df56efd13d57
-  data.tar.gz: 11ae4e897b165e0c21bc29491179ef23907de5c6c5dc1da6639811c85dfb488cb0b41200dfa85b4510d51fbf11d6a67a13668778ba6110f036dd94c659aa1f8e
+  metadata.gz: 93a2d9fe2e17186dbbd219ac14db54aa89056ea45bcbbdba01b91b93a9a8fe4bf05cb41a6a0c82ee927b3b3cf2f926d60e7e9c9a28f5cf1896fc5a71a46f363a
+  data.tar.gz: c5d34233e4e9f2732636c1bdc5ce7cc66f6b97130c453081eb22fceff5a5dd2b6f0799f74bb7d8d0a1f403f8f7ea368c3f4af94f12020640bb30d4ff5a30d7cf

data/app/models/concerns/hydra/access_controls/permissions.rb

@@ -49,6 +49,107 @@ module Hydra
           rightsMetadata.individuals.map {|x|  Permission.new(type: 'user', access: x[1], name: x[0] )})
       end
 
+      # Return a list of groups that have discover permission
+      def discover_groups
+        rightsMetadata.groups.map {|k, v| k if v == 'discover'}.compact
+      end
+
+      # Grant discover permissions to the groups specified. Revokes discover permission for all other groups.
+      # @param[Array] groups a list of group names
+      # @example
+      #  r.discover_groups= ['one', 'two', 'three']
+      #  r.discover_groups 
+      #  => ['one', 'two', 'three']
+      #
+      def discover_groups=(groups)
+        set_discover_groups(groups, discover_groups)
+      end
+
+      # Grant discover permissions to the groups specified. Revokes discover permission for all other groups.
+      # @param[String] groups a list of group names
+      # @example
+      #  r.discover_groups_string= 'one, two, three'
+      #  r.discover_groups 
+      #  => ['one', 'two', 'three']
+      #
+      def discover_groups_string=(groups)
+        self.discover_groups=groups.split(/[\s,]+/)
+      end
+
+      # Display the groups a comma delimeted string
+      def discover_groups_string
+        self.discover_groups.join(', ')
+      end
+
+      # Grant discover permissions to the groups specified. Revokes discover permission for
+      # any of the eligible_groups that are not in groups.
+      # This may be used when different users are responsible for setting different
+      # groups.  Supply the groups the current user is responsible for as the 
+      # 'eligible_groups'
+      # @param[Array] groups a list of groups
+      # @param[Array] eligible_groups the groups that are eligible to have their discover permssion revoked. 
+      # @example
+      #  r.discover_groups = ['one', 'two', 'three']
+      #  r.discover_groups 
+      #  => ['one', 'two', 'three']
+      #  r.set_discover_groups(['one'], ['three'])
+      #  r.discover_groups
+      #  => ['one', 'two']  ## 'two' was not eligible to be removed
+      #
+      def set_discover_groups(groups, eligible_groups)
+        set_entities(:discover, :group, groups, eligible_groups)
+      end
+
+      def discover_users
+        rightsMetadata.individuals.map {|k, v| k if v == 'discover'}.compact
+      end
+
+      # Grant discover permissions to the users specified. Revokes discover permission for all other users.
+      # @param[Array] users a list of usernames
+      # @example
+      #  r.discover_users= ['one', 'two', 'three']
+      #  r.discover_users 
+      #  => ['one', 'two', 'three']
+      #
+      def discover_users=(users)
+        set_discover_users(users, discover_users)
+      end
+
+      # Grant discover permissions to the groups specified. Revokes discover permission for all other users.
+      # @param[String] users a list of usernames
+      # @example
+      #  r.discover_users_string= 'one, two, three'
+      #  r.discover_users 
+      #  => ['one', 'two', 'three']
+      #
+      def discover_users_string=(users)
+        self.discover_users=users.split(/[\s,]+/)
+      end
+
+      # Display the users as a comma delimeted string
+      def discover_users_string
+        self.discover_users.join(', ')
+      end
+
+      # Grant discover permissions to the users specified. Revokes discover permission for
+      # any of the eligible_users that are not in users.
+      # This may be used when different users are responsible for setting different
+      # users.  Supply the users the current user is responsible for as the 
+      # 'eligible_users'
+      # @param[Array] users a list of users
+      # @param[Array] eligible_users the users that are eligible to have their discover permssion revoked. 
+      # @example
+      #  r.discover_users = ['one', 'two', 'three']
+      #  r.discover_users 
+      #  => ['one', 'two', 'three']
+      #  r.set_discover_users(['one'], ['three'])
+      #  r.discover_users
+      #  => ['one', 'two']  ## 'two' was not eligible to be removed
+      #
+      def set_discover_users(users, eligible_users)
+        set_entities(:discover, :person, users, eligible_users)
+      end
+
       # Return a list of groups that have discover permission
       def read_groups
         rightsMetadata.groups.map {|k, v| k if v == 'read'}.compact

data/lib/hydra/model_mixins/rights_metadata.rb

@@ -3,6 +3,7 @@ module Hydra
     module RightsMetadata
       extend ActiveSupport::Concern
       extend Deprecation
+      include Hydra::AccessControls::Permissions
 
       included do
         Deprecation.warn(RightsMetadata, "Hydra::ModelMixins::RightsMetadata has been deprecated and will be removed in hydra-head 7.0. Use Hydra::AccessControls::Permissions instead", caller(3));
@@ -44,323 +45,6 @@ module Hydra
 
       end
     
-      # Return a list of groups that have discover permission
-      def discover_groups
-        rightsMetadata.groups.map {|k, v| k if v == 'discover'}.compact
-      end
-
-      # Grant discover permissions to the groups specified. Revokes discover permission for all other groups.
-      # @param[Array] groups a list of group names
-      # @example
-      #  r.discover_groups= ['one', 'two', 'three']
-      #  r.discover_groups 
-      #  => ['one', 'two', 'three']
-      #
-      def discover_groups=(groups)
-        set_discover_groups(groups, discover_groups)
-      end
-
-      # Grant discover permissions to the groups specified. Revokes discover permission for all other groups.
-      # @param[String] groups a list of group names
-      # @example
-      #  r.discover_groups_string= 'one, two, three'
-      #  r.discover_groups 
-      #  => ['one', 'two', 'three']
-      #
-      def discover_groups_string=(groups)
-        self.discover_groups=groups.split(/[\s,]+/)
-      end
-
-      # Display the groups a comma delimeted string
-      def discover_groups_string
-        self.discover_groups.join(', ')
-      end
-
-      # Grant discover permissions to the groups specified. Revokes discover permission for
-      # any of the eligible_groups that are not in groups.
-      # This may be used when different users are responsible for setting different
-      # groups.  Supply the groups the current user is responsible for as the 
-      # 'eligible_groups'
-      # @param[Array] groups a list of groups
-      # @param[Array] eligible_groups the groups that are eligible to have their discover permssion revoked. 
-      # @example
-      #  r.discover_groups = ['one', 'two', 'three']
-      #  r.discover_groups 
-      #  => ['one', 'two', 'three']
-      #  r.set_discover_groups(['one'], ['three'])
-      #  r.discover_groups
-      #  => ['one', 'two']  ## 'two' was not eligible to be removed
-      #
-      def set_discover_groups(groups, eligible_groups)
-        set_entities(:discover, :group, groups, eligible_groups)
-      end
-
-      def discover_users
-        rightsMetadata.individuals.map {|k, v| k if v == 'discover'}.compact
-      end
-
-      # Grant discover permissions to the users specified. Revokes discover permission for all other users.
-      # @param[Array] users a list of usernames
-      # @example
-      #  r.discover_users= ['one', 'two', 'three']
-      #  r.discover_users 
-      #  => ['one', 'two', 'three']
-      #
-      def discover_users=(users)
-        set_discover_users(users, discover_users)
-      end
-
-      # Grant discover permissions to the groups specified. Revokes discover permission for all other users.
-      # @param[String] users a list of usernames
-      # @example
-      #  r.discover_users_string= 'one, two, three'
-      #  r.discover_users 
-      #  => ['one', 'two', 'three']
-      #
-      def discover_users_string=(users)
-        self.discover_users=users.split(/[\s,]+/)
-      end
-
-      # Display the users as a comma delimeted string
-      def discover_users_string
-        self.discover_users.join(', ')
-      end
-
-      # Grant discover permissions to the users specified. Revokes discover permission for
-      # any of the eligible_users that are not in users.
-      # This may be used when different users are responsible for setting different
-      # users.  Supply the users the current user is responsible for as the 
-      # 'eligible_users'
-      # @param[Array] users a list of users
-      # @param[Array] eligible_users the users that are eligible to have their discover permssion revoked. 
-      # @example
-      #  r.discover_users = ['one', 'two', 'three']
-      #  r.discover_users 
-      #  => ['one', 'two', 'three']
-      #  r.set_discover_users(['one'], ['three'])
-      #  r.discover_users
-      #  => ['one', 'two']  ## 'two' was not eligible to be removed
-      #
-      def set_discover_users(users, eligible_users)
-        set_entities(:discover, :person, users, eligible_users)
-      end
-
-      # Return a list of groups that have discover permission
-      def read_groups
-        rightsMetadata.groups.map {|k, v| k if v == 'read'}.compact
-      end
-
-      # Grant read permissions to the groups specified. Revokes read permission for all other groups.
-      # @param[Array] groups a list of group names
-      # @example
-      #  r.read_groups= ['one', 'two', 'three']
-      #  r.read_groups 
-      #  => ['one', 'two', 'three']
-      #
-      def read_groups=(groups)
-        set_read_groups(groups, read_groups)
-      end
-
-      # Grant read permissions to the groups specified. Revokes read permission for all other groups.
-      # @param[String] groups a list of group names
-      # @example
-      #  r.read_groups_string= 'one, two, three'
-      #  r.read_groups 
-      #  => ['one', 'two', 'three']
-      #
-      def read_groups_string=(groups)
-        self.read_groups=groups.split(/[\s,]+/)
-      end
-
-      # Display the groups a comma delimeted string
-      def read_groups_string
-        self.read_groups.join(', ')
-      end
-
-      # Grant read permissions to the groups specified. Revokes read permission for
-      # any of the eligible_groups that are not in groups.
-      # This may be used when different users are responsible for setting different
-      # groups.  Supply the groups the current user is responsible for as the 
-      # 'eligible_groups'
-      # @param[Array] groups a list of groups
-      # @param[Array] eligible_groups the groups that are eligible to have their read permssion revoked. 
-      # @example
-      #  r.read_groups = ['one', 'two', 'three']
-      #  r.read_groups 
-      #  => ['one', 'two', 'three']
-      #  r.set_read_groups(['one'], ['three'])
-      #  r.read_groups
-      #  => ['one', 'two']  ## 'two' was not eligible to be removed
-      #
-      def set_read_groups(groups, eligible_groups)
-        set_entities(:read, :group, groups, eligible_groups)
-      end
-
-      def read_users
-        rightsMetadata.individuals.map {|k, v| k if v == 'read'}.compact
-      end
-
-      # Grant read permissions to the users specified. Revokes read permission for all other users.
-      # @param[Array] users a list of usernames
-      # @example
-      #  r.read_users= ['one', 'two', 'three']
-      #  r.read_users 
-      #  => ['one', 'two', 'three']
-      #
-      def read_users=(users)
-        set_read_users(users, read_users)
-      end
-
-      # Grant read permissions to the groups specified. Revokes read permission for all other users.
-      # @param[String] users a list of usernames
-      # @example
-      #  r.read_users_string= 'one, two, three'
-      #  r.read_users 
-      #  => ['one', 'two', 'three']
-      #
-      def read_users_string=(users)
-        self.read_users=users.split(/[\s,]+/)
-      end
-
-      # Display the users as a comma delimeted string
-      def read_users_string
-        self.read_users.join(', ')
-      end
-
-      # Grant read permissions to the users specified. Revokes read permission for
-      # any of the eligible_users that are not in users.
-      # This may be used when different users are responsible for setting different
-      # users.  Supply the users the current user is responsible for as the 
-      # 'eligible_users'
-      # @param[Array] users a list of users
-      # @param[Array] eligible_users the users that are eligible to have their read permssion revoked. 
-      # @example
-      #  r.read_users = ['one', 'two', 'three']
-      #  r.read_users 
-      #  => ['one', 'two', 'three']
-      #  r.set_read_users(['one'], ['three'])
-      #  r.read_users
-      #  => ['one', 'two']  ## 'two' was not eligible to be removed
-      #
-      def set_read_users(users, eligible_users)
-        set_entities(:read, :person, users, eligible_users)
-      end
-
-
-      # Return a list of groups that have edit permission
-      def edit_groups
-        rightsMetadata.groups.map {|k, v| k if v == 'edit'}.compact
-      end
-
-      # Grant edit permissions to the groups specified. Revokes edit permission for all other groups.
-      # @param[Array] groups a list of group names
-      # @example
-      #  r.edit_groups= ['one', 'two', 'three']
-      #  r.edit_groups 
-      #  => ['one', 'two', 'three']
-      #
-      def edit_groups=(groups)
-        set_edit_groups(groups, edit_groups)
-      end
-
-      # Grant edit permissions to the groups specified. Revokes edit permission for all other groups.
-      # @param[String] groups a list of group names
-      # @example
-      #  r.edit_groups_string= 'one, two, three'
-      #  r.edit_groups 
-      #  => ['one', 'two', 'three']
-      #
-      def edit_groups_string=(groups)
-        self.edit_groups=groups.split(/[\s,]+/)
-      end
-
-      # Display the groups a comma delimeted string
-      def edit_groups_string
-        self.edit_groups.join(', ')
-      end
-
-      # Grant edit permissions to the groups specified. Revokes edit permission for
-      # any of the eligible_groups that are not in groups.
-      # This may be used when different users are responsible for setting different
-      # groups.  Supply the groups the current user is responsible for as the 
-      # 'eligible_groups'
-      # @param[Array] groups a list of groups
-      # @param[Array] eligible_groups the groups that are eligible to have their edit permssion revoked. 
-      # @example
-      #  r.edit_groups = ['one', 'two', 'three']
-      #  r.edit_groups 
-      #  => ['one', 'two', 'three']
-      #  r.set_edit_groups(['one'], ['three'])
-      #  r.edit_groups
-      #  => ['one', 'two']  ## 'two' was not eligible to be removed
-      #
-      def set_edit_groups(groups, eligible_groups)
-        set_entities(:edit, :group, groups, eligible_groups)
-      end
-
-      def edit_users
-        rightsMetadata.individuals.map {|k, v| k if v == 'edit'}.compact
-      end
-
-      # Grant edit permissions to the groups specified. Revokes edit permission for all other groups.
-      # @param[Array] users a list of usernames
-      # @example
-      #  r.edit_users= ['one', 'two', 'three']
-      #  r.edit_users 
-      #  => ['one', 'two', 'three']
-      #
-      def edit_users=(users)
-        set_edit_users(users, edit_users)
-      end
-
-      # Grant edit permissions to the users specified. Revokes edit permission for
-      # any of the eligible_users that are not in users.
-      # This may be used when different users are responsible for setting different
-      # users.  Supply the users the current user is responsible for as the 
-      # 'eligible_users'
-      # @param[Array] users a list of users
-      # @param[Array] eligible_users the users that are eligible to have their edit permssion revoked. 
-      # @example
-      #  r.edit_users = ['one', 'two', 'three']
-      #  r.edit_users 
-      #  => ['one', 'two', 'three']
-      #  r.set_edit_users(['one'], ['three'])
-      #  r.edit_users
-      #  => ['one', 'two']  ## 'two' was not eligible to be removed
-      #
-      def set_edit_users(users, eligible_users)
-        set_entities(:edit, :person, users, eligible_users)
-      end
-
-
-      private 
-
-      # @param  permission either :discover, :read or :edit
-      # @param  type either :person or :group
-      # @param  values  Values to set
-      # @param  changeable Values we are allowed to change
-      def set_entities(permission, type, values, changeable)
-        g = preserved(type, permission)
-        (changeable - values).each do |entity|
-          #Strip permissions from users not provided
-          g[entity] = 'none'
-        end
-        values.each { |name| g[name] = permission.to_s}
-        rightsMetadata.update_permissions(type.to_s=>g)
-      end
-
-      ## Get those permissions we don't want to change
-      def preserved(type, permission)
-        case permission
-        when :edit
-          g = {}
-        when :read
-          Hash[rightsMetadata.quick_search_by_type(type).select {|k, v| v == 'edit'}]
-        when :discover
-          Hash[rightsMetadata.quick_search_by_type(type).select {|k, v| v == 'discover'}]
-        end
-      end
-
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.4.0.pre2
+  version: 6.4.0.rc1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport