hydra-access-controls 6.0.0.pre1 → 6.0.0.pre2

data/hydra-access-controls.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'active-fedora'
+  gem.add_dependency 'active-fedora', '6.0.0.pre2'
   gem.add_dependency 'cancan'
   gem.add_dependency 'deprecation'
   gem.add_dependency 'blacklight'

data/lib/hydra/access_controls_enforcement.rb

@@ -119,9 +119,11 @@ module Hydra::AccessControlsEnforcement
   # @param [Hash] opts (optional, not currently used)
   def enforce_show_permissions(opts={})
     load_permissions_from_solr
-    unless @permissions_solr_document['access_t'] && (@permissions_solr_document['access_t'].first == "public" || @permissions_solr_document['access_t'].first == "Public")
-      if @permissions_solr_document["embargo_release_date_dt"] 
-        embargo_date = Date.parse(@permissions_solr_document["embargo_release_date_dt"].split(/T/)[0])
+    access_key = ActiveFedora::SolrService.solr_name("access", Hydra::Datastream::RightsMetadata.indexer)
+    embargo_key = ActiveFedora::SolrService.solr_name("embargo_release_date", Hydra::Datastream::RightsMetadata.date_indexer)
+    unless @permissions_solr_document[access_key] && (@permissions_solr_document[access_key].first == "public" || @permissions_solr_document[access_key].first == "Public")
+      if @permissions_solr_document[embargo_key] 
+        embargo_date = Date.parse(@permissions_solr_document[embargo_key].split(/T/)[0])
         if embargo_date > Date.parse(Time.now.to_s)
           unless can?(:edit, params[:id])
             raise Hydra::AccessDenied.new("This item is under embargo.  You do not have sufficient access privileges to read this document.", :edit, params[:id])
@@ -216,7 +218,7 @@ module Hydra::AccessControlsEnforcement
     user_access_filters = []
     
     permission_types.each do |type|
-      user_access_filters << "#{type}_access_group_t:public"
+      user_access_filters << ActiveFedora::SolrService.solr_name("#{type}_access_group", Hydra::Datastream::RightsMetadata.indexer) + ":public"
     end
     
     # Grant access based on user id & role
@@ -232,7 +234,7 @@ module Hydra::AccessControlsEnforcement
       user_access_filters = []
       current_ability.user_groups.each_with_index do |role, i|
         permission_types.each do |type|
-          user_access_filters << escape_filter("#{type}_access_group_t", role)
+          user_access_filters << escape_filter(ActiveFedora::SolrService.solr_name("#{type}_access_group", Hydra::Datastream::RightsMetadata.indexer), role)
         end
       end
       user_access_filters
@@ -245,9 +247,9 @@ module Hydra::AccessControlsEnforcement
   def apply_individual_permissions(permission_types)
       # for individual person access
       user_access_filters = []
-      if user_key.present?
+      if current_user && current_user.user_key.present?
         permission_types.each do |type|
-          user_access_filters << escape_filter("#{type}_access_person_t", user_key)
+          user_access_filters << escape_filter(ActiveFedora::SolrService.solr_name("#{type}_access_person", Hydra::Datastream::RightsMetadata.indexer), current_user.user_key)
         end
       end
       user_access_filters
@@ -274,6 +276,6 @@ module Hydra::AccessControlsEnforcement
   # @param user_parameters the current user-subitted parameters
   def exclude_unwanted_models(solr_parameters, user_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "-has_model_s:\"info:fedora/afmodel:FileAsset\""
+    solr_parameters[:fq] << "-#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:FileAsset\""
   end
 end

data/lib/hydra/admin_policy.rb

@@ -9,7 +9,10 @@ class Hydra::AdminPolicy < ActiveFedora::Base
   # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
   has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata 
 
-  has_metadata :name =>'descMetadata', :type => ActiveFedora::QualifiedDublinCoreDatastream
+  has_metadata :name =>'descMetadata', :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
+    m.title :type=> :text, :index_as=>[:searchable]
+    
+  end
 
   delegate_to :descMetadata, [:title, :description], :unique=>true
   delegate :license_title, :to=>'rightsMetadata', :at=>[:license, :title], :unique=>true
@@ -31,11 +34,11 @@ class Hydra::AdminPolicy < ActiveFedora::Base
     or_query = [] 
     RoleMapper.roles(user).each do |group|
       permissions.each do |permission|
-        or_query << "#{permission}_access_group_t:#{group}"
+        or_query << ActiveFedora::SolrService.solr_name("#{permission}_access_group", indexer)+":#{group}"
       end
     end
     permissions.each do |permission|
-      or_query << "#{permission}_access_person_t:#{user.user_key}"
+      or_query << ActiveFedora::SolrService.solr_name("#{permission}_access_person", indexer)+":#{user.user_key}"
     end
     find_with_conditions(or_query.join(" OR "))
   end
@@ -73,9 +76,4 @@ class Hydra::AdminPolicy < ActiveFedora::Base
 
   end
 
-  def to_solr(solr_doc = {}) 
-    super
-    solr_doc['title_display'] = solr_doc['title_t'].first if solr_doc['title_t']
-    solr_doc
-  end
 end

data/lib/hydra/datastream/inheritable_rights_metadata.rb

@@ -7,13 +7,13 @@ module Hydra
       @terminology = Hydra::Datastream::RightsMetadata.terminology
   
       def to_solr(solr_doc=Hash.new)
-        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
-        solr_doc["inheritable_read_access_person_t"] = read_access.machine.person
-        solr_doc["inheritable_edit_access_group_t"] = edit_access.machine.group
-        solr_doc["inheritable_edit_access_person_t"] = edit_access.machine.person
-        solr_doc["inheritable_embargo_release_date_dt"] = embargo_release_date
+        solr_doc[ActiveFedora::SolrService.solr_name('inheritable_discover_access_group', indexer)] = discover_access.machine.group
+        solr_doc[ActiveFedora::SolrService.solr_name('inheritable_discover_access_person', indexer)] = discover_access.machine.person
+        solr_doc[ActiveFedora::SolrService.solr_name('inheritable_read_access_group', indexer)] = read_access.machine.group
+        solr_doc[ActiveFedora::SolrService.solr_name('inheritable_read_access_person', indexer)] = read_access.machine.person
+        solr_doc[ActiveFedora::SolrService.solr_name('inheritable_edit_access_group', indexer)] = edit_access.machine.group
+        solr_doc[ActiveFedora::SolrService.solr_name('inheritable_edit_access_person', indexer)] = edit_access.machine.person
+        solr_doc[ActiveFedora::SolrService.solr_name('inheritable_embargo_release_date', date_indexer)] = embargo_release_date
         return solr_doc
       end
     end

data/lib/hydra/datastream/rights_metadata.rb

@@ -175,22 +175,38 @@ 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?
+        solr_doc[ActiveFedora::SolrService.solr_name('edit_access_group', indexer)] = vals unless vals.empty?
         vals = discover_access.machine.group
-        solr_doc['discover_access_group_t'] = vals unless vals.empty?
+        solr_doc[ActiveFedora::SolrService.solr_name('discover_access_group', indexer)] = vals unless vals.empty?
         vals = read_access.machine.group
-        solr_doc['read_access_group_t'] = vals unless vals.empty?
+        solr_doc[ActiveFedora::SolrService.solr_name('read_access_group', indexer)] = vals unless vals.empty?
         vals = edit_access.machine.person
-        solr_doc['edit_access_person_t'] = vals unless vals.empty?
+        solr_doc[ActiveFedora::SolrService.solr_name('edit_access_person', indexer)] = vals unless vals.empty?
         vals = discover_access.machine.person
-        solr_doc['discover_access_person_t'] = vals unless vals.empty?
+        solr_doc[ActiveFedora::SolrService.solr_name('discover_access_person', indexer)] = vals unless vals.empty?
         vals = read_access.machine.person
-        solr_doc['read_access_person_t'] = vals unless vals.empty?
+        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
         solr_doc
       end
 
+      def indexer
+        self.class.indexer
+      end
+
+      def self.indexer
+        @indexer ||= Solrizer::Descriptor.new(:text, :stored, :indexed, :multivalued)
+      end
+
+      def date_indexer
+        self.class.date_indexer
+      end
+
+      def self.date_indexer
+        @date_indexer ||= Solrizer::Descriptor.new(:date, :stored, :indexed)
+      end
+
       # Completely clear the permissions
       def clear_permissions!
         remove_all_permissions({:person=>true})

data/lib/hydra/policy_aware_ability.rb

@@ -26,9 +26,10 @@ module Hydra::PolicyAwareAbility
   # Returns nil if no policy associated with the object
   def policy_pid_for(object_pid)
     return @policy_pid if @policy_pid
-    solr_result = ActiveFedora::Base.find_with_conditions({:id=>object_pid}, :fl=>'is_governed_by_s')
+    #is_governed_by_ssim
+    solr_result = ActiveFedora::Base.find_with_conditions({:id=>object_pid}, :fl=>ActiveFedora::SolrService.solr_name('is_governed_by', :symbol))
     begin
-      @policy_pid = value_from_solr_field(solr_result, 'is_governed_by_s').first.gsub("info:fedora/", "")
+      @policy_pid = value_from_solr_field(solr_result, ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)).first.gsub("info:fedora/", "")
     rescue NoMethodError
       @policy_pid = nil
     end

data/lib/hydra/policy_aware_access_controls_enforcement.rb

@@ -16,7 +16,7 @@ module Hydra::PolicyAwareAccessControlsEnforcement
   def policy_clauses 
     policy_pids = policies_with_access
     return nil if policy_pids.empty?
-    '(' + policy_pids.map {|pid| "is_governed_by_s:info\\:fedora/#{pid.gsub(/:/, '\\\\:')}"}.join(' OR ') + ')'
+    '(' + policy_pids.map {|pid| ActiveFedora::SolrService.solr_name("is_governed_by", :symbol) + ":info\\:fedora/#{pid.gsub(/:/, '\\\\:')}"}.join(' OR ') + ')'
   end
   
   
@@ -39,7 +39,7 @@ module Hydra::PolicyAwareAccessControlsEnforcement
       user_access_filters = []
       current_ability.user_groups.each_with_index do |role, i|
         discovery_permissions.each do |type|
-          user_access_filters << "inheritable_#{type}_access_group_t:#{role}"
+          user_access_filters << ActiveFedora::SolrService.solr_name("inheritable_#{type}_access_group", Hydra::Datastream::RightsMetadata.indexer ) + ":#{role}"
         end
       end
       user_access_filters
@@ -49,7 +49,7 @@ module Hydra::PolicyAwareAccessControlsEnforcement
       # for individual person access
       user_access_filters = []
       discovery_permissions.each do |type|
-        user_access_filters << "inheritable_#{type}_access_person_t:#{user_key}"        
+        user_access_filters << ActiveFedora::SolrService.solr_name("inheritable_#{type}_access_person", Hydra::Datastream::RightsMetadata.indexer ) + ":#{current_user.user_key}"        
       end
       user_access_filters
   end

data/spec/unit/ability_spec.rb

@@ -4,18 +4,18 @@ describe Ability do
   before do
     Hydra.stub(:config).and_return({
       :permissions=>{
-        :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"},
+        :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_t",
-        :embargo_release_date => "embargo_release_date_dt",
+        :embargo_release_date => "embargo_release_date_dtsi",
       
         :inheritable => {
-          :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"},
-          :owner => "inheritable_depositor_t",
-          :embargo_release_date => "inheritable_embargo_release_date_dt"
+          :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",
+          :embargo_release_date => "inheritable_embargo_release_date_dtsi"
         }
     }})
   end

data/spec/unit/access_controls_enforcement_spec.rb

@@ -10,10 +10,6 @@ describe Hydra::AccessControlsEnforcement do
         @current_ability ||= Ability.new(current_user)
       end
 
-      def user_key
-        current_user.user_key
-      end
-
       def session
       end
     end
@@ -32,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_t\:public/)      
+          @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:public/)      
         end
       end
       it "Then I should not be treated as a member of the 'registered' group" do
@@ -52,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_t\:public/)  
-          @solr_parameters[:fq].first.should match(/#{type}_access_group_t\:registered/)      
+          @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:public/)  
+          @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\: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_t\:#{@user.user_key}/)      
+          @solr_parameters[:fq].first.should match(/#{type}_access_person_tsim\:#{@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_t\:#{group_id}/)      
+            @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:#{group_id}/)      
           end
         end
       end
@@ -94,7 +90,7 @@ describe Hydra::AccessControlsEnforcement do
       subject.stub(:current_user).and_return(user)
       subject.should_receive(:can?).with(:edit, nil).and_return(true)
       subject.stub(:can?).with(:read, nil).and_return(true)
-      subject.instance_variable_set :@permissions_solr_document, SolrDocument.new({"edit_access_person_t"=>["testuser@example.com"], "embargo_release_date_dt"=>(Date.parse(Time.now.to_s)+2).to_s})
+      subject.instance_variable_set :@permissions_solr_document, SolrDocument.new({"edit_access_person_tsim"=>["testuser@example.com"], "embargo_release_date_dtsi"=>(Date.parse(Time.now.to_s)+2).to_s})
 
       subject.params = {}
       subject.should_receive(:load_permissions_from_solr) #This is what normally sets @permissions_solr_document
@@ -107,7 +103,7 @@ describe Hydra::AccessControlsEnforcement do
       subject.should_receive(:can?).with(:edit, nil).and_return(false)
       subject.stub(:can?).with(:read, nil).and_return(true)
       subject.params = {}
-      subject.instance_variable_set :@permissions_solr_document, SolrDocument.new({"edit_access_person_t"=>["testuser@example.com"], "embargo_release_date_dt"=>(Date.parse(Time.now.to_s)+2).to_s})
+      subject.instance_variable_set :@permissions_solr_document, SolrDocument.new({"edit_access_person_tsim"=>["testuser@example.com"], "embargo_release_date_dtsi"=>(Date.parse(Time.now.to_s)+2).to_s})
       subject.should_receive(:load_permissions_from_solr) #This is what normally sets @permissions_solr_document
       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."
     end
@@ -123,14 +119,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_t\:#{@stub_user.user_key}/)      
+        @solr_parameters[:fq].first.should match(/#{type}_access_person_tsim\:#{@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_t\:archivist/)        
-        @solr_parameters[:fq].first.should match(/#{type}_access_group_t\:researcher/)        
+        @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:archivist/)        
+        @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:researcher/)        
       end
     end
 
@@ -138,8 +134,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_t\:abc\\\/123/)        
-        @solr_parameters[:fq].first.should match(/#{type}_access_group_t\:cde\\\/567/)        
+        @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:abc\\\/123/)        
+        @solr_parameters[:fq].first.should match(/#{type}_access_group_tsim\:cde\\\/567/)        
       end
     end
   end
@@ -153,7 +149,7 @@ describe Hydra::AccessControlsEnforcement do
     end
     it "should set solr query parameters to filter out FileAssets" do
       subject.send(:exclude_unwanted_models, @solr_parameters, @user_parameters)
-      @solr_parameters[:fq].should include("-has_model_s:\"info:fedora/afmodel:FileAsset\"")  
+      @solr_parameters[:fq].should include("-#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:FileAsset\"")  
     end
   end
 

data/spec/unit/admin_policy_spec.rb

@@ -3,18 +3,18 @@ require 'spec_helper'
 describe Hydra::AdminPolicy do
   before do
     Hydra.stub(:config).and_return({:permissions=>{
-      :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"},
-      :owner => "depositor_t",
-      :embargo_release_date => "embargo_release_date_dt",
+      :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",
+      :embargo_release_date => "embargo_release_date_dtsi",
       
       :inheritable => {
-        :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"},
-        :owner => "inheritable_depositor_t",
-        :embargo_release_date => "inheritable_embargo_release_date_dt"
+        :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",
+        :embargo_release_date => "inheritable_embargo_release_date_dtsi"
       }
     }})
   end
@@ -40,11 +40,8 @@ describe Hydra::AdminPolicy do
 
   describe "to_solr" do
     subject { Hydra::AdminPolicy.new(:title=>"Foobar").to_solr }
-    it "should have title_t" do
-      subject["title_t"].should == ['Foobar']
-    end
-    it "should have title_display" do
-      subject["title_display"].should == 'Foobar'
+    it "should have title_tsim" 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_t"].should == ["Lil Kim"]
-      solr_doc["edit_access_group_t"].sort.should == ["group1", "group2"]
-      solr_doc["discover_access_person_t"].should == ["Joe Schmoe"]
-      solr_doc["discover_access_group_t"].should == ["public"]
+      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"]
     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_t"].should == ["researcher1"]
-      solr_doc["edit_access_group_t"].should == ["archivist"]
-      solr_doc["read_access_group_t"].should == ["public"]
-      solr_doc["discover_access_group_t"].should == ["bob"]
+      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"]
     end
   end
   describe "embargo_release_date=" do

data/spec/unit/inheritable_rights_metadata_spec.rb

@@ -4,18 +4,18 @@ require "nokogiri"
 describe Hydra::Datastream::InheritableRightsMetadata do
   before do
     Hydra.stub(:config).and_return({:permissions=>{
-      :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"},
-      :owner => "depositor_t",
-      :embargo_release_date => "embargo_release_date_dt",
+      :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",
+      :embargo_release_date => "embargo_release_date_dtsi",
       
       :inheritable => {
-        :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"},
-        :owner => "inheritable_depositor_t",
-        :embargo_release_date => "inheritable_embargo_release_date_dt"
+        :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",
+        :embargo_release_date => "inheritable_embargo_release_date_dtsi"
       }
     }})
   end

data/spec/unit/policy_aware_ability_spec.rb

@@ -4,18 +4,18 @@ describe Hydra::PolicyAwareAbility do
   before do
     Hydra.stub(:config).and_return({
       :permissions=>{
-        :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"},
-        :owner => "depositor_t",
-        :embargo_release_date => "embargo_release_date_dt",
+        :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",
+        :embargo_release_date => "embargo_release_date_dtsi",
       
         :inheritable => {
-          :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"},
-          :owner => "inheritable_depositor_t",
-          :embargo_release_date => "inheritable_embargo_release_date_dt"
+          :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",
+          :embargo_release_date => "inheritable_embargo_release_date_dtsi"
         }
     }})
   end

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Hydra::PolicyAwareAccessControlsEnforcement do
   before(:all) do
-    class MockController
+    class PolicyMockController
       include Hydra::AccessControlsEnforcement
       include Hydra::PolicyAwareAccessControlsEnforcement
       attr_accessor :params
       
-      def user_key
-        current_user.user_key
+      def current_ability
+        @current_ability ||= Ability.new(current_user)
       end
 
       def session
@@ -64,7 +64,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
     @sample_policies.each {|p| p.delete }
   end
   
-  subject { MockController.new }
+  subject { PolicyMockController.new }
   
   before do
     @solr_parameters = {}
@@ -96,12 +96,12 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
       policy_pids = (1..6).map {|n| "test:policy#{n}"}
       subject.should_receive(:policies_with_access).and_return(policy_pids)
       subject.apply_gated_discovery(@solr_parameters, @user_parameters)
-      @solr_parameters[:fq].first.should include(" OR (is_governed_by_s:info\\:fedora/test\\:policy1 OR is_governed_by_s:info\\:fedora/test\\:policy2 OR is_governed_by_s:info\\:fedora/test\\:policy3 OR is_governed_by_s:info\\:fedora/test\\:policy4 OR is_governed_by_s:info\\:fedora/test\\:policy5 OR is_governed_by_s:info\\:fedora/test\\:policy6)")
+      @solr_parameters[:fq].first.should include(" OR (#{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy1 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy2 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy3 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy4 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy5 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy6)")
     end
     it "should not change anything if there are no clauses to add" do
       subject.stub(:policy_clauses).and_return(nil)
       subject.apply_gated_discovery(@solr_parameters, @user_parameters)
-      @solr_parameters[:fq].first.should_not include(" OR (is_governed_by_s:info\\:fedora/test\\:policy1 OR is_governed_by_s:info\\:fedora/test\\:policy2 OR is_governed_by_s:info\\:fedora/test\\:policy3 OR is_governed_by_s:info\\:fedora/test\\:policy4 OR is_governed_by_s:info\\:fedora/test\\:policy5 OR is_governed_by_s:info\\:fedora/test\\:policy6)")
+      @solr_parameters[:fq].first.should_not include(" OR (#{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy1 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy2 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy3 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy4 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy5 OR #{ActiveFedora::SolrService.solr_name('is_governed_by', :symbol)}:info\\:fedora/test\\:policy6)")
     end
   end
 end

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_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']
+      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']
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre1
+  version: 6.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -34,17 +34,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0.pre2
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement