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

Use a string rather than symbol when reading recipe from a hash. #29

Merged
merged 1 commit into from
Apr 9, 2014

Conversation

jpstroop
Copy link
Contributor

@jpstroop jpstroop commented Apr 8, 2014

Closes #28

This and a couple of other small bugs were being masked by the fact that #kdu_compress_recipe always falls back to a default recipe:

https://github.com/jpstroop/hydra-derivatives/blob/add_jp2_support/lib/hydra/derivatives/jpeg2k_image.rb#L84-L98

simply testing that the stream had content was not sufficient. Additional tests to check that we're getting the intended recipe are included.

@jcoyne
Copy link
Member

jcoyne commented Apr 8, 2014

It looks like the build is failing probably due to the Hydra-Head 7 upgrade:

     Failure/Error: let(:file) { GenericFile.new(mime_type: 'image/png').tap { |t| t.content.content = attachment; t.save } }
     ActiveFedora::UnknownAttributeError:
       GenericFile does not have an attribute `mime_type'

@jcoyne
Copy link
Member

jcoyne commented Apr 8, 2014

I think this will be fixed by #30

@jpstroop
Copy link
Contributor Author

jpstroop commented Apr 8, 2014

Cool, was just looking into it but will wait and see. Thanks!

@jpstroop jpstroop mentioned this pull request Apr 8, 2014
@jcoyne
Copy link
Member

jcoyne commented Apr 8, 2014

@jpstroop can you rebase this PR against master so we can remove the merge commit?

@jpstroop
Copy link
Contributor Author

jpstroop commented Apr 9, 2014

@jcoyne Does this look better?

@jcoyne
Copy link
Member

jcoyne commented Apr 9, 2014

@jpstroop Not quite, you need to rebase it onto master, so that this commit has a parent commit of ab90ce5

Make sure you reset your master branch to be the same as upstream/master, then checkout your branch and git rebase master

@jpstroop
Copy link
Contributor Author

jpstroop commented Apr 9, 2014

@jcoyne Bah...forgot to pull from upstream. Sorry. I think it's correct now.

jcoyne added a commit that referenced this pull request Apr 9, 2014
Use a string rather than symbol when reading recipe from a hash.
@jcoyne jcoyne merged commit 8e6116d into samvera:master Apr 9, 2014
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.

Kakadu recipe key should not be a symbol in config
2 participants