hydra-head 3.0.0pre1

data/test_support/spec/controllers/hydra_controller_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe Hydra::Controller do
+  before(:all) do
+    class HydraControllerTest
+    end
+  end
+  
+  it "should add the necessary helpers to classes that include it" do
+    HydraControllerTest.expects(:helper).with(:hydra_assets)
+    HydraControllerTest.expects(:helper).with(:hydra_fedora_metadata)
+    HydraControllerTest.send(:include, Hydra::Controller)
+  end
+end

data/test_support/spec/controllers/permissions_controller_spec.rb

@@ -0,0 +1,80 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+# See cucumber tests (ie. /features/edit_document.feature) for more tests, including ones that test the edit method & view
+# You can run the cucumber tests with 
+#
+# cucumber --tags @edit
+# or
+# rake cucumber
+
+describe PermissionsController do
+  describe "index" do
+    it "should retrieve the object's rightsMetadata datastream as a Hydra::RightsMetadata object and render the _index partial" do
+    end
+  end
+  describe "show" do
+    it"should render different partial based on the permission type" do
+      pending
+      renders "permissions/edit_individual"
+      renders "permissions/edit_group"
+    end
+  end
+  describe "edit" do
+  end
+  describe "new" do
+    it "should render the _new partial"
+  end
+  describe "create" do
+    it "should create a new permissions entry" do
+      stub_solrizer = stub("solrizer", :solrize)
+      Solrizer::Fedora::Solrizer.stubs(:new).returns(stub_solrizer)
+      mock_ds = mock("Datastream")
+      Hydra::RightsMetadata.stubs(:from_xml).returns(mock_ds)
+      mock_ds.expects(:permissions).with({"person" => "_person_id_"}, "read")
+      # mock_ds.expects(:update_permissions).with({"person"=>{"_person_id_"=>"read"}})
+      mock_ds.stubs(:content)
+      mock_ds.stubs(:pid=)
+      mock_ds.stubs(:dsid=)
+      mock_ds.stubs(:save)
+      mock_object = mock("object")
+      mock_object.stubs(:datastreams_in_memory).returns({"rightsMetadata"=>mock_ds})
+      
+      ActiveFedora::Base.expects(:load_instance).with("_pid_").returns(mock_object)
+
+      post :create, :asset_id=>"_pid_", :permission => {"actor_id"=>"_person_id_","actor_type"=>"person","access_level"=>"read"}      
+      # post :create, :asset_id=>"_pid_", :permission => {"person"=>"_person_id_","level"=>"read"}
+    end
+    it "should rely on .update method"
+  end
+  describe "update" do
+    it "should call Hydra::RightsMetadata properties setter" do
+      stub_solrizer = stub("solrizer", :solrize)
+      Solrizer::Fedora::Solrizer.stubs(:new).returns(stub_solrizer)
+      mock_ds = mock("Datastream")
+      Hydra::RightsMetadata.stubs(:from_xml).returns(mock_ds)
+      mock_ds.expects(:update_permissions).with({"group" => {"_group_id_"=>"discover"}})
+      mock_ds.stubs(:content)
+      mock_ds.stubs(:pid=)
+      mock_ds.stubs(:dsid=)
+      mock_ds.stubs(:save)
+      mock_object = mock("object")
+      mock_object.stubs(:datastreams_in_memory).returns({"rightsMetadata"=>mock_ds})
+      
+      ActiveFedora::Base.expects(:load_instance).with("_pid_").returns(mock_object)
+      # must define new routes that can handle url like this
+      # /assets/_pid_/permissions/group/_group_id_
+      # /assets/:asset_id/permissions/:actor_type/:actor_id
+      
+      # this is what currently works 
+      # post :update, :asset_id=>"_pid_", :actor_type=>"group", :actor_id=>"_group_id_", :permission => {"group"=>"_group_id_","level"=>"discover"}
+
+      post :update, :asset_id=>"_pid_", :permission => {"group"=>{"_group_id_"=>"discover"}}
+    end
+    it "should add a rightsMetadata datastream if it doesn't exist"
+    it "should not cause the metadata to be indexed twice" do
+      # should load the object as ActiveFedora::Base, initialize the rightsMetadata datastream as Hydra::RightsMetadata, update the datastream, save the datastream, and tell Solrizer to re-index the object from pid
+      # re-indexing from pid rather than passing in the current object prevents double-indexing of the edited metadatata datastream
+    end
+  end
+end

data/test_support/spec/controllers/user_sessions_controller_spec.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe UserSessionsController do
+
+  before(:each) do
+    @user = mock("User")
+    @user.stubs(:can_be_superuser?).returns true
+    @user2 = mock("User")
+    @user2.stubs(:can_be_superuser?).returns false
+  end
+  
+  it "should allow for toggling on and off session[:superuser_mode]" do
+    controller.stubs(:current_user).returns(@user)
+    request.env["HTTP_REFERER"] = ""
+    get :superuser
+    session[:superuser_mode].should be_true
+    get :superuser
+    session[:superuser_mode].should be_nil
+  end
+  
+  it "should not allow superuser_mode to be set in session if current_user is not a superuser" do
+    controller.stubs(:current_user).returns(@user2)
+    request.env["HTTP_REFERER"] = ""
+    get :superuser
+    session[:superuser_mode].should be_nil
+  end
+  
+  it "should redirect to the referer" do
+    controller.stubs(:current_user).returns(@user)
+    request.env["HTTP_REFERER"] = file_assets_path
+    get :superuser
+    response.should redirect_to(file_assets_path)
+  end
+  
+end

data/test_support/spec/generators/hydra-head_generator_spec.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "generators/hydra/head_generator"
+require "generators/blacklight/blacklight_generator"
+
+describe Hydra::HeadGenerator do
+
+  it "should be tested, but it's not clear how..."
+  it "should inject Hydra behaviors into User model by adding include Hydra::User" do
+    pending "Not sure how to test this..."
+  end
+
+end
+

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -0,0 +1,212 @@
+# Need way to find way to stub current_user and RoleMapper in order to run these tests
+require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper') )
+
+describe Hydra::AccessControlsEnforcement do
+  before(:each) do
+    @extra_controller_params = {}
+  end
+  
+  describe "enforce_access_controls" do
+    describe "[index]" do
+      it "should trigger enforce_index_permissions" do
+        helper.params[:action] = "index"
+        helper.expects(:enforce_index_permissions)
+        helper.enforce_access_controls
+      end
+    end
+    describe "[show]" do
+      it "should trigger enforce_show_permissions" do
+        helper.params[:action] = "show"
+        helper.expects(:enforce_show_permissions)
+        helper.enforce_access_controls
+      end
+    end
+    
+    describe "[edit]" do
+      it "should trigger enforce_edit_permissions" do
+        helper.params[:action] = "edit"
+        helper.expects(:enforce_edit_permissions)
+        helper.enforce_access_controls
+      end
+    end
+    describe "[update]" do
+      it "should trigger enforce_update_permissions" do
+        helper.params[:action] = "update"
+        helper.expects(:enforce_update_permissions)
+        helper.enforce_access_controls
+      end
+    end
+    
+  end
+  
+  describe "add_access_controls_to_solr_params" do
+    it "should set up gated discovery" do
+      stub_solr_params = {}
+      helper.stubs(:reader?).returns(false)
+      helper.stubs(:params).returns({:action=>:index})
+      helper.expects(:apply_gated_discovery).with(stub_solr_params, {})
+      helper.send(:add_access_controls_to_solr_params, stub_solr_params, {})
+    end
+    it "should make blacklight use the :public_qt response handler if user does not have read permissions" do
+      stub_solr_params = {}
+      helper.stubs(:solr_parameters).returns(stub_solr_params)
+      helper.stubs(:reader?).returns(false)
+      helper.stubs(:params).returns({:action=>:index})
+      helper.stubs(:apply_gated_discovery)
+      helper.send(:add_access_controls_to_solr_params, stub_solr_params, {})
+      stub_solr_params[:qt].should == Blacklight.config[:public_qt]
+    end
+  end
+  
+  describe "enforce_index_permissions" do
+    it "should be defined but do nothing (currently enforce_index_permissions doesn't do anything but it's there if you want to override)" do
+      # just ensure that calling the method does not raise an error
+      helper.send(:enforce_index_permissions)
+    end
+  end
+  
+  describe "enforce_show_permissions" do
+    it "should deny access to documents if role does not have read permissions" do
+      helper.stubs(:reader?).returns(false)
+      helper.stubs(:params).returns({:action=>:show,:id=>"hydrangea:fixture_mods_article1"}) # the permissions from this are not actually used because we stub the :reader? method
+      helper.expects(:redirect_to).with(:f => nil, :q => nil, :action => 'index')
+      helper.send(:enforce_show_permissions)
+      flash[:notice].should ==  "You do not have sufficient access privileges to read this document, which has been marked private."
+    end
+  end
+  describe "enforce_edit_permissions" do
+    it "should deny access to documents if role does not have edit permissions" do
+      helper.stubs(:editor?).returns(false)
+      helper.stubs(:params).returns({:action=>:edit,:id=>"hydrangea:fixture_mods_article1"} ) # the permissions from this are not actually used because we stub the :editor? method
+      helper.expects(:redirect_to).with(:action => :show)
+      helper.send(:enforce_edit_permissions)
+      flash[:notice].should == "You do not have sufficient privileges to edit this document. You have been redirected to the read-only view."
+    end  
+  end
+  describe "enforce_update_permissions" do
+    it "should deny access to documents if role does not have update permissions" do
+      helper.stubs(:editor?).returns(false)
+      helper.stubs(:params).returns({:action=>:edit,:id=>"hydrangea:fixture_mods_article1"} ) # the permissions from this are not actually used because we stub the :editor? method
+      helper.expects(:redirect_to).with(:action => :show)
+      helper.send(:enforce_update_permissions)
+      flash[:notice].should == "You do not have sufficient privileges to edit this document. You have been redirected to the read-only view."
+    end  
+  end
+  describe "apply_gated_discovery" do
+    it "should set the query using build_lucene_query" do
+      stub_solr_params = {}
+      helper.stubs(:solr_parameters).returns(stub_solr_params)
+      user_query = "my important query"
+      helper.stubs(:params).returns({:q=>user_query} )
+      helper.expects(:build_lucene_query).with(user_query).returns("stub lucene query")
+      helper.send(:apply_gated_discovery, stub_solr_params, {})
+      stub_solr_params[:q].should == "stub lucene query"
+    end
+  end
+  
+  describe "build_lucene_query" do
+
+    it "should return fields for all roles the user is a member of checking against the discover, access, read fields" do
+     stub_user = User.new
+     stub_user.stubs(:is_being_superuser?).returns false
+     stub_user.stubs(:login).returns "archivist1@example.com"
+     helper.stubs(:current_user).returns(stub_user)
+     # This example assumes that archivist1 is in the archivist and researcher groups.
+     # Tried stubbing RoleMapper.roles instead, but that broke 26 other tests because mocha fails to release the expectation.
+     # RoleMapper.stubs(:roles).with(stub_user.login).returns(["archivist", "researcher"])
+     query = helper.send(:build_lucene_query, "string")
+     
+     ["discover","edit","read"].each do |type|
+       query.should match(/_query_\:\"#{type}_access_group_t\:archivist/) and
+       query.should match(/_query_\:\"#{type}_access_group_t\:researcher/)
+     end
+    end
+    it "should return fields for all the person specific discover, access, read fields" do
+     stub_user = User.new
+     stub_user.stubs(:is_being_superuser?).returns false
+     helper.stubs(:current_user).returns(stub_user)
+     query = helper.send(:build_lucene_query, "string")
+     ["discover","edit","read"].each do |type|
+       query.should match(/_query_\:\"#{type}_access_person_t\:#{stub_user.login}/)
+     end
+    end
+    describe "for superusers" do
+     it "should return superuser access level" do
+       stub_user = User.new
+       stub_user.stubs(:is_being_superuser?).returns true
+       helper.stubs(:current_user).returns(stub_user)
+       query = helper.send(:build_lucene_query, "string")
+       ["discover","edit","read"].each do |type|         
+         query.should match(/_query_\:\"#{type}_access_person_t\:\[\* TO \*\]/)
+       end
+     end
+     it "should not return superuser access to non-superusers" do
+       stub_user = User.new
+       stub_user.stubs(:is_being_superuser?).returns false
+       helper.stubs(:current_user).returns(stub_user)
+       query = helper.send(:build_lucene_query, "string")
+       ["discover","edit","read"].each do |type|
+         query.should_not match(/_query_\:\"#{type}_access_person_t\:\[\* TO \*\]/)
+       end
+     end
+    end
+  end
+
+  it "should have necessary fieldnames from initializer" do
+   Hydra.config[:permissions][:catchall].should_not be_nil
+   Hydra.config[:permissions][:discover][:group].should_not be_nil
+   Hydra.config[:permissions][:discover][:individual].should_not be_nil
+   Hydra.config[:permissions][:read][:group].should_not be_nil
+   Hydra.config[:permissions][:read][:individual].should_not be_nil
+   Hydra.config[:permissions][:edit][:group].should_not be_nil
+   Hydra.config[:permissions][:edit][:individual].should_not be_nil
+   Hydra.config[:permissions][:owner].should_not be_nil
+   Hydra.config[:permissions][:embargo_release_date].should_not be_nil
+  end
+
+  # SPECS FOR SINGLE DOCUMENT REQUESTS
+  describe 'Get Document Permissions By Id' do
+   before(:each) do
+     @doc_id = 'hydrangea:fixture_mods_article1'
+     @bad_id = "redrum"
+     @response2, @document = helper.get_permissions_solr_response_for_doc_id(@doc_id)
+   end
+
+   it "should raise Blacklight::InvalidSolrID for an unknown id" do
+     lambda {
+       helper.get_permissions_solr_response_for_doc_id(@bad_id)
+     }.should raise_error(Blacklight::Exceptions::InvalidSolrID)
+   end
+   
+   it "should raise Blacklight::InvalidSolrID for nil id" do
+     lambda {
+       helper.get_permissions_solr_response_for_doc_id(nil)
+     }.should raise_error(Blacklight::Exceptions::InvalidSolrID)
+   end
+
+   it "should have a non-nil result for a known id" do
+     @document.should_not == nil
+   end
+   it "should have a single document in the response for a known id" do
+     @response2.docs.size.should == 1
+   end
+   it 'should have the expected value in the id field' do
+     @document.id.should == @doc_id
+   end
+   it 'should have non-nil values for permissions fields that are set on the object' do
+     @document.get(Hydra.config[:permissions][:catchall]).should_not be_nil
+     @document.get(Hydra.config[:permissions][:discover][:group]).should_not be_nil
+     @document.get(Hydra.config[:permissions][:edit][:group]).should_not be_nil
+     @document.get(Hydra.config[:permissions][:edit][:individual]).should_not be_nil
+     @document.get(Hydra.config[:permissions][:read][:group]).should_not be_nil
+ 
+     # @document.get(Hydra.config[:permissions][:discover][:individual]).should_not be_nil
+     # @document.get(Hydra.config[:permissions][:read][:individual]).should_not be_nil
+     # @document.get(Hydra.config[:permissions][:owner]).should_not be_nil
+     # @document.get(Hydra.config[:permissions][:embargo_release_date]).should_not be_nil
+   end
+  end
+   
+end
+
+

data/test_support/spec/helpers/access_controls_evaluation_spec.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Hydra::AccessControlsEvaluation do
+  
+  describe "test_permission" do
+    it "should automatically add logged-in users to 'registered' group" do
+      mock_user = mock("User", :login => "logged_in_person")
+      helper.stubs(:read_groups).returns(["registered"])
+      helper.stubs(:current_user).returns(nil)
+      helper.test_permission(:read).should == false 
+      helper.stubs(:current_user).returns(mock_user)
+      helper.test_permission(:read).should == true 
+    end
+  end
+  
+  describe "editor?" do
+    it "should return true if current_user.is_being_superuser? is true" do
+      mock_user = mock("User", :login => "BigWig")
+      mock_user.stubs(:is_being_superuser?).returns true
+      helper.stubs(:current_user).returns mock_user
+      helper.editor?.should be_true
+    end
+    it "should return false if the session[:user] is not logged in" do
+      helper.stubs(:current_user).returns(nil)
+      helper.editor?.should be_false
+    end    
+    it "should return false if the session[:user] does not have an editor role" do
+      mock_user = mock("User", :login=>"nobody_special")
+      mock_user.stubs(:is_being_superuser?).returns(false)
+      helper.stubs(:current_user).returns(mock_user)
+      helper.editor?.should be_false
+    end
+  end  
+  
+end

data/test_support/spec/helpers/assets_controller_helper_spec.rb

@@ -0,0 +1,71 @@
+require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper') )
+
+describe Hydra::AssetsControllerHelper do
+  
+  describe "prep_updater_method_args" do
+    it "should parse the input params" do
+      sample_params = {"content_type"=>"mods_asset", 
+        "action"=>"update", 
+        "_method"=>"put", 
+        "field_selectors"=>{"descMetadata"=>{"person_0_computing_id"=>[{"person"=>"0"}, "computing_id"], "journal_0_issue_start_page"=>[{"journal"=>"0"}, "issue", "start_page"], "person_1_description"=>[{"person"=>"1"}, "description"], "person_1_institution"=>[{"person"=>"1"}, "institution"], "journal_0_origin_info_publisher"=>[{"journal"=>"0"}, "origin_info", "publisher"], "abstract"=>["abstract"], "person_0_last_name"=>[{"person"=>"0"}, "last_name"], "person_0_description"=>[{"person"=>"0"}, "description"], "journal_0_issue_volume"=>[{"journal"=>"0"}, "issue", "volume"], "title_info_main_title"=>["title_info", "main_title"], "location_url"=>["location", "url"], "note"=>["note"], "person_1_last_name"=>[{"person"=>"1"}, "last_name"], "subject_topic"=>["subject", "topic"], "person_0_institution"=>[{"person"=>"0"}, "institution"], "person_1_first_name"=>[{"person"=>"1"}, "first_name"], "person_1"=>[{"person"=>"1"}], "journal_0_title_info_main_title"=>[{"journal"=>"0"}, "title_info", "main_title"], "journal_0_issue_level"=>[{"journal"=>"0"}, "issue", "level"], "journal_0_issue_end_page"=>[{"journal"=>"0"}, "issue", "end_page"], "peer_reviewed"=>["peer_reviewed"], "person_0_first_name"=>[{"person"=>"0"}, "first_name"], "person_1_computing_id"=>[{"person"=>"1"}, "computing_id"], "journal_0_issn"=>[{"journal"=>"0"}, "issn"], "journal_0_issue_publication_date"=>[{"journal"=>"0"}, "issue", "publication_date"]}, "rightsMetadata"=>{"embargo_embargo_release_date"=>["embargo", "embargo_release_date"]}, "properties"=>{"release_to"=>["release_to"]}}, 
+        "id"=>"hydrangea:fixture_mods_article3", 
+        "controller"=>"assets", 
+        "asset"=>{"descMetadata"=>{"person_0_computing_id"=>{"0"=>""}, "journal_0_issue_start_page"=>{"0"=>"195"}, "person_1_description"=>{"0"=>""}, "person_1_institution"=>{"0"=>"Baltimore"}, "journal_0_origin_info_publisher"=>{"0"=>"PUBLISHER"}, "abstract"=>{"0"=>"ABSTRACT"}, "person_0_last_name"=>{"0"=>"Smith"}, "person_0_description"=>{"0"=>""}, "journal_0_issue_volume"=>{"0"=>"2               "}, "title_info_main_title"=>{"0"=>"Test Article"}, "location_url"=>{"0"=>"http://example.com/foo"}, "note"=>{"0"=>""}, "person_1_last_name"=>{"0"=>"Lacks"}, "subject_topic"=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, "person_0_institution"=>{"0"=>"FACULTY, UNIVERSITY"}, "person_1_first_name"=>{"0"=>"Henrietta"}, "journal_0_title_info_main_title"=>{"0"=>"The Journal of Mock Object"}, "journal_0_issue_level"=>{"0"=>""}, "journal_0_issue_end_page"=>{"0"=>"230"}, "person_0_first_name"=>{"0"=>"John"}, "person_1_computing_id"=>{"0"=>""}, "journal_0_issn"=>{"0"=>"1234-5678"}, "journal_0_issue_publication_date"=>{"0"=>"FEB. 2007"}}, "rightsMetadata"=>{"embargo_embargo_release_date"=>{"0"=>""}}, "properties"=>{"released"=>{"0"=>"true"}, "release_to"=>{"0"=>"public"}}}}
+      helper.stubs(:params).returns(sample_params)
+      helper.prep_updater_method_args[:params].should == {[{:journal=>0}, :issn]=>{"0"=>"1234-5678"}, [{:person=>0}, :description]=>{"0"=>""}, [:abstract]=>{"0"=>"ABSTRACT"}, [{:person=>0}, :last_name]=>{"0"=>"Smith"}, [{:journal=>0}, :issue, :level]=>{"0"=>""}, [:release_to]=>{"0"=>"public"}, [{:person=>1}, :computing_id]=>{"0"=>""}, [{:journal=>0}, :title_info, :main_title]=>{"0"=>"The Journal of Mock Object"}, [:subject, :topic]=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, [{:person=>1}, :first_name]=>{"0"=>"Henrietta"}, [{:journal=>0}, :issue, :volume]=>{"0"=>"2               "}, [{:person=>1}, :institution]=>{"0"=>"Baltimore"}, [{:journal=>0}, :origin_info, :publisher]=>{"0"=>"PUBLISHER"}, [{:person=>0}, :computing_id]=>{"0"=>""}, [{:person=>0}, :first_name]=>{"0"=>"John"}, [:title_info, :main_title]=>{"0"=>"Test Article"}, [{:person=>0}, :institution]=>{"0"=>"FACULTY, UNIVERSITY"}, [{:journal=>0}, :issue, :end_page]=>{"0"=>"230"}, [:location, :url]=>{"0"=>"http://example.com/foo"}, [{:person=>1}, :description]=>{"0"=>""}, [{:person=>1}, :last_name]=>{"0"=>"Lacks"}, :released=>{"0"=>"true"}, [:embargo, :embargo_release_date]=>{"0"=>""}, [{:journal=>0}, :issue, :publication_date]=>{"0"=>"FEB. 2007"}, [:note]=>{"0"=>""}, [{:journal=>0}, :issue, :start_page]=>{"0"=>"195"}}
+      helper.prep_updater_method_args[:opts].should == {:datastreams=>"properties"}
+    end
+  end
+  
+  describe "sanitize_update_params" do
+    it "should create a hash appropriate for passing into ActiveFedora::Base.update_datastream_attributes" do
+      sample_params = {
+        "content_type"=>"mods_asset", 
+        "action"=>"update", 
+        "_method"=>"put", 
+        "field_selectors"=>{
+          "descMetadata"=>{"person_0_computing_id"=>[{"person"=>"0"}, "computing_id"], "journal_0_issue_start_page"=>[{"journal"=>"0"}, "issue", "start_page"], "person_1_description"=>[{"person"=>"1"}, "description"], "person_1_institution"=>[{"person"=>"1"}, "institution"], "journal_0_origin_info_publisher"=>[{"journal"=>"0"}, "origin_info", "publisher"], "abstract"=>["abstract"], "person_0_last_name"=>[{"person"=>"0"}, "last_name"], "person_0_description"=>[{"person"=>"0"}, "description"], "journal_0_issue_volume"=>[{"journal"=>"0"}, "issue", "volume"], "title_info_main_title"=>["title_info", "main_title"], "location_url"=>["location", "url"], "note"=>["note"], "person_1_last_name"=>[{"person"=>"1"}, "last_name"], "subject_topic"=>["subject", "topic"], "person_0_institution"=>[{"person"=>"0"}, "institution"], "person_1_first_name"=>[{"person"=>"1"}, "first_name"], "person_1"=>[{"person"=>"1"}], "journal_0_title_info_main_title"=>[{"journal"=>"0"}, "title_info", "main_title"], "journal_0_issue_level"=>[{"journal"=>"0"}, "issue", "level"], "journal_0_issue_end_page"=>[{"journal"=>"0"}, "issue", "end_page"], "peer_reviewed"=>["peer_reviewed"], "person_0_first_name"=>[{"person"=>"0"}, "first_name"], "person_1_computing_id"=>[{"person"=>"1"}, "computing_id"], "journal_0_issn"=>[{"journal"=>"0"}, "issn"], "journal_0_issue_publication_date"=>[{"journal"=>"0"}, "issue", "publication_date"]}, 
+          "rightsMetadata"=>{"embargo_embargo_release_date"=>["embargo", "embargo_release_date"]}, 
+          "properties"=>{"release_to"=>["release_to"]}
+          }, 
+        "id"=>"hydrangea:fixture_mods_article3", 
+        "controller"=>"assets", 
+        "asset"=>{"descMetadata"=>{"person_0_computing_id"=>{"0"=>""}, "journal_0_issue_start_page"=>{"0"=>"195"}, "person_1_description"=>{"0"=>""}, "person_1_institution"=>{"0"=>"Baltimore"}, "journal_0_origin_info_publisher"=>{"0"=>"PUBLISHER"}, "abstract"=>{"0"=>"ABSTRACT"}, "person_0_last_name"=>{"0"=>"Smith"}, "person_0_description"=>{"0"=>""}, "journal_0_issue_volume"=>{"0"=>"2               "}, "title_info_main_title"=>{"0"=>"Test Article"}, "location_url"=>{"0"=>"http://example.com/foo"}, "note"=>{"0"=>""}, "person_1_last_name"=>{"0"=>"Lacks"}, "subject_topic"=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, "person_0_institution"=>{"0"=>"FACULTY, UNIVERSITY"}, "person_1_first_name"=>{"0"=>"Henrietta"}, "journal_0_title_info_main_title"=>{"0"=>"The Journal of Mock Object"}, "journal_0_issue_level"=>{"0"=>""}, "journal_0_issue_end_page"=>{"0"=>"230"}, "person_0_first_name"=>{"0"=>"John"}, "person_1_computing_id"=>{"0"=>""}, "journal_0_issn"=>{"0"=>"1234-5678"}, "journal_0_issue_publication_date"=>{"0"=>"FEB. 2007"}}, "rightsMetadata"=>{"embargo_embargo_release_date"=>{"0"=>""}}, "properties"=>{"released"=>{"0"=>"true"}, "release_to"=>{"0"=>"public"}}}
+        }
+      
+      expected_sane_params = {
+        "descMetadata"=>{[{:person=>0}, :institution]=>{"0"=>"FACULTY, UNIVERSITY"}, [{:journal=>0}, :title_info, :main_title]=>{"0"=>"The Journal of Mock Object"}, [{:journal=>0}, :issue, :volume]=>{"0"=>"2               "}, [{:journal=>0}, :issn]=>{"0"=>"1234-5678"}, [{:person=>1}, :first_name]=>{"0"=>"Henrietta"}, [{:person=>0}, :last_name]=>{"0"=>"Smith"}, [:location, :url]=>{"0"=>"http://example.com/foo"}, [:subject, :topic]=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, [{:person=>0}, :first_name]=>{"0"=>"John"}, [{:person=>1}, :computing_id]=>{"0"=>""}, [{:journal=>0}, :issue, :end_page]=>{"0"=>"230"}, [:note]=>{"0"=>""}, [:title_info, :main_title]=>{"0"=>"Test Article"}, [{:journal=>0}, :issue, :publication_date]=>{"0"=>"FEB. 2007"}, [{:person=>1}, :description]=>{"0"=>""}, [:abstract]=>{"0"=>"ABSTRACT"}, [{:journal=>0}, :issue, :level]=>{"0"=>""}, [{:person=>1}, :institution]=>{"0"=>"Baltimore"}, [{:person=>0}, :computing_id]=>{"0"=>""}, [{:person=>1}, :last_name]=>{"0"=>"Lacks"}, [{:journal=>0}, :issue, :start_page]=>{"0"=>"195"}, [{:person=>0}, :description]=>{"0"=>""}, [{:journal=>0}, :origin_info, :publisher]=>{"0"=>"PUBLISHER"}}, "rightsMetadata"=>{[:embargo, :embargo_release_date]=>{"0"=>""}}, 
+        "properties"=>{[:release_to]=>{"0"=>"public"}, :released=>{"0"=>"true"}}
+        }
+      helper.stubs(:params).returns(sample_params)
+      sanitized_params = helper.sanitize_update_params
+      sanitized_params.should == expected_sane_params
+      sanitized_params["descMetadata"].should == expected_sane_params["descMetadata"]
+    end
+  end
+  
+  describe "tidy_response_from_update" do
+    it "should put response values into an array with fieldname / index / value Hash for each field updated" do
+      sample_input = {"descMetadata"=>{"journal_0_issue_start_page"=>{"0"=>"195"}, "person_0_computing_id"=>{"-1"=>""}, "journal_0_origin_info_publisher"=>{"0"=>"PUBLISHER"}, "person_1_institution"=>{"0"=>"Baltimore"}, "person_1_description"=>{"-1"=>""}, "abstract"=>{"0"=>"ABSTRACT"}, "person_0_description"=>{"-1"=>""}, "person_0_last_name"=>{"0"=>"Smith"}, "journal_0_issue_volume"=>{"0"=>"2               "}, "title_info_main_title"=>{"0"=>"Matt's Test Article! Again!?"}, "note"=>{"-1"=>""}, "location_url"=>{"0"=>"http://example.com/foo"}, "person_1_last_name"=>{"0"=>"Lacks"}, "subject_topic"=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, "journal_0_issue_level"=>{"0"=>"55       "}, "journal_0_issue_end_page"=>{"0"=>"230"}, "person_1_first_name"=>{"0"=>"Henrietta"}, "person_0_institution"=>{"0"=>"FACULTY, UNIVERSITY"}, "journal_0_title_info_main_title"=>{"0"=>"The Journal of Mock Object"}, "journal_0_issue_publication_date"=>{"0"=>"FEB. 2007"}, "person_1_computing_id"=>{"-1"=>""}, "person_0_first_name"=>{"0"=>"John"}, "journal_0_issn"=>{"0"=>"1234-5678"}}, "rightsMetadata"=>{"embargo_embargo_release_date"=>{"-1"=>""}}, "properties"=>{:released=>{"0"=>"true"}, :release_to=>{"0"=>"public"}, [:release_to]=>{}}}
+      expected_output = {"updated"=>[{"value"=>{"0"=>"195"}, "index"=>"journal_0_issue_start_page", "field_name"=>"descMetadata"}, {"value"=>{"-1"=>""}, "index"=>"person_0_computing_id", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"PUBLISHER"}, "index"=>"journal_0_origin_info_publisher", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"Baltimore"}, "index"=>"person_1_institution", "field_name"=>"descMetadata"}, {"value"=>{"-1"=>""}, "index"=>"person_1_description", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"ABSTRACT"}, "index"=>"abstract", "field_name"=>"descMetadata"}, {"value"=>{"-1"=>""}, "index"=>"person_0_description", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"Smith"}, "index"=>"person_0_last_name", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"2               "}, "index"=>"journal_0_issue_volume", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"Matt's Test Article! Again!?"}, "index"=>"title_info_main_title", "field_name"=>"descMetadata"}, {"value"=>{"-1"=>""}, "index"=>"note", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"http://example.com/foo"}, "index"=>"location_url", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"Lacks"}, "index"=>"person_1_last_name", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, "index"=>"subject_topic", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"55       "}, "index"=>"journal_0_issue_level", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"230"}, "index"=>"journal_0_issue_end_page", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"Henrietta"}, "index"=>"person_1_first_name", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"FACULTY, UNIVERSITY"}, "index"=>"person_0_institution", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"The Journal of Mock Object"}, "index"=>"journal_0_title_info_main_title", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"FEB. 2007"}, "index"=>"journal_0_issue_publication_date", "field_name"=>"descMetadata"}, {"value"=>{"-1"=>""}, "index"=>"person_1_computing_id", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"John"}, "index"=>"person_0_first_name", "field_name"=>"descMetadata"}, {"value"=>{"0"=>"1234-5678"}, "index"=>"journal_0_issn", "field_name"=>"descMetadata"}, {"value"=>{"-1"=>""}, "index"=>"embargo_embargo_release_date", "field_name"=>"rightsMetadata"}, {"value"=>{"0"=>"true"}, "index"=>:released, "field_name"=>"properties"}, {"value"=>{"0"=>"public"}, "index"=>:release_to, "field_name"=>"properties"}, {"value"=>{}, "index"=>[:release_to], "field_name"=>"properties"}]}
+      result = helper.tidy_response_from_update(sample_input)
+      (expected_output["updated"] - result["updated"]).should == []
+    end
+    it "if handling submission from jeditable (which will only submit one value at a time), return the value it submitted" do
+      sample_input = {"descMetadata"=>{"journal_0_issue_start_page"=>{"0"=>"195"}} }
+      expected_output = {"0"=>"195"}
+      helper.stubs(:params).returns({:field_id => "my field id"})
+      helper.tidy_response_from_update(sample_input).should == expected_output
+    end
+  end
+  
+  describe "update_document" do
+    it "should update the document with the provided params" do
+      sample_params = "sample params"
+      mock_document = mock("document")
+      mock_document.expects(:update_datastream_attributes).with(sample_params)
+      helper.update_document(mock_document, sample_params)
+    end
+  end
+  
+end