hydra-access-controls 8.2.0 → 9.0.0.beta1

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Hydra::PolicyAwareAccessControlsEnforcement do
-  before(:all) do
+  before do
     class PolicyMockController
       include Hydra::AccessControlsEnforcement
       include Hydra::PolicyAwareAccessControlsEnforcement
       attr_accessor :params
-      
+
       def current_ability
         @current_ability ||= Ability.new(current_user)
       end
@@ -16,146 +16,150 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
 
       delegate :logger, to: :Rails
     end
-    
+
     @sample_policies = []
     # user discover
-    policy1 = Hydra::AdminPolicy.new(:pid=>"test:policy1")
-    policy1.default_permissions = [{:type=>"user", :access=>"discover", :name=>"sara_student"}]
-    policy1.save
+    policy1 = Hydra::AdminPolicy.create("test-policy1")
+    policy1.default_permissions.create(:type=>"person", :access=>"discover", :name=>"sara_student")
+    policy1.save!
+
     @sample_policies << policy1
-    
+
     # user read
-    policy2 = Hydra::AdminPolicy.new(:pid=>"test:policy2")
-    policy2.default_permissions = [{:type=>"user", :access=>"read", :name=>"sara_student"}]
-    policy2.save
+    policy2 = Hydra::AdminPolicy.create("test-policy2")
+    policy2.default_permissions.create(:type=>"person", :access=>"read", :name=>"sara_student")
+    policy2.save!
     @sample_policies << policy2
-    
+
     # user edit
-    policy3 = Hydra::AdminPolicy.new(:pid=>"test:policy3")
-    policy3.default_permissions = [{:type=>"user", :access=>"edit", :name=>"sara_student"}]
-    policy3.save
+    policy3 = Hydra::AdminPolicy.create("test-policy3")
+    policy3.default_permissions.create(:type=>"person", :access=>"edit", :name=>"sara_student")
+    policy3.save!
     @sample_policies << policy3
-    
-    
+
+
     # group discover
-    policy4 = Hydra::AdminPolicy.new(:pid=>"test:policy4")
-    policy4.default_permissions = [{:type=>"group", :access=>"discover", :name=>"africana-104-students"}]
-    policy4.save
+    policy4 = Hydra::AdminPolicy.create("test-policy4")
+    policy4.default_permissions.create(:type=>"group", :access=>"discover", :name=>"africana-104-students")
+    policy4.save!
     @sample_policies << policy4
-    
+
     # group read
-    policy5 = Hydra::AdminPolicy.new(:pid=>"test:policy5")
-    policy5.default_permissions = [{:type=>"group", :access=>"read", :name=>"africana-104-students"}]
-    policy5.save
+    policy5 = Hydra::AdminPolicy.create("test-policy5")
+    policy5.default_permissions.create(:type=>"group", :access=>"read", :name=>"africana-104-students")
+    policy5.save!
     @sample_policies << policy5
-    
+
     # group edit
-    policy6 = Hydra::AdminPolicy.new(:pid=>"test:policy6")
-    policy6.default_permissions = [{:type=>"group", :access=>"edit", :name=>"africana-104-students"}]
-    policy6.save
+    policy6 = Hydra::AdminPolicy.create("test-policy6")
+    policy6.default_permissions.create(:type=>"group", :access=>"edit", :name=>"africana-104-students")
+    policy6.save!
     @sample_policies << policy6
-    
+
     # public discover
-    policy7 = Hydra::AdminPolicy.create(:pid => "test:policy7")
-    policy7.default_permissions = [{:type=>"group", :access=>"discover", :name=>"public"}]
-    policy7.save
+    policy7 = Hydra::AdminPolicy.create("test-policy7")
+    policy7.default_permissions.create(:type=>"group", :access=>"discover", :name=>"public")
+    policy7.save!
     @sample_policies << policy7
-  
+
     # public read
-    policy8 = Hydra::AdminPolicy.create(:pid => "test:policy8")
-    policy8.default_permissions = [{:type=>"group", :access=>"read", :name=>"public"}]
-    policy8.save
+    policy8 = Hydra::AdminPolicy.create("test-policy8")
+    policy8.default_permissions.create(:type=>"group", :access=>"read", :name=>"public")
+    policy8.save!
     @sample_policies << policy8
 
     # user discover policies for testing that all are applied when over 10 are applicable
     (9..11).each do |i|
-      policy = Hydra::AdminPolicy.create(:pid => "test:policy#{i}")
-      policy.default_permissions = [{:type=>"user", :access=>"discover", :name=>"sara_student"}]
-      policy.save
+      policy = Hydra::AdminPolicy.create("test-policy#{i}")
+      policy.default_permissions.create(:type=>"person", :access=>"discover", :name=>"sara_student")
+      policy.save!
       @sample_policies << policy
     end
 
-    # no access 
-    policy_no_access = Hydra::AdminPolicy.create(:pid=>"test:policy_no_access")
-    @sample_policies << policy_no_access
+    # no access
+    policy_no_access = Hydra::AdminPolicy.new("test-policy_no_access")
+    policy_no_access.save!
 
-    @policies_with_access = @sample_policies.select { |p| p.pid != policy_no_access.pid }
-  end
-  
-  after(:all) do
-    @sample_policies.each {|p| p.delete }
+    @sample_policies << policy_no_access
+    @policies_with_access = @sample_policies.select { |p| p.id != policy_no_access.id }
   end
-  
+
   subject { PolicyMockController.new }
-  
+
   before do
     @solr_parameters = {}
+    @user_parameters = {}
     @user = FactoryGirl.build(:sara_student)
   end
-  
+
   describe "policies_with_access" do
     context "Authenticated user" do
       before do
-        RoleMapper.stub(:roles).with(@user).and_return(@user.roles)
-        subject.stub(:current_user).and_return(@user)
+        allow(RoleMapper).to receive(:roles).with(@user).and_return(@user.roles)
+        allow(subject).to receive(:current_user).and_return(@user)
       end
       it "should return the policies that provide discover permissions" do
-        @policies_with_access.map {|p| p.pid }.each do |p|
-          subject.policies_with_access.should include(p)
+        @policies_with_access.map {|p| p.id }.each do |p|
+          expect(subject.policies_with_access).to include(p)
         end
-        subject.policies_with_access.should_not include("test:policy_no_access")
+        expect(subject.policies_with_access).to_not include("test-policy_no_access")
       end
       it "should allow you to configure which model to use for policies" do
-        Hydra.stub(:config).and_return( {:permissions=>{:policy_class => ModsAsset}} )
-        ModsAsset.should_receive(:find_with_conditions).and_return([])
+        allow(Hydra.config.permissions).to receive(:policy_class).and_return(ModsAsset)
+        expect(ModsAsset).to receive(:find_with_conditions).and_return([])
         subject.policies_with_access
       end
     end
     context "Anonymous user" do
-      before { subject.stub(:current_user).and_return(nil) }
+      before { allow(subject).to receive(:current_user).and_return(nil) }
       it "should return the policies that provide discover permissions" do
-        subject.policies_with_access.should match_array ["test:policy7", "test:policy8"]
+        expect(subject.policies_with_access).to match_array ["test-policy7", "test-policy8"]
       end
     end
   end
-  
+
   describe "apply_gated_discovery" do
     before do
-      RoleMapper.stub(:roles).with(@user).and_return(@user.roles)
-      subject.stub(:current_user).and_return(@user)
+      allow(RoleMapper).to receive(:roles).with(@user).and_return(@user.roles)
+      allow(subject).to receive(:current_user).and_return(@user)
     end
+
     it "should include policy-aware query" do
       # stubbing out policies_with_access because solr doesn't always return them in the same order.
-      policy_pids = (1..8).map {|n| "test:policy#{n}"}
-      subject.should_receive(:policies_with_access).and_return(policy_pids)
-      subject.apply_gated_discovery(@solr_parameters)
-      governed_field = ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)
-      @solr_parameters[:fq].first.should include(" OR (_query_:\"{!raw f=#{governed_field}}info:fedora/test:policy1\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy2\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy3\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy4\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy5\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy6\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy7\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy8\")")
+      policy_ids = (1..8).map {|n| "test:policy#{n}"}
+      expect(subject).to receive(:policies_with_access).and_return(policy_ids)
+      subject.apply_gated_discovery(@solr_parameters, @user_parameters)
+      governed_field = ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)
+      expect(@solr_parameters[:fq].first).to include(" OR (_query_:\"{!raw f=#{governed_field}}info:fedora/test:policy1\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy2\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy3\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy4\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy5\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy6\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy7\" OR _query_:\"{!raw f=#{governed_field}}info:fedora/test:policy8\")")
     end
+
     it "should not change anything if there are no clauses to add" do
-      subject.stub(:policy_clauses).and_return(nil)
-      subject.apply_gated_discovery(@solr_parameters)
-      @solr_parameters[:fq].first.should_not include(" OR (#{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy1 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy2 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy3 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy4 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy5 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy6 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy7 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy8)")
+      allow(subject).to receive(:policy_clauses).and_return(nil)
+      subject.apply_gated_discovery(@solr_parameters, @user_parameters)
+      expect(@solr_parameters[:fq].first).to_not include(" OR (#{ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy1 OR #{ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy2 OR #{ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy3 OR #{ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy4 OR #{ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy5 OR #{ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy6 OR #{ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy7 OR #{ActiveFedora::SolrQueryBuilder.solr_name('is_governed_by', :symbol)}:info\\:fedora\\/test\\:policy8)")
     end
   end
 
   describe "apply_policy_role_permissions" do
+    before do
+      allow(subject).to receive(:current_user).and_return(@user)
+    end
+
     it "should escape slashes in the group names" do
-      RoleMapper.stub(:roles).with(@user).and_return(["abc/123","cde/567"])
-      subject.stub(:current_user).and_return(@user)
+      allow(RoleMapper).to receive(:roles).with(@user).and_return(["abc/123","cde/567"])
       user_access_filters = subject.apply_policy_group_permissions
       ["edit","discover","read"].each do |type|
-        user_access_filters.should include("#{ActiveFedora::SolrService.solr_name("inheritable_#{type}_access_group", Hydra::Datastream::RightsMetadata.indexer )}\:abc\\\/123")
-        user_access_filters.should include("#{ActiveFedora::SolrService.solr_name("inheritable_#{type}_access_group", Hydra::Datastream::RightsMetadata.indexer )}\:cde\\\/567")
+        expect(user_access_filters).to include("inheritable_#{type}_access_group_ssim\:abc\\\/123")
+        expect(user_access_filters).to include("inheritable_#{type}_access_group_ssim\:cde\\\/567")
       end
     end
+
     it "should escape spaces in the group names" do
-      RoleMapper.stub(:roles).with(@user).and_return(["abc 123","cd/e 567"])
-      subject.stub(:current_user).and_return(@user)
+      allow(RoleMapper).to receive(:roles).with(@user).and_return(["abc 123","cd/e 567"])
       user_access_filters = subject.apply_policy_group_permissions
       ["edit","discover","read"].each do |type|
-        user_access_filters.should include("#{ActiveFedora::SolrService.solr_name("inheritable_#{type}_access_group", Hydra::Datastream::RightsMetadata.indexer )}\:abc\\ 123")
-        user_access_filters.should include("#{ActiveFedora::SolrService.solr_name("inheritable_#{type}_access_group", Hydra::Datastream::RightsMetadata.indexer )}\:cd\\\/e\\ 567")
+        expect(user_access_filters).to include("inheritable_#{type}_access_group_ssim\:abc\\ 123")
+        expect(user_access_filters).to include("inheritable_#{type}_access_group_ssim\:cd\\\/e\\ 567")
       end
     end
   end

data/spec/unit/role_mapper_spec.rb

@@ -2,27 +2,27 @@ require 'spec_helper'
 
 describe RoleMapper do
   it "should define the 4 roles" do
-    RoleMapper.role_names.sort.should == %w(admin_policy_object_editor archivist donor patron researcher) 
+    expect(RoleMapper.role_names.sort).to eq %w(admin_policy_object_editor archivist donor patron researcher) 
   end
   it "should quer[iy]able for roles for a given user" do
-    RoleMapper.roles('leland_himself@example.com').sort.should == ['archivist', 'donor', 'patron']
-    RoleMapper.roles('archivist2@example.com').should == ['archivist']
+    expect(RoleMapper.roles('leland_himself@example.com').sort).to eq ['archivist', 'donor', 'patron']
+    expect(RoleMapper.roles('archivist2@example.com')).to eq ['archivist']
   end
 
   it "should not change it's response when it's called repeatedly" do
     u = User.new(:uid=>'leland_himself@example.com')
-    u.stub(:new_record?).and_return(false)
-    RoleMapper.roles(u).sort.should == ['archivist', 'donor', 'patron', "registered"]
-    RoleMapper.roles(u).sort.should == ['archivist', 'donor', 'patron', "registered"]
+    allow(u).to receive(:new_record?).and_return(false)
+    expect(RoleMapper.roles(u).sort).to eq ['archivist', 'donor', 'patron', "registered"]
+    expect(RoleMapper.roles(u).sort).to eq ['archivist', 'donor', 'patron', "registered"]
   end
 
   it "should return an empty array if there are no roles" do
-    RoleMapper.roles('zeus@olympus.mt').empty?.should == true
+    expect(RoleMapper.roles('zeus@olympus.mt')).to be_empty
   end
   it "should know who is what" do
-    RoleMapper.whois('archivist').sort.should == %w(archivist1@example.com archivist2@example.com leland_himself@example.com)
-    RoleMapper.whois('salesman').empty?.should == true
-    RoleMapper.whois('admin_policy_object_editor').sort.should == %w(archivist1@example.com)
+    expect(RoleMapper.whois('archivist').sort).to eq %w(archivist1@example.com archivist2@example.com leland_himself@example.com)
+    expect(RoleMapper.whois('salesman')).to be_empty
+    expect(RoleMapper.whois('admin_policy_object_editor').sort).to eq %w(archivist1@example.com)
   end
 
 end

data/spec/unit/with_access_right_spec.rb

@@ -34,7 +34,7 @@ describe "WithAccessRight" do
   end
 
   context "persisted" do
-    before { subject.stub( persisted?: true) }
+    before { allow(subject).to receive(:persisted?).and_return(true) }
     context "when it is public" do
       before do
         subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 9.0.0.beta1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,98 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 9.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 9.0.0.beta3
 - !ruby/object:Gem::Dependency
-  name: om
+  name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
-- !ruby/object:Gem::Dependency
-  name: cancancan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -162,10 +142,17 @@ files:
 - app/models/concerns/hydra/access_controls/visibility.rb
 - app/models/concerns/hydra/access_controls/with_access_right.rb
 - app/models/concerns/hydra/admin_policy_behavior.rb
+- app/models/concerns/hydra/rights.rb
+- app/models/hydra/access_controls/access_control_list.rb
+- app/models/hydra/access_controls/embargo.rb
+- app/models/hydra/access_controls/lease.rb
+- app/models/hydra/access_controls/permission.rb
 - app/models/role_mapper.rb
 - app/services/hydra/embargo_service.rb
 - app/services/hydra/lease_service.rb
 - app/validators/hydra/future_date_validator.rb
+- app/vocabularies/acl.rb
+- app/vocabularies/hydra/acl.rb
 - config/fedora.yml
 - config/locales/hydra-access-controls.en.yml
 - config/solr.yml
@@ -173,13 +160,9 @@ files:
 - lib/active_fedora/accessible_by.rb
 - lib/hydra-access-controls.rb
 - lib/hydra/ability.rb
-- lib/hydra/access_controls/permission.rb
 - lib/hydra/access_controls_enforcement.rb
 - lib/hydra/admin_policy.rb
 - lib/hydra/config.rb
-- lib/hydra/datastream.rb
-- lib/hydra/datastream/inheritable_rights_metadata.rb
-- lib/hydra/datastream/rights_metadata.rb
 - lib/hydra/permissions_cache.rb
 - lib/hydra/permissions_query.rb
 - lib/hydra/permissions_solr_document.rb
@@ -204,9 +187,6 @@ files:
 - spec/unit/admin_policy_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/embargoable_spec.rb
-- spec/unit/hydra_rights_metadata_persistence_spec.rb
-- spec/unit/hydra_rights_metadata_spec.rb
-- spec/unit/inheritable_rights_metadata_spec.rb
 - spec/unit/permission_spec.rb
 - spec/unit/permissions_spec.rb
 - spec/unit/policy_aware_ability_spec.rb
@@ -228,15 +208,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra
@@ -258,9 +238,6 @@ test_files:
 - spec/unit/admin_policy_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/embargoable_spec.rb
-- spec/unit/hydra_rights_metadata_persistence_spec.rb
-- spec/unit/hydra_rights_metadata_spec.rb
-- spec/unit/inheritable_rights_metadata_spec.rb
 - spec/unit/permission_spec.rb
 - spec/unit/permissions_spec.rb
 - spec/unit/policy_aware_ability_spec.rb
@@ -269,3 +246,4 @@ test_files:
 - spec/unit/visibility_spec.rb
 - spec/unit/with_access_right_spec.rb
 - spec/validators/future_date_validator_spec.rb
+has_rdoc: 

data/lib/hydra/access_controls/permission.rb

@@ -1,40 +0,0 @@
-module Hydra::AccessControls
-  class Permission
-    def initialize(args)
-      @vals = {name: args[:name], access: args[:access], type: args[:type]}
-    end
-
-    def persisted?
-      false
-    end
-
-    def to_hash
-      @vals
-    end
-
-    def [] var
-      to_hash[var]
-    end
-
-    def name
-      self[:name]
-    end
-
-    def access
-      self[:access]
-    end
-
-    def type
-      self[:type]
-    end
-
-    def _destroy
-      false
-    end
-
-    def == other
-      other.is_a?(Permission) && self.name == other.name && self.type == other.type && self.access == other.access
-    end
-
-  end
-end

data/lib/hydra/datastream/inheritable_rights_metadata.rb

@@ -1,22 +0,0 @@
-require 'active_support/core_ext/string'
-module Hydra
-  module Datastream
-    # Implements Hydra RightsMetadata XML terminology for asserting access permissions
-    class InheritableRightsMetadata < Hydra::Datastream::RightsMetadata    
-  
-      @terminology = Hydra::Datastream::RightsMetadata.terminology
-  
-      def to_solr(solr_doc=Hash.new)
-        [:discover, :read, :edit].each do |access|
-          solr_doc[Hydra.config[:permissions][:inheritable][access][:group]] = send("#{access}_access").machine.group
-          solr_doc[Hydra.config[:permissions][:inheritable][access][:individual]] = send("#{access}_access").machine.person
-        end
-        if embargo_release_date.present?
-          key = Hydra.config.permissions.inheritable.embargo.release_date.sub(/_[^_]+$/, '') #Strip off the suffix
-          ::Solrizer.insert_field(solr_doc, key, embargo_release_date, :stored_sortable)
-        end
-        return solr_doc
-      end
-    end
-  end
-end