hydra-head 3.0.0.rc2 → 3.0.0

data/README.textile

@@ -74,7 +74,7 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
   gem 'rails', '~>3.0.10'
 
   gem 'blacklight', '~> 3.0.0'
-  gem 'hydra-head', '3.0.0.rc1'
+  gem 'hydra-head', '3.0.0.rc2'
 
   # We will assume that you're using sqlite3 for testing/demo, 
   # but in a production setup you probably want to use a real sql database like mysql or postgres
@@ -95,6 +95,7 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
          gem 'database_cleaner'
          gem 'capybara'
          gem 'bcrypt-ruby'
+         gem "jettywrapper"
   end
 </pre>
 
@@ -110,7 +111,7 @@ Even if all of the dependencies are satisfied, this will take a _very_ long time
 
 <pre>
   gem install blacklight
-  gem install hydra-head -v 3.0.0.rc1
+  gem install hydra-head -v 3.0.0.rc2
 </pre>
 
 Then re-run bundle install and it will run slightly faster.
@@ -190,6 +191,34 @@ git submodule init
 git submodule update
 </pre>
 
+*Important*: To apply the your application's solrconfig.xml and schema.xml to the copy of solr in hydra-jetty, run this:
+
+<pre>
+  rake hydra:jetty:config
+</pre>
+
+Now you're ready to start jetty.  We've written a useful gem that gives you rake tasks for starting and stopping jetty.  Make sure you have jettywrapper in your Gemfile
+
+<pre>
+  gem "jettywrapper"
+</pre>
+
+Then run <pre>  bundle install <pre>
+
+Now that you have jettywrapper installed, to start jetty use
+
+<pre>
+  rake jetty:start
+</pre>
+
+To stop jetty
+
+<pre>
+  rake jetty:stop
+</pre>
+
+For more information about using jettywrapper, see http://hudson.projecthydra.org/job/jettywrapper/Documentation/
+
 h3.  RSpec and Cucumber for Testing
 
 We STRONGLY recommend that you write tests for every local change you make.  This will allow you to ensure that upgrading the core code doesn't break any local changes you have made.

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/helpers/application_helper.rb

@@ -29,22 +29,6 @@ module ApplicationHelper
   def linked_label(field, field_string)
     link_to(field, add_facet_params(field_string, field).merge!({"controller" => "catalog", :action=> "index"}))
   end
-  def link_to_document(doc, opts={:label=>Blacklight.config[:index][:show_link].to_sym, :counter => nil,:title => nil})
-    label = case opts[:label]
-      when Symbol
-        doc.get(opts[:label])
-      when String
-        opts[:label]
-      else
-        raise 'Invalid label argument'
-      end
-
-    if label.blank?
-      label = doc[:id]
-    end
-    
-    link_to_with_data(label, catalog_path(doc[:id]), {:method => :put, :data => {:counter => opts[:counter]},:title=>opts[:title]})
-  end
 
   # currently only used by the render_document_partial helper method (below)
   def document_partial_name(document)

data/app/helpers/blacklight_helper.rb

@@ -34,7 +34,7 @@ module BlacklightHelper
   def link_to_document(doc, opts={:label=>Blacklight.config[:index][:show_link].to_sym, :counter => nil,:title => nil})
     label = case opts[:label]
       when Symbol
-        doc.fetch(opts[:label], "foo")
+        doc.fetch(opts[:label], "")
       when String
         opts[:label]
       else

data/lib/generators/hydra/head_generator.rb

@@ -118,7 +118,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,9 +42,16 @@ 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",
+      "active_fedora_model_s",
       "pub_date",
       "subject_topic_facet",
       "language_facet",
@@ -53,7 +60,7 @@ Blacklight.configure(:shared) do |config|
       "subject_era_facet"
     ]),
     :labels => {
-      "object_type_facet"   => "Format",
+      "active_fedora_model_s"   => "Format",
       "pub_date"            => "Publication Year",
       "subject_topic_facet" => "Topic",
       "language_facet"      => "Language",

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.0.0.rc2"
+  VERSION = "3.0.0"
 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/lib/railties/hydra_jetty.rake

@@ -13,6 +13,14 @@ JETTY_PARAMS = {
 }
 
 #:jetty_port => ENV['HYDRA_JETTY_PORT'],
+
+namespace :jetty do
+  desc "Apply all configs to Testing Server (relies on hydra:jetty:config tasks unless you override it)"
+  task :config do
+    Rake::Task["hydra:jetty:config"].invoke
+  end
+end
+
 namespace :hydra do
   namespace :jetty do
     desc "Starts the bundled Hydra Testing Server"
@@ -39,13 +47,12 @@ namespace :hydra do
       Rake::Task["hydra:jetty:config_solr"].invoke
     end
     
-    desc "Copies the default SOLR config for the bundled Hydra Testing Server"
+    desc "Copies the contents of solr_conf into the Solr development-core and test-core of Testing Server"
     task :config_solr do
-      FileList['solr_conf/conf/*'].each do |f|  
-        cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
-        cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
-    end
-
+      FileList['solr_conf/*'].each do |f|  
+        cp_r("#{f}", 'jetty/solr/development-core/', :verbose => true)
+        cp_r("#{f}", 'jetty/solr/test-core/', :verbose => true)
+      end
     end
 
     desc "Copies a custom fedora config for the bundled Hydra Testing Server"

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,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/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/features/html_validity.feature

@@ -14,14 +14,14 @@ Feature: HTML validity
     
   Scenario: Search Results (unauthenticated)
     Given I am on the home page
-    When I follow "Article"
+    When I follow "ModsAsset"
     Then I should see "TITLE OF HOST JOURNAL"
     And the page should be HTML5 valid
     
   Scenario: Search Results (authenticated)
     Given I am logged in as "archivist1@example.com" 
     When I am on the home page
-    And I follow "Article"
+    And I follow "ModsAsset"
     Then I should see "TITLE OF HOST JOURNAL"
     And the page should be HTML5 valid
     

data/test_support/features/mods_asset_search_result.feature

@@ -13,12 +13,12 @@ Feature: ModsAsset Search Result
 
   Scenario: html5 valid - unauthenticated 
     Given I am on the home page
-    When I follow "Article"
+    When I follow "ModsAsset"
     Then the page should be HTML5 valid
 
   Scenario: html5 valid - authenticated 
     Given I am logged in as "archivist1@example.com" 
     When I am on the home page
-    And I follow "Article"
+    And I follow "ModsAsset"
     Then the page should be HTML5 valid
 

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

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 15424113
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 3
   - 0
   - 0
-  - rc
-  - 2
-  version: 3.0.0.rc2
+  version: 3.0.0
 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 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 -05:00
+date: 2011-11-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -757,6 +755,7 @@ files:
 - README_RAKE_TASKS.textile
 - README_SUBTREE.textile
 - README_TERSE.textile
+- RELEASE_NOTES.textile
 - Rakefile
 - TESTING.textile
 - TESTING_PLUGIN.textile
@@ -1282,14 +1281,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: