hydra-head 4.0.0.rc2 → 4.0.0.rc3

data/app/models/mods_asset.rb

@@ -1,14 +1,14 @@
 # A Basic Model for Assets that conform to Hydra commonMetadata cModel and have basic MODS metadata (currently "Article" is the MODS exemplar)
 class ModsAsset < ActiveFedora::Base
   
-  # declares a rightsMetadata datastream with type Hydra::RightsMetadata
+  # declares a rightsMetadata datastream with type Hydra::Datastream::RightsMetadata
   #  basically, it is another expression of
-  #  has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadata
+  #  has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
   include Hydra::ModelMixins::CommonMetadata
   
-  # declares a descMetadata datastream with type Hydra::ModsArticle
+  # declares a descMetadata datastream with type Hydra::Datastream::ModsArticle
   #  basically, it is another expression of
-  #  has_metadata :name => "descMetadata", :type => Hydra::ModsArticle
+  #  has_metadata :name => "descMetadata", :type => Hydra::Datastream::ModsArticle
   include Hydra::ModelMixins::ModsObject
   
   # adds helpful methods for basic hydra objects

data/app/models/uses_default_partials.rb

@@ -4,9 +4,9 @@
 # a Fedora object for the Hypatia SET hydra content type
 class UsesDefaultPartials < ActiveFedora::Base
   
-  has_metadata :name => "descMetadata", :type => Hydra::ModsGenericContent
+  has_metadata :name => "descMetadata", :type => Hydra::Datastream::ModsGenericContent
   
-  has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadata
+  has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
 
   # adds helpful methods for basic hydra objects.  
   include Hydra::ModelMethods

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

@@ -7,7 +7,7 @@
 
 
 
-<% @fedora_object = ActiveFedora::Base.load_instance(params[:id])
+<% @fedora_object = ActiveFedora::Base.find(params[:id])
    @datastreams = @fedora_object.datastreams
 %>
 

data/app/views/catalog/show.html.erb

@@ -18,7 +18,7 @@
 	    <span class="next"><%= link_to_next_document(@next_document)%></span>	
       </div>
     <%- end -%>
-    <%- if editor? && controller.action_name != "delete" -%>
+    <%- if can?(:edit, @document) && controller.action_name != "delete" -%>
     	<span class="edit-browse">
     		<%= edit_and_browse_links %>
     	</span>

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

@@ -5,7 +5,7 @@
 <% if @document_fedora.class.respond_to?(:conference_relator_terms) %>
   <% choices = @document_fedora.class.conference_relator_terms %>
 <% else %>
-  <% choices = Hydra::ModsArticle.conference_relator_terms %>
+  <% choices = Hydra::Datastream::ModsArticle.conference_relator_terms %>
 <% end %>
 <li>
   <dl class="conference contributor" id="<%= base_id %>">

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

@@ -5,7 +5,7 @@
 <% if @document_fedora.class.respond_to?(:organization_relator_terms) %>
   <% choices = @document_fedora.class.organization_relator_terms %>
 <% else %>
-  <% choices = Hydra::ModsArticle.organization_relator_terms %>
+  <% choices = Hydra::Datastream::ModsArticle.organization_relator_terms %>
 <% end %>
 
 <dl class="organization contributor" id="<%= base_id %>">

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

@@ -5,7 +5,7 @@
 <% if @document_fedora.class.respond_to?(:person_relator_terms) %>
   <% choices = @document_fedora.class.person_relator_terms %>
 <% else %>
-  <% choices = Hydra::ModsArticle.person_relator_terms %>
+  <% choices = Hydra::Datastream::ModsArticle.person_relator_terms %>
 <% end %>
   <fieldset class="person contributor" id="<%= base_id %>">
         <%- if @document_fedora.datastreams["descMetadata"].class.terminology.has_term?(:person, :computing_id) %>

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

@@ -5,7 +5,7 @@
 <% if @document_fedora.class.respond_to?(:organization_relator_terms) %>
   <% choices = @document_fedora.class.organization_relator_terms %>
 <% else %>
-  <% choices = Hydra::ModsArticle.organization_relator_terms %>
+  <% choices = Hydra::Datastream::ModsArticle.organization_relator_terms %>
 <% end %>
 <% unless get_values_from_datastream(@document_fedora,"descMetadata", [{:organization => organization_counter}, :namePart]).first.empty? %>
   <li id="<%= base_id %>">

data/app/views/hydra/file_assets/_index.html.erb

@@ -7,7 +7,7 @@
 			</table>
 <% end %>
 
-<% if !@document.nil? && editor? && params[:number_of_files].to_i > 0 %>
+<% if !@document.nil? && can?(:edit, @document) && params[:number_of_files].to_i > 0 %>
   <%- container_content_type_param = defined?(container_content_type) ? "?container_content_type=#{container_content_type}" : "" %>
   <fieldset id='uploader'>
     <legend>File Upload</legend>

data/app/views/hydra/file_assets/_result.html.erb

@@ -4,7 +4,7 @@
   </td>
   <td>
 	
-   <% if editor? %>
+   <% if can? :edit, @document %>
     	<%= button_to("Delete", "/file_assets/" + result["id"] + "?container_id=" + @document[:id], :confirm => "Are you sure you want to delete this file?", :method => :delete, :class => "delete-button") %>
 
    <% end %>

data/app/views/hydra/permissions/index.html.erb

@@ -1 +1 @@
-<%= render :partial=>"permissions/index" %>
+<%= render :partial=>"hydra/permissions/index" %>

data/app/views/hydra/permissions/new.html.erb

@@ -1 +1 @@
-<%= render :partial=>"permissions/new" %>
+<%= render :partial=>"hydra/permissions/new" %>

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

@@ -1,7 +1,7 @@
 <%- document ||= @document -%>
 <div>
   <dl class="defList">
-    <% if editor? %>
+    <% if can? :edit, document %>
       <h3>Group</h3>
       <%= get_data_with_label(document, "Discover Access:", 'discover_access_group_t', :default=>"private") %>
       <%= get_data_with_label(document, "Read & Download Access:", 'read_access_group_t', :default=>"private") %>

data/hydra-head.gemspec

@@ -13,22 +13,20 @@ Gem::Specification.new do |s|
   s.description = %q{Hydra-Head is a Rails Engine containing the core code for a Hydra application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer, and om}
 
   s.add_dependency "rails", '~> 3.2.1'
-  s.add_dependency "blacklight", '~>3.2.2'  
+  s.add_dependency "blacklight", '~>3.3.1'  
   s.add_dependency "devise"
-  s.add_dependency "active-fedora", '~>4.0.0.rc13'
+  s.add_dependency "active-fedora", '~>4.0.0.rc18'
   s.add_dependency 'RedCloth', '=4.2.9'
   s.add_dependency 'solrizer-fedora', '>=1.2.5'
   s.add_dependency 'block_helpers'
   s.add_dependency 'sanitize'
-  s.add_dependency 'om', '=1.5.3'
-
+  s.add_dependency 'cancan'
   
   s.add_development_dependency 'sqlite3-ruby'
 
   s.add_development_dependency 'yard'
   s.add_development_dependency 'jettywrapper', ">=1.0.4"
-  #s.add_development_dependency 'rspec-rails', '>= 2.8.0'
-  s.add_development_dependency 'rspec-rails', '~> 2.6.0'
+  s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'cucumber-rails', '>=1.2.0'
   s.add_development_dependency 'factory_girl'

data/lib/hydra/access_controls_enforcement.rb

@@ -18,9 +18,13 @@ module Hydra::AccessControlsEnforcement
   #   end
   def enforce_access_controls(opts={})
     controller_action = params[:action].to_s
-    if params[:action] == "destroy" then controller_action = "edit" end
+    controller_action = "edit" if params[:action] == "destroy" 
     delegate_method = "enforce_#{controller_action}_permissions"
-    self.send(delegate_method.to_sym)
+    if self.respond_to?(delegate_method.to_sym, true)
+      self.send(delegate_method.to_sym)
+    else
+      true
+    end
   end
   
   
@@ -71,7 +75,7 @@ module Hydra::AccessControlsEnforcement
     if params[:viewing_context] == "browse"
       session[:viewing_context] = params[:viewing_context]
     elsif session[:viewing_context] == "edit"
-      if editor?
+      if can? :edit, params[:id]
         logger.debug("enforce_viewing_context_for_show_requests redirecting to edit")
         if params[:files]
           redirect_to :action=>:edit, :files=>true
@@ -104,7 +108,7 @@ module Hydra::AccessControlsEnforcement
           end
         end
       end
-      unless reader?
+      unless can? :read, params[:id] 
         flash[:notice]= "You do not have sufficient access privileges to read this document, which has been marked private."
         redirect_to(:action => 'index', :q => nil , :f => nil) and return false
       end
@@ -116,7 +120,7 @@ module Hydra::AccessControlsEnforcement
   def enforce_edit_permissions(opts={})
     logger.debug("Enforcing edit permissions")
     load_permissions_from_solr
-    if !editor?
+    if !can? :edit, params[:id]
       session[:viewing_context] = "browse"
       flash[:notice] = "You do not have sufficient privileges to edit this document. You have been redirected to the read-only view."
       redirect_to :action=>:show
@@ -164,7 +168,7 @@ module Hydra::AccessControlsEnforcement
   #   end
   def add_access_controls_to_solr_params(solr_parameters, user_parameters)
     apply_gated_discovery(solr_parameters, user_parameters)
-    if !reader? 
+    if !can? :read, params[:id]
       solr_parameters[:qt] = Blacklight.config[:public_qt]
     end
   end

data/lib/hydra/access_controls_evaluation.rb

@@ -16,86 +16,22 @@ module Hydra::AccessControlsEvaluation
   # @example
   #   test_permission(:edit)
   def test_permission(permission_type)    
-    # if !current_user.nil?
-      if (@permissions_solr_document == nil)
-        logger.warn("SolrDocument is nil")
-      end
-
-      if current_user.nil? 
-        user = "public"
-        logger.debug("current_user is nil, assigning public")
-      else
-        user = user_key
-      end
-      
-      user_groups = RoleMapper.roles(user)
-      # everyone is automatically a member of the group 'public'
-      user_groups.push 'public' unless user_groups.include?('public')
-      # logged-in users are automatically members of the group "registered"
-      user_groups.push 'registered' unless (user == "public" || user_groups.include?('registered') )
-      
-      logger.debug("User #{user} is a member of groups: #{user_groups.inspect}")
-      case permission_type
-        when :edit
-          logger.debug("Checking edit permissions for user: #{user}")
-          group_intersection = user_groups & edit_groups
-          result = !group_intersection.empty? || edit_persons.include?(user)
-        when :read
-          logger.debug("Checking read permissions for user: #{user}")
-          group_intersection = user_groups & read_groups
-          result = !group_intersection.empty? || read_persons.include?(user)
-        else
-          result = false
-      end
-      logger.debug("test_permission result: #{result}")
-      return result
-    # else
-    #   logger.debug("nil user, test_permission returning false")
-    #   return false
-    # end
+    ActiveSupport::Deprecation.warn("test_permission has been deprecated. Use can? instead") 
+    can? permission_type, @permissions_solr_document
   end
-  
+
   # Test whether the the current user has edit permissions.  
   # This is available as a view helper method as well as within your controllers.
   def editor?
-    test_permission(:edit) or (current_user and current_user.is_being_superuser?(session))
+    logger.warn("editor? has been deprecated. Use can? instead")
+    can? :edit, @permissions_solr_document
   end
   
   # Test whether the the current user has read permissions.  
   # This is available as a view helper method as well as within your controllers.
   def reader?
-    test_permission(:read) or (current_user and current_user.is_being_superuser?(session))
-  end
-
-  private
-  def edit_groups
-    edit_group_field = Hydra.config[:permissions][:edit][:group]
-    eg = ((@permissions_solr_document == nil || @permissions_solr_document.fetch(edit_group_field,nil) == nil) ? [] : @permissions_solr_document.fetch(edit_group_field,nil))
-    logger.debug("edit_groups: #{eg.inspect}")
-    return eg
-  end
-
-  # edit implies read, so read_groups is the union of edit and read groups
-  def read_groups
-    read_group_field = Hydra.config[:permissions][:read][:group]
-    rg = edit_groups | ((@permissions_solr_document == nil || @permissions_solr_document.fetch(read_group_field,nil) == nil) ? [] : @permissions_solr_document.fetch(read_group_field,nil))
-    logger.debug("read_groups: #{rg.inspect}")
-    return rg
-  end
-
-  def edit_persons
-    edit_person_field = Hydra.config[:permissions][:edit][:individual]
-    ep = ((@permissions_solr_document == nil || @permissions_solr_document.fetch(edit_person_field,nil) == nil) ? [] : @permissions_solr_document.fetch(edit_person_field,nil))
-    logger.debug("edit_persons: #{ep.inspect}")
-    return ep
-  end
-
-  # edit implies read, so read_persons is the union of edit and read persons
-  def read_persons
-    read_individual_field = Hydra.config[:permissions][:read][:individual]
-    rp = edit_persons | ((@permissions_solr_document == nil || @permissions_solr_document.fetch(read_individual_field,nil) == nil) ? [] : @permissions_solr_document.fetch(read_individual_field,nil))
-    logger.debug("read_persons: #{rp.inspect}")
-    return rp
+    logger.warn("reader? has been deprecated. Use can? instead")
+    can? :read, @permissions_solr_document
   end
 
 end

data/lib/hydra/assets.rb

@@ -90,7 +90,7 @@ module Hydra::Assets
   end
   
   def destroy
-    af = ActiveFedora::Base.find(params[:id])
+    af = ActiveFedora::Base.find(params[:id], :cast=>true)
     assets = af.destroy_child_assets
     af.delete
     msg = "Deleted #{params[:id]}"
@@ -105,9 +105,6 @@ module Hydra::Assets
   
   protected
 
-  def load_document
-    @document = load_document_from_params
-  end
 
   
   def mods_assets_update_validation

data/lib/hydra/common_mods_index_methods.rb

@@ -8,6 +8,11 @@
 #   This method returns a Hash of person_full_name_facet values which extract the persons affiliation and puts it in an mods_organization_facet
 
 module Hydra::CommonModsIndexMethods
+
+  def self.included(base)
+    ActiveSupport::Deprecation.warn("Hydra::CommonModsIndexMethods has been deprecated. Use Hydra::Datastream::CommonModsIndexMethods instead")
+  end
+
   # Extracts the first and last names of persons and creates Solr::Field objects with for person_full_name_facet
   #
   # == Returns:

data/lib/hydra/controller.rb

@@ -24,15 +24,12 @@ module Hydra::Controller
   # Sets @document_fedora with the loaded object
   # Sets @file_assets with file objects that are children of the loaded object
   def load_fedora_document
-    @document_fedora = ActiveFedora::Base.find(params[:id])
-    unless @document_fedora.class.include?(ActiveFedora::Relationships)
-      @document_fedora.class.send :include, ActiveFedora::Relationships
-    end
-    unless @document_fedora.class.include?(ActiveFedora::FileManagement)
-      @document_fedora.class.send :include, ActiveFedora::FileManagement
+    @document_fedora = ActiveFedora::Base.find(params[:id], :cast=>true)
+    unless @document_fedora.class.include?(Hydra::ModelMethods)
+      @document_fedora.class.send :include, Hydra::ModelMethods
     end
     
-    @file_assets = @document_fedora.file_objects(:response_format=>:solr)
+    @file_assets = @document_fedora.parts(:response_format=>:solr)
   end
   
   

data/lib/hydra/file_assets.rb

@@ -1,7 +1,6 @@
 module Hydra::FileAssets
   extend ActiveSupport::Concern
   
-  
   included do
     include Hydra::AccessControlsEnforcement
     include Hydra::AssetsControllerHelper
@@ -33,7 +32,7 @@ module Hydra::FileAssets
       @container_response, @document = get_solr_response_for_doc_id(params[:asset_id])
       
       # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
-      @container =  ActiveFedora::Base.find(params[:asset_id])
+      @container =  ActiveFedora::Base.find(params[:asset_id], :cast=>true)
       @solr_result = @container.file_objects(:response_format=>:solr)
     end
     
@@ -98,7 +97,7 @@ module Hydra::FileAssets
   
   # Common destroy method for all AssetsControllers 
   def destroy
-    ActiveFedora::Base.find(params[:id]).delete 
+    ActiveFedora::Base.find(params[:id], :cast=>true).delete 
 
     flash[:notice] = "Deleted #{params[:id]} from #{params[:container_id]}."
     
@@ -125,11 +124,7 @@ module Hydra::FileAssets
     pid = @file_asset.container_id
     @downloadable = false
     # A FileAsset is downloadable iff the user has read or higher access to a parent
-    begin
-      @response, @permissions_solr_document = get_solr_response_for_doc_id(pid)
-    rescue Blacklight::Exceptions::InvalidSolrID
-    end
-    if reader?
+    if can? :read, @file_asset
       @downloadable = true
     end
 

data/lib/hydra/model_methods.rb

@@ -2,8 +2,9 @@ module Hydra::ModelMethods
   extend ActiveSupport::Concern
 
   included do
-    extend ActiveFedora::Relationships
-    extend ActiveFedora::FileManagement
+    unless self.class ==  Module
+        self.has_many :parts, :class_name=>'ActiveFedora::Base', :property=>:is_part_of
+    end
   end
   
   #

data/lib/hydra/model_mixins/common_metadata.rb

@@ -15,10 +15,10 @@ module Hydra::ModelMixins
   
     def self.included(klazz)
       # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-      klazz.has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadata
+      klazz.has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
     
       # Ensure that objects assert the commonMetadata cModel
       # klazz.relationships << :has_model => "info:fedora/hydra-cModel:commonMetadata"
     end
   end
-end
+end

data/lib/hydra/model_mixins/mods_object.rb

@@ -1,16 +1,16 @@
 # Include this into models to specify that the descMetadata datastream contains basic MODS metadata
 # 
 # Explicitly declares:
-#   descMetadata datastream using Hydra::ModsArticle Terminology
+#   descMetadata datastream using Hydra::Datastream::ModsArticle Terminology
 #
 module Hydra::ModelMixins::ModsObject
   
   def self.included(klazz)
     # Uses the Hydra MODS Basic profile for tracking descriptive metadata
-    klazz.has_metadata :name => "descMetadata", :type => Hydra::ModsArticle
+    klazz.has_metadata :name => "descMetadata", :type => Hydra::Datastream::ModsArticle
     
     # Ensure that objects assert the modsObject cModel
     # klazz.relationships << :has_model => "info:fedora/hydra-cModel:modsObject"
   end
   
-end
+end

data/lib/hydra/models/file_asset.rb

@@ -28,12 +28,12 @@ module Hydra
       
 
       def label
-        descMetadata.title_values.first
+        descMetadata.title.first
       end
           
       def label=(label)
         super
-        descMetadata.title_values = label
+        descMetadata.title = label
       end    
       
       # augments add_file_datastream to also put file size (in bytes/KB/MB/GB/TB) in dc:extent 
@@ -46,7 +46,7 @@ module Hydra
         else
           size = ""
         end
-        datastreams["descMetadata"].extent_values = size
+        datastreams["descMetadata"].extent = size
       end
 
       # Override ActiveFedora::Base.to_solr to...

data/lib/hydra/mods_article.rb

@@ -2,9 +2,15 @@ require "uva/mods_index_methods"
 module Hydra
   
   class ModsArticle < ActiveFedora::NokogiriDatastream       
-    include Hydra::CommonModsIndexMethods
+    include Hydra::Datastream::CommonModsIndexMethods
     include Uva::ModsIndexMethods
 
+    def initialize(digital_object, dsid, options={})
+      ActiveSupport::Deprecation.warn("Hydra::ModsArticle has been deprecated. Use Hydra::Datastream::ModsArticle instead")
+      super
+
+    end
+
     set_terminology do |t|
       t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
 

data/lib/hydra/mods_dataset.rb

@@ -1,7 +1,15 @@
 require "uva/mods_index_methods"
 module Hydra
+
   class ModsDataset < ActiveFedora::NokogiriDatastream
     include Hydra::CommonModsIndexMethods
+
+    def initialize(digital_object, dsid, options={})
+      ActiveSupport::Deprecation.warn("Hydra::ModsDataset has been deprecated. Use Hydra::Datastream::ModsDataset instead")
+      super
+
+    end
+
     set_terminology do |t|
       t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
 

data/lib/hydra/mods_generic_content.rb

@@ -2,6 +2,11 @@ module Hydra
 class ModsGenericContent < ActiveFedora::NokogiriDatastream       
   include Hydra::CommonModsIndexMethods
 
+  def initialize(digital_object, dsid, options={})
+    ActiveSupport::Deprecation.warn("Hydra::ModsGenericContent has been deprecated. Use Hydra::Datastream::ModsGenericContent instead")
+    super
+  end
+
   set_terminology do |t|
     t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
 

data/lib/hydra/mods_image.rb

@@ -2,6 +2,11 @@ module Hydra
 class ModsImage < ActiveFedora::NokogiriDatastream       
   include Hydra::CommonModsIndexMethods
 
+  def initialize(digital_object, dsid, options={})
+    ActiveSupport::Deprecation.warn("Hydra::ModsImage has been deprecated. Use Hydra::Datastream::ModsImage instead")
+    super
+  end
+
   set_terminology do |t|
     t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")
 

data/lib/hydra/repository_controller.rb

@@ -38,15 +38,6 @@ module Hydra::RepositoryController
     ::ActiveFedora::SolrService.solr_name(field_name, field_type)
   end
   
-  # Uses submitted params Hash to figure out what Model to load
-  # params should contain :content_type and :id
-  def load_document_from_params
-    af_model = retrieve_af_model(params[:content_type])
-    unless af_model 
-      af_model = ModsAsset
-    end
-    return af_model.find(params[:id])
-  end
   
   # Returns a list of datastreams for download.
   # Uses user's roles and "mime_type" value in submitted params to decide what to return.
@@ -55,7 +46,7 @@ module Hydra::RepositoryController
     if opts[:canonical]
       mime_type = opts[:mime_type] ? opts[:mime_type] : "application/pdf"
       result = filter_datastreams_for_mime_type(fedora_object.datastreams, mime_type).sort.first[1]
-    elsif editor? 
+    elsif can? :edit, fedora_object
       if params["mime_type"] == "all"
         result = fedora_object.datastreams
       else
@@ -82,6 +73,19 @@ module Hydra::RepositoryController
   end
 
   protected 
+  def load_document
+    @document = load_document_from_params
+  end
+
+  # Uses submitted params Hash to figure out what Model to load
+  # params should contain :content_type and :id
+  def load_document_from_params
+    af_model = retrieve_af_model(params[:content_type])
+    unless af_model 
+      af_model = ModsAsset
+    end
+    return af_model.find(params[:id])
+  end
   
   def retrieve_af_model(class_name, opts={})
     if !class_name.nil?
@@ -98,11 +102,6 @@ module Hydra::RepositoryController
       return false
   end
 
-  def load_af_instance_from_solr(doc)
-    pid = doc[:id] ? doc[:id] : doc[:id.to_s]
-    pid ? ActiveFedora::Base.load_instance_from_solr(pid,doc) : nil
-  end
-  
   private
   
   def filter_datastreams_for_mime_type(datastreams_hash, mime_type)

data/lib/hydra/rights_metadata.rb

@@ -1,7 +1,11 @@
-require "active-fedora"
 module Hydra
 class RightsMetadata < ActiveFedora::NokogiriDatastream       
   
+  def initialize(digital_object, dsid, options={})
+    ActiveSupport::Deprecation.warn("Hydra::RightsMetadata has been deprecated. Use Hydra::Datastream::RightsMetadata instead")
+    super
+  end
+
   set_terminology do |t|
     t.root(:path=>"rightsMetadata", :xmlns=>"http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1", :schema=>"http://github.com/projecthydra/schemas/tree/v1/rightsMetadata.xsd") 
     t.copyright {

data/lib/hydra/submission_workflow.rb

@@ -118,7 +118,7 @@ module Hydra::SubmissionWorkflow
       begin
         af = ActiveFedora::Base.load_instance_from_solr(params[:id])
         return "#{ActiveFedora::ContentModel.known_models_for( af ).first}".underscore.pluralize.to_sym
-      rescue
+      rescue Exception => e #TODO this should be ActiveFedora::ObjectNotFoundError
         nil
       end
     end

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "4.0.0.rc2"
+  VERSION = "4.0.0.rc3"
 end
 

data/lib/hydra.rb

@@ -1,4 +1,5 @@
 require "blacklight"
+require 'active-fedora'
 # Hydra libraries
 module Hydra
   extend Blacklight::GlobalConfigurable