hydra-head 3.0.1 → 3.1.0.pre1

data/solr_conf/conf/solrconfig.xml

@@ -82,121 +82,36 @@
      </lst>
   </requestHandler>
 
-  <!-- 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>
-
-
-        <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>
+  <!-- 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
+  -->
 
-        <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="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>
+  
   <requestHandler name="public_search" class="solr.SearchHandler" >
     <lst name="defaults">
       <!-- Making defType lucene to exclude file assets -->
@@ -207,8 +122,6 @@
       <!-- 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/tasks/hydra-head.rake

@@ -180,19 +180,19 @@ namespace :hyhead do
       FileUtils.cp_r(File.join('..','..','test_support','fixtures'), File.join('.','test_support','fixtures'))
       
       puts "Executing bundle install --local"
-      %x[bundle install --local]
+      puts %x[bundle install --local]
       errors << 'Error running bundle install in test app' unless $?.success?
 
       puts "Installing cucumber in test app"
-      %x[rails g cucumber:install]
+      puts %x[rails g cucumber:install]
       errors << 'Error installing cucumber in test app' unless $?.success?
 
       puts "generating default blacklight install"
-      %x[rails generate blacklight --devise]
+      puts %x[rails generate blacklight --devise]
       errors << 'Error generating default blacklight install' unless $?.success?
       
       puts "generating default hydra-head install"
-      %x[rails generate hydra:head -df]  # using -f to force overwriting of solr.yml
+      puts %x[rails generate hydra:head -df]  # using -f to force overwriting of solr.yml
       errors << 'Error generating default hydra-head install' unless $?.success?
 
       # set log_level to :warn in the test app's test environment. (:debug is too verbose)
@@ -201,7 +201,7 @@ namespace :hyhead do
 
       puts "Running rake db:migrate"
       %x[rake db:migrate]
-      %x[rake db:migrate RAILS_ENV=test]
+      %x[rake db:test:prepare]
       raise "Errors: #{errors.join("; ")}" unless errors.empty?
 
 
@@ -223,7 +223,7 @@ namespace :hyhead do
   task :test => [:use_test_app]  do
     
     puts "Running rspec tests"
-    puts %x[rake hyhead:spec:rcov]
+    puts %x[rake hyhead:spec]
     rspec_success = $?.success?
 
     puts "Running cucumber tests"

data/test_support/features/absent_model_search_result.feature

@@ -1,8 +1,14 @@
 Feature: Objects Without Models - Search Results
   I want to see appropriate information in search results for objects without an (active)fedora model
 
-  # Objects without a model, are not ever displayed because they don't have rightsMetadata
-    
+  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
   Scenario: html5 valid - unauthenticated 
     When I am on the home page
     And I fill in "q" with "test"

data/test_support/features/step_definitions/edit_metadata_steps.rb

@@ -48,7 +48,7 @@ Then /^I should see a "([^"]*)" button(?: within "([^"]*)")?$/ do |button_locato
 end
 
 Given /^that "([^"]*)" has been loaded into fedora$/ do |pid|
-  Hydra::FixtureLoader.new('test_support/fixtures').reload(pid)
+  ActiveFedora::FixtureLoader.new('test_support/fixtures').reload(pid)
   
 end
 

data/test_support/fixtures/small_file.txt

@@ -0,0 +1 @@
+small

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -60,10 +60,8 @@ describe CatalogController do
     
     describe "access controls" do
       before(:all) do
-        @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"]
+        @public_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"public"}]
+        @private_only_results = Blacklight.solr.find Hash[:phrases=>{:access_t=>"private"}]
       end
 
       it "should only return public documents if role does not have permissions" do
@@ -74,8 +72,7 @@ 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
-        mock_user.stubs(:is_being_superuser?).returns(true)
+        session[:superuser_mode] = true
         controller.stubs(:current_user).returns(mock_user)
         get :index
         assigns(:document_list).count.should > @public_only_results.docs.count
@@ -87,24 +84,28 @@ describe CatalogController do
   describe "load_fedora_document" do
 
     it "should load @document_fedora and @file_assets" do
-      controller.stubs(:params).returns({:id=>"foo:id"})
-      stub_base_object = stub("Base Object")
-      ActiveFedora::ContentModel.expects(:known_models_for).with( stub_base_object ).returns( [ModsAsset] )
-      stub_mods_asset = stub("MODS Asset")
-      stub_mods_asset.expects(:file_objects).with(:response_format=>:solr).returns("file assets response")
+      # controller.stubs(:params).returns({:id=>"foo:id"})
+      # stub_base_object = stub("Base Object")
+      # ActiveFedora::ContentModel.expects(:known_models_for).with( stub_base_object ).returns( [ModsAsset] )
+      # stub_mods_asset = stub("MODS Asset")
+      # stub_mods_asset.expects(:file_objects).with(:response_format=>:solr).returns("file assets response")
       
       # Note: Had to stub Fedora::Repository.instance.find_model rather than stubbing ActiveFedora::Base.load_instance and ModsAsset.load_instance because 
       # Mocha was not unstubbing the ModsAsset class
       #
       # ActiveFedora::Base.stubs(:load_instance).with("foo:id").returns( stub_base_object )
       # ModsAsset.stubs(:load_instance).with("foo:id").returns( stub_mods_asset )
-      Fedora::Repository.instance.expects(:find_model).with("foo:id", ActiveFedora::Base).returns( stub_base_object )
-      Fedora::Repository.instance.expects(:find_model).with("foo:id", ModsAsset).returns( stub_mods_asset )
+      # Fedora::Repository.instance.expects(:find_model).with("foo:id", ActiveFedora::Base).returns( stub_base_object )
+      # Fedora::Repository.instance.expects(:find_model).with("foo:id", ModsAsset).returns( stub_mods_asset )
       
+      controller.params[:id]='hydrangea:fixture_mods_article1'
       controller.load_fedora_document
       
-      assigns[:document_fedora].should == stub_mods_asset
-      assigns[:file_assets].should == "file assets response"
+      assigns[:document_fedora].class.should == ModsAsset 
+      assigns[:document_fedora].pid.should == 'hydrangea:fixture_mods_article1' 
+      assigns[:file_assets].class.should == Solr::Response::Standard
+      assigns[:file_assets].hits.size.should == 1
+      assigns[:file_assets].hits.first["id"].should == "hydrangea:fixture_uploaded_svg1"
     end
   end
   

data/test_support/spec/controllers/file_assets_controller_spec.rb

@@ -65,12 +65,7 @@ describe FileAssetsController do
   end
 
   describe "index" do
-    before(:each) do
-      Fedora::Repository.stubs(:instance).returns(stub_everything)
-    end
-
     it "should be refined further!"
-    
   end
   describe "new" do
     it "should return the file uploader view"
@@ -117,11 +112,11 @@ describe FileAssetsController do
       controller.expects(:model_config).at_least_once.returns(controller.workflow_config[:mods_assets])
       xhr :post, :create, :container_id=>"_PID_", :wf_step=>"files"
       response.should redirect_to(:controller=>"catalog", :id=>"_PID_", :action => 'edit', :wf_step=>"permissions")
-      response.flash[:notice].should == "You must specify a file to upload."
+      request.flash[:notice].should == "You must specify a file to upload."
     end
     it "should display a message that you need to select a file to upload if no Filedata is provided" do
       xhr :post, :create
-      response.flash[:notice].include?("You must specify a file to upload.").should be_true
+      request.flash[:notice].include?("You must specify a file to upload.").should be_true
     end
     
   end
@@ -144,11 +139,10 @@ describe FileAssetsController do
   
   describe "integration tests - " do
     before(:all) do
-      Fedora::Repository.register(ActiveFedora.fedora_config[:url])
       ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
       @test_container = ActiveFedora::Base.new
-      @test_container.add_relationship(:is_member_of, "foo:1")
-      @test_container.add_relationship(:has_collection_member, "foo:2")
+      @test_container.add_relationship(:is_member_of, "info:fedora/foo:1")
+      @test_container.add_relationship(:has_collection_member, "info:fedora/foo:2")
       @test_container.save
       
       @test_fa = FileAsset.new
@@ -182,13 +176,12 @@ describe FileAssetsController do
       end
 
       it "should set is_part_of relationship on the new File Asset pointing back at the container" do
-        
-        test_file = fixture("empty_file.txt")
+        test_file = fixture("small_file.txt")
         filename = "My File Name"
         test_file.expects(:original_filename).twice.returns("My File Name")
         post :create, {:Filedata=>[test_file], :Filename=>filename, :container_id=>@test_container.pid}
-        assigns(:file_asset).relationships[:self][:is_part_of].should == ["info:fedora/#{@test_container.pid}"] 
-        retrieved_fa = FileAsset.load_instance(@test_fa.pid).relationships[:self][:is_part_of].should == ["info:fedora/#{@test_container.pid}"]
+        assigns(:file_asset).ids_for_outbound(:is_part_of).should == [@test_container.pid] 
+        retrieved_fa = FileAsset.load_instance(@test_fa.pid).ids_for_outbound(:is_part_of).should == [@test_container.pid]
       end
     end
   end

data/test_support/spec/controllers/permissions_controller_spec.rb

@@ -30,15 +30,19 @@ describe PermissionsController do
       stub_solrizer = stub("solrizer", :solrize)
       Solrizer::Fedora::Solrizer.stubs(:new).returns(stub_solrizer)
       mock_ds = mock("Datastream")
-      Hydra::RightsMetadata.stubs(:from_xml).returns(mock_ds)
+      Hydra::RightsMetadata.stubs(:from_xml)
+      Hydra::RightsMetadata.stubs(:new).returns(mock_ds)
       mock_ds.expects(:permissions).with({"person" => "_person_id_"}, "read")
       # mock_ds.expects(:update_permissions).with({"person"=>{"_person_id_"=>"read"}})
       mock_ds.stubs(:content)
       mock_ds.stubs(:pid=)
       mock_ds.stubs(:dsid=)
       mock_ds.stubs(:save)
+      mock_ds.stubs(:serialize!)
       mock_object = mock("object")
-      mock_object.stubs(:datastreams_in_memory).returns({"rightsMetadata"=>mock_ds})
+      mock_object.stubs(:datastreams).returns({"rightsMetadata"=>mock_ds})
+      mock_inner = mock('Mock Inner')
+      mock_object.stubs(:inner_object).returns(mock_inner)
       
       ActiveFedora::Base.expects(:load_instance).with("_pid_").returns(mock_object)
 
@@ -52,14 +56,18 @@ describe PermissionsController do
       stub_solrizer = stub("solrizer", :solrize)
       Solrizer::Fedora::Solrizer.stubs(:new).returns(stub_solrizer)
       mock_ds = mock("Datastream")
-      Hydra::RightsMetadata.stubs(:from_xml).returns(mock_ds)
+      Hydra::RightsMetadata.stubs(:from_xml)
+      Hydra::RightsMetadata.stubs(:new).returns(mock_ds)
       mock_ds.expects(:update_permissions).with({"group" => {"_group_id_"=>"discover"}})
       mock_ds.stubs(:content)
       mock_ds.stubs(:pid=)
       mock_ds.stubs(:dsid=)
+      mock_ds.stubs(:serialize!)
       mock_ds.stubs(:save)
       mock_object = mock("object")
-      mock_object.stubs(:datastreams_in_memory).returns({"rightsMetadata"=>mock_ds})
+      mock_object.stubs(:datastreams).returns({"rightsMetadata"=>mock_ds})
+      mock_inner = mock('Mock Inner')
+      mock_object.stubs(:inner_object).returns(mock_inner)
       
       ActiveFedora::Base.expects(:load_instance).with("_pid_").returns(mock_object)
       # must define new routes that can handle url like this

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -2,83 +2,6 @@
 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/helpers/hydra_model_methods_spec.rb

@@ -10,7 +10,7 @@ describe Hydra::ModelMethods do
       prop_ds.expects(:depositor_values=).with("foouser")
       rights_ds.expects(:update_indexed_attributes).with([:edit_access, :person]=>"foouser")
 
-      helper.stubs(:datastreams_in_memory).returns({"rightsMetadata"=>rights_ds,"properties"=>prop_ds})
+      helper.stubs(:datastreams).returns({"rightsMetadata"=>rights_ds,"properties"=>prop_ds})
       helper.apply_depositor_metadata("foouser")
     end
   end
@@ -36,13 +36,18 @@ describe Hydra::ModelMethods do
   
   describe "set_title" do
     it "should set the title if the descMetadata is a NokogiriDatastream that responds to :title term" do
-      dm = Hydra::ModsArticle.new
+      obj = ActiveFedora::Base.new
+      dm = Hydra::ModsArticle.new(obj.inner_object, nil)
+      dm.stubs(:content).returns('')
       helper.stubs(:datastreams).returns("descMetadata"=>dm)
       helper.set_title("My title")
       dm.term_values(:title).should == ["My title"]
     end
     it "should set the title if the descMetadata is a MetadataDatastream with a title field defined" do
-      dm = ActiveFedora::QualifiedDublinCoreDatastream.new
+      obj = ActiveFedora::Base.new
+      dm = ActiveFedora::QualifiedDublinCoreDatastream.new(obj.inner_object, nil)
+      dm.stubs(:content).returns('')
+      #dm = ActiveFedora::QualifiedDublinCoreDatastream.new  nil, nil 
       helper.stubs(:datastreams).returns("descMetadata"=>dm)
       helper.set_title("My title")
       dm.title_values.should == ["My title"]
@@ -55,7 +60,7 @@ describe Hydra::ModelMethods do
       prop_ds.expects(:respond_to?).with(:collection_values).returns(true)
       prop_ds.expects(:collection_values=).with("mods_asset")
 
-      helper.stubs(:datastreams_in_memory).returns({"properties"=>prop_ds})
+      helper.stubs(:datastreams).returns({"properties"=>prop_ds})
       helper.set_collection_type("mods_asset")
     end
   end