hydra-head 3.1.0.pre1 → 3.1.0.pre2

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    hydra-head (3.0.0.rc2)
+    hydra-head (3.1.0.pre2)
       RedCloth (= 4.2.3)
-      active-fedora (~> 3.1.0.rc1)
+      active-fedora (~> 3.1.1)
       blacklight (= 3.0.0)
       block_helpers
       builder
@@ -55,7 +55,7 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    active-fedora (3.1.0.rc1)
+    active-fedora (3.1.1)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -67,7 +67,7 @@ GEM
       om (>= 1.4.3)
       rdf
       rdf-rdfxml
-      rubydora (~> 0.1.9)
+      rubydora (= 0.2.3)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -120,7 +120,7 @@ GEM
       capybara (>= 1.1.1)
       cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
-    curb (0.7.15)
+    curb (0.7.16)
     daemons (1.1.4)
     database_cleaner (0.6.7)
     diff-lcs (1.1.3)
@@ -129,11 +129,11 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     facets (2.8.4)
-    factory_girl (2.2.0)
+    factory_girl (2.1.2)
       activesupport
     fastercsv (1.5.4)
-    ffi (1.0.10)
-    gherkin (2.5.4)
+    ffi (1.0.9)
+    gherkin (2.5.2)
       json (>= 1.4.6)
     gyoku (0.4.4)
       builder (>= 2.1.2)
@@ -144,7 +144,7 @@ GEM
     httpi (0.9.5)
       rack
     i18n (0.5.0)
-    jettywrapper (1.0.1)
+    jettywrapper (1.0.2)
       activesupport (>= 3.0.0)
       childprocess
       i18n
@@ -178,7 +178,7 @@ GEM
     om (1.4.3)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     rack (1.2.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -205,7 +205,7 @@ GEM
     rdf-rdfxml (0.3.5)
       nokogiri (>= 1.4.4)
       rdf (>= 0.3.4)
-    rdoc (3.11)
+    rdoc (3.10)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -213,25 +213,25 @@ GEM
       builder (>= 2.1.2)
     rsolr-ext (1.0.3)
       rsolr (>= 1.0.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.7.0)
+      rspec (~> 2.6.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.1.9)
+    rubydora (0.2.3)
       activemodel
       activesupport
       fastercsv
@@ -269,7 +269,7 @@ GEM
       rsolr
       solr-ruby (>= 0.0.6)
       solrizer (>= 1.0.0)
-    stomp (1.1.9)
+    stomp (1.1.10)
     term-ansicolor (1.0.7)
     thor (0.14.6)
     treetop (1.4.10)

data/RELEASE_NOTES.textile

@@ -0,0 +1,8 @@
+h2. 3.0.0
+
+If you have been testing out the Release Candidates, you need to add this line to your CatalogController:
+
+<pre>
+  # This filters out objects that you want to exclude from search results.  By default, it filters out FileAssets  
+  CatalogController.solr_search_params_logic << :exclude_unwanted_models
+</pre>

data/app/controllers/assets_controller.rb

@@ -12,6 +12,7 @@ class AssetsController < ApplicationController
     helper :hydra
     
     before_filter :search_session, :history_session
+    before_filter :load_document, :only => :update # allows other filters to operate on the document before the update method is called
     before_filter :require_solr
 
     # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
@@ -54,8 +55,6 @@ class AssetsController < ApplicationController
     # @example Sets the 1st and 2nd "medium" values on the descMetadata datastream in the _PID_ document, overwriting any existing values.
     #   put :update, :id=>"_PID_", "asset"=>{"descMetadata"=>{"medium"=>{"0"=>"Paper Document", "1"=>"Image"}}
     def update
-      @document = load_document_from_params
-      
       logger.debug("attributes submitted: #{@sanitized_params.inspect}")
            
       @response = update_document(@document, @sanitized_params)
@@ -114,10 +113,12 @@ class AssetsController < ApplicationController
     # This is a method to simply remove the item from SOLR but keep the object in fedora. 
     alias_method :withdraw, :destroy
     
-    #def withdraw
-    #  
-    #end
     protected
+
+    def load_document
+      @document = load_document_from_params
+    end
+
     
     def mods_assets_update_validation
       desc_metadata = params[:asset][:descMetadata]

data/hydra-head.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", '~> 3.0.10'
   s.add_dependency "blacklight", '3.0.0'  
-  s.add_dependency "active-fedora", '~>3.1.0.rc1'
+  s.add_dependency "active-fedora", '~>3.1.1'
   s.add_dependency 'builder'
   s.add_dependency 'columnize'
   s.add_dependency 'crack'

data/lib/generators/hydra/head_generator.rb

@@ -119,7 +119,9 @@ EOF
         "\n  before_filter :enforce_access_controls" +
         "\n  before_filter :enforce_viewing_context_for_show_requests, :only=>:show" +
         "\n  # This applies appropriate access controls to all solr queries" +  
-        "\n  CatalogController.solr_search_params_logic << :add_access_controls_to_solr_params"         
+        "\n  CatalogController.solr_search_params_logic << :add_access_controls_to_solr_params" +  
+        "\n  # This filters out objects that you want to exclude from search results, like FileAssets" +  
+        "\n  CatalogController.solr_search_params_logic << :exclude_unwanted_models"   
       end
     else
       puts "     \e[31mFailure\e[0m  Could not find #{model_name.underscore}.rb.  To add Hydra behaviors to your Blacklight::Catalog Controllers, you must include the Hydra::Controller module in the Controller class definition.  See the Hydra::Controller section in the Hydra API Docs for more info." 

data/lib/generators/hydra/templates/config/initializers/blacklight_config.rb

@@ -42,6 +42,13 @@ Blacklight.configure(:shared) do |config|
   # TODO: Reorganize facet data structures supplied in config to make simpler
   # for human reading/writing, kind of like search_fields. Eg,
   # config[:facet] << {:field_name => "format", :label => "Format", :limit => 10}
+  #
+  # Hydra uses active_fedora_model_s by default for displaying Format because that field is automatically 
+  # populated by active-fedora from your RELS-EXT.  You can change this to anything you want to use though.
+  # for example, the sample Hydra::ModsAsset Datastream Class adds object_type_facet = "Article" in its to_solr method.\
+  # You could use that as the format field instead of active_fedora_model_s to have a more nicer value displayed.
+  # 
+  #
   config[:facet] = {
     :field_names => (facet_fields = [
       "object_type_facet",

data/lib/generators/hydra/templates/solr_conf/conf/schema.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!-- 
+IMPORTANT
+This copy of the solr schema is only used in the context of testing hydra-head.  If you want to make changes available to individual hydra heads, you must apply them to the template in lib/generators/hydra/templates/solr_config
+-->
 <schema name="Hydra" version="1.1">
   <!-- For complete comments from the Solr project example schema.xml:
       http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/schema.xml?view=markup
@@ -91,7 +95,7 @@
    <field name="format" type="string" indexed="true" stored="true"/>
    <!-- pub_date is assumed by Blacklight's default configuration, so we must define it here to avoid errors -->
    <field name="pub_date" type="string" indexed="true" stored="true" multiValued="true"/>
-       
+   
    <dynamicField name="*_i"  type="sint"    indexed="true"  stored="true"/>
    <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true"/>
    <dynamicField name="*_l"  type="slong"   indexed="true"  stored="true"/>
@@ -114,5 +118,7 @@
  <defaultSearchField>text</defaultSearchField>
  <solrQueryParser defaultOperator="AND" />
  <copyField source="*_facet" dest="text" />
+ <copyField source="*_t" dest="text" />
+ <copyField source="*_s" dest="text" />
 
 </schema>

data/lib/generators/hydra/templates/solr_conf/conf/solrconfig.xml

@@ -82,51 +82,121 @@
      </lst>
   </requestHandler>
 
-  <!-- For complete comments from the Solr project example solrconfig.xml:
-      http://svn.apache.org/repos/asf/lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
-    See also:  
-      http://wiki.apache.org/solr/SolrConfigXml
-  -->
+  <!-- Searching ("All Fields") -->
+    <requestHandler name="search" class="solr.SearchHandler" default="true">
+      <lst name="defaults">
+        <str name="defType">dismax</str>
+        <str name="echoParams">explicit</str>      
+        <str name="q.alt">*:*</str>
+        <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
+        <!-- this qf and pf are used by default, if not otherwise specified by
+             client. The default blacklight_config will use these for the
+             "keywords" search. See the author_qf/author_pf, title_qf, etc 
+             below, which the default blacklight_config will specify for
+             those searches. You may also be interested in:
+             http://wiki.apache.org/solr/LocalParams
+        -->
+        <str name="qf">
+          id
+          title_t^25000
+          text
+          active_fedora_model_s
+          object_type_facet
+        </str>
+        <str name="pf">
+          id
+          title_t^250000
+          text^10
+          active_fedora_model_s
+          object_type_facet
+        </str>
+        <str name="author_qf">
+          author_unstem_search^200
+          author_addl_unstem_search^50
+          author_t^20
+          author_addl_t
+        </str>
+        <str name="author_pf">
+          author_unstem_search^2000
+          author_addl_unstem_search^500
+          author_t^200
+          author_addl_t^10
+        </str>
+        <str name="title_qf">
+          title_unstem_search^50000
+          subtitle_unstem_search^25000
+          title_addl_unstem_search^10000
+          title_t^5000
+          subtitle_t^2500
+          title_addl_t^100
+          title_added_entry_unstem_search^50
+          title_added_entry_t^10
+          title_series_unstem_search^5
+          title_series_t
+        </str>
+        <str name="title_pf">
+          title_unstem_search^500000
+          subtitle_unstem_search^250000
+          title_addl_unstem_search^100000
+          title_t^50000
+          subtitle_t^25000
+          title_addl_t^1000
+          title_added_entry_unstem_search^500
+          title_added_entry_t^100
+          title_series_t^50
+          title_series_unstem_search^10
+        </str>
+        <str name="subject_qf">
+          subject_topic_unstem_search^200
+          subject_unstem_search^125
+          subject_topic_facet^100
+          subject_t^50
+          subject_addl_unstem_search^10
+          subject_addl_t
+        </str>
+        <str name="subject_pf">
+          subject_topic_unstem_search^2000
+          subject_unstem_search^1250
+          subject_t^1000
+          subject_topic_facet^500
+          subject_addl_unstem_search^100
+          subject_addl_t^10
+        </str>
 
-  <requestHandler name="search" class="solr.SearchHandler" default="true">
-    <lst name="defaults">
-      <!-- Making defType lucene to exclude file assets -->
-      <str name="defType">lucene</str>
-      <!-- lucene params -->
-      <str name="df">has_model_s</str>
-      <str name="q.op">AND</str>
-      <!-- dismax params -->
-      <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
-      <str name="q.alt">*:*</str>
-      <str name="qf_dismax">id^0.8 id_t^0.8 title_t^0.3 mods_t^0.2</str>
-      <str name="pf_dismax">id^0.9  id_t^0.9 title_t^0.5 mods_t^0.2</str>
-      <int name="ps">100</int>
-      <float name="tie">0.01</float>
-      <!-- general -->
-      <str name="facet">on</str>
-      <str name="facet.mincount">1</str>
-	    <str name="echoParams">explicit</str>
-      <str name="fl">
-        id,title_t,date_t,year_facet,month_facet,has_model_s,has_collection_member_s,is_part_of_s,system_create_dt,
-        person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,
-        person_7_role_t,person_8_role_t,person_9_role_t,
-        person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,
-        person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
-        person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,
-        person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,
-        status_t,subject_t,depositor_t,
-				journal_title_info_t,journal_issue_publication_date_t,
-				journal_issue_pages_end_t,journal_issue_volume_t,journal_title_info_main_title_t,journal_issue_pages_start_t,
-				journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
-        person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
-        person_7_institution_t,person_8_institution_t,person_9_institution_t,
-        mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
-        mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_main_title_t, mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
-        object_type_facet, department_facet, peer_reviewed_facet
-      </str>
-    </lst>
-  </requestHandler>
-  
+
+        <int name="ps">3</int>
+        <float name="tie">0.01</float>
+
+        <!-- NOT using marc_display because it is large and will slow things down for search results -->
+        <str name="fl">
+          *,score
+        </str>
+
+        <str name="facet">true</str>
+        <str name="facet.mincount">1</str>
+        <str name="facet.limit">10</str>
+        <str name="facet.field">format</str>
+        <str name="facet.field">lc_1letter_facet</str>
+        <str name="facet.field">lc_alpha_facet</str>
+        <str name="facet.field">lc_b4cutter_facet</str>
+        <str name="facet.field">language_facet</str>
+        <str name="facet.field">pub_date</str>
+        <str name="facet.field">subject_era_facet</str>
+        <str name="facet.field">subject_geo_facet</str>
+        <str name="facet.field">subject_topic_facet</str>
+
+        <str name="spellcheck">true</str>
+        <str name="spellcheck.dictionary">default</str>
+        <str name="spellcheck.onlyMorePopular">true</str>
+        <str name="spellcheck.extendedResults">true</str>
+        <str name="spellcheck.collate">false</str>
+        <str name="spellcheck.count">5</str>
+      </lst>
+      <arr name="last-components">
+        <str>spellcheck</str>
+      </arr>
+    </requestHandler>
+    
   <requestHandler name="public_search" class="solr.SearchHandler" >
     <lst name="defaults">
       <!-- Making defType lucene to exclude file assets -->
@@ -137,6 +207,8 @@
       <!-- dismax params -->
       <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
       <str name="q.alt">*:*</str>
+      <str name="qf">id^0.8 id_t^0.8 format text^0.3 journal_issn_t</str>
+      <str name="pf">id^0.9  id_t^0.9 text^0.5 journal_issn_t</str>
       <str name="qf_dismax">id^0.8 id_t^0.8 format text^0.3</str>
       <str name="pf_dismax">id^0.9  id_t^0.9 text^0.5</str>
       <int name="ps">100</int>
@@ -146,17 +218,7 @@
       <str name="facet.mincount">1</str>
 	    <str name="echoParams">explicit</str>
       <str name="fl">
-        id,text,title_t,date_t,year_facet,month_facet,medium_t,series_facet,box_facet,folder_facet,has_model_s,has_collection_member_s,system_create_dt,
-        person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,person_7_role_t,person_8_role_t,person_9_role_t,
-        person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
-        person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,depositor_t,
-
-        journal_title_info_t, journal_title_info_main_title_t, journal_issue_publication_date_t, journal_issue_pages_start_t, journal_issue_pages_end_t, journal_issue_volume_t, journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
-        person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
-        person_7_institution_t,person_8_institution_t,person_9_institution_t,
-        mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
-        mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_t,mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
-        object_type_facet, department_facet, peer_reviewed_facet
+       *,score
       </str>
     </lst>
   </requestHandler>

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.1.0.pre1"
+  VERSION = "3.1.0.pre2"
 end
 

data/lib/hydra/access_controls_enforcement.rb

@@ -172,13 +172,46 @@ module Hydra::AccessControlsEnforcement
   # @param solr_parameters the current solr parameters
   # @param user_parameters the current user-subitted parameters
   def apply_gated_discovery(solr_parameters, user_parameters)
-    # solr_parameters[:q] ||= []
-    solr_parameters[:q] = build_lucene_query(params[:q])
-    # @extra_controller_params ||= {}
-    # @extra_controller_params.merge!(:q=>build_lucene_query(params[:q]))
-    logger.debug("Solr query: #{ solr_parameters[:q] }")
+    solr_parameters[:fq] ||= []
+    # Grant access to public content
+    permission_types = ["edit","discover","read"]
+    user_access_filters = []
+    
+    permission_types.each do |type|
+      user_access_filters << "#{type}_access_group_t:public"
+    end
+    
+    # Grant access based on user id & role
+    unless current_user.nil?
+      # for roles
+      RoleMapper.roles(current_user.login).each_with_index do |role, i|
+        permission_types.each do |type|
+          user_access_filters << "#{type}_access_group_t:#{role}"
+        end
+      end
+      # for individual person access
+      permission_types.each do |type|
+        user_access_filters << "#{type}_access_person_t:#{current_user.login}"        
+      end
+      if current_user.is_being_superuser?(session)
+        permission_types.each do |type|
+          user_access_filters << "#{type}_access_person_t:[* TO *]"        
+        end
+      end
+      
+      # Enforcing Embargo at Query time has been disabled.  
+      # If you want to do this, set up your own solr_search_params before_filter that injects the appropriate :fq constraints for a field that expresses your objects' embargo status.
+      #
+      # include docs in results if the embargo date is NOT in the future OR if the current user is depositor
+      # embargo_query = "(NOT embargo_release_date_dt:[NOW TO *]) OR depositor_t:#{current_user.login}"
+      # embargo_query = "(NOT embargo_release_date_dt:[NOW TO *]) OR (embargo_release_date_dt:[NOW TO *] AND  depositor_t:#{current_user.login}) AND NOT (NOT depositor_t:#{current_user.login} AND embargo_release_date_dt:[NOW TO *])"
+      # solr_parameters[:fq] << embargo_query         
+    end
+    solr_parameters[:fq] << user_access_filters.join(" OR ")
+    logger.debug("Solr parameters: #{ solr_parameters.inspect }")
   end
   
+  
   # proxy for {enforce_index_permissions}
   def enforce_search_permissions
     enforce_index_permissions
@@ -188,10 +221,19 @@ module Hydra::AccessControlsEnforcement
   def enforce_read_permissions
     enforce_show_permissions
   end
+  
+  # This filters out objects that you want to exclude from search results.  By default it only excludes FileAssets
+  # @param solr_parameters the current solr parameters
+  # @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\""
+  end
 
   # Build the lucene query that performs gated discovery based on Hydra rightsMetadata information in Solr
   # @param [String] user_query the user's original query request that will be wrapped in access controls
   def build_lucene_query(user_query)
+    logger.warn("DEPRECATED: build_lucene_query has been deprecated.  Recommended convention is to use blacklight's dismax search requestHandler (not lucene) and filter queries with :fq solr parameters.  See Hydra::AccessControlsEnforcement#apply_gated_discovery and Hydra::AccessControlsEnforcement#exclude_unwanted_models")
     q = ""
     # start query of with user supplied query term
       q << "_query_:\"{!dismax qf=$qf_dismax pf=$pf_dismax}#{user_query}\" AND " if user_query

data/lib/railties/hydra-fixtures.rake

@@ -25,7 +25,7 @@ namespace :hydra do
   end
   
   desc "Delete the object identified by pid. Example: rake hydra:delete pid=demo:12"
-  task :delete => :init do
+  task :delete => :environment do
     # If a destination url has been provided, attampt to export from the fedora repository there.
     if ENV["destination"]
       Fedora::Repository.register(ENV["destination"])

data/solr_conf/conf/schema.xml

@@ -118,5 +118,7 @@ This copy of the solr schema is only used in the context of testing hydra-head.
  <defaultSearchField>text</defaultSearchField>
  <solrQueryParser defaultOperator="AND" />
  <copyField source="*_facet" dest="text" />
+ <copyField source="*_t" dest="text" />
+ <copyField source="*_s" dest="text" />
 
 </schema>

data/solr_conf/conf/solrconfig.xml

@@ -82,36 +82,121 @@
      </lst>
   </requestHandler>
 
-  <!-- For complete comments from the Solr project example solrconfig.xml:
-      http://svn.apache.org/repos/asf/lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
-    See also:  
-      http://wiki.apache.org/solr/SolrConfigXml
-  -->
+  <!-- Searching ("All Fields") -->
+    <requestHandler name="search" class="solr.SearchHandler" default="true">
+      <lst name="defaults">
+        <str name="defType">dismax</str>
+        <str name="echoParams">explicit</str>      
+        <str name="q.alt">*:*</str>
+        <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
+        <!-- this qf and pf are used by default, if not otherwise specified by
+             client. The default blacklight_config will use these for the
+             "keywords" search. See the author_qf/author_pf, title_qf, etc 
+             below, which the default blacklight_config will specify for
+             those searches. You may also be interested in:
+             http://wiki.apache.org/solr/LocalParams
+        -->
+        <str name="qf">
+          id
+          title_t^25000
+          text
+          active_fedora_model_s
+          object_type_facet
+        </str>
+        <str name="pf">
+          id
+          title_t^250000
+          text^10
+          active_fedora_model_s
+          object_type_facet
+        </str>
+        <str name="author_qf">
+          author_unstem_search^200
+          author_addl_unstem_search^50
+          author_t^20
+          author_addl_t
+        </str>
+        <str name="author_pf">
+          author_unstem_search^2000
+          author_addl_unstem_search^500
+          author_t^200
+          author_addl_t^10
+        </str>
+        <str name="title_qf">
+          title_unstem_search^50000
+          subtitle_unstem_search^25000
+          title_addl_unstem_search^10000
+          title_t^5000
+          subtitle_t^2500
+          title_addl_t^100
+          title_added_entry_unstem_search^50
+          title_added_entry_t^10
+          title_series_unstem_search^5
+          title_series_t
+        </str>
+        <str name="title_pf">
+          title_unstem_search^500000
+          subtitle_unstem_search^250000
+          title_addl_unstem_search^100000
+          title_t^50000
+          subtitle_t^25000
+          title_addl_t^1000
+          title_added_entry_unstem_search^500
+          title_added_entry_t^100
+          title_series_t^50
+          title_series_unstem_search^10
+        </str>
+        <str name="subject_qf">
+          subject_topic_unstem_search^200
+          subject_unstem_search^125
+          subject_topic_facet^100
+          subject_t^50
+          subject_addl_unstem_search^10
+          subject_addl_t
+        </str>
+        <str name="subject_pf">
+          subject_topic_unstem_search^2000
+          subject_unstem_search^1250
+          subject_t^1000
+          subject_topic_facet^500
+          subject_addl_unstem_search^100
+          subject_addl_t^10
+        </str>
 
-  <requestHandler name="search" class="solr.SearchHandler" default="true">
-    <lst name="defaults">
-      <!-- Making defType lucene to exclude file assets -->
-      <str name="defType">lucene</str>
-      <!-- lucene params -->
-      <str name="df">has_model_s</str>
-      <str name="q.op">AND</str>
-      <!-- dismax params -->
-      <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
-      <str name="q.alt">*:*</str>
-      <str name="qf_dismax">id^0.8 id_t^0.8 title_t^0.3 mods_t^0.2</str>
-      <str name="pf_dismax">id^0.9  id_t^0.9 title_t^0.5 mods_t^0.2</str>
-      <int name="ps">100</int>
-      <float name="tie">0.01</float>
-      <!-- general -->
-      <str name="facet">on</str>
-      <str name="facet.mincount">1</str>
-	    <str name="echoParams">explicit</str>
-      <str name="fl">
-        *,score
-      </str>
-    </lst>
-  </requestHandler>
-  
+
+        <int name="ps">3</int>
+        <float name="tie">0.01</float>
+
+        <!-- NOT using marc_display because it is large and will slow things down for search results -->
+        <str name="fl">
+          *,score
+        </str>
+
+        <str name="facet">true</str>
+        <str name="facet.mincount">1</str>
+        <str name="facet.limit">10</str>
+        <str name="facet.field">format</str>
+        <str name="facet.field">lc_1letter_facet</str>
+        <str name="facet.field">lc_alpha_facet</str>
+        <str name="facet.field">lc_b4cutter_facet</str>
+        <str name="facet.field">language_facet</str>
+        <str name="facet.field">pub_date</str>
+        <str name="facet.field">subject_era_facet</str>
+        <str name="facet.field">subject_geo_facet</str>
+        <str name="facet.field">subject_topic_facet</str>
+
+        <str name="spellcheck">true</str>
+        <str name="spellcheck.dictionary">default</str>
+        <str name="spellcheck.onlyMorePopular">true</str>
+        <str name="spellcheck.extendedResults">true</str>
+        <str name="spellcheck.collate">false</str>
+        <str name="spellcheck.count">5</str>
+      </lst>
+      <arr name="last-components">
+        <str>spellcheck</str>
+      </arr>
+    </requestHandler>
+    
   <requestHandler name="public_search" class="solr.SearchHandler" >
     <lst name="defaults">
       <!-- Making defType lucene to exclude file assets -->
@@ -122,6 +207,8 @@
       <!-- dismax params -->
       <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
       <str name="q.alt">*:*</str>
+      <str name="qf">id^0.8 id_t^0.8 format text^0.3 journal_issn_t</str>
+      <str name="pf">id^0.9  id_t^0.9 text^0.5 journal_issn_t</str>
       <str name="qf_dismax">id^0.8 id_t^0.8 format text^0.3</str>
       <str name="pf_dismax">id^0.9  id_t^0.9 text^0.5</str>
       <int name="ps">100</int>

data/test_support/features/absent_model_search_result.feature

@@ -1,14 +1,8 @@
 Feature: Objects Without Models - Search Results
   I want to see appropriate information in search results for objects without an (active)fedora model
 
-  Scenario: Have a Search Result that is an Object Without a Model
-    Given I am logged in as "archivist1@example.com" 
-    And I am on the home page
-    And I fill in "q" with "test"
-    When I press "submit"
-    Then I should see a link to "the show document page for hydra:test_no_model"
-
-# you can't see this object unless you are an editor
+  # Objects without a model, are not ever displayed because they don't have rightsMetadata
+    
   Scenario: html5 valid - unauthenticated 
     When I am on the home page
     And I fill in "q" with "test"

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -60,8 +60,10 @@ describe CatalogController do
     
     describe "access controls" do
       before(:all) do
-        @public_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"public"}]
-        @private_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"private"}]
+        @public_only_results = Blacklight.solr.find Hash[:fq=>"access_t:public"]
+        # @public_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"public"}]
+        # @private_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"private"}]
+        @private_only_results = Blacklight.solr.find Hash[:fq=>"access_t:private"]
       end
 
       it "should only return public documents if role does not have permissions" do
@@ -72,7 +74,8 @@ describe CatalogController do
       it "should return all documents if role does have permissions" do
 	User.any_instance.stubs(:login).returns("BigWig")
         mock_user =  User.new
-        session[:superuser_mode] = true
+        # session[:superuser_mode] = true
+        mock_user.stubs(:is_being_superuser?).returns(true)
         controller.stubs(:current_user).returns(mock_user)
         get :index
         assigns(:document_list).count.should > @public_only_results.docs.count

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -2,6 +2,83 @@
 require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper') )
 
 describe Hydra::AccessControlsEnforcement do
+
+  describe "apply_gated_discovery" do
+    before(:each) do
+      @stub_user = User.new :email=>'archivist1@example.com'
+      @stub_user.stubs(:is_being_superuser?).returns false
+      @stub_user.stubs(:login).returns "fred"
+      RoleMapper.stubs(:roles).with(@stub_user.login).returns(["archivist","researcher"])
+      helper.stubs(:current_user).returns(@stub_user)
+      @solr_parameters = {}
+      @user_parameters = {}
+    end
+    it "should set query fields for the user id checking against the discover, access, read fields" do
+      helper.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.login}/)      
+      end
+    end
+    it "should set query fields for all roles the user is a member of checking against the discover, access, read fields" do
+      helper.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/)        
+      end
+    end
+    # it "should filter out any content whose embargo date is in the future" do
+    #   helper.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+    #   @solr_parameters[:fq].should include("-embargo_release_date_dt:[NOW TO *]")
+    # end
+    it "should allow content owners access to their embargoed content" do
+      pending
+      helper.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+      @solr_parameters[:fq].should include("(NOT embargo_release_date_dt:[NOW TO *]) OR depositor_t:#{@stub_user.login}")
+      
+      # @solr_parameters[:fq].should include("embargo_release_date_dt:[NOW TO *] AND  depositor_t:#{current_user.login}) AND NOT (NOT depositor_t:#{current_user.login} AND embargo_release_date_dt:[NOW TO *]")
+    end
+    
+    describe "for superusers" do
+      it "should return superuser access level" do
+        stub_user = User.new
+        stub_user.stubs(:login).returns "suzie"
+        stub_user.stubs(:is_being_superuser?).returns true
+        RoleMapper.stubs(:roles).with(stub_user.login).returns(["archivist","researcher"])
+        helper.stubs(:current_user).returns(stub_user)
+        helper.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+        ["discover","edit","read"].each do |type|    
+          @solr_parameters[:fq].first.should match(/#{type}_access_person_t\:\[\* TO \*\]/)          
+        end
+      end
+      it "should not return superuser access to non-superusers" do
+        stub_user = User.new
+        stub_user.stubs(:login).returns "suzie"
+        stub_user.stubs(:is_being_superuser?).returns false
+        RoleMapper.stubs(:roles).with(stub_user.login).returns(["archivist","researcher"])
+        helper.stubs(:current_user).returns(stub_user)
+        helper.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
+        ["discover","edit","read"].each do |type|
+          @solr_parameters[:fq].should_not include("#{type}_access_person_t\:\[\* TO \*\]")              
+        end
+      end
+    end
+
+  end
+  
+  describe "exclude_unwanted_models" do
+    before(:each) do
+      stub_user = User.new :email=>'archivist1@example.com'
+      stub_user.stubs(:is_being_superuser?).returns false
+      helper.stubs(:current_user).returns(stub_user)
+      @solr_parameters = {}
+      @user_parameters = {}
+    end
+    it "should set solr query parameters to filter out FileAssets" do
+      helper.send(:exclude_unwanted_models, @solr_parameters, @user_parameters)
+      @solr_parameters[:fq].should include("-has_model_s:\"info:fedora/afmodel:FileAsset\"")  
+    end
+  end
+  
  describe "build_lucene_query" do
 
    it "should return fields for all roles the user is a member of checking against the discover, access, read fields" do

data/test_support/spec/models/hydra_rights_metadata_spec.rb

@@ -5,7 +5,8 @@ require "nokogiri"
 describe Hydra::RightsMetadata do
   
   before(:each) do
-    ActiveFedora::RubydoraConnection.stubs(:instance).returns(stub_everything())
+    # The way RubyDora loads objects prevents us from stubbing the fedora connection :(
+    # ActiveFedora::RubydoraConnection.stubs(:instance).returns(stub_everything())
     obj = ActiveFedora::Base.new
     @sample = Hydra::RightsMetadata.new(obj.inner_object, nil)
     @sample.stubs(:content).returns('')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 1923832027
+  hash: 1923832029
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 1
-  version: 3.1.0.pre1
+  - 2
+  version: 3.1.0.pre2
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 -05:00
+date: 2011-11-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,14 +60,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15424103
+        hash: 1
         segments: 
         - 3
         - 1
-        - 0
-        - rc
         - 1
-        version: 3.1.0.rc1
+        version: 3.1.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -745,6 +743,7 @@ files:
 - README_RAKE_TASKS.textile
 - README_SUBTREE.textile
 - README_TERSE.textile
+- RELEASE_NOTES.textile
 - Rakefile
 - TESTING.textile
 - TESTING_PLUGIN.textile
@@ -1166,7 +1165,7 @@ files:
 - vendor/cache/abstract-1.0.0.gem
 - vendor/cache/actionmailer-3.0.10.gem
 - vendor/cache/actionpack-3.0.10.gem
-- vendor/cache/active-fedora-3.1.0.rc1.gem
+- vendor/cache/active-fedora-3.1.1.gem
 - vendor/cache/activemodel-3.0.10.gem
 - vendor/cache/activerecord-3.0.10.gem
 - vendor/cache/activeresource-3.0.10.gem
@@ -1183,23 +1182,23 @@ files:
 - vendor/cache/crack-0.3.1.gem
 - vendor/cache/cucumber-1.1.0.gem
 - vendor/cache/cucumber-rails-1.1.1.gem
-- vendor/cache/curb-0.7.15.gem
+- vendor/cache/curb-0.7.16.gem
 - vendor/cache/daemons-1.1.4.gem
 - vendor/cache/database_cleaner-0.6.7.gem
 - vendor/cache/diff-lcs-1.1.3.gem
 - vendor/cache/equivalent-xml-0.2.8.gem
 - vendor/cache/erubis-2.6.6.gem
 - vendor/cache/facets-2.8.4.gem
-- vendor/cache/factory_girl-2.2.0.gem
+- vendor/cache/factory_girl-2.1.2.gem
 - vendor/cache/fastercsv-1.5.4.gem
-- vendor/cache/ffi-1.0.10.gem
-- vendor/cache/gherkin-2.5.4.gem
+- vendor/cache/ffi-1.0.9.gem
+- vendor/cache/gherkin-2.5.2.gem
 - vendor/cache/gyoku-0.4.4.gem
 - vendor/cache/haml-3.1.3.gem
 - vendor/cache/httparty-0.8.1.gem
 - vendor/cache/httpi-0.9.5.gem
 - vendor/cache/i18n-0.5.0.gem
-- vendor/cache/jettywrapper-1.0.1.gem
+- vendor/cache/jettywrapper-1.0.2.gem
 - vendor/cache/json-1.6.1.gem
 - vendor/cache/json_pure-1.6.1.gem
 - vendor/cache/kaminari-0.12.4.gem
@@ -1218,7 +1217,7 @@ files:
 - vendor/cache/nokogiri-1.5.0.gem
 - vendor/cache/nori-1.0.2.gem
 - vendor/cache/om-1.4.3.gem
-- vendor/cache/polyglot-0.3.2.gem
+- vendor/cache/polyglot-0.3.3.gem
 - vendor/cache/rack-1.2.4.gem
 - vendor/cache/rack-mount-0.6.14.gem
 - vendor/cache/rack-test-0.5.7.gem
@@ -1228,18 +1227,18 @@ files:
 - vendor/cache/rbx-require-relative-0.0.5.gem
 - vendor/cache/rdf-0.3.4.1.gem
 - vendor/cache/rdf-rdfxml-0.3.5.gem
-- vendor/cache/rdoc-3.11.gem
+- vendor/cache/rdoc-3.10.gem
 - vendor/cache/rest-client-1.6.7.gem
 - vendor/cache/rsolr-1.0.2.gem
 - vendor/cache/rsolr-ext-1.0.3.gem
-- vendor/cache/rspec-2.7.0.gem
-- vendor/cache/rspec-core-2.7.1.gem
-- vendor/cache/rspec-expectations-2.7.0.gem
-- vendor/cache/rspec-mocks-2.7.0.gem
-- vendor/cache/rspec-rails-2.7.0.gem
+- vendor/cache/rspec-2.6.0.gem
+- vendor/cache/rspec-core-2.6.4.gem
+- vendor/cache/rspec-expectations-2.6.0.gem
+- vendor/cache/rspec-mocks-2.6.0.gem
+- vendor/cache/rspec-rails-2.6.1.gem
 - vendor/cache/ruby-debug-0.10.4.gem
 - vendor/cache/ruby-debug-base-0.10.4.gem
-- vendor/cache/rubydora-0.1.9.gem
+- vendor/cache/rubydora-0.2.3.gem
 - vendor/cache/rubyzip-0.9.4.gem
 - vendor/cache/sanitize-2.0.3.gem
 - vendor/cache/savon-0.9.7.gem
@@ -1247,7 +1246,7 @@ files:
 - vendor/cache/solr-ruby-0.0.8.gem
 - vendor/cache/solrizer-1.1.2.gem
 - vendor/cache/solrizer-fedora-1.1.3.gem
-- vendor/cache/stomp-1.1.9.gem
+- vendor/cache/stomp-1.1.10.gem
 - vendor/cache/term-ansicolor-1.0.7.gem
 - vendor/cache/thor-0.14.6.gem
 - vendor/cache/treetop-1.4.10.gem