Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/controllers/callbacks_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def status
initial_status = @submission.status
extract_and_update_status_and_handle(params)
unless @submission.save
fail ActionController::RoutingError, 'Approved Status Requires Handle'
raise ActionController::RoutingError, 'Approved Status Requires Handle'
end
@submission.send_status_email unless @submission.status == initial_status
render nothing: true, status: 200
Expand All @@ -15,14 +15,14 @@ def status

def extract_and_update_status_and_handle(params)
json = JSON.parse(params[:body])
fail ActionController::RoutingError, 'Invalid Status' unless json['status']
raise ActionController::RoutingError, 'Invalid Status' unless json['status']
@submission.status = json['status'] if valid_status?(json['status'])
extract_and_update_handle(json) if @submission.status == 'approved'
end

def validate_submission_and_params(params)
fail ActionController::RoutingError, 'Not Found' unless @submission
fail ActionController::RoutingError, 'Invalid Status' unless params[:body]
raise ActionController::RoutingError, 'Not Found' unless @submission
raise ActionController::RoutingError, 'Invalid Status' unless params[:body]
end

def extract_and_update_handle(json)
Expand Down
3 changes: 2 additions & 1 deletion app/models/sword.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ def initialize(submission, callback_uri)
end

def deposit
@submission.to_sword_package(@callback_uri)
@response = @sword_server.post(
@submission.to_sword_package(@callback_uri),
File.read(@submission.sword_path),
content_type: 'application/zip',
x_packaging: 'http://purl.org/net/sword-types/METSDSpaceSIP')
end
Expand Down