hydra-access-controls 8.0.0.beta1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0d98e3c908f1b964b513a14bcefa045555e2a4e
-  data.tar.gz: e76217063ba9f7dc9135c9fd9a12f0c0df79a22d
+  metadata.gz: 40e759b7615b78617bcefe2142ae56d9e20fcdd3
+  data.tar.gz: 32093d9d2cd45ae6913644976cff53344be2532f
 SHA512:
-  metadata.gz: 83eead2405cf85b0bf7c62e7b31eca5d40940e62ea59b2fdc841d1d7c7d82c5eb8eedfb7723915daf21ee2d949c73a372bdee513961cfb6fd4bdb08b082f64ca
-  data.tar.gz: dc983e490624103a8eeeac6e6c8ee0745009ea35475d90b741a044551a52b6f2fa4b0032e89a9a3ae556e7be935e2b455b1e4fe4ff35d641337f65b7886919d3
+  metadata.gz: 268da443deb9bbc03cff733704a6517d17a3b0ec35ded2f03003b15b4bf97772fedd8bfe02f17bfa490e361400c886da3dd21a3213d36412e9daadd0c8611afc
+  data.tar.gz: bbb965bacc370f3b20e0d5c43e231ca321835228877c53f485e77e6b5a8eea249ec8356bb6d17672dd42e7f60db5388315f582929ee7365b7ba2d57ec03ea2bb

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

@@ -2,7 +2,6 @@ module Hydra
   module AccessControls
     module Permissions
       extend ActiveSupport::Concern
-      extend Deprecation
 
       included do
         include Hydra::AccessControls::Visibility

data/hydra-access-controls.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency 'activesupport'
-  gem.add_dependency "active-fedora", '~> 8.0.0.rc2'
+  gem.add_dependency 'activesupport', '~> 4.0'
+  gem.add_dependency "active-fedora", '~> 8.0.0'
   gem.add_dependency "om", '~> 3.0', '>= 3.0.7'
   gem.add_dependency 'cancancan'
   gem.add_dependency 'deprecation'

data/lib/hydra/ability.rb

@@ -3,7 +3,6 @@ require 'cancan'
 module Hydra
   module Ability
     extend ActiveSupport::Concern
-    extend Deprecation
     
     # once you include Hydra::Ability you can add custom permission methods by appending to ability_logic like so:
     #
@@ -155,20 +154,10 @@ module Hydra
         Hydra.config.permissions.read.group
       end
 
-      def edit_person_field
-        Deprecation.warn(Ability, "The edit_person_field class method is deprecated and will be removed from Hydra::Ability in hydra-head 8.0.  Use edit_user_field instead.", caller)
-        edit_user_field
-      end
-
       def edit_user_field 
         Hydra.config.permissions.edit.individual
       end
 
-      def read_person_field
-        Deprecation.warn(Ability, "The read_person_field class method is deprecated and will be removed from Hydra::Ability in hydra-head 8.0.  Use read_user_field instead.", caller)
-        read_user_field
-      end
-
       def read_user_field 
         Hydra.config.permissions.read.individual
       end

data/lib/hydra/access_controls_enforcement.rb

@@ -36,14 +36,6 @@ module Hydra::AccessControlsEnforcement
     false
   end
 
-  def is_public?
-    ActiveSupport::Deprecation.warn("Hydra::AccessControlsEnforcement.is_public? has been deprecated. Use can? instead.") 
-    load_permissions_from_solr
-    access_key = ActiveFedora::SolrService.solr_name("access", Hydra::Datastream::RightsMetadata.indexer)
-    @permissions_solr_document[access_key].present? && @permissions_solr_document[access_key].first.downcase == "public"
-  end
-  
-
   #
   # Action-specific enforcement
   #

data/lib/hydra/admin_policy.rb

@@ -2,7 +2,6 @@ class Hydra::AdminPolicy < ActiveFedora::Base
   
   include Hydra::AdminPolicyBehavior
   include Hydra::AccessControls::Permissions 
-  extend Deprecation
 
   has_metadata 'descMetadata', type: ActiveFedora::QualifiedDublinCoreDatastream do |m|
     m.title :type=> :text, :index_as=>[:searchable]    
@@ -13,28 +12,4 @@ class Hydra::AdminPolicy < ActiveFedora::Base
   has_attributes :license_description, datastream: 'rightsMetadata', at: [:license, :description], multiple: false
   has_attributes :license_url, datastream: 'rightsMetadata', at: [:license, :url], multiple: false
 
-  def self.readable_by_user(user)
-    Deprecation.warn(Hydra::AdminPolicy, "The class method Hydra::AdminPolicy.readable_by_user(user) is deprecated and will be removed from hydra-head 8.0.", caller)
-    where_user_has_permissions(user, [:read, :edit])
-  end
-
-  def self.editable_by_user(user)
-    Deprecation.warn(Hydra::AdminPolicy, "The class method Hydra::AdminPolicy.editable_by_user(user) is deprecated and will be removed from hydra-head 8.0.", caller)
-    where_user_has_permissions(user, [:edit])
-  end
-
-  def self.where_user_has_permissions(user, permissions=[:edit])
-    Deprecation.warn(Hydra::AdminPolicy, "The class method Hydra::AdminPolicy.where_user_has_permissions(user) is deprecated and will be removed from hydra-head 8.0.", caller)
-    or_query = [] 
-    RoleMapper.roles(user).each do |group|
-      permissions.each do |permission|
-        or_query << ActiveFedora::SolrService.solr_name("#{permission}_access_group", indexer)+":#{group}"
-      end
-    end
-    permissions.each do |permission|
-      or_query << ActiveFedora::SolrService.solr_name("#{permission}_access_person", indexer)+":#{user.user_key}"
-    end
-    find_with_conditions(or_query.join(" OR "))
-  end
-
 end

data/lib/hydra/datastream/rights_metadata.rb

@@ -3,7 +3,6 @@ module Hydra
   module Datastream
     # Implements Hydra RightsMetadata XML terminology for asserting access permissions
     class RightsMetadata < ActiveFedora::OmDatastream       
-      extend Deprecation
       
       set_terminology do |t|
         t.root(:path=>"rightsMetadata", :xmlns=>"http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1", :schema=>"http://github.com/projecthydra/schemas/tree/v1/rightsMetadata.xsd") 
@@ -152,11 +151,6 @@ module Hydra
         return quick_search_by_type(:group)
       end
       
-      def individuals
-        Deprecation.warn(RightsMetadata, "The method `individuals' is deprecated and will be removed from Hydra::Datastream::RightsMetadata in hydra-head 8.0.  Use `users' instead.", caller)
-        users
-      end
-
       # Reports on which users have which permissions
       # @return Hash in format {user_name => user_permissions, user_name => user_permissions}
       def users

data/lib/hydra/permissions_solr_document.rb

@@ -1,20 +1,13 @@
 class Hydra::PermissionsSolrDocument < SolrDocument
+
   def under_embargo?
-    #permissions = permissions_doc(params[:id])
     embargo_key = ActiveFedora::SolrService.solr_name("embargo_release_date", Hydra::Datastream::RightsMetadata.date_indexer)
     if self[embargo_key] 
       embargo_date = Date.parse(self[embargo_key].split(/T/)[0])
       return embargo_date > Date.parse(Time.now.to_s)
     end
     false
-  end
-
-  def is_public?
-    ActiveSupport::Deprecation.warn("Hydra::PermissionsSolrDocument.is_public? has been deprecated. Use can? instead.") 
-    access_key = ActiveFedora::SolrService.solr_name("access", Hydra::Datastream::RightsMetadata.indexer)
-    self[access_key].present? && self[access_key].first.downcase == "public"
-  end
-  
+  end  
 
 end
 

data/lib/hydra/policy_aware_ability.rb

@@ -1,7 +1,6 @@
 # Repeats access controls evaluation methods, but checks against a governing "Policy" object (or "Collection" object) that provides inherited access controls.
 module Hydra::PolicyAwareAbility
   extend ActiveSupport::Concern
-  extend Deprecation
   include Hydra::Ability
   
   # Extends Hydra::Ability.test_edit to try policy controls if object-level controls deny access
@@ -94,11 +93,6 @@ module Hydra::PolicyAwareAbility
     return rg
   end
 
-  def edit_persons_from_policy(policy_pid)
-    Deprecation.warn(Hydra::PolicyAwareAbility, "The edit_persons_from_policy method is deprecated and will be removed from Hydra::PolicyAwareAbility in hydra-head 8.0.  Use edit_users_from_policy instead.", caller)
-    edit_users_from_policy(policy_pid)
-  end
-
   # Returns the list of users granted edit access by the policy object identified by policy_pid
   def edit_users_from_policy(policy_pid)
     policy_permissions = policy_permissions_doc(policy_pid)
@@ -108,11 +102,6 @@ module Hydra::PolicyAwareAbility
     return eu
   end
 
-  def read_persons_from_policy(policy_pid)
-    Deprecation.warn(Hydra::PolicyAwareAbility, "The read_persons_from_policy method is deprecated and will be removed from Hydra::PolicyAwareAbility in hydra-head 8.0.  Use read_users_from_policy instead.", caller)
-    read_users_from_policy(policy_pid)
-  end
-
   # Returns the list of users granted read access by the policy object identified by policy_pid
   # Note: edit implies read, so read_users is the union of edit and read users
   def read_users_from_policy(policy_pid)

data/lib/hydra/policy_aware_access_controls_enforcement.rb

@@ -1,6 +1,5 @@
 # Repeats access controls evaluation methods, but checks against a governing "Policy" object (or "Collection" object) that provides inherited access controls.
 module Hydra::PolicyAwareAccessControlsEnforcement
-  extend Deprecation
   
   # Extends Hydra::AccessControlsEnforcement.apply_gated_discovery to reflect policy-provided access
   # appends the result of policy_clauses into the :fq
@@ -31,11 +30,6 @@ module Hydra::PolicyAwareAccessControlsEnforcement
     result.map {|h| h['id']}
   end
   
-  def apply_policy_role_permissions(permission_types = discovery_permissions)
-    Deprecation.warn(Hydra::PolicyAwareAccessControlsEnforcement, "The method apply_policy_role_permissions is deprecated and will be removed from Hydra::PolicyAwareAccessControlsEnforcement in hydra-head 8.0.  Use apply_policy_group_permissions instead.", caller)
-    apply_policy_group_permissions(permission_types)
-  end
-
   def apply_policy_group_permissions(permission_types = discovery_permissions)
       # for groups
       user_access_filters = []
@@ -47,11 +41,6 @@ module Hydra::PolicyAwareAccessControlsEnforcement
       user_access_filters
   end
 
-  def apply_policy_individual_permissions(permission_types = discovery_permissions)
-    Deprecation.warn(Hydra::PolicyAwareAccessControlsEnforcement, "The method apply_policy_individual_permissions is deprecated and will be removed from Hydra::PolicyAwareAccessControlsEnforcement in hydra-head 8.0.  Use apply_policy_user_permissions instead.", caller)
-    apply_policy_user_permissions(permission_types)
-  end
-
   def apply_policy_user_permissions(permission_types = discovery_permissions)
     # for individual user access
     user_access_filters = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 8.0.0.beta1
+  version: 8.0.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,36 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0.rc2
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0.rc2
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -231,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2