hydra-access-controls 6.4.0.rc5 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76381cfbb357cec68b454fdbd3063282f75eb4d4
-  data.tar.gz: 55598936df275fb7a52d2ff5d9395cd004914062
+  metadata.gz: 550f14aaf46093d42a43ab926b41d29c00ec370d
+  data.tar.gz: de0348503df87083363d268918cda3c9060f3649
 SHA512:
-  metadata.gz: 3607135f5aa9afae8abb1d026a0379993461144a9aba78e881c5c39283161bff14b2b916923c0218ccad67a92f7da25452a209ef727d6d63c42fe4c119e0ce5f
-  data.tar.gz: cc97938c99770ca31edf253d21f660b8bb0e54954f4a5469f90e26e85c4c7472a5995c5a00fc3ae6ffc3b97d7e7c50ce87daef34d264aae1c2e8b5912860a807
+  metadata.gz: 6c317e27b93d56b80332b0a0d52a91a0141afbff106b89e429109ea664d63e1546a29307b2fa9d69ee93b89cab0ff823bd694d0e9f732d7fbe6a7780ef555bda
+  data.tar.gz: af750abded990c0d4bf727f74f005e11aee1cc199fa3c752a0b5c3cd139cd41866fc2412d003a98f89fc8827adf394aee51e319f04aa3574f9b2f200976aacb0

data/README.textile

@@ -77,7 +77,7 @@ In config/initializers/hydra_config.rb
 
 h3. Policy-based Enforcement (or Collecton-level enforcement)
 
-If you have Policy-based enforcement enabled, then objects will inherit extra GRANT permissions from AdminPolicy objects (APOs) they are linked to with an isGovernedBy RDF relationship (stored in solr as _is_governed_by_s_ field).  This allows you to grant discover/read/edit access for a whole set of objects by changing the policy they are governed by.
+If you have Policy-based enforcement enabled, then objects will inherit extra GRANT permissions from AdminPolicy objects (APOs) they are linked to with an isGovernedBy RDF relationship (stored in solr as _is_governed_by_ssim_ field).  This allows you to grant discover/read/edit access for a whole set of objects by changing the policy they are governed by.
 
 AdminPolicy objects store their inheritable rightsMetadata in a datastream called defaultRights.  This datastream uses the regular Hydra rightsMetadata schema.  Each AdminPolicy object also has its own rightsMetadata datasream, like all other Hydra assets, which specifies who is able to _edit_ the Policy or _use_ it (associate it with objects).
 

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'
-  gem.add_dependency "active-fedora", '>= 6.6.0.rc1'
+  gem.add_dependency "active-fedora", '~> 6.6'
   gem.add_dependency 'cancan'
   gem.add_dependency 'deprecation'
   gem.add_dependency 'blacklight', '~> 4.0' 

data/lib/hydra/access_controls_enforcement.rb

@@ -118,7 +118,7 @@ module Hydra::AccessControlsEnforcement
   end
 
   def escape_filter(key, value)
-    [key, value.gsub(/[ \/]/, ' ' => '\ ', '/' => '\/')].join(':')
+    [key, value.gsub(/[ :\/]/, ' ' => '\ ', '/' => '\/', ':' => '\:')].join(':')
   end
 
   def apply_individual_permissions(permission_types)

data/spec/unit/access_controls_enforcement_spec.rb

@@ -148,6 +148,14 @@ describe Hydra::AccessControlsEnforcement do
         @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:cd\\\/e\\ 567/)
       end
     end
+    it "should escape colons in the group names" do
+      RoleMapper.stub(:roles).with(@stub_user).and_return(["abc:123","cde:567"])
+      subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+      ["discover","edit","read"].each do |type|
+        @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:abc\\:123/)
+        @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:cde\\:567/)
+      end
+    end
   end
   
   describe "exclude_unwanted_models" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.4.0.rc5
+  version: 6.4.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,16 +30,16 @@ dependencies:
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 6.6.0.rc1
+        version: '6.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 6.6.0.rc1
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -186,9 +186,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.1.7