hydra-derivatives 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c50d782fb24f22b346b37488997f08b6412ebb7
-  data.tar.gz: 04b2eb295f5081b08143302733d115b15b52a76b
+SHA256:
+  metadata.gz: 47fbc2bf8a041e266066dac9b4735ef653ab669e373e475c976e36615ce98f09
+  data.tar.gz: ee2435c0b1cd2aebc7b274b92e4280a4c68f493e0c2665b3dfce3b1b363acfaa
 SHA512:
-  metadata.gz: 7c334e3f9356efbe09922e815a84da44daf1e229018021819c1be8983cee3bfb815350477ba49b603c03fcfd1f177048afeb709c05a8e77fd35947bcb43074ba
-  data.tar.gz: d4c454ce7bc48be6b6becd36b38c8a2edf5ba73c39c5af7ed266c8296d8f14cfbcec2820574c562a7a77c74a8e064c07c7919ab640ef2866132eb42d5d74835e
+  metadata.gz: 8adf3f99d52e6b8f21597a2d022fd3f9f1c5c0b319c9ebfb68ae91202db3b61531aea12169fd5bc4fd9602fa8fcfe2d7bc3486c097b704e8575e5b22c2b44c1a
+  data.tar.gz: 92c5704c75bd8cbff6f2b10f8a238cf60da0e2d9c914396c148152cf8d7c55c61b5799f97abaec5d6401b86ac94a26810aed4ae6c965f21d19695faecea20ef0

data/.travis.yml

@@ -5,9 +5,10 @@ before_install:
   - gem update --system
   - gem install bundler
 rvm:
-  - 2.2.5
-  - 2.3.4
-  - 2.4.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
@@ -35,4 +36,4 @@ addons:
       - libpng-dev
       - imagemagick
       - ffmpeg
-      - libreoffice
+      - libreoffice

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,36 @@
+The Samvera community is dedicated to providing a welcoming and
+positive experience for all its members, whether they are at a formal
+gathering, in a social setting, or taking part in activities online.
+The Samvera community welcomes participation from people all over the
+world and these members bring with them a wide variety of
+professional, personal and social backgrounds; whatever these may be,
+we treat colleagues with dignity and respect.
+
+Community members communicate primarily in English, though for many of
+them this is not their native language. We therefore strive to express
+ourselves simply and clearly remembering that unnecessary use of
+jargon and slang will be a barrier to understanding for many of our
+colleagues.  We are sensitive to the fact that the international
+nature of the community means that we span many different social norms
+around language and behaviour and we strive to conduct ourselves,
+online and in person, in ways that are unlikely to cause offence.
+
+Samvera conversations are often information-rich and intended to
+generate discussion and debate.  We discuss ideas from a standpoint of
+mutual respect and reasoned argument.
+
+Community members work together to promote a respectful and safe
+community. In the event that someone’s conduct is causing offence or
+distress, Samvera has a detailed
+[Anti-Harassment Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
+which can be applied to address the problem. The first step in dealing
+with any serious misconduct is to contact a local meeting organizer,
+the
+[Samvera community helpers](https://wiki.duraspace.org/display/samvera/Samvera+Community+Helpers)
+([email](mailto:helpers@samvera.org)), a community member you
+trust, or the
+[Samvera Steering Group](https://wiki.duraspace.org/display/samvera/Samvera+Steering+Group+membership)
+immediately; at Samvera events, these people can be identified by
+distinctive name badges. The
+[Policy and Protocol](https://wiki.duraspace.org/display/samvera/Anti-Harassment+Policy)
+should be consulted for fuller details.

data/CONTRIBUTING.md

@@ -1,21 +1,24 @@
 # How to Contribute
 
-We want your help to make Project Hydra great.
-There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+We want your help to make the Samvera community great. There are a few guidelines
+that we need contributors to follow so that we can have a chance of
+keeping on top of things.
 
 ## Code of Conduct
 
-The Hydra community is dedicated to providing a welcoming and positive experience for all its
-members, whether they are at a formal gathering, in a social setting, or taking part in activities
-online.  Please see our [Code of Conduct](https://wiki.duraspace.org/display/hydra/Code+of+Conduct)
-for more information.
+The Samvera Community is dedicated to providing a welcoming and positive
+experience for all its members, whether they are at a formal gathering, in
+a social setting, or taking part in activities online. Please see our
+[Code of Conduct](CODE_OF_CONDUCT.md) for more information.
 
-## Hydra Project Intellectual Property Licensing and Ownership
+## Samvera Community Intellectual Property Licensing and Ownership
 
-All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
-If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+All code contributors must have an Individual Contributor License Agreement
+(iCLA) on file with the Samvera Steering Group. If the contributor works for
+an institution, the institution must have a Corporate Contributor License
+Agreement (cCLA) on file.
 
-https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Property+Licensing+and+Ownership
 
 You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
 
@@ -31,7 +34,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 ### Reporting Issues
 
 * Make sure you have a [GitHub account](https://github.com/signup/free)
-* Submit a [Github issue](./issues) by:
+* Submit a [Github issue](https://github.com/samvera/hydra-derivatives/issues/) by:
   * Clearly describing the issue
     * Provide a descriptive summary
     * Explain the expected behavior
@@ -48,7 +51,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * Please avoid working directly on the `master` branch.
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
 * Make sure you have added sufficient tests and documentation for your changes.
-  * Test functionality with RSpec; est features / UI with Capybara.
+  * Test functionality with RSpec; Test features / UI with Capybara.
 * Run _all_ the tests to assure nothing else was accidentally broken.
 
 ### Documenting Code
@@ -60,15 +63,11 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment.
   * This work greatly increases the usability of the code base and supports the on-ramping of new committers.
   * We will all be understanding of one another's time constraints in this area.
-* YARD examples:
-  * [Hydra::Works::RemoveGenericFile](https://github.com/projecthydra-labs/hydra-works/blob/master/lib/hydra/works/services/generic_work/remove_generic_file.rb)
-  * [ActiveTriples::LocalName::Minter](https://github.com/ActiveTriples/active_triples-local_name/blob/master/lib/active_triples/local_name/minter.rb)
 * [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
 
 ### Committing changes
 
 * Make commits of logical units.
-  * Your commit should include a high level description of your work in HISTORY.textile
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 * If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
@@ -103,6 +102,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
       long to fit in 72 characters
 ```
 
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
 ### Submitting Changes
 
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
@@ -125,9 +128,7 @@ We adopted [Github's Pull Request Review](https://help.github.com/articles/about
 Common checks that may occur in our repositories:
 
 1. Travis CI - where our automated tests are running
-2. Hound CI - where we check for style violations
-3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
-4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
+2. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
 
 If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
 
@@ -144,16 +145,17 @@ First, the person contributing the code is putting themselves out there. Be mind
 This is your chance for a mentoring moment of another developer. Take time to give an honest and thorough review of what has changed. Things to consider:
 
   * Does the commit message explain what is going on?
-  * Does the code changes have tests? _Not all changes need new tests, some changes are refactors_
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
   * Do new or changed methods, modules, and classes have documentation?
   * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
   * Does the description of the new/changed specs match your understanding of what the spec is doing?
+  * Did the Travis tests complete successfully?
 
 If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 
 # Additional Resources
 
 * [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [GitHub pull request documentation](https://help.github.com/articles/about-pull-requests/)
 * [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
 * [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/README.md

@@ -1,12 +1,36 @@
 # hydra-derivatives
 
+Code:
 [![Version](https://badge.fury.io/rb/hydra-derivatives.png)](http://badge.fury.io/rb/hydra-derivatives)
-[![Build Status](https://travis-ci.org/projecthydra/hydra-derivatives.png?branch=master)](https://travis-ci.org/projecthydra/hydra-derivatives)
-[![Dependency Status](https://gemnasium.com/projecthydra/hydra-derivatives.png)](https://gemnasium.com/projecthydra/hydra-derivatives)
-[![Coverage Status](https://coveralls.io/repos/github/projecthydra/hydra-derivatives/badge.svg?branch=master)](https://coveralls.io/github/projecthydra/hydra-derivatives?branch=master)
+[![Build Status](https://travis-ci.org/samvera/hydra-derivatives.png?branch=master)](https://travis-ci.org/samvera/hydra-derivatives)
+[![Coverage Status](https://coveralls.io/repos/github/samvera/hydra-derivatives/badge.svg?branch=master)](https://coveralls.io/github/samvera/hydra-derivatives?branch=master)
+
+Docs:
+[![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
+[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE.txt)
+
+Jump In: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+
+# What is hydra-derivatives?
 
 Derivative generation for hydra
 
+## Product Owner & Maintenance
+
+**hydra-derivatives** is a Core Component of the Samvera community. The documentation for
+what this means can be found
+[here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
+
+### Product Owner
+
+[jenlindner](https://github.com/jenlindner)
+
+# Help
+
+The Samvera community is here to help. Please see our [support guide](./SUPPORT.md).
+
+# Getting Started
+
 If you have an ActiveFedora class like this:
 ```ruby
     class GenericFile < ActiveFedora::Base
@@ -188,3 +212,10 @@ Instead, each directive may contain these arguments:
   * `:layers` (Integer) : The number of quality layers. Default: 8
   * `:compression` (Integer) : The left number of the compression ratio `n:1`, e.g. 12 will apply 12:1 compression. Default: 10.
   * `:tile_size` (Integer) : Pixel dimension of the tiles. Default: 1024
+
+# Acknowledgments
+
+This software has been developed by and is brought to you by the Samvera community.  Learn more at the
+[Samvera website](http://samvera.org/).
+
+![Samvera Logo](https://wiki.duraspace.org/download/thumbnails/87459292/samvera-fall-font2-200w.png?version=1&modificationDate=1498550535816&api=v2)

data/SUPPORT.md

@@ -0,0 +1,5 @@
+If you would like to report an issue, first search [the list of issues](https://github.com/samvera/hydra-derivatives/issues/) to see if someone else has already reported it, and then feel free to [create a new issue](https://github.com/samvera/hydra-derivatives/issues/new).
+
+If you have questions or need help, please email [the Samvera community tech list](https://groups.google.com/forum/#!forum/samvera-tech) or stop by the #dev channel in [the Samvera community Slack team](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391#Getintouch!-Slack).
+
+You can learn more about the various Samvera communication channels on the [Get in touch!](https://wiki.duraspace.org/pages/viewpage.action?pageId=87460391) wiki page.

data/VERSION

@@ -1 +1 @@
-3.4.1
+3.4.2

data/hydra-derivatives.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   spec.add_development_dependency 'rake', '~> 10.1'
   spec.add_development_dependency 'rspec', '~> 3.1'

data/lib/hydra/derivatives/processors/full_text.rb

@@ -22,16 +22,23 @@ module Hydra::Derivatives::Processors
       # TODO: this pulls the whole file into memory. We should stream it from Fedora instead
       # @return [String] the result of calling the extract service
       def fetch
-        req = Net::HTTP.new(uri.host, uri.port)
-        req.use_ssl = true if check_for_ssl
-        resp = req.post(uri.to_s, file_content, request_headers)
+        resp = http_request
         raise "Solr Extract service was unsuccessful. '#{uri}' returned code #{resp.code} for #{source_path}\n#{resp.body}" unless resp.code == '200'
         file_content.rewind if file_content.respond_to?(:rewind)
+        resp.body.force_encoding(resp.type_params['charset']) if resp.type_params['charset']
+        resp.body
+      end
 
-        if resp.type_params['charset']
-          resp.body.force_encoding(resp.type_params['charset'])
+      # Send the request to the extract service
+      # @return [Net::HttpResponse] the result of calling the extract service
+      def http_request
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          req = Net::HTTP::Post.new(uri.request_uri, request_headers)
+          req.use_ssl = true if check_for_ssl
+          req.basic_auth uri.user, uri.password unless uri.password.nil?
+          req.body = file_content
+          http.request req
         end
-        resp.body
       end
 
       def file_content

data/lib/hydra/derivatives/processors/shell_based_processor.rb

@@ -62,9 +62,8 @@ module Hydra::Derivatives::Processors
         err_str = ''
         stdin, stdout, stderr, wait_thr = popen3(command)
         context[:pid] = wait_thr[:pid]
+        files = [stderr, stdout]
         stdin.close
-        stdout.close
-        files = [stderr]
 
         until all_eof?(files)
           ready = IO.select(files, nil, nil, 60)
@@ -82,11 +81,14 @@ module Hydra::Derivatives::Processors
                 err_str << data
               end
             rescue EOFError
-              Rails.logger "Caught an eof error in ShellBasedProcessor"
+              Hydra::Derivatives::Logger.debug "Caught an eof error in ShellBasedProcessor"
               # No big deal.
             end
           end
         end
+
+        stdout.close
+        stderr.close
         exit_status = wait_thr.value
 
         raise "Unable to execute command \"#{command}\". Exit code: #{exit_status}\nError message: #{err_str}" unless exit_status.success?

data/spec/processors/full_text_spec.rb

@@ -18,13 +18,17 @@ describe Hydra::Derivatives::Processors::FullText do
   describe "fetch" do
     subject { processor.send(:fetch) }
 
-    let(:request)       { double }
     let(:response_body) { 'returned by Solr' }
     let(:uri)           { URI('https://example.com:99/solr/update') }
+    let(:req) do
+      Net::HTTP::Post.new(
+        '/solr/update',
+        "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244"
+      )
+    end
 
     before do
       allow(processor).to receive(:uri).and_return(uri)
-      allow(Net::HTTP).to receive(:new).with('example.com', 99).and_return(request)
     end
 
     context "when that is successful" do
@@ -32,7 +36,9 @@ describe Hydra::Derivatives::Processors::FullText do
 
       it "calls the extraction service" do
         expect(processor).to receive(:check_for_ssl)
-        expect(request).to receive(:post).with('https://example.com:99/solr/update', String, "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(resp)
+        expect(Net::HTTP).to receive(:start).with('example.com', 99).and_yield(req)
+        expect(Net::HTTP::Post).to receive(:new).with('/solr/update', "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(req)
+        expect(req).to receive(:request).and_return(resp)
         expect(subject).to eq response_body
       end
     end
@@ -44,7 +50,9 @@ describe Hydra::Derivatives::Processors::FullText do
 
       it "calls the extraction service" do
         expect(processor).to receive(:check_for_ssl)
-        expect(request).to receive(:post).with('https://example.com:99/solr/update', String, "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(resp)
+        expect(Net::HTTP).to receive(:start).with('example.com', 99).and_yield(req)
+        expect(Net::HTTP::Post).to receive(:new).with('/solr/update', "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(req)
+        expect(req).to receive(:request).and_return(resp)
         expect(subject).to eq response_utf8
       end
     end
@@ -54,10 +62,39 @@ describe Hydra::Derivatives::Processors::FullText do
 
       it "raises an error" do
         expect(processor).to receive(:check_for_ssl)
-        expect(request).to receive(:post).with('https://example.com:99/solr/update', String, "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(resp)
+        expect(Net::HTTP).to receive(:start).with('example.com', 99).and_yield(req)
+        expect(Net::HTTP::Post).to receive(:new).with('/solr/update', "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(req)
+        expect(req).to receive(:request).and_return(resp)
         expect { subject }.to raise_error(RuntimeError, %r{^Solr Extract service was unsuccessful. 'https://example\.com:99/solr/update' returned code 500})
       end
     end
+
+    context "with basic_auth" do
+      let(:resp) { double(code: '200', type_params: {}, body: response_body) }
+      let(:uri) { URI('https://user:password@example.com:99/solr/update') }
+
+      it "calls the extraction service with basic auth" do
+        expect(processor).to receive(:check_for_ssl)
+        expect(Net::HTTP).to receive(:start).with('example.com', 99).and_yield(req)
+        expect(Net::HTTP::Post).to receive(:new).with('/solr/update', "Content-Type" => "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Content-Length" => "24244").and_return(req)
+        expect(req).to receive(:basic_auth).with('user', 'password')
+        expect(req).to receive(:request).and_return(resp)
+        expect(subject).to eq response_body
+      end
+    end
+
+    context "with no basic_auth credentials" do
+      let(:resp) { double(code: '401', type_params: {}, body: response_body) }
+      let(:uri) { URI('https://user:password@example.com:99/solr/update') }
+
+      it "raises a 401 error" do
+        req.basic_auth(nil, nil)
+        expect(processor).to receive(:check_for_ssl)
+        expect(Net::HTTP).to receive(:start).with('example.com', 99).and_yield(req)
+        expect(req).to receive(:request).and_return(resp)
+        expect { subject }.to raise_error(RuntimeError, %r{^Solr Extract service was unsuccessful. 'https://user:password@example.com:99/solr/update' returned code 401})
+      end
+    end
   end
 
   describe "uri" do

data/spec/processors/shell_based_processor_spec.rb

@@ -10,10 +10,19 @@ describe Hydra::Derivatives::Processors::ShellBasedProcessor do
   after { Object.send(:remove_const, :TestProcessor) }
 
   let(:processor) { TestProcessor.new }
+  let(:proc_class) { TestProcessor }
 
   describe "options_for" do
     it "returns a hash" do
       expect(processor.options_for("a")).to be_a Hash
     end
   end
+
+  describe ".execute" do
+    context "when an EOF error occurs" do
+      it "doesn't crash" do
+        proc_class.execute("echo foo")
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -214,12 +214,14 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - History.md
 - LICENSE.txt
 - README.md
 - Rakefile
+- SUPPORT.md
 - TODO
 - VERSION
 - config/fcrepo_wrapper_test.yml
@@ -336,8 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Derivative generation plugin for hydra