hydra-access-controls 6.0.0.rc1 → 6.0.0.rc2

data/lib/hydra/datastream/rights_metadata.rb

@@ -196,7 +196,7 @@ module Hydra
       end
 
       def self.indexer
-        @indexer ||= Solrizer::Descriptor.new(:text, :stored, :indexed, :multivalued)
+        @indexer ||= Solrizer::Descriptor.new(:string, :stored, :indexed, :multivalued)
       end
 
       def date_indexer

data/spec/unit/ability_spec.rb

@@ -4,17 +4,17 @@ describe Ability do
   before do
     Hydra.stub(:config).and_return({
       :permissions=>{
-        :discover => {:group =>"discover_access_group_tsim", :individual=>"discover_access_person_tsim"},
-        :read => {:group =>"read_access_group_tsim", :individual=>"read_access_person_tsim"},
-        :edit => {:group =>"edit_access_group_tsim", :individual=>"edit_access_person_tsim"},
+        :discover => {:group =>"discover_access_group_ssim", :individual=>"discover_access_person_ssim"},
+        :read => {:group =>"read_access_group_ssim", :individual=>"read_access_person_ssim"},
+        :edit => {:group =>"edit_access_group_ssim", :individual=>"edit_access_person_ssim"},
         :owner => "depositor_t",
         :embargo_release_date => "embargo_release_date_dtsi",
       
         :inheritable => {
-          :discover => {:group =>"inheritable_discover_access_group_tsim", :individual=>"inheritable_discover_access_person_tsim"},
-          :read => {:group =>"inheritable_read_access_group_tsim", :individual=>"inheritable_read_access_person_tsim"},
-          :edit => {:group =>"inheritable_edit_access_group_tsim", :individual=>"inheritable_edit_access_person_tsim"},
-          :owner => "inheritable_depositor_tsim",
+          :discover => {:group =>"inheritable_discover_access_group_ssim", :individual=>"inheritable_discover_access_person_ssim"},
+          :read => {:group =>"inheritable_read_access_group_ssim", :individual=>"inheritable_read_access_person_ssim"},
+          :edit => {:group =>"inheritable_edit_access_group_ssim", :individual=>"inheritable_edit_access_person_ssim"},
+          :owner => "inheritable_depositor_ssim",
           :embargo_release_date => "inheritable_embargo_release_date_dtsi"
         }
     }})
@@ -22,10 +22,10 @@ describe Ability do
 
   describe "class methods" do
     subject { Ability }
-    its(:read_group_field) { should == 'read_access_group_tsim'}
-    its(:read_person_field) { should == 'read_access_person_tsim'}
-    its(:edit_group_field) { should == 'edit_access_group_tsim'}
-    its(:edit_person_field) { should == 'edit_access_person_tsim'}
+    its(:read_group_field) { should == 'read_access_group_ssim'}
+    its(:read_person_field) { should == 'read_access_person_ssim'}
+    its(:edit_group_field) { should == 'edit_access_group_ssim'}
+    its(:edit_person_field) { should == 'edit_access_person_ssim'}
   end
 
   context "for a not-signed in user" do

data/spec/unit/access_controls_enforcement_spec.rb

@@ -28,7 +28,7 @@ describe Hydra::AccessControlsEnforcement do
       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_tsim\:public/)      
+          @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:public/)      
         end
       end
       it "Then I should not be treated as a member of the 'registered' group" do
@@ -48,19 +48,19 @@ describe Hydra::AccessControlsEnforcement do
       end
       it "Then I should be treated as a member of the 'public' and 'registered' groups" do
         ["discover","edit","read"].each do |type|
-          @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:public/)  
-          @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:registered/)      
+          @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:public/)  
+          @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:registered/)      
         end
       end
       it "Then I should see assets that I have discover, read, or edit access to" do
         ["discover","edit","read"].each do |type|
-          @solr_parameters[:fq].first.should match(/#{type}_access_person_tsim\:#{@user.user_key}/)      
+          @solr_parameters[:fq].first.should match(/#{type}_access_person_ssim\:#{@user.user_key}/)      
         end
       end
       it "Then I should see assets that my groups have discover, read, or edit access to" do
         ["faculty", "africana-faculty"].each do |group_id|
           ["discover","edit","read"].each do |type|
-            @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:#{group_id}/)      
+            @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:#{group_id}/)      
           end
         end
       end
@@ -73,7 +73,7 @@ describe Hydra::AccessControlsEnforcement do
       RoleMapper.stub(:roles).with(user.user_key).and_return(["archivist"])
       subject.stub(:current_user).and_return(user)
       subject.stub(:can?).with(:read, nil).and_return(true)
-      stub_doc = Hydra::PermissionsSolrDocument.new({"edit_access_person_tsim"=>["testuser@example.com"], "embargo_release_date_dtsi"=>(Date.parse(Time.now.to_s)+2).to_s})
+      stub_doc = Hydra::PermissionsSolrDocument.new({"edit_access_person_ssim"=>["testuser@example.com"], "embargo_release_date_dtsi"=>(Date.parse(Time.now.to_s)+2).to_s})
 
       subject.params = {}
       subject.should_receive(:can?).with(:edit, stub_doc).and_return(true)
@@ -87,7 +87,7 @@ describe Hydra::AccessControlsEnforcement do
       subject.stub(:current_user).and_return(user)
       subject.stub(:can?).with(:read, nil).and_return(true)
       subject.params = {}
-      stub_doc = Hydra::PermissionsSolrDocument.new({"edit_access_person_tsim"=>["testuser@example.com"], "embargo_release_date_dtsi"=>(Date.parse(Time.now.to_s)+2).to_s})
+      stub_doc = Hydra::PermissionsSolrDocument.new({"edit_access_person_ssim"=>["testuser@example.com"], "embargo_release_date_dtsi"=>(Date.parse(Time.now.to_s)+2).to_s})
       subject.should_receive(:can?).with(:edit, stub_doc).and_return(false)
       subject.should_receive(:get_permissions_solr_response_for_doc_id).and_return(stub_doc)
       lambda {subject.send(:enforce_show_permissions, {})}.should raise_error Hydra::AccessDenied, "This item is under embargo.  You do not have sufficient access privileges to read this document."
@@ -104,14 +104,14 @@ describe Hydra::AccessControlsEnforcement do
     it "should set query fields for the user id checking against the discover, access, read fields" do
       subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
       ["discover","edit","read"].each do |type|
-        @solr_parameters[:fq].first.should match(/#{type}_access_person_tsim\:#{@stub_user.user_key}/)      
+        @solr_parameters[:fq].first.should match(/#{type}_access_person_ssim\:#{@stub_user.user_key}/)      
       end
     end
     it "should set query fields for all roles the user is a member of checking against the discover, access, read fields" do
       subject.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
       ["discover","edit","read"].each do |type|
-        @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:archivist/)        
-        @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:researcher/)        
+        @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:archivist/)        
+        @solr_parameters[:fq].first.should match(/#{type}_access_group_ssim\:researcher/)        
       end
     end
 
@@ -119,8 +119,8 @@ describe Hydra::AccessControlsEnforcement do
       RoleMapper.stub(:roles).with(@stub_user.user_key).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_tsim\:abc\\\/123/)        
-        @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:cde\\\/567/)        
+        @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

data/spec/unit/admin_policy_spec.rb

@@ -3,17 +3,17 @@ require 'spec_helper'
 describe Hydra::AdminPolicy do
   before do
     Hydra.stub(:config).and_return({:permissions=>{
-      :discover => {:group =>"discover_access_group_tsim", :individual=>"discover_access_person_tsim"},
-      :read => {:group =>"read_access_group_tsim", :individual=>"read_access_person_tsim"},
-      :edit => {:group =>"edit_access_group_tsim", :individual=>"edit_access_person_tsim"},
-      :owner => "depositor_tsim",
+      :discover => {:group =>"discover_access_group_ssim", :individual=>"discover_access_person_ssim"},
+      :read => {:group =>"read_access_group_ssim", :individual=>"read_access_person_ssim"},
+      :edit => {:group =>"edit_access_group_ssim", :individual=>"edit_access_person_ssim"},
+      :owner => "depositor_ssim",
       :embargo_release_date => "embargo_release_date_dtsi",
       
       :inheritable => {
-        :discover => {:group =>"inheritable_discover_access_group_tsim", :individual=>"inheritable_discover_access_person_tsim"},
-        :read => {:group =>"inheritable_read_access_group_tsim", :individual=>"inheritable_read_access_person_tsim"},
-        :edit => {:group =>"inheritable_edit_access_group_tsim", :individual=>"inheritable_edit_access_person_tsim"},
-        :owner => "inheritable_depositor_tsim",
+        :discover => {:group =>"inheritable_discover_access_group_ssim", :individual=>"inheritable_discover_access_person_ssim"},
+        :read => {:group =>"inheritable_read_access_group_ssim", :individual=>"inheritable_read_access_person_ssim"},
+        :edit => {:group =>"inheritable_edit_access_group_ssim", :individual=>"inheritable_edit_access_person_ssim"},
+        :owner => "inheritable_depositor_ssim",
         :embargo_release_date => "inheritable_embargo_release_date_dtsi"
       }
     }})
@@ -40,7 +40,7 @@ describe Hydra::AdminPolicy do
 
   describe "to_solr" do
     subject { Hydra::AdminPolicy.new(:title=>"Foobar").to_solr }
-    it "should have title_tsim" do
+    it "should have title_ssim" do
       subject[ActiveFedora::SolrService.solr_name('title', type: :string)].should == ["Foobar"]
     end
   end

data/spec/unit/hydra_rights_metadata_spec.rb

@@ -153,10 +153,10 @@ describe Hydra::Datastream::RightsMetadata do
       @sample.update_values(params)
       solr_doc = @sample.to_solr
       
-      solr_doc["edit_access_person_tsim"].should == ["Lil Kim"]
-      solr_doc["edit_access_group_tsim"].sort.should == ["group1", "group2"]
-      solr_doc["discover_access_person_tsim"].should == ["Joe Schmoe"]
-      solr_doc["discover_access_group_tsim"].should == ["public"]
+      solr_doc["edit_access_person_ssim"].should == ["Lil Kim"]
+      solr_doc["edit_access_group_ssim"].sort.should == ["group1", "group2"]
+      solr_doc["discover_access_person_ssim"].should == ["Joe Schmoe"]
+      solr_doc["discover_access_group_ssim"].should == ["public"]
     end
     it "should solrize fixture content correctly" do
       lsample = Hydra::Datastream::RightsMetadata.new(nil, nil)
@@ -164,10 +164,10 @@ describe Hydra::Datastream::RightsMetadata do
                                   'group' => {'archivist' => 'edit', 'public' =>'read', 'bob'=>'discover'}})
 
       solr_doc = lsample.to_solr
-      solr_doc["edit_access_person_tsim"].should == ["researcher1"]
-      solr_doc["edit_access_group_tsim"].should == ["archivist"]
-      solr_doc["read_access_group_tsim"].should == ["public"]
-      solr_doc["discover_access_group_tsim"].should == ["bob"]
+      solr_doc["edit_access_person_ssim"].should == ["researcher1"]
+      solr_doc["edit_access_group_ssim"].should == ["archivist"]
+      solr_doc["read_access_group_ssim"].should == ["public"]
+      solr_doc["discover_access_group_ssim"].should == ["bob"]
     end
   end
   describe "embargo_release_date=" do

data/spec/unit/inheritable_rights_metadata_spec.rb

@@ -4,17 +4,17 @@ require "nokogiri"
 describe Hydra::Datastream::InheritableRightsMetadata do
   before do
     Hydra.stub(:config).and_return({:permissions=>{
-      :discover => {:group =>"discover_access_group_tsim", :individual=>"discover_access_person_tsim"},
-      :read => {:group =>"read_access_group_tsim", :individual=>"read_access_person_tsim"},
-      :edit => {:group =>"edit_access_group_tsim", :individual=>"edit_access_person_tsim"},
-      :owner => "depositor_tsim",
+      :discover => {:group =>"discover_access_group_ssim", :individual=>"discover_access_person_ssim"},
+      :read => {:group =>"read_access_group_ssim", :individual=>"read_access_person_ssim"},
+      :edit => {:group =>"edit_access_group_ssim", :individual=>"edit_access_person_ssim"},
+      :owner => "depositor_ssim",
       :embargo_release_date => "embargo_release_date_dtsi",
       
       :inheritable => {
-        :discover => {:group =>"inheritable_discover_access_group_tsim", :individual=>"inheritable_discover_access_person_tsim"},
-        :read => {:group =>"inheritable_read_access_group_tsim", :individual=>"inheritable_read_access_person_tsim"},
-        :edit => {:group =>"inheritable_edit_access_group_tsim", :individual=>"inheritable_edit_access_person_tsim"},
-        :owner => "inheritable_depositor_tsim",
+        :discover => {:group =>"inheritable_discover_access_group_ssim", :individual=>"inheritable_discover_access_person_ssim"},
+        :read => {:group =>"inheritable_read_access_group_ssim", :individual=>"inheritable_read_access_person_ssim"},
+        :edit => {:group =>"inheritable_edit_access_group_ssim", :individual=>"inheritable_edit_access_person_ssim"},
+        :owner => "inheritable_depositor_ssim",
         :embargo_release_date => "inheritable_embargo_release_date_dtsi"
       }
     }})

data/spec/unit/policy_aware_ability_spec.rb

@@ -4,17 +4,17 @@ describe Hydra::PolicyAwareAbility do
   before do
     Hydra.stub(:config).and_return({
       :permissions=>{
-        :discover => {:group =>"discover_access_group_tsim", :individual=>"discover_access_person_tsim"},
-        :read => {:group =>"read_access_group_tsim", :individual=>"read_access_person_tsim"},
-        :edit => {:group =>"edit_access_group_tsim", :individual=>"edit_access_person_tsim"},
-        :owner => "depositor_tsim",
+        :discover => {:group =>"discover_access_group_ssim", :individual=>"discover_access_person_ssim"},
+        :read => {:group =>"read_access_group_ssim", :individual=>"read_access_person_ssim"},
+        :edit => {:group =>"edit_access_group_ssim", :individual=>"edit_access_person_ssim"},
+        :owner => "depositor_ssim",
         :embargo_release_date => "embargo_release_date_dtsi",
       
         :inheritable => {
-          :discover => {:group =>"inheritable_discover_access_group_tsim", :individual=>"inheritable_discover_access_person_tsim"},
-          :read => {:group =>"inheritable_read_access_group_tsim", :individual=>"inheritable_read_access_person_tsim"},
-          :edit => {:group =>"inheritable_edit_access_group_tsim", :individual=>"inheritable_edit_access_person_tsim"},
-          :owner => "inheritable_depositor_tsim",
+          :discover => {:group =>"inheritable_discover_access_group_ssim", :individual=>"inheritable_discover_access_person_ssim"},
+          :read => {:group =>"inheritable_read_access_group_ssim", :individual=>"inheritable_read_access_person_ssim"},
+          :edit => {:group =>"inheritable_edit_access_group_ssim", :individual=>"inheritable_edit_access_person_ssim"},
+          :owner => "inheritable_depositor_ssim",
           :embargo_release_date => "inheritable_embargo_release_date_dtsi"
         }
     }})

data/spec/unit/rights_metadata_spec.rb

@@ -61,11 +61,11 @@ describe Hydra::ModelMixins::RightsMetadata 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_tsim'].size.should == 2
-      result['read_access_group_tsim'].should include('group-6', 'group-7')
-      result['edit_access_group_tsim'].should == ['group-8']
-      result['discover_access_person_tsim'].should == ['person2']
-      result['read_access_person_tsim'].should == ['person1']
+      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']
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc1
+  version: 6.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport