hydra-head 3.1.4 → 3.1.5

data/hydra-head.gemspec

@@ -13,9 +13,10 @@ 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.0.10'
+  s.add_dependency "rsolr", '1.0.2' ## version 1.0.6 breaks when using blacklight 3.0.0
   s.add_dependency "blacklight", '3.0.0'  
-  s.add_dependency "active-fedora", '~>3.1.1'
-  s.add_dependency 'builder'
+  s.add_dependency "active-fedora", '~>3.1.4'
+  s.add_dependency 'builder', '2.1.2'
   s.add_dependency 'columnize'
   s.add_dependency 'crack'
   s.add_dependency 'curb', '0.7.15' ##Locked here because centos 5.2 (Hudson) doesn't support curl 7.16
@@ -39,7 +40,7 @@ Gem::Specification.new do |s|
   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.3'
+  s.add_dependency 'solrizer-fedora', '>=1.2.0'
   s.add_dependency 'term-ansicolor'
   s.add_dependency 'trollop'
   s.add_dependency 'will_paginate'

data/lib/generators/hydra/assets_generator.rb

@@ -13,7 +13,7 @@
 require 'rails/generators'
 require 'rails/generators/base'
 module Hydra
-  class Assets < Rails::Generators::Base
+  class AssetsGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
   
     def assets

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end
 

data/lib/hydra.rb

@@ -6,13 +6,14 @@ module Hydra
   autoload :Configurable, 'blacklight/configurable'
   autoload :Assets
   autoload :FileAssets
+  autoload :AccessControlsEvaluation
+  autoload :AccessControlsEnforcement
 end
 
 
 require 'mediashelf/active_fedora_helper'
 
 require 'hydra/repository_controller'
-require 'hydra/access_controls_enforcement'
 require 'hydra/assets_controller_helper'
 require 'hydra/file_assets_helper'
 

data/lib/hydra/assets_controller_helper.rb

@@ -124,9 +124,10 @@ module Hydra::AssetsControllerHelper
   # Note: OM now handles destringifying params internally.  You probably don't have to do it!
   
   private
-    
+  
+  
   def send_datastream(datastream)
-    send_data datastream.content, :filename=>datastream.label, :type=>datastream.attributes["mimeType"]
+    self.send_data datastream.content, :filename=>datastream.dsLabel, :type=>datastream.mimeType
   end
   
   #underscores are escaped w/ + signs, which are unescaped by rails to spaces

data/lib/hydra/catalog.rb

@@ -1,4 +1,4 @@
-require "hydra/access_controls_enforcement"
+#require "hydra/access_controls_enforcement"
 # Include this module into any of your Blacklight Catalog classes (ie. CatalogController) to add Hydra functionality
 #
 # The primary function of this module is to mix in a number of other Hydra Modules, including 

data/lib/hydra/file_assets.rb

@@ -1,14 +1,14 @@
 module Hydra::FileAssets
   extend ActiveSupport::Concern
   
-  include Hydra::AccessControlsEnforcement
-  include Hydra::AssetsControllerHelper
-  include Hydra::FileAssetsHelper  
-  include Hydra::RepositoryController  
-  include MediaShelf::ActiveFedoraHelper
-  include Blacklight::SolrHelper
   
   included do
+    include Hydra::AccessControlsEnforcement
+    include Hydra::AssetsControllerHelper
+    include Hydra::FileAssetsHelper  
+    include Hydra::RepositoryController  
+    include MediaShelf::ActiveFedoraHelper
+    include Blacklight::SolrHelper
     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.
     include Hydra::SubmissionWorkflow
@@ -59,26 +59,8 @@ module Hydra::FileAssets
     end
     
     if params.has_key?(:Filedata)
-      @file_assets = create_and_save_file_assets_from_params
-      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,'info:fedora/' + params[:container_id])
-        end
-  
-        ## Apply any posted file metadata
-        unless params[:asset].nil?
-          logger.debug("applying submitted file metadata: #{@sanitized_params.inspect}")
-          apply_file_metadata
-        end
-        # If redirect_params has not been set, use {:action=>:index}
-        logger.debug "Created #{file_asset.pid}."
-      end
-      flash[:notice] = notice.join("<br/>") unless notice.blank?
+      notice = process_files
+      flash[:notice] = notice.join("<br/>".html_safe) unless notice.blank?
     else
       flash[:notice] = "You must specify a file to upload."
     end
@@ -90,6 +72,29 @@ module Hydra::FileAssets
     
     redirect_to redirect_params
   end
+
+  def process_files
+    @file_assets = create_and_save_file_assets_from_params
+    notice = []
+    @file_assets.each do |file_asset|
+      apply_depositor_metadata(file_asset)
+
+      notice << render_to_string(:partial=>'file_assets/asset_saved_flash', :locals => { :file_asset => file_asset })
+        
+      if !params[:container_id].nil?
+        associate_file_asset_with_container(file_asset,'info:fedora/' + params[:container_id])
+      end
+
+      ## Apply any posted file metadata
+      unless params[:asset].nil?
+        logger.debug("applying submitted file metadata: #{@sanitized_params.inspect}")
+        apply_file_metadata
+      end
+      # If redirect_params has not been set, use {:action=>:index}
+      logger.debug "Created #{file_asset.pid}."
+    end
+    notice
+  end
   
   # Common destroy method for all AssetsControllers 
   def destroy
@@ -135,11 +140,14 @@ module Hydra::FileAssets
       end
 
       if @downloadable
-        if @file_asset.datastreams.include?("DS1")
+        # First try to use datastream_id value (set in FileAssetsHelper)
+        if @file_asset.datastreams.include?(datastream_id)
+          send_datastream @file_asset.datastreams[datastream_id]
+        elsif @file_asset.datastreams.include?("DS1")
           send_datastream @file_asset.datastreams["DS1"]
         end
       else
-        flash[:notice]= "You do not have sufficient access privileges to download this document, which has been marked private."
+        flash[:notice]= "You do not have sufficient access privileges to download this file."
         redirect_to(:action => 'index', :q => nil , :f => nil)
       end
     end

data/lib/hydra/file_assets_helper.rb

@@ -26,10 +26,17 @@ module Hydra::FileAssetsHelper
   def add_posted_blob_to_asset(asset,file)
     #file_name = filename_from_params
     file_name = file.original_filename
-    
-    asset.add_file_datastream(file, :label=>file_name, :mimeType=>mime_type(file_name))
+    options = {:label=>file_name, :mimeType=>mime_type(file_name)}
+    dsid = datastream_id #Only call this once so that it could be a sequence
+    options[:dsid] = dsid if dsid
+    asset.add_file_datastream(file, options)
     asset.set_title_and_label( file_name, :only_if_blank=>true )
   end
+
+  #Override this if you want to specify the datastream_id (dsID) for the created blob
+  def datastream_id
+    "content"
+  end
   
   # Associate the new file asset with its container
   def associate_file_asset_with_container(file_asset=nil, container_id=nil)

data/lib/hydra/generic_image.rb

@@ -75,7 +75,7 @@ module Hydra::GenericImage
   def derivation_url ds_name, opts={}
     source_ds_name = ds_name == :max ? "content" : "max"
     raise "Oops! Cannot find source datastream." unless datastreams.keys.include? source_ds_name
-    if ds_name == :max && datastreams["content"].attributes["mimeType"] == "image/jpeg"
+    if ds_name == :max && datastreams["content"].mimeType == "image/jpeg"
       url = datastream_url(source_ds_name)
     else
       opts_array=[]

data/lib/hydra/image.rb

@@ -146,7 +146,7 @@ class Image < ActiveFedora::Base
 
   def derivation_url ds_name, opts={}
     source_ds_name = ds_name == :max ? "MASTER" : "MAX"
-    if ds_name == :max && datastreams["MASTER"].attributes["mimeType"] == "image/jpeg"
+    if ds_name == :max && datastreams["MASTER"].mimeType == "image/jpeg"
       url = datastream_url(source_ds_name)
     else
       opts_array=[]

data/lib/hydra/repository_controller.rb

@@ -68,7 +68,7 @@ module Hydra::RepositoryController
         result = Hash[]
         fedora_object.datastreams.each_pair do |dsid,ds|
           if !ds.new_object?
-            mime_type = ds.attributes["mimeType"] ? ds.attributes["mimeType"] : ""
+            mime_type = ds.mimeType ? ds.mimeType : ""
             if mime_type.include?("pdf") || ds.label.include?("_TEXT.xml") || ds.label.include?("_METS.xml")
              result[dsid] = ds
             end 
@@ -78,7 +78,7 @@ module Hydra::RepositoryController
     else
       result = Hash[]
       fedora_object.datastreams.each_pair do |dsid,ds|
-         if ds.attributes["mimeType"].include?("pdf")
+         if ds.mimeType.include?("pdf")
            result[dsid] = ds
          end  
        end
@@ -92,11 +92,11 @@ module Hydra::RepositoryController
   def filter_datastreams_for_mime_type(datastreams_hash, mime_type)
     result = Hash[]
     datastreams_hash.each_pair do |dsid,ds|
-      ds_mime_type = ds.attributes["mimeType"] ? ds.attributes["mimeType"] : ""
+      ds_mime_type = ds.mimeType ? ds.mimeType : ""
       if ds_mime_type == mime_type
        result[dsid] = ds
       end  
     end
     return result
   end
-end
+end

data/test_support/etc/Gemfile

@@ -16,7 +16,7 @@ gem 'jettywrapper'
 
 # For testing
 group :development, :test do 
-       gem 'solrizer-fedora', '>=1.1.0'
+       gem 'solrizer-fedora', '>=1.2.0'
        gem 'ruby-debug'
        gem 'rspec'
        gem 'rspec-rails', '>=2.5.0'

data/test_support/fixtures/hydra_test_default_partials.foxml.xml

@@ -25,7 +25,7 @@
       <foxml:xmlContent>
         <rdf:RDF xmlns:fedora-model="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rel="info:fedora/fedora-system:def/relations-external#" xmlns:hydra="http://projecthydra.org/ns/relations#">
           <rdf:Description rdf:about="info:fedora/hydra:test_default_partials">
-            <hasModel xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="info:fedora/afmodel:UsesDefaultPartials"></hasModel>
+            <hasModel xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="info:fedora/afmodel:CommonMetadataAsset"></hasModel>
           </rdf:Description>
         </rdf:RDF>
       </foxml:xmlContent>
@@ -77,4 +77,4 @@
     </foxml:datastreamVersion>
   </foxml:datastream>
   
- </foxml:digitalObject> 
+ </foxml:digitalObject> 

data/test_support/spec/controllers/file_assets_controller_spec.rb

@@ -90,7 +90,6 @@ describe FileAssetsController do
     it "should create and save a file asset from the given params" do
       mock_fa = mock("FileAsset")
       mock_file = mock("File")
-      mock_fa.expects(:label).returns("Foo File")
       mock_fa.stubs(:pid).returns("foo:pid")
       controller.expects(:create_and_save_file_assets_from_params).returns([mock_fa])
       xhr :post, :create, :Filedata=>[mock_file], :Filename=>"Foo File"

data/test_support/spec/helpers/assets_controller_helper_spec.rb

@@ -68,4 +68,12 @@ describe Hydra::AssetsControllerHelper do
     end
   end
   
+  describe "send_datastream" do
+    it "should return the requested datastream with content disposition & mime type set from datastream attributes" do
+      test_ds = ModsAsset.find("hydrangea:fixture_file_asset1").datastreams["DS1"]
+      helper.expects(:send_data).with(test_ds.content, :filename=>"bali.jpg", :type=>"image/jpeg")
+      helper.send(:send_datastream, test_ds)
+    end
+  end
+  
 end

data/test_support/spec/helpers/file_assets_helper_spec.rb

@@ -1,6 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Hydra::FileAssetsHelper do
+
+  it "should respond to datastream_id" do
+    helper.should respond_to :datastream_id  ### API method, test that it's there to be overridden
+  end
+
   describe "create_and_save_file_asset_from_params" do
     it "should create the file asset, add posted blob to it and save the file asset" do
       mock_fa = mock("file asset")
@@ -13,13 +18,14 @@ describe Hydra::FileAssetsHelper do
   end
   
   describe "add_posted_blob_to_asset" do
-    it "should set object title and label" do
+    it "should set object title and label, relying on datastream_id to set dsId" do
       mock_file = mock("File")
       file_name = "Posted Filename.foo"
       helper.stubs(:params).returns( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
       mock_fa = mock("file asset")
       mock_file.expects(:original_filename).returns(file_name)
-      mock_fa.expects(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype")
+      helper.stubs(:datastream_id).returns('bar')
+      mock_fa.expects(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid=>'bar')
       mock_fa.expects(:set_title_and_label).with( file_name, :only_if_blank=>true )
       helper.expects(:mime_type).with(file_name).returns("mymimetype")
       helper.add_posted_blob_to_asset(mock_fa,mock_file)
@@ -31,12 +37,12 @@ describe Hydra::FileAssetsHelper do
       helper.stubs(:params).returns( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
       mock_fa = mock("file asset")
       mock_file.expects(:original_filename).returns(file_name)
-      mock_fa.expects(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype")
+      mock_fa.expects(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid => 'content')
       mock_fa.stubs(:set_title_and_label)
       helper.expects(:mime_type).with(file_name).returns("mymimetype")
       helper.add_posted_blob_to_asset(mock_fa,mock_file)
     end
-    it "should support submissions from single-file uploader" do
+    it "should support submissions from single-file uploader, defaulting to dsId of content" do
       mock_file = mock("File")
       file_name = "Posted Filename.foo"
 #      helper.expects(:filename_from_params).returns(file_name)
@@ -44,7 +50,7 @@ describe Hydra::FileAssetsHelper do
       mock_file.expects(:original_filename).returns(file_name)
       mock_fa = mock("file asset")
       helper.expects(:mime_type).with(file_name).returns("mymimetype")
-      mock_fa.expects(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype")
+      mock_fa.expects(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid => 'content')
       mock_fa.stubs(:set_title_and_label)
       helper.add_posted_blob_to_asset(mock_fa,mock_file)
     end
@@ -107,4 +113,4 @@ describe Hydra::FileAssetsHelper do
       end
     end
   end
-end
+end

data/test_support/spec/helpers/hydra_fedora_metadata_helper_spec.rb

@@ -3,15 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe HydraFedoraMetadataHelper do
   
   before(:all) do
-    # @mock_ng_ds = mock("nokogiri datastream")
-    # @mock_ng_ds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-    # @mock_ng_ds.stubs(:class).returns(ActiveFedora::NokogiriDatastream)
-    # @mock_md_ds = stub(:stream_values=>"value")
-    # datastreams = {"ng_ds"=>@mock_ng_ds,"simple_ds"=>@mock_md_ds}
     @resource = mock("fedora object")
-    # @resource.stubs(:datastreams).returns(datastreams)
-    # @resource.stubs(:datastreams_in_memory).returns(datastreams)
-        
     @resource.stubs(:get_values_from_datastream).with("simple_ds", "subject", "").returns( ["topic1","topic2"] )
 
     @resource.stubs(:get_values_from_datastream).with("ng_ds", [:title, :main_title], "").returns( ["My Title"] )
@@ -228,6 +220,7 @@ describe HydraFedoraMetadataHelper do
       # ordering is important.  this next line makes sure that the inputs are in the correct order
       # (tried using CSS3 nth-of-type selectors in have_selector but it didn't work)
       generated_html.should match(/<input.*name="field_selectors\[myDsName\]\[name_3_name_part\]\[\]\[name\]".*\/><input.*name="field_selectors\[myDsName\]\[name_3_name_part\]\[\].*value="name_part" .*\/>/)
+      generated_html.should be_html_safe
     end
     it "should not generate any field selectors if the field key is not an array" do
       helper.field_selectors_for("myDsName", :description).should == ""

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 1
-  - 4
-  version: 3.1.4
+  - 5
+  version: 3.1.5
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-17 00:00:00 -06:00
+date: 2011-11-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,9 +35,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: blacklight
+  name: rsolr
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: blacklight
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -49,41 +65,43 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: active-fedora
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 3
         - 1
-        - 1
-        version: 3.1.1
+        - 4
+        version: 3.1.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: columnize
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +111,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: crack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,11 +125,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: curb
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -123,11 +141,11 @@ dependencies:
         - 15
         version: 0.7.15
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: database_cleaner
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,11 +155,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,11 +169,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: facets
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -167,11 +185,11 @@ dependencies:
         - 4
         version: 2.8.4
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -181,11 +199,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -195,11 +213,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -211,11 +229,11 @@ dependencies:
         - 3
         version: 1.4.3
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: launchy
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -225,11 +243,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: linecache
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -239,11 +257,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -253,11 +271,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: mediashelf-loggable
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -269,11 +287,11 @@ dependencies:
         - 7
         version: 0.4.7
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: multipart-post
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -283,11 +301,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -297,11 +315,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: om
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -313,11 +331,11 @@ dependencies:
         - 3
         version: 1.2.3
   type: :runtime
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -327,11 +345,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id021
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -341,11 +359,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id022
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -355,11 +373,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id023
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -371,11 +389,11 @@ dependencies:
         - 3
         version: 4.2.3
   type: :runtime
-  version_requirements: *id024
+  version_requirements: *id025
 - !ruby/object:Gem::Dependency 
   name: solr-ruby
   prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -385,11 +403,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id025
+  version_requirements: *id026
 - !ruby/object:Gem::Dependency 
   name: mediashelf-loggable
   prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -401,11 +419,11 @@ dependencies:
         - 7
         version: 0.4.7
   type: :runtime
-  version_requirements: *id026
+  version_requirements: *id027
 - !ruby/object:Gem::Dependency 
   name: solrizer
   prerelease: false
-  requirement: &id027 !ruby/object:Gem::Requirement 
+  requirement: &id028 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -417,27 +435,27 @@ dependencies:
         - 0
         version: 1.1.0
   type: :runtime
-  version_requirements: *id027
+  version_requirements: *id028
 - !ruby/object:Gem::Dependency 
   name: solrizer-fedora
   prerelease: false
-  requirement: &id028 !ruby/object:Gem::Requirement 
+  requirement: &id029 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
         - 1
-        - 1
-        - 3
-        version: 1.1.3
+        - 2
+        - 0
+        version: 1.2.0
   type: :runtime
-  version_requirements: *id028
+  version_requirements: *id029
 - !ruby/object:Gem::Dependency 
   name: term-ansicolor
   prerelease: false
-  requirement: &id029 !ruby/object:Gem::Requirement 
+  requirement: &id030 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -447,11 +465,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id029
+  version_requirements: *id030
 - !ruby/object:Gem::Dependency 
   name: trollop
   prerelease: false
-  requirement: &id030 !ruby/object:Gem::Requirement 
+  requirement: &id031 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -461,11 +479,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id030
+  version_requirements: *id031
 - !ruby/object:Gem::Dependency 
   name: will_paginate
   prerelease: false
-  requirement: &id031 !ruby/object:Gem::Requirement 
+  requirement: &id032 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -475,11 +493,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id031
+  version_requirements: *id032
 - !ruby/object:Gem::Dependency 
   name: xml-simple
   prerelease: false
-  requirement: &id032 !ruby/object:Gem::Requirement 
+  requirement: &id033 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -489,11 +507,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id032
+  version_requirements: *id033
 - !ruby/object:Gem::Dependency 
   name: block_helpers
   prerelease: false
-  requirement: &id033 !ruby/object:Gem::Requirement 
+  requirement: &id034 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -503,11 +521,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id033
+  version_requirements: *id034
 - !ruby/object:Gem::Dependency 
   name: sanitize
   prerelease: false
-  requirement: &id034 !ruby/object:Gem::Requirement 
+  requirement: &id035 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -517,11 +535,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id034
+  version_requirements: *id035
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id035 !ruby/object:Gem::Requirement 
+  requirement: &id036 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -531,11 +549,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id035
+  version_requirements: *id036
 - !ruby/object:Gem::Dependency 
   name: jettywrapper
   prerelease: false
-  requirement: &id036 !ruby/object:Gem::Requirement 
+  requirement: &id037 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -547,11 +565,11 @@ dependencies:
         - 4
         version: 1.0.4
   type: :development
-  version_requirements: *id036
+  version_requirements: *id037
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id037 !ruby/object:Gem::Requirement 
+  requirement: &id038 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -561,11 +579,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id037
+  version_requirements: *id038
 - !ruby/object:Gem::Dependency 
   name: ruby-debug-base
   prerelease: false
-  requirement: &id038 !ruby/object:Gem::Requirement 
+  requirement: &id039 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -575,11 +593,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id038
+  version_requirements: *id039
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id039 !ruby/object:Gem::Requirement 
+  requirement: &id040 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -591,11 +609,11 @@ dependencies:
         - 0
         version: 2.7.0
   type: :development
-  version_requirements: *id039
+  version_requirements: *id040
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id040 !ruby/object:Gem::Requirement 
+  requirement: &id041 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -605,11 +623,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id040
+  version_requirements: *id041
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id041 !ruby/object:Gem::Requirement 
+  requirement: &id042 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -621,11 +639,11 @@ dependencies:
         - 5
         version: 0.8.5
   type: :development
-  version_requirements: *id041
+  version_requirements: *id042
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
   prerelease: false
-  requirement: &id042 !ruby/object:Gem::Requirement 
+  requirement: &id043 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -637,11 +655,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id042
+  version_requirements: *id043
 - !ruby/object:Gem::Dependency 
   name: gherkin
   prerelease: false
-  requirement: &id043 !ruby/object:Gem::Requirement 
+  requirement: &id044 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -651,11 +669,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id043
+  version_requirements: *id044
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id044 !ruby/object:Gem::Requirement 
+  requirement: &id045 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -665,11 +683,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id044
+  version_requirements: *id045
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id045 !ruby/object:Gem::Requirement 
+  requirement: &id046 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -679,7 +697,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id045
+  version_requirements: *id046
 description: "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"
 email: 
 - hydra-tech@googlegroups.com
@@ -721,7 +739,6 @@ files:
 - app/controllers/contributors_controller.rb
 - app/controllers/downloads_controller.rb
 - app/controllers/file_assets_controller.rb
-- app/controllers/generic_content_objects_controller.rb
 - app/controllers/get_controller.rb
 - app/controllers/permissions_controller.rb
 - app/controllers/user_sessions_controller.rb
@@ -752,6 +769,7 @@ files:
 - app/helpers/personalization_helper.rb
 - app/helpers/release_process_helper.rb
 - app/models/audio_asset.rb
+- app/models/common_metadata_asset.rb
 - app/models/file_asset.rb
 - app/models/generic_content.rb
 - app/models/generic_image.rb
@@ -799,15 +817,13 @@ files:
 - app/views/contributors/_show_person.html.erb
 - app/views/contributors/new.html.erb
 - app/views/downloads/index.html.erb
+- app/views/file_assets/_asset_saved_flash.html.erb
 - app/views/file_assets/_deletable_result.html.erb
 - app/views/file_assets/_file_assets_form.html.erb
 - app/views/file_assets/_index.html.erb
 - app/views/file_assets/_new.html.erb
 - app/views/file_assets/_result.html.erb
 - app/views/file_assets/index.html.erb
-- app/views/fluid_infusion/_uploader.html.erb
-- app/views/fluid_infusion/_uploader_generic_content_objects.js.erb
-- app/views/fluid_infusion/_uploader_js.erb
 - app/views/generic_content_objects/_contributor_form.html.erb
 - app/views/generic_content_objects/_description_form.html.erb
 - app/views/generic_content_objects/_edit_description.html.erb
@@ -1132,49 +1148,48 @@ files:
 - test_support/spec/support/matchers/solr_matchers.rb
 - test_support/spec/unit/hydra-head-engine_spec.rb
 - test_support/spec/unit/hydra-head_spec.rb
-- test_support/spec/views/uploader.html.erb_spec.rb
 - tmp/.placeholder
 - uninstall.rb
 - vendor/cache/RedCloth-4.2.3.gem
 - vendor/cache/abstract-1.0.0.gem
-- vendor/cache/actionmailer-3.0.10.gem
-- vendor/cache/actionpack-3.0.10.gem
-- vendor/cache/active-fedora-3.1.1.gem
-- vendor/cache/activemodel-3.0.10.gem
-- vendor/cache/activerecord-3.0.10.gem
-- vendor/cache/activeresource-3.0.10.gem
-- vendor/cache/activesupport-3.0.10.gem
+- vendor/cache/actionmailer-3.0.11.gem
+- vendor/cache/actionpack-3.0.11.gem
+- vendor/cache/active-fedora-3.1.4.gem
+- vendor/cache/activemodel-3.0.11.gem
+- vendor/cache/activerecord-3.0.11.gem
+- vendor/cache/activeresource-3.0.11.gem
+- vendor/cache/activesupport-3.0.11.gem
 - vendor/cache/addressable-2.2.6.gem
 - vendor/cache/akami-1.0.0.gem
 - vendor/cache/arel-2.0.10.gem
 - vendor/cache/blacklight-3.0.0.gem
 - vendor/cache/block_helpers-0.3.3.gem
 - vendor/cache/builder-2.1.2.gem
-- vendor/cache/capybara-1.1.1.gem
-- vendor/cache/childprocess-0.2.2.gem
-- vendor/cache/columnize-0.3.4.gem
+- vendor/cache/capybara-1.1.2.gem
+- vendor/cache/childprocess-0.2.3.gem
+- vendor/cache/columnize-0.3.5.gem
 - vendor/cache/crack-0.3.1.gem
-- vendor/cache/cucumber-1.1.0.gem
-- vendor/cache/cucumber-rails-1.1.1.gem
+- vendor/cache/cucumber-1.1.3.gem
+- vendor/cache/cucumber-rails-1.2.0.gem
 - vendor/cache/curb-0.7.15.gem
 - vendor/cache/daemons-1.1.4.gem
-- vendor/cache/database_cleaner-0.6.7.gem
+- vendor/cache/database_cleaner-0.7.0.gem
 - vendor/cache/diff-lcs-1.1.3.gem
 - vendor/cache/equivalent-xml-0.2.8.gem
 - vendor/cache/erubis-2.6.6.gem
 - vendor/cache/facets-2.8.4.gem
-- vendor/cache/factory_girl-2.1.2.gem
+- vendor/cache/factory_girl-2.3.2.gem
 - vendor/cache/fastercsv-1.5.4.gem
-- vendor/cache/ffi-1.0.9.gem
-- vendor/cache/gherkin-2.5.2.gem
+- vendor/cache/ffi-1.0.11.gem
+- vendor/cache/gherkin-2.6.8.gem
 - vendor/cache/gyoku-0.4.4.gem
 - vendor/cache/haml-3.1.3.gem
 - vendor/cache/httparty-0.8.1.gem
 - vendor/cache/httpi-0.9.5.gem
 - vendor/cache/i18n-0.5.0.gem
-- vendor/cache/jettywrapper-1.0.4.gem
-- vendor/cache/json-1.6.1.gem
-- vendor/cache/json_pure-1.6.1.gem
+- vendor/cache/jettywrapper-1.1.0.gem
+- vendor/cache/json-1.6.2.gem
+- vendor/cache/json_pure-1.6.2.gem
 - vendor/cache/kaminari-0.12.4.gem
 - vendor/cache/launchy-2.0.5.gem
 - vendor/cache/linecache-0.46.gem
@@ -1183,9 +1198,9 @@ files:
 - vendor/cache/marc-0.4.3.gem
 - vendor/cache/mediashelf-loggable-0.4.7.gem
 - vendor/cache/metaclass-0.0.1.gem
-- vendor/cache/mime-types-1.16.gem
+- vendor/cache/mime-types-1.17.2.gem
 - vendor/cache/mocha-0.10.0.gem
-- vendor/cache/multi_json-1.0.3.gem
+- vendor/cache/multi_json-1.0.4.gem
 - vendor/cache/multi_xml-0.4.1.gem
 - vendor/cache/multipart-post-1.1.2.gem
 - vendor/cache/nokogiri-1.5.0.gem
@@ -1195,13 +1210,13 @@ files:
 - vendor/cache/rack-1.2.4.gem
 - vendor/cache/rack-mount-0.6.14.gem
 - vendor/cache/rack-test-0.5.7.gem
-- vendor/cache/rails-3.0.10.gem
-- vendor/cache/railties-3.0.10.gem
-- vendor/cache/rake-0.9.2.gem
+- vendor/cache/rails-3.0.11.gem
+- vendor/cache/railties-3.0.11.gem
+- vendor/cache/rake-0.9.2.2.gem
 - vendor/cache/rbx-require-relative-0.0.5.gem
 - vendor/cache/rdf-0.3.4.1.gem
 - vendor/cache/rdf-rdfxml-0.3.5.gem
-- vendor/cache/rdoc-3.10.gem
+- vendor/cache/rdoc-3.11.gem
 - vendor/cache/rest-client-1.6.7.gem
 - vendor/cache/rsolr-1.0.2.gem
 - vendor/cache/rsolr-ext-1.0.3.gem
@@ -1212,20 +1227,20 @@ files:
 - vendor/cache/rspec-rails-2.7.0.gem
 - vendor/cache/ruby-debug-0.10.4.gem
 - vendor/cache/ruby-debug-base-0.10.4.gem
-- vendor/cache/rubydora-0.2.3.gem
-- vendor/cache/rubyzip-0.9.4.gem
+- vendor/cache/rubydora-0.2.6.gem
+- vendor/cache/rubyzip-0.9.5.gem
 - vendor/cache/sanitize-2.0.3.gem
 - vendor/cache/savon-0.9.7.gem
-- vendor/cache/selenium-webdriver-2.8.0.gem
+- vendor/cache/selenium-webdriver-2.13.0.gem
 - vendor/cache/solr-ruby-0.0.8.gem
 - vendor/cache/solrizer-1.1.2.gem
-- vendor/cache/solrizer-fedora-1.1.3.gem
+- vendor/cache/solrizer-fedora-1.2.0.gem
 - vendor/cache/stomp-1.1.10.gem
 - vendor/cache/term-ansicolor-1.0.7.gem
 - vendor/cache/thor-0.14.6.gem
 - vendor/cache/treetop-1.4.10.gem
 - vendor/cache/trollop-1.16.2.gem
-- vendor/cache/tzinfo-0.3.30.gem
+- vendor/cache/tzinfo-0.3.31.gem
 - vendor/cache/unicode-0.4.0.gem
 - vendor/cache/wasabi-2.0.0.gem
 - vendor/cache/will_paginate-3.0.2.gem