hydra-access-controls 5.0.0.pre9 → 5.0.0.pre10

data/README.textile

@@ -66,7 +66,6 @@ Hydra uses its own set of default solr field names to track rights-related metad
   Hydra.configure(:shared) do |config|
     # ... other stuff ...
     config[:permissions] = {
-      :catchall => "access_t",
       :discover => {:group =>"discover_access_group_t", :individual=>"discover_access_person_t"},
       :read => {:group =>"read_access_group_t", :individual=>"read_access_person_t"},
       :edit => {:group =>"edit_access_group_t", :individual=>"edit_access_person_t"},
@@ -74,7 +73,6 @@ Hydra uses its own set of default solr field names to track rights-related metad
       :embargo_release_date => "embargo_release_date_dt"
     }
     config[:permissions][:inheritable] = {
-      :catchall => "inheritable_access_t",
       :discover => {:group =>"inheritable_discover_access_group_t", :individual=>"inheritable_discover_access_person_t"},
       :read => {:group =>"inheritable_read_access_group_t", :individual=>"inheritable_read_access_person_t"},
       :edit => {:group =>"inheritable_edit_access_group_t", :individual=>"inheritable_edit_access_person_t"},

data/lib/hydra-access-controls.rb

@@ -1,4 +1,7 @@
 require 'active_support'
+# TODO would it be possible to put the require fedora in an after_initialize block like this?
+#ActiveSupport.on_load(:after_initialize) do
+# This would allow solrizer to load it's config files after the rails logger is up.
 require 'active-fedora'
 require 'cancan'
 

data/lib/hydra/datastream/inheritable_rights_metadata.rb

@@ -7,7 +7,6 @@ module Hydra
       @terminology = Hydra::Datastream::RightsMetadata.terminology
   
       def to_solr(solr_doc=Hash.new)
-        solr_doc["inheritable_access_t"] = access.machine.group.val + access.machine.person.val
         solr_doc["inheritable_discover_access_group_t"] = discover_access.machine.group
         solr_doc["inheritable_discover_access_person_t"] = discover_access.machine.person
         solr_doc["inheritable_read_access_group_t"] = read_access.machine.group
@@ -19,4 +18,4 @@ module Hydra
       end
     end
   end
-end
+end

data/lib/hydra/datastream/rights_metadata.rb

@@ -21,7 +21,7 @@ module Hydra
           t.description(:path=>'human', :attributes=>{:type=>'description'})
           t.url(:path=>'machine', :attributes=>{:type=>'uri'})
         }
-        t.access {
+        t.access do
           t.human_readable(:path=>"human")
           t.machine {
             t.group
@@ -30,7 +30,7 @@ module Hydra
           t.person(:proxy=>[:machine, :person])
           t.group(:proxy=>[:machine, :group])
           # accessor :access_person, :term=>[:access, :machine, :person]
-        }
+        end
         t.discover_access(:ref=>[:access], :attributes=>{:type=>"discover"})
         t.read_access(:ref=>[:access], :attributes=>{:type=>"read"})
         t.edit_access(:ref=>[:access], :attributes=>{:type=>"edit"})
@@ -175,6 +175,19 @@ module Hydra
 
       def to_solr(solr_doc=Hash.new)
         super(solr_doc)
+        vals = edit_access.machine.group
+        solr_doc['edit_access_group_t'] = vals unless vals.empty?
+        vals = discover_access.machine.group
+        solr_doc['discover_access_group_t'] = vals unless vals.empty?
+        vals = read_access.machine.group
+        solr_doc['read_access_group_t'] = vals unless vals.empty?
+        vals = edit_access.machine.person
+        solr_doc['edit_access_person_t'] = vals unless vals.empty?
+        vals = discover_access.machine.person
+        solr_doc['discover_access_person_t'] = vals unless vals.empty?
+        vals = read_access.machine.person
+        solr_doc['read_access_person_t'] = 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
         solr_doc
       end

data/spec/unit/ability_spec.rb

@@ -5,7 +5,6 @@ describe Ability do
   before do
     Hydra.stub(:config).and_return({
       :permissions=>{
-        :catchall => "access_t",
         :discover => {:group =>"discover_access_group_t", :individual=>"discover_access_person_t"},
         :read => {:group =>"read_access_group_t", :individual=>"read_access_person_t"},
         :edit => {:group =>"edit_access_group_t", :individual=>"edit_access_person_t"},
@@ -13,7 +12,6 @@ describe Ability do
         :embargo_release_date => "embargo_release_date_dt",
       
         :inheritable => {
-          :catchall => "inheritable_access_t",
           :discover => {:group =>"inheritable_discover_access_group_t", :individual=>"inheritable_discover_access_person_t"},
           :read => {:group =>"inheritable_read_access_group_t", :individual=>"inheritable_read_access_person_t"},
           :edit => {:group =>"inheritable_edit_access_group_t", :individual=>"inheritable_edit_access_person_t"},

data/spec/unit/admin_policy_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Hydra::AdminPolicy do
   before do
     Hydra.stub(:config).and_return({:permissions=>{
-      :catchall => "access_t",
       :discover => {:group =>"discover_access_group_t", :individual=>"discover_access_person_t"},
       :read => {:group =>"read_access_group_t", :individual=>"read_access_person_t"},
       :edit => {:group =>"edit_access_group_t", :individual=>"edit_access_person_t"},
@@ -11,7 +10,6 @@ describe Hydra::AdminPolicy do
       :embargo_release_date => "embargo_release_date_dt",
       
       :inheritable => {
-        :catchall => "inheritable_access_t",
         :discover => {:group =>"inheritable_discover_access_group_t", :individual=>"inheritable_discover_access_person_t"},
         :read => {:group =>"inheritable_read_access_group_t", :individual=>"inheritable_read_access_person_t"},
         :edit => {:group =>"inheritable_edit_access_group_t", :individual=>"inheritable_edit_access_person_t"},
@@ -62,7 +60,7 @@ describe Hydra::AdminPolicy do
     describe "to_solr" do
       subject {@policy.to_solr}
       it "should not affect normal solr permissions fields" do    
-        subject.should_not have_key( Hydra.config[:permissions][:catchall] )
+      puts subject
         subject.should_not have_key( Hydra.config[:permissions][:discover][:group] ) 
         subject.should_not have_key( Hydra.config[:permissions][:discover][:individual] )
         subject.should_not have_key( Hydra.config[:permissions][:read][:group] )
@@ -72,9 +70,6 @@ describe Hydra::AdminPolicy do
         subject.should_not have_key( Hydra.config[:permissions][:embargo_release_date] )
       end
       it "should provide prefixed/inherited solr permissions fields" do
-        catchall = Hydra.config[:permissions][:inheritable][:catchall] 
-        subject[catchall].should have(7).items
-        subject[catchall].should include("posers", "slightlycoolkids", "africana-faculty", "cool-kids", "constantine", "nero", "julius_caesar") 
         subject[Hydra.config[:permissions][:inheritable][:discover][:group] ].should == ["posers"]
         subject[Hydra.config[:permissions][:inheritable][:discover][:individual] ].should == ["constantine"]
         subject[Hydra.config[:permissions][:inheritable][:read][:group] ].should == ["slightlycoolkids"]

data/spec/unit/inheritable_rights_metadata_spec.rb

@@ -4,7 +4,6 @@ require "nokogiri"
 describe Hydra::Datastream::InheritableRightsMetadata do
   before do
     Hydra.stub(:config).and_return({:permissions=>{
-      :catchall => "access_t",
       :discover => {:group =>"discover_access_group_t", :individual=>"discover_access_person_t"},
       :read => {:group =>"read_access_group_t", :individual=>"read_access_person_t"},
       :edit => {:group =>"edit_access_group_t", :individual=>"edit_access_person_t"},
@@ -12,7 +11,6 @@ describe Hydra::Datastream::InheritableRightsMetadata do
       :embargo_release_date => "embargo_release_date_dt",
       
       :inheritable => {
-        :catchall => "inheritable_access_t",
         :discover => {:group =>"inheritable_discover_access_group_t", :individual=>"inheritable_discover_access_person_t"},
         :read => {:group =>"inheritable_read_access_group_t", :individual=>"inheritable_read_access_person_t"},
         :edit => {:group =>"inheritable_edit_access_group_t", :individual=>"inheritable_edit_access_person_t"},
@@ -42,7 +40,6 @@ describe Hydra::Datastream::InheritableRightsMetadata do
   describe "to_solr" do
     subject {@sample.to_solr}
     it "should NOT provide normal solr permissions fields" do    
-      subject.should_not have_key( Hydra.config[:permissions][:catchall] )
       subject.should_not have_key( Hydra.config[:permissions][:discover][:group] ) 
       subject.should_not have_key( Hydra.config[:permissions][:discover][:individual] )
       subject.should_not have_key( Hydra.config[:permissions][:read][:group] )
@@ -52,7 +49,6 @@ describe Hydra::Datastream::InheritableRightsMetadata do
       subject.should_not have_key( Hydra.config[:permissions][:embargo_release_date] )
     end
     it "should provide prefixed/inherited solr permissions fields" do
-      subject[Hydra.config[:permissions][:inheritable][:catchall] ].should == ["posers", "slightly-cool-kids", "africana-faculty", "cool-kids", "constantine", "nero", "julius_caesar"] 
       subject[Hydra.config[:permissions][:inheritable][:discover][:group] ].should == ["posers"]
       subject[Hydra.config[:permissions][:inheritable][:discover][:individual] ].should == ["constantine"]
       subject[Hydra.config[:permissions][:inheritable][:read][:group] ].should == ["slightly-cool-kids"]

data/spec/unit/policy_aware_ability_spec.rb

@@ -4,7 +4,6 @@ describe Hydra::PolicyAwareAbility do
   before do
     Hydra.stub(:config).and_return({
       :permissions=>{
-        :catchall => "access_t",
         :discover => {:group =>"discover_access_group_t", :individual=>"discover_access_person_t"},
         :read => {:group =>"read_access_group_t", :individual=>"read_access_person_t"},
         :edit => {:group =>"edit_access_group_t", :individual=>"edit_access_person_t"},
@@ -12,7 +11,6 @@ describe Hydra::PolicyAwareAbility do
         :embargo_release_date => "embargo_release_date_dt",
       
         :inheritable => {
-          :catchall => "inheritable_access_t",
           :discover => {:group =>"inheritable_discover_access_group_t", :individual=>"inheritable_discover_access_person_t"},
           :read => {:group =>"inheritable_read_access_group_t", :individual=>"inheritable_read_access_person_t"},
           :edit => {:group =>"inheritable_edit_access_group_t", :individual=>"inheritable_edit_access_person_t"},

data/spec/unit/rights_metadata_spec.rb

@@ -47,6 +47,22 @@ describe Hydra::ModelMixins::RightsMetadata do
 
   end
 
+  context "to_solr" do
+    before do
+      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
+      ## 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_t'].size.should == 2
+      result['read_access_group_t'].should include('group-6', 'group-7')
+      result['edit_access_group_t'].should == ['group-8']
+      result['discover_access_person_t'].should == ['person2']
+      result['read_access_person_t'].should == ['person1']
+    end
+  end
+
   context "with rightsMetadata" do
     before do
       subject.rightsMetadata.update_permissions("person"=>{"person1"=>"read","person2"=>"discover"}, "group"=>{'group-6' => 'read', "group-7"=>'read', 'group-8'=>'edit'})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre9
+  version: 5.0.0.pre10
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-13 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport