hydra-access-controls 6.4.0 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 550f14aaf46093d42a43ab926b41d29c00ec370d
-  data.tar.gz: de0348503df87083363d268918cda3c9060f3649
+  metadata.gz: 1c7889e840d3022c5487081cbb7e11c7abad06ab
+  data.tar.gz: b8323dbda12665dc1ee7d29bcc5b194dcd09f7fa
 SHA512:
-  metadata.gz: 6c317e27b93d56b80332b0a0d52a91a0141afbff106b89e429109ea664d63e1546a29307b2fa9d69ee93b89cab0ff823bd694d0e9f732d7fbe6a7780ef555bda
-  data.tar.gz: af750abded990c0d4bf727f74f005e11aee1cc199fa3c752a0b5c3cd139cd41866fc2412d003a98f89fc8827adf394aee51e319f04aa3574f9b2f200976aacb0
+  metadata.gz: b8e37c30ce82f7a2ac0c5f3d737ccc76ac0001675486d5bce88212b65ab786af187df510552ab05329f5da2e90da036e0e2022430d9c53f5c48aae4fd01198e9
+  data.tar.gz: 8b6be814f5af9b0c997c2dff7bbaa2c1a0f568135da51bc6411f92ef3555fa2271fd0228187d1f4d9d1111c9b5c2bb0104659f6197357bb31f3dbb08f7ec5bd8

data/lib/hydra/access_controls_enforcement.rb

@@ -22,10 +22,6 @@ module Hydra::AccessControlsEnforcement
     permission_types = discovery_permissions
     user_access_filters = []
     
-    permission_types.each do |type|
-      user_access_filters << ActiveFedora::SolrService.solr_name("#{type}_access_group", Hydra::Datastream::RightsMetadata.indexer) + ":public"
-    end
-    
     # Grant access based on user id & role
     solr_access_filters_logic.each do |method_name|
       user_access_filters += send(method_name, permission_types)

data/lib/hydra/datastream/rights_metadata.rb

@@ -143,9 +143,11 @@ module Hydra
       # @param params ex. {"group"=>{"group1"=>"discover","group2"=>"edit"}, "person"=>{"person1"=>"read","person2"=>"discover"}}
       # Restricts actor type to group or person.  Any others will be ignored
       def permissions= (params)
-        group_ids = groups.keys | params['group'].keys
+        groups_for_update = params['group'] ? params['group'].keys : []
+        group_ids = groups.keys | groups_for_update
         group_ids.each {|group_id| self.permissions({"group"=>group_id}, params['group'].fetch(group_id, 'none'))}
-        user_ids = individuals.keys | params['person'].keys
+        users_for_update = params['person'] ? params['person'].keys : []
+        user_ids = individuals.keys | users_for_update
         user_ids.each {|person_id| self.permissions({"person"=>person_id}, params['person'].fetch(person_id, 'none'))}
       end
       

data/spec/unit/access_controls_enforcement_spec.rb

@@ -27,9 +27,7 @@ describe Hydra::AccessControlsEnforcement do
         subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
       end
       it "Then I should be treated as a member of the 'public' group" do
-        ["discover","edit","read"].each do |type|
-          @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:public/)      
-        end
+        expect(@solr_parameters[:fq].first).to eq 'edit_access_group_ssim:public OR discover_access_group_ssim:public OR read_access_group_ssim:public'
       end
       it "Then I should not be treated as a member of the 'registered' group" do
         @solr_parameters[:fq].first.should_not match(/registered/) 

data/spec/unit/hydra_rights_metadata_spec.rb

@@ -31,6 +31,12 @@ describe Hydra::Datastream::RightsMetadata do
   
   describe "permissions" do
     describe "setter" do
+      it "should set person permissions" do
+        @sample.permissions = {"person"=>{"maria"=>"read","marcus"=>"discover"}}
+      end
+      it "should set group permissions" do
+        @sample.permissions = {"group"=>{"librarians"=>"read","students"=>"discover"}}
+      end
       it "should create/update/delete permissions for the given user/group" do
         @sample.class.terminology.xpath_for(:access, :person, "person_123").should == '//oxns:access/oxns:machine/oxns:person[contains(., "person_123")]'
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Access controls for project hydra