hydra-head 3.0.1 → 3.1.0.pre1

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     hydra-head (3.0.0.rc2)
       RedCloth (= 4.2.3)
-      active-fedora (~> 3.0.7)
+      active-fedora (~> 3.1.0.rc1)
       blacklight (= 3.0.0)
       block_helpers
       builder
@@ -28,11 +28,10 @@ PATH
       rack-test
       rails (~> 3.0.10)
       rake
-      rcov
       sanitize
       solr-ruby
       solrizer (>= 1.1.0)
-      solrizer-fedora (>= 1.1.0)
+      solrizer-fedora (>= 1.1.3)
       term-ansicolor
       trollop
       will_paginate
@@ -56,7 +55,7 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    active-fedora (3.0.7)
+    active-fedora (3.1.0.rc1)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -66,6 +65,9 @@ GEM
       multipart-post (= 1.1.2)
       nokogiri
       om (>= 1.4.3)
+      rdf
+      rdf-rdfxml
+      rubydora (~> 0.1.9)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -83,6 +85,8 @@ GEM
       activesupport (= 3.0.10)
     activesupport (3.0.10)
     addressable (2.2.6)
+    akami (1.0.0)
+      gyoku (>= 0.4.0)
     arel (2.0.10)
     blacklight (3.0.0)
       kaminari
@@ -125,18 +129,25 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     facets (2.8.4)
-    factory_girl (2.1.2)
+    factory_girl (2.2.0)
       activesupport
     fastercsv (1.5.4)
-    ffi (1.0.9)
-    gherkin (2.5.2)
+    ffi (1.0.10)
+    gherkin (2.5.4)
       json (>= 1.4.6)
+    gyoku (0.4.4)
+      builder (>= 2.1.2)
     haml (3.1.3)
     httparty (0.8.1)
       multi_json
       multi_xml
+    httpi (0.9.5)
+      rack
     i18n (0.5.0)
-    jettywrapper (0.0.10)
+    jettywrapper (1.0.1)
+      activesupport (>= 3.0.0)
+      childprocess
+      i18n
       logger
       mediashelf-loggable
     json (1.6.1)
@@ -163,6 +174,7 @@ GEM
     multi_xml (0.4.1)
     multipart-post (1.1.2)
     nokogiri (1.5.0)
+    nori (1.0.2)
     om (1.4.3)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
@@ -188,8 +200,12 @@ GEM
       thor (~> 0.14.4)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
-    rcov (0.9.11)
-    rdoc (3.10)
+    rdf (0.3.4.1)
+      addressable (>= 2.2.6)
+    rdf-rdfxml (0.3.5)
+      nokogiri (>= 1.4.4)
+      rdf (>= 0.3.4)
+    rdoc (3.11)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -197,27 +213,43 @@ GEM
       builder (>= 2.1.2)
     rsolr-ext (1.0.3)
       rsolr (>= 1.0.2)
-    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)
+    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)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.6.0)
+      rspec (~> 2.7.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)
+      activemodel
+      activesupport
+      fastercsv
+      mime-types
+      nokogiri
+      rest-client
+      savon
     rubyzip (0.9.4)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
+    savon (0.9.7)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 2.0)
     selenium-webdriver (2.8.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
@@ -246,6 +278,8 @@ GEM
     trollop (1.16.2)
     tzinfo (0.3.30)
     unicode (0.4.0)
+    wasabi (2.0.0)
+      nokogiri (>= 1.4.0)
     will_paginate (3.0.2)
     xml-simple (1.1.1)
     xpath (0.1.4)
@@ -261,7 +295,7 @@ DEPENDENCIES
   factory_girl
   gherkin
   hydra-head!
-  jettywrapper (~> 0.0.10)
+  jettywrapper (>= 1.0.0)
   mocha
   rake
   rest-client

data/HISTORY.textile

@@ -1,10 +1,3 @@
-h3. 3.0.1
-
-* generator has the correct solr config files
-* reverted back to using object_type_facet for "Format" facet.  This is instead of using active_fedora_model_s, which made some cucumber tests unstable because active_fedora_model_s is populated inconsistently by ActiveFedora (really we should deprecate that solr field)
-
-h2. 3.0.0: Upgrade to Rails 3
-
 h3. 0.0.1
 
 Pulled plugin code from Hydrus 

data/app/controllers/assets_controller.rb

@@ -5,7 +5,6 @@ class AssetsController < ApplicationController
     include Blacklight::SolrHelper
     include Hydra::RepositoryController
     include Hydra::AssetsControllerHelper
-#    include WhiteListHelper
     include ReleaseProcessHelper
     
     
@@ -13,7 +12,7 @@ class AssetsController < ApplicationController
     helper :hydra
     
     before_filter :search_session, :history_session
-    before_filter :require_solr, :require_fedora
+    before_filter :require_solr
 
     # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
     include Hydra::SubmissionWorkflow

data/app/controllers/contributors_controller.rb

@@ -5,7 +5,7 @@ class ContributorsController < ApplicationController
   include MediaShelf::ActiveFedoraHelper
   include Hydra::RepositoryController
   include Hydra::AssetsControllerHelper
-  before_filter :require_solr, :require_fedora
+  before_filter :require_solr
   
   # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
   include Hydra::SubmissionWorkflow
@@ -99,4 +99,4 @@ class ContributorsController < ApplicationController
     af_model.find(asset_id)
   end
   
-end
+end

data/app/controllers/downloads_controller.rb

@@ -4,8 +4,6 @@ class DownloadsController < ApplicationController
     include Hydra::RepositoryController
     helper :downloads
     
-    before_filter :require_fedora
-    
     # Note: Actual downloads are handled by the index method insead of the show method
     # in order to avoid ActionController being clever with the filenames/extensions/formats.
     # To download a datastream, pass the datastream id as ?document_id=#{dsid} in the url
@@ -33,4 +31,4 @@ class DownloadsController < ApplicationController
     #   
     # end        
     
-end
+end

data/app/controllers/file_assets_controller.rb

@@ -7,8 +7,6 @@ class FileAssetsController < ApplicationController
   include MediaShelf::ActiveFedoraHelper
   include Blacklight::SolrHelper
   
-  
-  before_filter :require_fedora
   before_filter :require_solr, :only=>[:index, :create, :show, :destroy]
 
   # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
@@ -89,11 +87,11 @@ From file_assets/_new.html.haml
       notice = []
       @file_assets.each do |file_asset|
         apply_depositor_metadata(file_asset)
-        
+
         notice << "The file #{file_asset.label} has been saved in <a href=\"#{asset_url(file_asset.pid)}\">#{file_asset.pid}</a>."
           
         if !params[:container_id].nil?
-          associate_file_asset_with_container(file_asset,params[:container_id])
+          associate_file_asset_with_container(file_asset,'info:fedora/' + params[:container_id])
         end
   
         ## Apply any posted file metadata

data/app/controllers/generic_content_objects_controller.rb

@@ -6,7 +6,6 @@ class GenericContentObjectsController < ApplicationController
   include MediaShelf::ActiveFedoraHelper
   include Blacklight::SolrHelper
   
-  before_filter :require_fedora
   before_filter :require_solr
 
 
@@ -35,4 +34,4 @@ class GenericContentObjectsController < ApplicationController
   private
   
   
-end
+end

data/app/controllers/get_controller.rb

@@ -4,8 +4,6 @@ class GetController < ApplicationController
     include Hydra::RepositoryController
     helper :downloads
     
-    before_filter :require_fedora
-    
     def show
       fedora_object = ActiveFedora::Base.load_instance(params[:id])
       
@@ -36,4 +34,4 @@ class GetController < ApplicationController
       send_data datastream.content, :filename=>datastream.label, :type=>datastream.attributes["mimeType"]
     end
     
-end
+end

data/app/controllers/permissions_controller.rb

@@ -3,7 +3,7 @@ class PermissionsController < ApplicationController
   include MediaShelf::ActiveFedoraHelper
   include Hydra::AssetsControllerHelper
   
-  before_filter :require_solr, :require_fedora
+  before_filter :require_solr
   # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
   include Hydra::SubmissionWorkflow
   
@@ -60,11 +60,11 @@ Removed from permissions/_new.html.erb
     # xml_content = Fedora::Repository.instance.fetch_custom(pid, "datastreams/#{dsid}/content")
     #@document_fedora=ActiveFedora::Base.load_instance(params[:asset_id])
     @document_fedora=ActiveFedora::Base.load_instance(params[:asset_id])
-    xml_content = @document_fedora.datastreams_in_memory[dsid].content
-    ds = Hydra::RightsMetadata.from_xml(xml_content)
-    ds.pid = pid
-    ds.dsid = dsid
-    @document_fedora.datastreams_in_memory[dsid] = ds
+    xml_content = @document_fedora.datastreams[dsid].content
+    ds = Hydra::RightsMetadata.new(@document_fedora.inner_object, dsid)
+    Hydra::RightsMetadata.from_xml(xml_content, ds)
+
+    @document_fedora.datastreams[dsid] = ds
     
     access_actor_type = params["permission"]["actor_type"]
     actor_id = params["permission"]["actor_id"]
@@ -73,13 +73,7 @@ Removed from permissions/_new.html.erb
     # update the datastream's values
     result = ds.permissions({access_actor_type => actor_id}, access_level)
       
-    # Replace the object's datastream with the new updated ds
-    # !! Careful when re-working this.  If you init the object, replace the datastream, and call object.save, the datastream might get indexed twice!
-    # FUTURE: ActiveFedora::Base will support this soon:
-    # ActiveFedora::Base.replace_datastream("changeme:25","rightsMetadata", ds).
-    # base_object.replace_datastream("rightsMetadata", ds)
-    ds.pid = pid
-    ds.dsid = dsid
+    ds.serialize!
     ds.save
     
     # Re-index the object
@@ -114,25 +108,17 @@ Removed from permissions/_new.html.erb
     end
     
     dsid = "rightsMetadata"
-    # xml_content = Fedora::Repository.instance.fetch_custom(pid, "datastreams/#{dsid}/content")
-    #@document_fedora=ActiveFedora::Base.load_instance(params[:asset_id])
     @document_fedora=ActiveFedora::Base.load_instance(pid)
-    xml_content = @document_fedora.datastreams_in_memory[dsid].content
-    ds = Hydra::RightsMetadata.from_xml(xml_content)
-    ds.pid = pid
-    ds.dsid = dsid
-    @document_fedora.datastreams_in_memory[dsid] = ds
-    
+    xml_content = @document_fedora.datastreams[dsid].content
+    ds = Hydra::RightsMetadata.new(@document_fedora.inner_object, dsid)
+    Hydra::RightsMetadata.from_xml(xml_content, ds)
+    @document_fedora.datastreams[dsid] = ds
+
+     
     # update the datastream's values
     result = ds.update_permissions(params[:permission])
     
-    # Replace the object's datastream with the new updated ds
-    # !! Careful when re-working this.  If you init the object, replace the datastream, and call object.save, the datastream might get indexed twice!
-    # FUTURE: ActiveFedora::Base will support this soon:
-    # ActiveFedora::Base.replace_datastream("changeme:25","rightsMetadata", ds).
-    # base_object.replace_datastream("rightsMetadata", ds)
-    ds.pid = pid
-    ds.dsid = dsid
+    ds.serialize!
     ds.save
     
     # Re-index the object

data/app/models/file_asset.rb

@@ -33,10 +33,14 @@ class FileAsset < ActiveFedora::Base
   
   has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
   end
+
+  def label
+    descMetadata.title_values.first
+  end
       
   def label=(label)
     super
-    datastreams_in_memory["descMetadata"].title_values = label
+    descMetadata.title_values = label
   end    
   
   # augments add_file_datastream to also put file size (in bytes/KB/MB/GB/TB) in dc:extent 
@@ -49,7 +53,7 @@ class FileAsset < ActiveFedora::Base
     else
       size = ""
     end
-    datastreams_in_memory["descMetadata"].extent_values = size
+    datastreams["descMetadata"].extent_values = size
   end
 
   # Mimic the relationship accessor that would be created if a containers relationship existed

data/app/views/catalog/_edit_partials/_default.html.erb

@@ -22,7 +22,7 @@
     <dt>state:</dt>
         <dd><%= @fedora_object.state %></dd>
     <dt>owner id:</dt>
-        <dd><%= @fedora_object.owner_id %></dd>
+        <dd><%= @fedora_object.inner_object.ownerId %></dd>
   </dl>
   <dl>
     <dt>created:</dt>
@@ -40,10 +40,10 @@
                       <div id='<%=dsid%>'>
                         <h1><%=dsid%></h1>
                         <dl>
-                            <%= ("<dt>label:</dt><dd>" + @datastreams[dsid].label + "</dd>").html_safe unless @datastreams[dsid].label.blank? %>
-                            <%= ("<dt>last modified:</dt><dd>" + @datastreams[dsid].last_modified + "</dd>").html_safe unless @datastreams[dsid].last_modified.blank? %>
-                            <%= ("<dt>mimetype:</dt><dd>" + @datastreams[dsid].mime_type + "</dd>").html_safe unless @datastreams[dsid].mime_type.blank? %>
-                            <%= ("<dt>control group:</dt><dd>" + @datastreams[dsid].control_group + "</dd>").html_safe unless @datastreams[dsid].control_group.blank? %>
+                            <%= ("<dt>label:</dt><dd>" + @datastreams[dsid].dsLabel + "</dd>").html_safe unless @datastreams[dsid].dsLabel.blank? %>
+                            <%= ("<dt>last modified:</dt><dd>" + @datastreams[dsid].lastModifiedDate + "</dd>").html_safe unless @datastreams[dsid].lastModifiedDate.blank? %>
+                            <%= ("<dt>mimetype:</dt><dd>" + @datastreams[dsid].mimeType + "</dd>").html_safe unless @datastreams[dsid].mimeType.blank? %>
+                            <%= ("<dt>control group:</dt><dd>" + @datastreams[dsid].controlGroup + "</dd>").html_safe unless @datastreams[dsid].controlGroup.blank? %>
                         </dl>
                       </div>
                     </div></li>

data/app/views/contributors/_index.html.erb

@@ -1,4 +1,4 @@
-<%- person_collection = @document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:person).to_a -%>
+<%- person_collection = @document_fedora.datastreams["descMetadata"].find_by_terms(:person).to_a -%>
 <%- person_collection << [] if params[:add_contributor] -%>
 
 <%= render :partial=>"contributors/edit_person", :collection=>person_collection, :locals=>{:af_model => "mods_asset"} %>

data/app/views/generic_content_objects/_show_description.html.erb

@@ -1,9 +1,9 @@
   <div id="contributor_fields">
     <h3>Contributors</h3>
     <ol> 
-      <%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:person) %>
-      <%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:organization) %>
-      <%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:conference) %>
+      <%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:person) %>
+      <%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:organization) %>
+      <%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:conference) %>
     </ol>    
   </div>
 

data/app/views/mods_assets/_publication_form.html.erb

@@ -4,10 +4,10 @@
     <%= fedora_field_label("descMetadata", [:title_info,:main_title], "Title<span class=\"required-note\">Required</span>".html_safe) %>
     <%= fedora_text_field(@document_fedora,"descMetadata", [:title_info, :main_title], :multiple=>false, :required=>true) %>
   </p>
-  <%= render :partial=>"mods_assets/edit_journal", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:journal) %>
+  <%= render :partial=>"mods_assets/edit_journal", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:journal) %>
   <%= hidden_field_tag(:wf_step, params[:wf_step], :id => "publisher_wf_step") %>
   <%= hidden_field_tag(:new_asset, true, :id => "publisher_new_asset") if params[:new_asset] %>
   <%= hidden_field_tag(:content_type,"mods_asset", :id => "publisher_content_type") %>
   <%= submit_tag(submit_name, :name=>"continue", :class=>"save-submit") %>
   <%= submit_tag("Save and Finish", :name=>"finish", :class=>"save-submit") unless params[:new_asset] %>
-<%- end -%>
+<%- end -%>

data/app/views/mods_assets/_show_contributors.html.erb

@@ -1,7 +1,7 @@
 <div id="contributors_list">
   <ol> 
-  	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:person) %>
-  	<%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:organization) %>
-  	<%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:conference) %>
+  	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:person) %>
+  	<%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:organization) %>
+  	<%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:conference) %>
   </ol>
-</div>
+</div>

data/app/views/mods_assets/_show_description.html.erb

@@ -1,9 +1,9 @@
 <%# copied div below to show_contributor partial %>
 <div id="contributors_list">
 <ol> 
-	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:person) %>
-	<%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:organization) %>
-	<%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:conference) %>
+	<%= render :partial=>"contributors/show_person", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:person) %>
+	<%= render :partial=>"contributors/show_organization", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:organization) %>
+	<%= render :partial=>"contributors/show_conference", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:conference) %>
 </ol>
 </div>
 
@@ -11,7 +11,7 @@
 <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:journal => 0}, :title_info, :main_title]).first.empty? %>
 	<fieldset><legend>Published</legend>
 	<div id="journal" class="browse_value">
-	<%= render :partial=>"mods_assets/show_journal", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:journal) %>
+	<%= render :partial=>"mods_assets/show_journal", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:journal) %>
 	</div>
 	</fieldset>
 	<% end %>

data/app/views/mods_assets/_show_publication.html.erb

@@ -2,7 +2,7 @@
 	<fieldset>
 	  <legend>Published</legend>
   	<div id="journal" class="browse_value">
-  	  <%= render :partial=>"mods_assets/show_journal", :collection=>@document_fedora.datastreams_in_memory["descMetadata"].find_by_terms(:journal) %>
+  	  <%= render :partial=>"mods_assets/show_journal", :collection=>@document_fedora.datastreams["descMetadata"].find_by_terms(:journal) %>
   	</div>
 	</fieldset>
-<% end %>
+<% end %>

data/app/views/permissions/_edit_person_permissions.html.erb

@@ -12,7 +12,7 @@
 <% if person_id != current_user.login %>
 	<% field_name = "#{person_id}_access" %>
 	<% choices = [{"No Access" => "none"},{"Discover" => "discover"}, {"Read & Download" => "read"}, {"Edit & Upload" => "edit"}] %>
-	<% current_permissions = @document_fedora.datastreams_in_memory["rightsMetadata"].permissions({"person"=>person_id}) %>
+	<% current_permissions = @document_fedora.datastreams["rightsMetadata"].permissions({"person"=>person_id}) %>
 	
 	<p class="permission-submit">
   	<label for="<%= field_name %>"><%= person_id %></label>

data/app/views/permissions/_index.html.erb

@@ -11,7 +11,7 @@
     <%# This next line should be conditional upon a person having Publish permissions on the object's collection %>
     <% roles << "public" %>
     <% roles.each do |role| %>
-      <% role_permissions = @document_fedora.datastreams_in_memory["rightsMetadata"].permissions({"group"=>role}) %>
+      <% role_permissions = @document_fedora.datastreams["rightsMetadata"].permissions({"group"=>role}) %>
       <% field_name = "#{role}_group_access" %>
       <p id="<%=h "#{field_name}-container" %>" class="permissions">
         <label for="<%=h field_name %>"><%= role.capitalize %></label>
@@ -42,5 +42,5 @@
           <% choice_name = choice.values.first %>
           <% individual_permissions[choice_name] = get_values_from_datastream(@document_fedora,"rightsMetadata", ["#{choice_name}_access".to_sym, :person]) %>
         <% end %>
-        <%= render :partial=>"permissions/edit_person_permissions.html", :collection=>@document_fedora.datastreams_in_memory["rightsMetadata"].find_by_terms(:access, :person) %>
+        <%= render :partial=>"permissions/edit_person_permissions.html", :collection=>@document_fedora.datastreams["rightsMetadata"].find_by_terms(:access, :person) %>
   </fieldset>

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.0.7'
+  s.add_dependency "active-fedora", '~>3.1.0.rc1'
   s.add_dependency 'builder'
   s.add_dependency 'columnize'
   s.add_dependency 'crack'
@@ -35,12 +35,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack'
   s.add_dependency 'rack-test'
   s.add_dependency 'rake'
-  s.add_dependency 'rcov'
   s.add_dependency 'RedCloth', '=4.2.3'
   s.add_dependency 'solr-ruby' 
   s.add_dependency 'mediashelf-loggable', '>=0.4.7' ##This can be removed once this dependency is declared in solrizer
   s.add_dependency 'solrizer', '>=1.1.0'
-  s.add_dependency 'solrizer-fedora', '>=1.1.0'
+  s.add_dependency 'solrizer-fedora', '>=1.1.3'
   s.add_dependency 'term-ansicolor'
   s.add_dependency 'trollop'
   s.add_dependency 'will_paginate'
@@ -49,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sanitize'
   
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'jettywrapper', "~> 0.0.10"
+  s.add_development_dependency 'jettywrapper', ">=1.0.0"
   s.add_development_dependency 'ruby-debug'
   s.add_development_dependency 'ruby-debug-base'
   s.add_development_dependency 'rspec', '>= 2.0.0'  

data/lib/generators/hydra/head_generator.rb

@@ -31,6 +31,7 @@ class HeadGenerator < Rails::Generators::Base
    copy_file "config/initializers/fedora_config.rb", "config/initializers/fedora_config.rb"
    copy_file "config/initializers/hydra_config.rb", "config/initializers/hydra_config.rb"
    copy_file "config/initializers/blacklight_config.rb", "config/initializers/blacklight_config.rb"
+   copy_file "config/initializers/action_dispatch_http_upload_monkey_patch.rb", "config/initializers/action_dispatch_http_upload_monkey_patch.rb"
 
    # Role Mappings
    copy_file "config/role_map_cucumber.yml", "config/role_map_cucumber.yml"
@@ -118,9 +119,7 @@ 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  # This filters out objects that you want to exclude from search results, like FileAssets" +  
-        "\n  CatalogController.solr_search_params_logic << :exclude_unwanted_models"   
+        "\n  CatalogController.solr_search_params_logic << :add_access_controls_to_solr_params"         
       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/action_dispatch_http_upload_monkey_patch.rb

@@ -0,0 +1,12 @@
+module ActionDispatch
+  module Http
+    class UploadedFile
+      def closed?
+        @tempfile.closed?
+      end
+      def close
+        @tempfile.close
+      end
+    end
+  end
+end

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

@@ -42,13 +42,6 @@ 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,8 +1,4 @@
 <?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
@@ -95,7 +91,7 @@ This copy of the solr schema is only used in the context of testing hydra-head.
    <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"/>
@@ -118,7 +114,5 @@ 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>