-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Pcdm compatibility #61
Conversation
Ruby 2.0 builds fail due to this line in active fedora aggregation.
|
- 2.1 | ||
- 2.0 | ||
- 2.2 | ||
- 2. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will resolve to 2.2 also. So you can remove one of them.
Will rebase this when it is satisfactory. |
Refactor how output file is handled by image processor. Add ruby 2.2 move to latest active-fedora-aggregation Travis typo tell travis to test at - 2. Clean up pull request Update config spec
11e513e
to
c51dc7c
Compare
@flyingzumwalt this PR has been rebased. |
This is still a WIP, do not merge. |
@flyingzumwalt still a work in progress. |
@flyingzumwalt take a look at this one when you have a chance and let us know if you think it is good to merge. |
@@ -24,7 +24,8 @@ def encode_file(dest_path, file_suffix, mime_type, options = { }) | |||
end | |||
end | |||
out_file = File.open(new_output, "rb") | |||
object.add_file(out_file.read, path: dest_path, mime_type: mime_type) | |||
# object.add_file(out_file.read, path: destination_name, mime_type: mime_type) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
delete this line.
end | ||
end | ||
end | ||
# def output_file(path) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
delete these lines
@@ -1,4 +1,5 @@ | |||
require 'spec_helper' | |||
require 'hydra/works' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add comment: Including hydra-works in order to test compatibility with IndirectContainers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't actually invoke hydra-works anywhere in this test @flyingzumwalt. Should we be?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you can remove it, remove it. You might have to add the require statement in the test(s) that do rely on Hydra::Works classes.
Update to use new original_file style calls.
8a16f27
to
baed12d
Compare
# The first commit's message is: Persist dervivatives output service. # The 2nd commit message will be skipped: # Peg to hydra dervivatives PR for review samvera/hydra-derivatives#61 # This is the 3rd commit message: Update method method signature for AddFileToGenericFile in PersistDerivativesOutputFile service.
For review, DO NOT Merge as is. Moves towards closing #60.