hydra-access-controls 6.1.1 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58301ec96589566100dbd7d7d310f9750186e3b0
-  data.tar.gz: 78a503ad56405a2cfa3c830e54f6d896b4c69114
+  metadata.gz: 8aa9a9ba62eeb9030329ff121f35ea64ce5833b6
+  data.tar.gz: 3801bd2b2a23ce8e62a7af0d522b16a7f49f7794
 SHA512:
-  metadata.gz: 3a28c79e951cc47c9058752cc1ffc8fe423704d3309ee9f27e0ae1041a341125fd56c0438385ead60632c62614d2a7d88d73bdf4144639748b8659d1ef288352
-  data.tar.gz: f92e65fcb47e2ecb3ab1752faa8ce43e9d976fa5985be0ec142628a9654fd0f6a03f8fbd07f3540dd99ee35dc851d597791dba745f9ddeb8c504bb009d183c98
+  metadata.gz: 71123bf8489eca05d1eb124a7b815b7e97148cd6bac7e9886dbc1613cba2735312fae40c90129cc297f47032b65fccc896d63d1233c3077ceccbb869a8885197
+  data.tar.gz: fcea17d03eae35064878aa41691c5d923d65f3765d8175ce16ae207512e5f10a09a8fa2e7916ec168b510566f8e8f3c462e8325a070a4f9a0eeaa8e902a5a1a4

data/lib/hydra/access_controls_enforcement.rb

@@ -89,9 +89,13 @@ module Hydra::AccessControlsEnforcement
 
   
   # Which permission levels (logical OR) will grant you the ability to discover documents in a search.
+
   # Override this method if you want it to be something other than the default
   def discovery_permissions
-    ["edit","discover","read"]
+    @discovery_permissions ||= ["edit","discover","read"]
+  end
+  def disocvery_permissions= (permissions)
+    @discovery_permissions = permissions
   end
 
   # Contrller before filter that sets up access-controlled lucene query in order to provide gated discovery behavior

data/lib/hydra/datastream/rights_metadata.rb

@@ -187,7 +187,10 @@ module Hydra
         vals = read_access.machine.person
         solr_doc[ActiveFedora::SolrService.solr_name('read_access_person', indexer)] = vals unless vals.empty?
 
-        ::Solrizer::Extractor.insert_solr_field_value(solr_doc, "embargo_release_date_dt", embargo_release_date(:format=>:solr_date)) if embargo_release_date
+        if embargo_release_date
+          embargo_release_date_solr_key_name = ActiveFedora::SolrService.solr_name("embargo_release_date", date_indexer)
+          ::Solrizer::Extractor.insert_solr_field_value(solr_doc, embargo_release_date_solr_key_name , embargo_release_date(:format=>:solr_date))
+        end
         solr_doc
       end
 

data/spec/unit/access_controls_enforcement_spec.rb

@@ -35,6 +35,14 @@ describe Hydra::AccessControlsEnforcement do
         @solr_parameters[:fq].first.should_not match(/registered/) 
       end
       it "Then I should not have individual or group permissions"
+      it "Should changed based on the discovery_perissions" do
+        @solr_parameters = {}
+        discovery_permissions = ["read","edit"]
+        subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+        ["edit","read"].each do |type|
+          @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:public/)      
+        end
+      end
     end
     context "Given I am a registered user" do
       before do
@@ -64,6 +72,16 @@ describe Hydra::AccessControlsEnforcement do
           end
         end
       end
+      it "Should changed based on the discovery_perissions" do
+        @solr_parameters = {}
+        discovery_permissions = ["read","edit"]
+        subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+        ["faculty", "africana-faculty"].each do |group_id|
+          ["edit","read"].each do |type|
+            @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:#{group_id}/)      
+          end
+        end
+      end
     end
   end
   

data/spec/unit/rights_metadata_spec.rb

@@ -54,18 +54,21 @@ describe Hydra::ModelMixins::RightsMetadata do
   end
 
   context "to_solr" do
+    let(:embargo_release_date) { "2010-12-01" }
     before do
+      subject.rightsMetadata.embargo_release_date = embargo_release_date
       subject.rightsMetadata.update_permissions("person"=>{"person1"=>"read","person2"=>"discover"}, "group"=>{'group-6' => 'read', "group-7"=>'read', 'group-8'=>'edit'})
     end
     it "should produce a solr document" do
       result = subject.rightsMetadata.to_solr
-      result.size.should == 4
+      result.size.should == 5
       ## Wrote the test in this way, because the implementation uses a hash, and the hash order is not deterministic (especially in ruby 1.8.7)
       result['read_access_group_ssim'].size.should == 2
       result['read_access_group_ssim'].should include('group-6', 'group-7')
       result['edit_access_group_ssim'].should == ['group-8']
       result['discover_access_person_ssim'].should == ['person2']
       result['read_access_person_ssim'].should == ['person1']
+      result['embargo_release_date_dtsi'].should == subject.rightsMetadata.embargo_release_date(:format => :solr_date)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport