hydra-access-controls 9.8.1 → 9.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb2357b9d0d422f31c1c09e7247127f03080e702
-  data.tar.gz: 7bacf573b9e18f4cc6fe41a6bea2a49283f9923f
+  metadata.gz: e5e8e75ab64b8c7d4c45303b419f85541723e456
+  data.tar.gz: aa314f6c97078f405da78244abef65b2c009f6eb
 SHA512:
-  metadata.gz: b748fea012a141c3ed98e22cf4eae3708f353039dbabb21a824bd1067d6ad10c20aeb75d43dd934c5a049015f8ecb7887eb76e29ca34f509eb37db0653b120d1
-  data.tar.gz: 5cacc432d1d6f690a8654029b330cba866e57449f538eee9e5954b2c4b79d57bbcf9c36c790aec6a056a487969b18a0d89d90755e1cab01df7fb679eca050923
+  metadata.gz: bcc97deb25bd78cae7feaf01cffeedda9fc618648579326019676a0b6c34e6cb149d3612d805fca471b52b6b5363bcbe804e6ff38d5999a38d472b6d7915e0ed
+  data.tar.gz: 2b48522f260eb8394cca5d1e0a86a417f5059636339317e4ae80762de1629b15ee5f5c202cbe7da7da7194dba99b0ffb2d4ea9664bc8b105ef4ebd265f0b1f7d

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

@@ -9,8 +9,16 @@ module Hydra
         accepts_nested_attributes_for :permissions, allow_destroy: true
         alias_method :permissions_attributes_without_uniqueness=, :permissions_attributes=
         alias_method :permissions_attributes=, :permissions_attributes_with_uniqueness=
+
+        before_destroy :remove_permissions
+      end
+
+      # Destroy and permission objects associated with this object
+      def remove_permissions
+        permissions.destroy_all
       end
 
+
       def to_solr(solr_doc = {})
         super.tap do |doc|
           [:discover, :read, :edit].each do |access|

data/hydra-access-controls.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'activesupport', '~> 4.0'
-  gem.add_dependency "active-fedora", '~> 9.9'
+  gem.add_dependency "active-fedora", '~> 9.10.0'
   gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'deprecation', '~> 0.2'
   gem.add_dependency "blacklight", '>= 5.16'

data/lib/hydra/config.rb

@@ -131,7 +131,7 @@ module Hydra
       end
 
       def solr_name(*args)
-        ActiveFedora::SolrQueryBuilder.solr_name(*args)
+        ActiveFedora.index_field_mapper.solr_name(*args)
       end
 
       class EmbargoConfig
@@ -144,7 +144,7 @@ module Hydra
         end
 
         def solr_name(*args)
-          ActiveFedora::SolrQueryBuilder.solr_name(*args)
+          ActiveFedora.index_field_mapper.solr_name(*args)
         end
       end
 
@@ -158,7 +158,7 @@ module Hydra
         end
 
         def solr_name(*args)
-          ActiveFedora::SolrQueryBuilder.solr_name(*args)
+          ActiveFedora.index_field_mapper.solr_name(*args)
         end
       end
 

data/lib/hydra/policy_aware_ability.rb

@@ -23,7 +23,7 @@ module Hydra::PolicyAwareAbility
   def policy_id_for(object_id)
     policy_id = policy_id_cache[object_id]
     return policy_id if policy_id
-    solr_result = ActiveFedora::Base.find_with_conditions({ id: object_id }, fl: governed_by_solr_field).first
+    solr_result = ActiveFedora::Base.search_with_conditions({ id: object_id }, fl: governed_by_solr_field).first
     return unless solr_result
     policy_id_cache[object_id] = policy_id = Array(solr_result[governed_by_solr_field]).first
   end

data/lib/hydra/policy_aware_access_controls_enforcement.rb

@@ -24,7 +24,7 @@ module Hydra::PolicyAwareAccessControlsEnforcement
     # Grant access based on user id & group
     user_access_filters += apply_policy_group_permissions(discovery_permissions)
     user_access_filters += apply_policy_user_permissions(discovery_permissions)
-    result = policy_class.find_with_conditions( user_access_filters.join(" OR "), :fl => "id", :rows => policy_class.count )
+    result = policy_class.search_with_conditions( user_access_filters.join(" OR "), fl: "id", rows: policy_class.count )
     logger.debug "get policies: #{result}\n\n"
     result.map {|h| h['id']}
   end

data/spec/support/mods_asset.rb

@@ -3,5 +3,5 @@ class ModsAsset < ActiveFedora::Base
 
   # This is how we're associating admin policies with assets.
   # You can associate them however you want, just use the :is_governed_by relationship
-  belongs_to :admin_policy, class_name: "Hydra::AdminPolicy", predicate: ActiveFedora::Predicates.find_graph_predicate(:is_governed_by)
+  belongs_to :admin_policy, class_name: "Hydra::AdminPolicy", predicate: ActiveFedora::RDF::ProjectHydra.isGovernedBy
 end

data/spec/unit/admin_policy_spec.rb

@@ -15,7 +15,7 @@ describe Hydra::AdminPolicy do
   describe "to_solr" do
     subject { Hydra::AdminPolicy.new(:title=>["Foobar"]).to_solr }
     it "should have title_ssim" do
-      expect(subject[ActiveFedora::SolrQueryBuilder.solr_name('title', type: :string)]).to eq ["Foobar"]
+      expect(subject[ActiveFedora.index_field_mapper.solr_name('title', type: :string)]).to eq ["Foobar"]
     end
   end
 

data/spec/unit/config_spec.rb

@@ -6,12 +6,15 @@ describe Hydra::Config do
       # You only need to change these values if you've indexed permissions by some means other than the Hydra's built-in tooling.
       # If you change these, you must also update the permissions request handler in your solrconfig.xml to return those values
       config[:permissions] = {
-        :discover => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("discover_access_group", :symbol), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("discover_access_person", :symbol)},
-        :read => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("read_access_group", :symbol), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("read_access_person", :symbol)},
-        :edit => {:group =>ActiveFedora::SolrQueryBuilder.solr_name("edit_access_group", :symbol), :individual=>ActiveFedora::SolrQueryBuilder.solr_name("edit_access_person", :symbol)},
-        :owner => ActiveFedora::SolrQueryBuilder.solr_name("depositor", :symbol),
+        discover: { group: ActiveFedora.index_field_mapper.solr_name("discover_access_group", :symbol),
+                    individual: ActiveFedora.index_field_mapper.solr_name("discover_access_person", :symbol)},
+        read: { group: ActiveFedora.index_field_mapper.solr_name("read_access_group", :symbol),
+                individual: ActiveFedora.index_field_mapper.solr_name("read_access_person", :symbol)},
+        edit: { group: ActiveFedora.index_field_mapper.solr_name("edit_access_group", :symbol),
+                individual: ActiveFedora.index_field_mapper.solr_name("edit_access_person", :symbol)},
+        owner: ActiveFedora.index_field_mapper.solr_name("depositor", :symbol),
       }
-      config.permissions.embargo.release_date = ActiveFedora::SolrQueryBuilder.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
+      config.permissions.embargo.release_date = ActiveFedora.index_field_mapper.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
 
       # specify the user model
       config[:user_model] = 'User'
@@ -23,7 +26,7 @@ describe Hydra::Config do
       # This specifies the solr field names of permissions-related fields.
       # You only need to change these values if you've indexed permissions by some means other than the Hydra's built-in tooling.
       # If you change these, you must also update the permissions request handler in your solrconfig.xml to return those values
-      config.permissions.discover.group = ActiveFedora::SolrQueryBuilder.solr_name("discover_access_group", :symbol)
+      config.permissions.discover.group = ActiveFedora.index_field_mapper.solr_name("discover_access_group", :symbol)
 
       # specify the user model
       config.user_model = 'User'

data/spec/unit/permissions_spec.rb

@@ -9,13 +9,13 @@ describe Hydra::AccessControls::Permissions do
 
   subject { Foo.new }
 
-  it "should have many permissions" do
+  it "has many permissions" do
     expect(subject.permissions).to eq []
   end
 
   #TODO is permission same as an acl?
 
-  it "should have a set of permissions" do
+  it "has a set of permissions" do
     subject.read_groups=['group1', 'group2']
     subject.edit_users=['user1']
     subject.read_users=['user2', 'user3']
@@ -29,7 +29,7 @@ describe Hydra::AccessControls::Permissions do
   describe "building a new permission" do
     before { subject.save! }
 
-    it "should set the accessTo association" do
+    it "sets the accessTo association" do
       perm = subject.permissions.build(name: 'user1', type: 'person', access: 'read')
       subject.save
       expect(perm.access_to_id).to eq subject.id
@@ -47,7 +47,7 @@ describe Hydra::AccessControls::Permissions do
           subject.permissions_attributes = {'0' => { type: "group", access:"read", name:"group1" },
                                             '1' => { type: 'person', access: 'edit', name: 'user2' }}
         end
-        it "should handle a hash" do
+        it "handles a hash" do
           expect(subject.permissions.size).to eq 3
           expect(subject.permissions.to_a).to all(be_a(Hydra::AccessControls::Permission))
           expect(subject.permissions.map(&:to_hash)).to match_array [
@@ -164,7 +164,7 @@ describe Hydra::AccessControls::Permissions do
           Hydra::AccessControls::Permission.new(type: "person", access: "edit", name: "jcoyne")]
         subject.save!
       end
-      it "should set the permissions" do
+      it "sets the permissions" do
         expect(subject.edit_users).to eq ['jcoyne']
         expect(subject.edit_groups).to eq ['group1']
         subject.permissions = []
@@ -183,22 +183,22 @@ describe Hydra::AccessControls::Permissions do
       subject.permissions.build(type: 'group', access: 'edit', name: 'group-8')
     end
 
-    it "should have read groups accessor" do
+    it "has read groups accessor" do
       expect(subject.read_groups).to eq ['group-6', 'group-7']
     end
 
-    it "should have read groups string accessor" do
+    it "has read groups string accessor" do
       expect(subject.read_groups_string).to eq 'group-6, group-7'
     end
 
-    it "should have read groups string writer" do
+    it "has read groups string writer" do
       subject.read_groups_string = 'umg/up.dlt.staff, group-3'
       expect(subject.read_groups).to eq ['umg/up.dlt.staff', 'group-3']
       expect(subject.edit_groups).to eq ['group-8']
       expect(subject.read_users).to eq ['person1']
     end
 
-    it "should only revoke eligible groups" do
+    it "only revoke eligible groups" do
       subject.set_read_groups(['group-2', 'group-3'], ['group-6'])
       # 'group-7' is not eligible to be revoked
       expect(subject.permissions.map(&:to_hash)).to match_array([
@@ -210,4 +210,16 @@ describe Hydra::AccessControls::Permissions do
         { name: 'person2', type: 'person', access: 'discover' }])
     end
   end
+
+  context "when the original object is destroyed" do
+    before do
+      subject.save!
+      subject.permissions.build(type: 'person', access: 'read', name: 'person1')
+      subject.save!
+    end
+
+    it "destroys the associated permissions" do
+      expect { subject.destroy }.to change { Hydra::AccessControls::Permission.count }.by(-1)
+    end
+  end
 end

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -111,7 +111,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
 
       it "should allow you to configure which model to use for policies" do
         allow(Hydra.config.permissions).to receive(:policy_class).and_return(ModsAsset)
-        expect(ModsAsset).to receive(:find_with_conditions).and_return([])
+        expect(ModsAsset).to receive(:search_with_conditions).and_return([])
         subject.policies_with_access
       end
     end
@@ -127,20 +127,20 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
     before do
       allow(RoleMapper).to receive(:roles).with(user).and_return(user.roles)
     end
-    let(:governed_field) { ActiveFedora::SolrQueryBuilder.solr_name('isGovernedBy', :symbol) }
+    let(:governed_field) { ActiveFedora.index_field_mapper.solr_name('isGovernedBy', :symbol) }
 
-    it "should include policy-aware query" do
+    it "includes policy-aware query" do
       # stubbing out policies_with_access because solr doesn't always return them in the same order.
       policy_ids = (1..8).map {|n| "policies/#{n}"}
       expect(subject).to receive(:policies_with_access).and_return(policy_ids)
       subject.apply_gated_discovery(@solr_parameters)
-      expect(@solr_parameters[:fq].first).to include(" OR (_query_:\"{!raw f=#{governed_field}}policies/1\" OR _query_:\"{!raw f=#{governed_field}}policies/2\" OR _query_:\"{!raw f=#{governed_field}}policies/3\" OR _query_:\"{!raw f=#{governed_field}}policies/4\" OR _query_:\"{!raw f=#{governed_field}}policies/5\" OR _query_:\"{!raw f=#{governed_field}}policies/6\" OR _query_:\"{!raw f=#{governed_field}}policies/7\" OR _query_:\"{!raw f=#{governed_field}}policies/8\")")
+      expect(@solr_parameters[:fq].first).to include(" OR (_query_:\"{!field f=#{governed_field}}policies/1\" OR _query_:\"{!field f=#{governed_field}}policies/2\" OR _query_:\"{!field f=#{governed_field}}policies/3\" OR _query_:\"{!field f=#{governed_field}}policies/4\" OR _query_:\"{!field f=#{governed_field}}policies/5\" OR _query_:\"{!field f=#{governed_field}}policies/6\" OR _query_:\"{!field f=#{governed_field}}policies/7\" OR _query_:\"{!field f=#{governed_field}}policies/8\")")
     end
 
-    it "should not change anything if there are no clauses to add" do
+    it "doesn't change anything if there are no clauses to add" do
       allow(subject).to receive(:policy_clauses).and_return(nil)
       subject.apply_gated_discovery(@solr_parameters)
-      expect(@solr_parameters[:fq].first).not_to include(" OR (_query_:\"{!raw f=#{governed_field}}policies/1\" OR _query_:\"{!raw f=#{governed_field}}policies/2\" OR _query_:\"{!raw f=#{governed_field}}policies/3\" OR _query_:\"{!raw f=#{governed_field}}policies/4\" OR _query_:\"{!raw f=#{governed_field}}policies/5\" OR _query_:\"{!raw f=#{governed_field}}policies/6\" OR _query_:\"{!raw f=#{governed_field}}policies/7\" OR _query_:\"{!raw f=#{governed_field}}policies/8\")")
+      expect(@solr_parameters[:fq].first).not_to include(" OR (_query_:\"{!field f=#{governed_field}}policies/1\" OR _query_:\"{!field f=#{governed_field}}policies/2\" OR _query_:\"{!field f=#{governed_field}}policies/3\" OR _query_:\"{!field f=#{governed_field}}policies/4\" OR _query_:\"{!field f=#{governed_field}}policies/5\" OR _query_:\"{!field f=#{governed_field}}policies/6\" OR _query_:\"{!field f=#{governed_field}}policies/7\" OR _query_:\"{!field f=#{governed_field}}policies/8\")")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 9.8.1
+  version: 9.9.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.9'
+        version: 9.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.9'
+        version: 9.10.0
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement