hydra-head 4.0.0 → 4.0.1

data/tasks/hyhead_rspec.rake

@@ -28,7 +28,7 @@ begin
   namespace :hyhead do
     
     namespace :spec do
-      [:controllers, :generators, :helpers, :integration, :lib, :mailers, :models, :requests, :routing, :unit, :utilities, :utilities, :views].each do |sub|
+      [:controllers, :generators, :helpers, :integration, :lib, :mailers, :models, :requests, :routing, :unit, :utilities, :views].each do |sub|
         desc "Run the code examples in spec/#{sub}"
         RSpec::Core::RakeTask.new(sub => spec_prereq) do |t|
         #RSpec::Core::RakeTask.new(sub) do |t|
@@ -51,7 +51,7 @@ rescue LoadError
   # these tasks) even if you don't have rspec installed. 
   desc 'rspec rake tasks not available (rspec not installed)'
   task :spec do
-    abort 'Rspec rake tasks  not available. Be sure to install rspec gems. '
+    abort 'Rspec rake tasks not available. Be sure to install rspec gems.'
   end
 end
 

data/test_support/etc/Gemfile

@@ -21,7 +21,7 @@ group :development, :test do
        gem 'mocha'
        gem 'cucumber-rails', :require => false
        gem 'capybara'
-       gem 'factory_girl'
+       gem 'factory_girl', '~> 2.6.0'
        gem 'rest-client'
        gem 'solrizer-fedora', '>=1.2.5'
 end
@@ -32,5 +32,6 @@ group :assets do
   gem 'sass-rails',   '~> 3.2.4'
   gem 'coffee-rails', '~> 3.2.2'
   gem 'uglifier', '>= 1.2.3'
+  gem 'jquery-rails', '>= 1.0.12'
 end
 

data/test_support/features/button_delete_asset.feature

@@ -0,0 +1,13 @@
+@delete
+Feature: Button to delete assets
+  In order delete assets
+  As a person with permissions to the object
+  I want to see an asset being deleted
+  
+  Scenario: Deleting a standard asset.
+    Given I am logged in as "archivist1@example.com"
+    When I am on the home page
+    And I follow "Add a Basic MODS Asset"
+    Then I should see "Created a Mods Asset with pid "
+    When I press "Delete This Item"
+    Then I should see "Deleted changeme:"

data/test_support/features/file_upload.feature

@@ -47,6 +47,13 @@ Feature: Upload file into a document
     When I press "Upload File"
     Then the page should be HTML5 valid
   
+  Scenario: Downloading files
+    Given I am logged in as "archivist1@example.com"
+    When I am on the edit files page for hydrangea:fixture_mods_article1
+    Then I should see "image.jp2"
+    When I follow "image.jp2"
+    Then I should receive an "image/jp2" file named "image.jp2"
+  
   # Not sure if the file asset list is valid.  Will the user ever actually be here?  
   # @nojs
   # Scenario: Upload files on file assets list page

data/test_support/features/step_definitions/file_list_steps.rb

@@ -26,3 +26,11 @@ Then /^I (should|should not) see a link to "([^"]*)" with label "([^"]*)" in the
     end
   end
 end
+
+Then /^I should receive an? "([^"]*)" file named "([^"]*)"$/ do |content_type, file|
+  result = page.response_headers['Content-Type'].should == content_type
+  if result
+    result = page.response_headers['Content-Disposition'].should =~ /filename="#{file}"/
+  end
+  result
+end

data/test_support/features/step_definitions/html_validity_steps.rb

@@ -3,7 +3,44 @@ require "nokogiri"
 require 'rest_client'
 
 Then /^the page should be HTML5 valid$/ do
-  response_is_html_valid?(page.body).should be_true
+  response_is_html_valid?(page.source).should be_true
+end
+
+class Html5Validator
+  BASE_URI = 'http://html5.validator.nu'
+  HEADERS = { 'Content-Type' => 'text/html; charset=utf-8', 'Content-Encoding' => 'UTF-8' }
+
+  def initialize(text)
+    @text = text
+
+  end
+
+  def valid?
+    errors.empty?
+  end
+
+  def errors
+    validation['messages'].select { |msg| msg['type'] == 'error' }
+  end
+
+  def validation
+    @validation ||= validate!
+  end
+
+  def inspect
+    str = "\n#{validator.errors.length} HTML5 Validation Error(s):\n"
+    errors.each_with_index do |error,i|
+      str << "  #{i+1}) #{ error['message'] }\n"
+    end
+
+    str
+  end
+
+  private
+  def validate!
+    response = RestClient.post "#{BASE_URI}/?out=json", @text, HEADERS
+    JSON.parse(response.body)
+  end
 end
 
 private
@@ -12,10 +49,8 @@ def response_is_html_valid?(resp)
   begin
     # http://validator.w3.org/docs/api.html says to sleep for at least 1 second between requests.  Just making sure we don't get throttled.
     sleep(1.0)
-    validator_response = RestClient.post("http://validator.w3.org/check",
-                                         :output => "soap12",
-                                         :doctype => "HTML5",
-                                         :fragment => resp)
+    validator = Html5Validator.new(resp)
+    return true if validator.valid?
   rescue SocketError, RestClient::BadGateway #meaning we're either not connected to the internet or we were throttled by the validator.
     puts "WARNING: No connection to W3C validator.  Page may not be HTML5 valid!"
     return true
@@ -23,45 +58,7 @@ def response_is_html_valid?(resp)
     puts "WARNING: Timeout connecting to W3C validator.  Page may not be HTML5 valid!"
     return true
   end
-  
-  xml = Nokogiri::XML(validator_response)
-
-  #removing namespaces because we really don't care
-  xml.remove_namespaces!
-
-  fault = xml.xpath("//Fault/Code/Subcode/Value").text
-  if fault.present?
-    puts "WARNING: There was an error with the W3C validator.  Page may not be HTML5 valid!"
-    puts "FAULT: #{fault}"
-    return true
-  end
-
-  # "true" or "false"
-  valid = xml.xpath("//validity").text
-  error_list = xml.xpath("//errors/errorlist/error")
-  warning_list = xml.xpath("//warnings/warninglist/warning")
-
-  error_count = xml.xpath("//errors/errorcount").text
-  warning_count = xml.xpath("//warnings/warningcount").text
 
-  errors = []
-  warnings = []
-  error_list.each do |err|
-    errors << {:message => err.xpath("./message").text, :source => err.xpath("./source").text, :line => err.xpath("./line").text, :col => err.xpath("./col").text}
-  end
-
-  warning_list.each do |warn|
-    warnings << warn.xpath("./message").text
-  end
-  
-  if valid == "true"
-    return true
-  else
-    text = "\n#{error_count} HTML5 Validation Error(s):\n"
-    errors.each_with_index do |error,i|
-      text << "  #{i+1}) Line #{error[:line]}, Column #{error[:col]}: #{error[:message]}\n"
-    end
-    puts text unless errors == []
-    return false
-  end
+  puts validator.inspect
+  return false
 end

data/test_support/spec/controllers/file_assets_controller_spec.rb

@@ -27,22 +27,16 @@ describe Hydra::FileAssetsController do
       xhr :get, :index
       assigns[:solr_result].should == "solr result"
     end
-    it "should find all file assets belonging to a given container object if container_id or container_id is provided" do
-      mock_container = mock("container")
-      mock_container.expects(:file_objects).with(:response_format => :solr).returns("solr result")
-      controller.expects(:get_search_results).with(:q=>'is_part_of_s:info\:fedora/_PID_').returns(["assets solr response","assets solr list"])
-      controller.expects(:get_solr_response_for_doc_id).with('_PID_').returns(["container solr response","container solr doc"])
-      controller.stubs(:load_permissions_from_solr)
-      
-      ActiveFedora::Base.expects(:find).with("_PID_", :cast=>true).returns(mock_container)
-      xhr :get, :index, :asset_id=>"_PID_"
-      assigns[:response].should == "assets solr response"
-      assigns[:document_list].should == "assets solr list"
+    it "should find all file assets belonging to a given container object if asset_id is provided" do
+      pid = 'hydrangea:fixture_mods_article3'
+      xhr :get, :index, :asset_id=>pid
+      assigns[:response][:response][:docs].first["id"].should == "hydrangea:fixture_file_asset1"
+      assigns[:document_list].first.id.should == "hydrangea:fixture_file_asset1"
       
-      assigns[:container_response].should == "container solr response"
-      assigns[:document].should == "container solr doc"
-      assigns[:solr_result].should == "solr result"
-      assigns[:container].should == mock_container
+      assigns[:container_response][:response][:docs].first["id"].should == "hydrangea:fixture_mods_article3"
+      assigns[:document].id.should == "hydrangea:fixture_mods_article3"
+      assigns[:solr_result].first["id"].should == "hydrangea:fixture_file_asset1"
+      assigns[:container].should == ModsAsset.find('hydrangea:fixture_mods_article3')
     end
     
   end
@@ -55,14 +49,15 @@ describe Hydra::FileAssetsController do
   end
 
   describe "show" do
-    it "should redirect to index view if current_user does not have read or edit permissions" do
+    it "should redirect back if current_user does not have read or edit permissions" do
       mock_user = mock("User")
       mock_user.stubs(:email).returns("fake_user@example.com")
       mock_user.stubs(:is_being_superuser?).returns(false)
       mock_user.stubs(:new_record?).returns(false)
       controller.stubs(:current_user).returns(mock_user)
+      request.env["HTTP_REFERER"] = "http://example.com/?q=search"
       get(:show, :id=>"hydrangea:fixture_file_asset1")
-      response.should redirect_to(:action => 'index')
+      response.should redirect_to("http://example.com/?q=search")
     end
     it "should redirect to index view if the file does not exist" do
       get(:show, :id=>"example:invalid_object")

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -16,7 +16,33 @@ describe Hydra::AccessControlsEnforcement do
       end
     end
   end
-
+  describe "enforce_show_permissions" do
+    it "should allow a user w/ edit permissions to view an embargoed object" do
+      user = User.new :email=>'testuser@example.com'
+      user.stubs(:is_being_superuser?).returns false
+      RoleMapper.stubs(:roles).with(user.email).returns(["archivist"])
+      helper.stubs(:current_user).returns(user)
+      helper.stubs(:load_permissions_from_solr).returns("")
+      helper.stubs(:can?).with(:edit, nil).returns(true)
+      helper.stubs(:can?).with(:read, nil).returns(true)
+      @permissions_solr_document = SolrDocument.new({"edit_access_person_t"=>["testuser@example.com"], "embargo_release_date_dt"=>(Date.parse(Time.now.to_s)+2).to_s})
+      helper.send(:enforce_show_permissions, {})
+      flash[:alert].should be_nil
+    end
+    it "should prevent a user w/o edit permissions from viewing an embargoed object" do
+      user = User.new :email=>'testuser@example.com'
+      user.stubs(:is_being_superuser?).returns false
+      RoleMapper.stubs(:roles).with(user.email).returns([])
+      helper.stubs(:current_user).returns(user)
+      helper.stubs(:load_permissions_from_solr).returns("")
+      helper.stubs(:can?).with(:edit, nil).returns(false)
+      helper.stubs(:can?).with(:read, nil).returns(true)
+      helper.stubs(:redirect_to)
+      @permissions_solr_document = SolrDocument.new({"edit_access_person_t"=>["testuser@example.com"], "embargo_release_date_dt"=>(Date.parse(Time.now.to_s)+2).to_s})
+      helper.send(:enforce_show_permissions, {})
+      flash[:alert].should == "This item is under embargo.  You do not have sufficient access privileges to read this document."
+    end
+  end
   describe "apply_gated_discovery" do
     before(:each) do
       @stub_user = User.new :email=>'archivist1@example.com'

data/test_support/spec/helpers/assets_controller_helper_spec.rb

@@ -8,17 +8,17 @@ describe Hydra::AssetsControllerHelper do
         "action"=>"update", 
         "_method"=>"put", 
         "field_selectors"=>{
-          "descMetadata"=>{"person_0_computing_id"=>[{"person"=>"0"}, "computing_id"], "journal_0_issue_start_page"=>[{"journal"=>"0"}, "issue", "start_page"], "person_1_description"=>[{"person"=>"1"}, "description"], "person_1_institution"=>[{"person"=>"1"}, "institution"], "journal_0_origin_info_publisher"=>[{"journal"=>"0"}, "origin_info", "publisher"], "abstract"=>["abstract"], "person_0_last_name"=>[{"person"=>"0"}, "last_name"], "person_0_description"=>[{"person"=>"0"}, "description"], "journal_0_issue_volume"=>[{"journal"=>"0"}, "issue", "volume"], "title_info_main_title"=>["title_info", "main_title"], "location_url"=>["location", "url"], "note"=>["note"], "person_1_last_name"=>[{"person"=>"1"}, "last_name"], "subject_topic"=>["subject", "topic"], "person_0_institution"=>[{"person"=>"0"}, "institution"], "person_1_first_name"=>[{"person"=>"1"}, "first_name"], "person_1"=>[{"person"=>"1"}], "journal_0_title_info_main_title"=>[{"journal"=>"0"}, "title_info", "main_title"], "journal_0_issue_level"=>[{"journal"=>"0"}, "issue", "level"], "journal_0_issue_end_page"=>[{"journal"=>"0"}, "issue", "end_page"], "peer_reviewed"=>["peer_reviewed"], "person_0_first_name"=>[{"person"=>"0"}, "first_name"], "person_1_computing_id"=>[{"person"=>"1"}, "computing_id"], "journal_0_issn"=>[{"journal"=>"0"}, "issn"], "journal_0_issue_publication_date"=>[{"journal"=>"0"}, "issue", "publication_date"]}, 
+          "descMetadata"=>{"person_0_computing_id"=>[{"person"=>"0"}, "computing_id"], "journal_0_issue_start_page"=>[{"journal"=>"0"}, "issue", "start_page"], "person_1_description"=>[{"person"=>"1"}, "description"], "person_1_institution"=>[{"person"=>"1"}, "institution"], "journal_0_origin_info_publisher"=>[{"journal"=>"0"}, "origin_info", "publisher"], "abstract"=>["abstract"], "person_0_last_name"=>[{"person"=>"0"}, "last_name"], "person_0_description"=>[{"person"=>"0"}, "description"], "journal_0_issue_volume"=>[{"journal"=>"0"}, "issue", "volume"], "title_info_main_title"=>["title_info", "main_title"], "location_url"=>["location", "url"], "note"=>["note"], "person_1_last_name"=>[{"person"=>"1"}, "last_name"], "subject_topic"=>["subject", "topic"], "person_0_institution"=>[{"person"=>"0"}, "institution"], "person_1_first_name"=>[{"person"=>"1"}, "first_name"], "person_1"=>[{"person"=>"1"}], "journal_0_title_info_main_title"=>[{"journal"=>"0"}, "title_info", "main_title"], "journal_0_issue_level"=>[{"journal"=>"0"}, "issue", "level"], "journal_0_issue_end_page"=>[{"journal"=>"0"}, "issue", "end_page"], "peer_reviewed"=>["peer_reviewed"], "person_0_first_name"=>[{"person"=>"0"}, "first_name"], "person_1_computing_id"=>[{"person"=>"1"}, "computing_id"], "journal_0_issn"=>[{"journal"=>"0"}, "issn"], "journal_0_issue_publication_date"=>[{"journal"=>"0"}, "issue", "publication_date"], "subject_topic" => ["subject", "topic", "subject", "topic"]}, 
           "rightsMetadata"=>{"embargo_embargo_release_date"=>["embargo", "embargo_release_date"]}, 
           "properties"=>{"release_to"=>["release_to"]}
           }, 
         "id"=>"hydrangea:fixture_mods_article3", 
         "controller"=>"assets", 
-        "asset"=>{"descMetadata"=>{"person_0_computing_id"=>{"0"=>""}, "journal_0_issue_start_page"=>{"0"=>"195"}, "person_1_description"=>{"0"=>""}, "person_1_institution"=>{"0"=>"Baltimore"}, "journal_0_origin_info_publisher"=>{"0"=>"PUBLISHER"}, "abstract"=>{"0"=>"ABSTRACT"}, "person_0_last_name"=>{"0"=>"Smith"}, "person_0_description"=>{"0"=>""}, "journal_0_issue_volume"=>{"0"=>"2               "}, "title_info_main_title"=>{"0"=>"Test Article"}, "location_url"=>{"0"=>"http://example.com/foo"}, "note"=>{"0"=>""}, "person_1_last_name"=>{"0"=>"Lacks"}, "subject_topic"=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, "person_0_institution"=>{"0"=>"FACULTY, UNIVERSITY"}, "person_1_first_name"=>{"0"=>"Henrietta"}, "journal_0_title_info_main_title"=>{"0"=>"The Journal of Mock Object"}, "journal_0_issue_level"=>{"0"=>""}, "journal_0_issue_end_page"=>{"0"=>"230"}, "person_0_first_name"=>{"0"=>"John"}, "person_1_computing_id"=>{"0"=>""}, "journal_0_issn"=>{"0"=>"1234-5678"}, "journal_0_issue_publication_date"=>{"0"=>"FEB. 2007"}}, "rightsMetadata"=>{"embargo_embargo_release_date"=>{"0"=>""}}, "properties"=>{"released"=>{"0"=>"true"}, "release_to"=>{"0"=>"public"}}}
+        "asset"=>{"descMetadata"=>{"person_0_computing_id"=>{"0"=>""}, "journal_0_issue_start_page"=>{"0"=>"195"}, "person_1_description"=>{"0"=>""}, "person_1_institution"=>{"0"=>"Baltimore"}, "journal_0_origin_info_publisher"=>{"0"=>"PUBLISHER"}, "abstract"=>{"0"=>"ABSTRACT"}, "person_0_last_name"=>{"0"=>"Smith"}, "person_0_description"=>{"0"=>""}, "journal_0_issue_volume"=>{"0"=>"2               "}, "title_info_main_title"=>{"0"=>"Test Article"}, "location_url"=>{"0"=>"http://example.com/foo"}, "note"=>{"0"=>""}, "person_1_last_name"=>{"0"=>"Lacks"}, "subject_topic"=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, "person_0_institution"=>{"0"=>"FACULTY, UNIVERSITY"}, "person_1_first_name"=>{"0"=>"Henrietta"}, "journal_0_title_info_main_title"=>{"0"=>"The Journal of Mock Object"}, "journal_0_issue_level"=>{"0"=>""}, "journal_0_issue_end_page"=>{"0"=>"230"}, "person_0_first_name"=>{"0"=>"John"}, "person_1_computing_id"=>{"0"=>""}, "journal_0_issn"=>{"0"=>"1234-5678"}, "journal_0_issue_publication_date"=>{"0"=>"FEB. 2007"}, "subject_topic" => {"0"=>"Topic1", "1"=>"Topic2"}}, "rightsMetadata"=>{"embargo_embargo_release_date"=>{"0"=>""}}, "properties"=>{"released"=>{"0"=>"true"}, "release_to"=>{"0"=>"public"}}}
         }
       
       expected_sane_params = {
-        "descMetadata"=>{[{:person=>0}, :institution]=>{"0"=>"FACULTY, UNIVERSITY"}, [{:journal=>0}, :title_info, :main_title]=>{"0"=>"The Journal of Mock Object"}, [{:journal=>0}, :issue, :volume]=>{"0"=>"2               "}, [{:journal=>0}, :issn]=>{"0"=>"1234-5678"}, [{:person=>1}, :first_name]=>{"0"=>"Henrietta"}, [{:person=>0}, :last_name]=>{"0"=>"Smith"}, [:location, :url]=>{"0"=>"http://example.com/foo"}, [:subject, :topic]=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, [{:person=>0}, :first_name]=>{"0"=>"John"}, [{:person=>1}, :computing_id]=>{"0"=>""}, [{:journal=>0}, :issue, :end_page]=>{"0"=>"230"}, [:note]=>{"0"=>""}, [:title_info, :main_title]=>{"0"=>"Test Article"}, [{:journal=>0}, :issue, :publication_date]=>{"0"=>"FEB. 2007"}, [{:person=>1}, :description]=>{"0"=>""}, [:abstract]=>{"0"=>"ABSTRACT"}, [{:journal=>0}, :issue, :level]=>{"0"=>""}, [{:person=>1}, :institution]=>{"0"=>"Baltimore"}, [{:person=>0}, :computing_id]=>{"0"=>""}, [{:person=>1}, :last_name]=>{"0"=>"Lacks"}, [{:journal=>0}, :issue, :start_page]=>{"0"=>"195"}, [{:person=>0}, :description]=>{"0"=>""}, [{:journal=>0}, :origin_info, :publisher]=>{"0"=>"PUBLISHER"}}, "rightsMetadata"=>{[:embargo, :embargo_release_date]=>{"0"=>""}}, 
+        "descMetadata"=>{[{:person=>0}, :institution]=>{"0"=>"FACULTY, UNIVERSITY"}, [{:journal=>0}, :title_info, :main_title]=>{"0"=>"The Journal of Mock Object"}, [{:journal=>0}, :issue, :volume]=>{"0"=>"2               "}, [{:journal=>0}, :issn]=>{"0"=>"1234-5678"}, [{:person=>1}, :first_name]=>{"0"=>"Henrietta"}, [{:person=>0}, :last_name]=>{"0"=>"Smith"}, [:location, :url]=>{"0"=>"http://example.com/foo"}, [:subject, :topic]=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, [{:person=>0}, :first_name]=>{"0"=>"John"}, [{:person=>1}, :computing_id]=>{"0"=>""}, [{:journal=>0}, :issue, :end_page]=>{"0"=>"230"}, [:note]=>{"0"=>""}, [:title_info, :main_title]=>{"0"=>"Test Article"}, [{:journal=>0}, :issue, :publication_date]=>{"0"=>"FEB. 2007"}, [{:person=>1}, :description]=>{"0"=>""}, [:abstract]=>{"0"=>"ABSTRACT"}, [{:journal=>0}, :issue, :level]=>{"0"=>""}, [{:person=>1}, :institution]=>{"0"=>"Baltimore"}, [{:person=>0}, :computing_id]=>{"0"=>""}, [{:person=>1}, :last_name]=>{"0"=>"Lacks"}, [{:journal=>0}, :issue, :start_page]=>{"0"=>"195"}, [{:person=>0}, :description]=>{"0"=>""}, [{:journal=>0}, :origin_info, :publisher]=>{"0"=>"PUBLISHER"}, [:subject, :topic]=>{"0"=>"Topic1", "1"=>"Topic2"} }, "rightsMetadata"=>{[:embargo, :embargo_release_date]=>{"0"=>""}}, 
         "properties"=>{[:release_to]=>{"0"=>"public"}, :released=>{"0"=>"true"}}
         }
       helper.stubs(:params).returns(sample_params)

data/test_support/spec/integration/file_asset_spec.rb

@@ -44,50 +44,6 @@ describe FileAsset do
       solr_doc = @file_asset.to_solr
       solr_doc["title_t"].should == ["testing"]
     end
-
-    describe "with many kinds of assets" do
-      before(:each) do
-        @image_asset = ImageAsset.new
-        @audio_asset = AudioAsset.new
-        @video_asset = VideoAsset.new
-        @image_asset.save
-        @audio_asset.save
-        @video_asset.save
-      end
-      after do
-        begin
-        @image_asset.delete
-        rescue
-        end
-        begin
-        @audio_asset.delete
-        rescue
-        end
-        begin
-        @video_asset.delete
-        rescue
-        end
-      end 
-      it "should not load base fields twice for FileAsset if active_fedora_model is a class that is child of FileAsset" do
-  ## It's updating DC and descMetadata, because both have title.
-        @image_asset.update_indexed_attributes({:title=>{0=>"testing"}})
-        #call Solrizer::Indexer.create_document since that produces the problem
-        @image_asset.save
-        solr_doc = ImageAsset.find_by_solr(@image_asset.pid).first
-        solr_doc["title_t"].should == ["testing"]
-        @audio_asset.update_indexed_attributes({:title=>{0=>"testing"}})
-        #call Solrizer::Indexer.create_document since that produces the problem
-        @audio_asset.save
-        solr_doc = AudioAsset.find_by_solr(@audio_asset.pid).first
-        #puts "has_model_s: #{solr_doc['has_model_s'].inspect}"
-        solr_doc["title_t"].should == ["testing"]
-        @video_asset.update_indexed_attributes({:title=>{0=>"testing"}})
-        #call Solrizer::Indexer.create_document since that produces the problem
-        @video_asset.save
-        solr_doc = VideoAsset.find_by_solr(@video_asset.pid).first
-        solr_doc["title_t"].should == ["testing"]
-      end
-    end
     it "should load base fields for FileAsset for model_only if active_fedora_model is not FileAsset but is not child of FileAsset" do
       pending "I'm unconvinced as to the usefullness of this test. Why create as one type then reload as another? - Justin"
       @dummy_file_asset = DummyFileAsset.new

data/test_support/spec/models/hydra_rights_metadata_spec.rb

@@ -152,9 +152,11 @@ describe Hydra::Datastream::RightsMetadata do
       @sample.embargo_release_date=("2010-12-01")
       @sample.embargo_release_date(:format=>:solr_date).should == "2010-12-01T23:59:59Z"
     end
+    
+    # this test was returning '' under 1.9 and returning nil under ree and 1.8.7
     it "should not return anything if the date is empty string" do
       @sample.update_values({[:embargo,:machine,:date]=>''})
-      @sample.embargo_release_date(:format=>:solr_date).should == ''
+      @sample.embargo_release_date(:format=>:solr_date).should be_blank
     end
   end
   describe "under_embargo?" do

data/test_support/spec/spec_helper.rb

@@ -5,6 +5,22 @@
 
 ENV["RAILS_ENV"] ||= 'test'
 
+
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start do
+    add_filter "/test_support/"
+    add_filter "/tmp/"
+
+    add_filter do |source_file|
+      source_file.lines.count < 5
+    end
+  end
+end
+
 #require File.expand_path("../../config/environment", __FILE__)
 # version that works with our blacklight:spec stuff that calls specs
 # in a remote directory. 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-head
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,6 +140,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -241,17 +257,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: solrizer-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -280,12 +296,9 @@ files:
 - .gitignore
 - .gitmodules
 - .rvmrc
-- BLACKLIGHT_CONFIG.textile
 - Gemfile
 - Gemfile.lock
 - HISTORY.textile
-- HOW_DO_I.textile
-- HOW_TO_GET_STARTED.textile
 - INSTALL_PREREQ.textile
 - LICENSE
 - README.textile
@@ -397,7 +410,6 @@ files:
 - app/helpers/personalization_helper.rb
 - app/helpers/release_process_helper.rb
 - app/models/ability.rb
-- app/models/audio_asset.rb
 - app/models/common_metadata_asset.rb
 - app/models/file_asset.rb
 - app/models/generic_content.rb
@@ -411,13 +423,11 @@ files:
 - app/models/hydra/datastream/properties.rb
 - app/models/hydra/datastream/rights_metadata.rb
 - app/models/hydra/role_mapper_behavior.rb
-- app/models/image_asset.rb
 - app/models/mods_asset.rb
 - app/models/role_mapper.rb
 - app/models/superuser.rb
 - app/models/user_attribute.rb
 - app/models/uses_default_partials.rb
-- app/models/video_asset.rb
 - app/views/_add_assets_links.html.erb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
@@ -513,17 +523,12 @@ files:
 - config/solr_mappings.yml
 - db/migrate/20101105214243_add_user_attributes_table.rb
 - db/migrate/20101108192527_create_superusers.rb
-- fedora/conf/fedora.fcfg
 - fedora_conf/conf/development/fedora.fcfg
 - fedora_conf/conf/test/fedora.fcfg
 - hydra-head.gemspec
 - init.rb
 - install.rb
-- lib/application_controller.rb
 - lib/application_helper.rb
-- lib/block_mapper.rb
-- lib/ead_mapper.rb
-- lib/field_maps.rb
 - lib/generators/hydra/assets_generator.rb
 - lib/generators/hydra/cucumber_support_generator.rb
 - lib/generators/hydra/head_generator.rb
@@ -580,8 +585,6 @@ files:
 - lib/hydra/user.rb
 - lib/hydra/workflow.rb
 - lib/hydra/workflow/controller.rb
-- lib/marc_mapper.rb
-- lib/marc_record_ext.rb
 - lib/mediashelf/active_fedora_helper.rb
 - lib/prev_next_links.rb
 - lib/railties/active-fedora.rake
@@ -612,6 +615,7 @@ files:
 - test_support/features/button_add_generic_content.feature
 - test_support/features/button_add_image.feature
 - test_support/features/button_add_mods_asset.feature
+- test_support/features/button_delete_asset.feature
 - test_support/features/contributor_add.feature
 - test_support/features/default_partials_edit.feature
 - test_support/features/default_partials_search_result.feature
@@ -699,16 +703,13 @@ files:
 - test_support/spec/lib/common_mods_index_methods_spec.rb
 - test_support/spec/lib/hydra_submission_workflow_spec.rb
 - test_support/spec/models/ability_spec.rb
-- test_support/spec/models/audio_asset_spec.rb
 - test_support/spec/models/file_asset_spec.rb
 - test_support/spec/models/generic_content_spec.rb
 - test_support/spec/models/generic_image_spec.rb
 - test_support/spec/models/hydra_rights_metadata_spec.rb
-- test_support/spec/models/image_asset_spec.rb
 - test_support/spec/models/mods_asset_spec.rb
 - test_support/spec/models/role_mapper_spec.rb
 - test_support/spec/models/user_spec.rb
-- test_support/spec/models/video_asset_spec.rb
 - test_support/spec/rcov.opts
 - test_support/spec/spec.opts
 - test_support/spec/spec_helper.rb
@@ -746,7 +747,7 @@ files:
 - vendor/cache/diff-lcs-1.1.3.gem
 - vendor/cache/equivalent-xml-0.2.9.gem
 - vendor/cache/erubis-2.7.0.gem
-- vendor/cache/factory_girl-3.1.1.gem
+- vendor/cache/factory_girl-2.6.4.gem
 - vendor/cache/fastercsv-1.5.4.gem
 - vendor/cache/ffi-1.0.11.gem
 - vendor/cache/fssm-0.2.9.gem
@@ -757,6 +758,7 @@ files:
 - vendor/cache/i18n-0.6.0.gem
 - vendor/cache/jettywrapper-1.2.1.gem
 - vendor/cache/journey-1.0.3.gem
+- vendor/cache/jquery-rails-2.0.2.gem
 - vendor/cache/json-1.6.6.gem
 - vendor/cache/kaminari-0.13.0.gem
 - vendor/cache/libwebsocket-0.1.3.gem
@@ -835,7 +837,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Hydra-Head Rails Engine (requires Rails3)