Skip to content
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

Merged
merged 4 commits into from
Jun 26, 2015
Merged

Pcdm compatibility #61

merged 4 commits into from
Jun 26, 2015

Conversation

kevinreiss
Copy link
Contributor

For review, DO NOT Merge as is. Moves towards closing #60.

@kevinreiss
Copy link
Contributor Author

Ruby 2.0 builds fail due to this line in active fedora aggregation.

lib/active_fedora/aggregation.rb:28:in `<module:Aggregation>': private method `include' called for ActiveFedora::Base:Class (NoMethodError)

- 2.1
- 2.0
- 2.2
- 2.
Copy link
Member

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.

@kevinreiss
Copy link
Contributor Author

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
@kevinreiss
Copy link
Contributor Author

@flyingzumwalt this PR has been rebased.

@kevinreiss
Copy link
Contributor Author

This is still a WIP, do not merge.

@kevinreiss
Copy link
Contributor Author

@flyingzumwalt still a work in progress.

@kevinreiss
Copy link
Contributor Author

@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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete this line.

kevinreiss added a commit to samvera/hydra-works that referenced this pull request Jun 25, 2015
end
end
end
# def output_file(path)
Copy link
Member

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'
Copy link
Member

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

Copy link
Contributor Author

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?

Copy link
Member

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.

flyingzumwalt added a commit that referenced this pull request Jun 26, 2015
@flyingzumwalt flyingzumwalt merged commit 7a8377c into master Jun 26, 2015
kevinreiss added a commit to samvera/hydra-works that referenced this pull request Jun 26, 2015
kevinreiss added a commit to samvera/hydra-works that referenced this pull request Jun 26, 2015
# 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.
@jcoyne jcoyne deleted the pcdm_compatibility branch April 9, 2016 03:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants