hydra-works 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be24c7cb774b34fc21d74749c8320f6fcd275310
-  data.tar.gz: 20942f3a9129b254cafc6e6a5673648f5fc10851
+  metadata.gz: c1d6b6f3987a8df560123eee26e60f231fad1e8a
+  data.tar.gz: fefe3540d414cf554eea479f2de2249ee0417071
 SHA512:
-  metadata.gz: f5e5c82b0431194e3abc0884d522c2d855fdae15f61d8690ebbf0ff226e6b9e40b3a08d7ae2cc8d13fcbf68707c21fcd8c6a26a0fc823e7af9b04514e95f309f
-  data.tar.gz: 43ce3e8819b323483ab424ea06d26f31ceb103738a9c9ed7c36f2f049a1b99b90e6b43587e1ad33dca95123034a5fcb370101f44b7d8096fda131d7efbad0bef
+  metadata.gz: 8eb1fb9eae7a8dd692008ccc0c30c2707f694717e2d0d59e190afce5466557b25a26692e63be6dca281a083d96603d1a66c59d7503d0b3b17bdf35e2c159728f
+  data.tar.gz: 60c735f5169ae1f41a9b8a33013147961b830d536e4c41fd4f3b28b76709a731d192983966798276ca30ec44612a67b8bcb214f6712ae93251e60ad5fd22fcd4

data/.rubocop.yml

@@ -1,4 +1,5 @@
 require: rubocop-rspec
+inherit_from: .rubocop_todo.yml
 
 AllCops:
   DisplayCopNames: true
@@ -9,6 +10,17 @@ AllCops:
     - 'spec/internal/bin/*'
     - 'spec/internal/db/schema.rb'
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
+# By default RSpec/MessageSpies has the following:
+#   Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
+# The default assumes EnforcedStyle is 'have_received'. Most of our specs are 'receive'
+RSpec/MessageSpies:
+  Enabled: true
+  EnforcedStyle: receive
+
 Metrics/LineLength:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -0,0 +1,105 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-01-24 14:50:50 -0500 using RuboCop version 0.47.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 137
+
+# Offense count: 1
+RSpec/BeEql:
+  Exclude:
+    - 'spec/hydra/works/services/upload_file_spec.rb'
+
+# Offense count: 5
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/hydra/works/models/work_spec.rb'
+    - 'spec/hydra/works/services/characterization_service_spec.rb'
+
+# Offense count: 8
+RSpec/LeadingSubject:
+  Exclude:
+    - 'spec/hydra/works/characterization_spec.rb'
+    - 'spec/hydra/works/models/file_set_spec.rb'
+    - 'spec/hydra/works/services/add_file_to_file_set_spec.rb'
+    - 'spec/hydra/works/services/determine_mime_type_spec.rb'
+    - 'spec/hydra/works/services/determine_original_name_spec.rb'
+    - 'spec/hydra/works/virus_scanner_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  Exclude:
+    - 'spec/hydra/works/services/virus_checker_service_spec.rb'
+
+# Offense count: 52
+RSpec/MultipleExpectations:
+  Max: 8
+
+# Offense count: 119
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/hydra/works/models/collection_spec.rb'
+    - 'spec/hydra/works/models/concerns/file_set/contained_files_spec.rb'
+    - 'spec/hydra/works/models/concerns/file_set/mime_types_spec.rb'
+    - 'spec/hydra/works/models/concerns/file_set/versioned_content_spec.rb'
+    - 'spec/hydra/works/models/concerns/file_set/virus_check_spec.rb'
+    - 'spec/hydra/works/models/concerns/file_set_behavior_spec.rb'
+    - 'spec/hydra/works/models/file_set_spec.rb'
+    - 'spec/hydra/works/models/work_spec.rb'
+    - 'spec/hydra/works/services/add_file_to_file_set_spec.rb'
+    - 'spec/hydra/works/services/upload_file_spec.rb'
+
+# Offense count: 8
+# Configuration parameters: Max.
+RSpec/NestedGroups:
+  Exclude:
+    - 'spec/hydra/works/models/collection_spec.rb'
+    - 'spec/hydra/works/models/work_spec.rb'
+    - 'spec/hydra/works/services/characterization_service_spec.rb'
+    - 'spec/hydra/works/services/virus_checker_service_spec.rb'
+
+# Offense count: 6
+RSpec/SubjectStub:
+  Exclude:
+    - 'spec/hydra/works/models/concerns/file_set/mime_types_spec.rb'
+    - 'spec/hydra/works/models/concerns/file_set/virus_check_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/hydra/works/services/upload_file_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/hydra/works/not_collection_validator.rb'
+    - 'lib/hydra/works/not_file_set_validator.rb'
+    - 'lib/hydra/works/services/add_file_to_file_set.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: symmetrical, new_line, same_line
+Style/MultilineMethodCallBraceLayout:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/hydra/works/virus_scanner.rb'

data/.travis.yml

@@ -6,7 +6,10 @@ env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 rvm:
-  - 2.2.5
   - 2.3.1
+  - 2.4.0
 before_script:
   - jdk_switcher use oraclejdk8
+
+before_install:
+  - gem update --system

data/CONTRIBUTING.md

@@ -3,6 +3,13 @@
 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.
 
+## 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.
+
 ## Hydra Project Intellectual Property Licensing and Ownership
 
 All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
@@ -16,8 +23,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 * Reporting Issues
 * Making Changes
+* Documenting Code
+* Committing Changes
 * Submitting Changes
-* Merging Changes
+* Reviewing and Merging Changes
 
 ### Reporting Issues
 
@@ -38,8 +47,28 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * Then checkout the new branch with `git checkout fix/master/my_contribution`.
   * 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.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+
+### Documenting Code
+
+* All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
+  * Documentation should seek to answer the question "why does this code exist?"
+* Document private / protected methods as desired.
+* If you are working in a file with no prior documentation, do try to document as you gain understanding of the code.
+  * 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 
+  * 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)
@@ -60,7 +89,9 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
         class PostsController
           def index
-            respond_with Post.limit(10)
+            respond_to do |wants|
+              wants.html { render 'index' }
+            end
           end
         end
 
@@ -72,10 +103,6 @@ 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.
@@ -84,28 +111,45 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * `git pull --rebase`
   * `git checkout <your-branch>`
   * `git rebase master`
-  * It is likely a good idea to run your tests again.
+  * It is a good idea to run your tests again.
 * If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
   * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
-  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
 
-### Merging Changes
+### Reviewing and Merging Changes
+
+We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
+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)
+
+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.
+
+*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (Travis CI is usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
+
+#### Things to Consider When Reviewing
+
+First, the person contributing the code is putting themselves out there. Be mindful of what you say in a review.
+
+* Ask clarifying questions
+* State your understanding and expectations
+* Provide example code or alternate solutions, and explain why
+
+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:
 
-* It is considered "poor from" to merge your own request.
-* Please take the time to review the changes and get a sense of what is being 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 refactorings_
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactors_
+  * 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?
-  * Did the Travis tests complete successfully?
-* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
-* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+  * Does the description of the new/changed specs match your understanding of what the spec is doing?
 
-## New Developers
-A great way to get new developers involved and to learn the process is to have them go through the Hierarchy of Promises and create a pull request to improve it.
+If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 
 # Additional Resources
 

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 gem 'slop', '~> 3.6' # For byebug
 
 group :development, :test do
-  gem 'rubocop', '~> 0.37.2', require: false
+  gem 'rubocop', '~> 0.47.0', require: false
   gem 'rubocop-rspec', require: false
   gem 'pry' unless ENV['CI']
   gem 'pry-byebug' unless ENV['CI']

data/lib/hydra/works.rb

@@ -48,6 +48,7 @@ module Hydra
     autoload_under 'services' do
       autoload :VirusCheckerService
       autoload :AddFileToFileSet
+      autoload :AddExternalFileToFileSet
       autoload :UploadFileToFileSet
       autoload :PersistDerivative
       autoload :CharacterizationService

data/lib/hydra/works/services/add_external_file_to_file_set.rb

@@ -0,0 +1,108 @@
+module Hydra::Works
+  class AddExternalFileToFileSet
+    # Adds a file to the file_set
+    # @param [Hydra::PCDM::FileSet] file_set the file will be added to
+    # @param [String] external_file_url URL representing the externally stored file
+    # @param [RDF::URI or String] type URI for the RDF.type that identifies the file's role within the file_set
+    # @param [Hash] opts Options
+    # @option opts [Boolean] :update_existing When set to true, performs a create_or_update. When set to false, always creates a new file within file_set.files.
+    # @option opts [Boolean] :versioning Whether to create new version entries (only applicable if +type+ corresponds to a versionable file)
+    # @option opts [String] :filename A string for the original file name. Defaults to the same value as external_file_url
+    def self.call(file_set, external_file_url, type, opts = {})
+      fail ArgumentError, 'supplied object must be a file set' unless file_set.file_set?
+
+      update_existing = opts.fetch(:update_existing, true)
+      versioning = opts.fetch(:versioning, true)
+      filename = opts.fetch(:filename, external_file_url)
+
+      # TODO: required as a workaround for https://github.com/projecthydra/active_fedora/pull/858
+      file_set.save unless file_set.persisted?
+
+      updater_class = versioning ? VersioningUpdater : Updater
+      updater = updater_class.new(file_set, type, update_existing)
+      status = updater.update(external_file_url, filename)
+      status ? file_set : false
+    end
+
+    class Updater
+      attr_reader :file_set, :current_file
+
+      def initialize(file_set, type, update_existing)
+        @file_set = file_set
+        @current_file = find_or_create_file(type, update_existing)
+      end
+
+      # @param [#read] file object that will be interrogated using the methods: :path, :original_name, :original_filename, :mime_type, :content_type
+      # None of the attribute description methods are required.
+      def update(external_file_url, filename = nil)
+        attach_attributes(external_file_url, filename)
+        persist
+      end
+
+      private
+
+        # Persist a new file with its containing file set; otherwise, just save the file itself
+        def persist
+          if current_file.new_record?
+            file_set.save
+          else
+            current_file.save
+          end
+        end
+
+        def attach_attributes(external_file_url, filename = nil)
+          current_file.content = StringIO.new('')
+          current_file.original_name = filename
+          current_file.mime_type = "message/external-body; access-type=URL; URL=\"#{external_file_url}\""
+        end
+
+        # @param [Symbol, RDF::URI] the type of association or filter to use
+        # @param [true, false] update_existing when true, try to retrieve existing element before building one
+        def find_or_create_file(type, update_existing)
+          if type.instance_of? Symbol
+            find_or_create_file_for_symbol(type, update_existing)
+          else
+            find_or_create_file_for_rdf_uri(type, update_existing)
+          end
+        end
+
+        def find_or_create_file_for_symbol(type, update_existing)
+          association = file_set.association(type)
+          fail ArgumentError, "you're attempting to add a file to a file_set using '#{type}' association but the file_set does not have an association called '#{type}''" unless association
+          current_file = association.reader if update_existing
+          current_file || association.build
+        end
+
+        def find_or_create_file_for_rdf_uri(type, update_existing)
+          current_file = file_set.filter_files_by_type(type_to_uri(type)).first if update_existing
+          unless current_file
+            file_set.files.build
+            current_file = file_set.files.last
+            Hydra::PCDM::AddTypeToFile.call(current_file, type_to_uri(type))
+          end
+          current_file
+        end
+
+        # Returns appropriate URI for the requested type
+        #  * Converts supported symbols to corresponding URIs
+        #  * Converts URI strings to RDF::URI
+        #  * Returns RDF::URI objects as-is
+        def type_to_uri(type)
+          case type
+          when ::RDF::URI
+            type
+          when String
+            ::RDF::URI(type)
+          else
+            fail ArgumentError, 'Invalid file type.  You must submit a URI or a symbol.'
+          end
+        end
+    end
+
+    class VersioningUpdater < Updater
+      def update(*)
+        super && current_file.create_version
+      end
+    end
+  end
+end

data/lib/hydra/works/services/add_file_to_file_set.rb

@@ -2,7 +2,7 @@ module Hydra::Works
   class AddFileToFileSet
     # Adds a file to the file_set
     # @param [Hydra::PCDM::FileSet] file_set the file will be added to
-    # @param [IO,File,Rack::Multipart::UploadedFile, #read] object that will be the contents. If file responds to :mime_type, :content_type, :original_name, or :original_filename, those will be called to provide metadata.
+    # @param [IO,File,Rack::Multipart::UploadedFile, #read] file the object that will be the contents. If file responds to :mime_type, :content_type, :original_name, or :original_filename, those will be called to provide metadata.
     # @param [RDF::URI or String] type URI for the RDF.type that identifies the file's role within the file_set
     # @param [Boolean] update_existing whether to update an existing file if there is one. When set to true, performs a create_or_update. When set to false, always creates a new file within file_set.files.
     # @param [Boolean] versioning whether to create new version entries (only applicable if +type+ corresponds to a versionable file)
@@ -76,6 +76,7 @@ module Hydra::Works
             current_file = file_set.files.last
             Hydra::PCDM::AddTypeToFile.call(current_file, type_to_uri(type))
           end
+          current_file
         end
 
         # Returns appropriate URI for the requested type

data/lib/hydra/works/services/characterization_service.rb

@@ -36,7 +36,8 @@ module Hydra::Works
       # @return content of object if source is nil; otherwise, return a File or the source
       def source_to_content
         return object.content if source.nil?
-        return File.open(source).read if source.is_a? String
+        # do not read the file into memory It could be huge...
+        return File.open(source) if source.is_a? String
         source.rewind
         source.read
       end

data/lib/hydra/works/services/virus_checker_service.rb

@@ -28,13 +28,25 @@ module Hydra::Works
       # @param [File] file object to retrieve a path for
       def local_path_for_file(file)
         return file.path if file.respond_to?(:path)
+        return file.content.path if file.content.respond_to?(:path)
+
         Tempfile.open('') do |t|
           t.binmode
-          t.write(file.content.read)
-          file.content.rewind
+          write_to_temp_file(file, t)
           t.close
           t.path
         end
       end
+
+      def write_to_temp_file(file, temp_file)
+        if file.new_record?
+          temp_file.write(file.content.read)
+          file.content.rewind
+        else
+          file.stream.each do |chunk|
+            temp_file.write(chunk)
+          end
+        end
+      end
   end
 end

data/lib/hydra/works/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Works
-    VERSION = '0.15.0'.freeze
+    VERSION = '0.16.0'.freeze
   end
 end

data/spec/hydra/works/services/add_external_file_to_file_set_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Hydra::Works::AddExternalFileToFileSet do
+  let(:file_set)            { Hydra::Works::FileSet.new }
+  let(:file_set2)           { Hydra::Works::FileSet.new }
+  let(:filename)            { 'sample-file.pdf' }
+  let(:filename2)           { 'updated-file.txt' }
+  let(:original_name)       { 'original-name.pdf' }
+  # let(:file)                { File.open(File.join(fixture_path, filename)) }
+  # let(:file2)               { File.open(File.join(fixture_path, filename2)) }
+  let(:external_file_url)   { "http://foo.org/abc1234" }
+  let(:type)                { ::RDF::URI('http://pcdm.org/use#ExtractedText') }
+  let(:update_existing)     { true }
+  # let(:mime_type)           { 'application/pdf' }
+
+  context 'when file_set is not persisted' do
+    let(:file_set) { Hydra::Works::FileSet.new }
+    it 'saves file_set' do
+      described_class.call(file_set, external_file_url, type)
+      expect(file_set.persisted?).to be true
+    end
+  end
+
+  context 'when file_set is not valid' do
+    before do
+      file_set.save
+      allow(file_set).to receive(:valid?).and_return(false)
+    end
+    it 'returns false' do
+      expect(described_class.call(file_set, external_file_url, type)).to be false
+    end
+  end
+
+  context 'when file set is valid' do
+    before do
+      described_class.call(file_set, external_file_url, type, filename: original_name)
+    end
+
+    subject(:file) { file_set.filter_files_by_type(type).first }
+
+    it 'sets mime type of the File object to message/external body containing external file URL' do
+      expect(file.mime_type).to eq "message/external-body;access-type=URL;url=\"http://foo.org/abc1234\""
+    end
+
+    it 'assigns value of :filename option to the File object' do
+      expect(file.original_name).to eq original_name
+    end
+
+    context 'when no filename is passed in' do
+      before do
+        described_class.call(file_set, external_file_url, type)
+      end
+
+      subject(:file) { file_set.filter_files_by_type(type).last }
+
+      it 'sets filename of File objectd to be the same as the external file url' do
+        expect(file.original_name).to eq external_file_url
+      end
+    end
+  end
+end

data/spec/hydra/works/services/characterization_service_spec.rb

@@ -65,7 +65,7 @@ describe Hydra::Works::CharacterizationService do
     context "using a string path as the source." do
       it 'passes a file with the string as a path to FileCharacterization.' do
         path_on_disk = File.join(fixture_path, filename)
-        expect(Hydra::FileCharacterization).to receive(:characterize).with(file_content, filename, :fits)
+        expect(Hydra::FileCharacterization).to receive(:characterize).with(kind_of(File), filename, :fits)
         described_class.run(file, path_on_disk)
       end
     end

data/spec/hydra/works/services/virus_checker_service_spec.rb

@@ -2,8 +2,16 @@ require 'spec_helper'
 
 describe Hydra::Works::VirusCheckerService do
   let(:system_virus_scanner) { double }
-  let(:file) { Hydra::PCDM::File.new { |f| f.content = File.new(File.join(fixture_path, 'sample-file.pdf')) } }
+  let(:file) { Hydra::PCDM::File.new }
   let(:virus_checker) { described_class.new(file, system_virus_scanner) }
+  let(:datastream) { instance_double "ActiveFedora::File::Streaming::FileBody" }
+  let(:content) { instance_double "File" }
+
+  before do
+    allow(file).to receive(:stream).and_return(datastream)
+    allow(file).to receive(:content).and_return(content)
+    allow(datastream).to receive(:each)
+  end
 
   context '.file_has_virus?' do
     it 'is a convenience method' do
@@ -16,14 +24,15 @@ describe Hydra::Works::VirusCheckerService do
 
   context 'with an infected file' do
     context 'that responds to :path' do
-      it 'will return false' do
+      it 'will return true' do
         expect(system_virus_scanner).to receive(:infected?).with('/tmp/file.pdf').and_return(true)
         allow(file).to receive(:path).and_return('/tmp/file.pdf')
         expect(virus_checker.file_has_virus?).to eq(true)
       end
     end
     context 'that does not respond to :path' do
-      it 'will return false' do
+      let(:content) { instance_double "File", read: ["abc123", nil], rewind: true }
+      it 'will return true' do
         expect(system_virus_scanner).to receive(:infected?).with(kind_of(String)).and_return(true)
         allow(file).to receive(:respond_to?).and_call_original
         allow(file).to receive(:respond_to?).with(:path).and_return(false)
@@ -32,17 +41,47 @@ describe Hydra::Works::VirusCheckerService do
     end
   end
 
-  context 'with a clean file' do
+  context 'with a clean unsaved file' do
     context 'that responds to :path' do
-      it 'will return true' do
+      it 'will return false' do
         expect(system_virus_scanner).to receive(:infected?).with('/tmp/file.pdf').and_return(false)
         allow(file).to receive(:path).and_return('/tmp/file.pdf')
         expect(virus_checker.file_has_virus?).to eq(false)
       end
     end
+
+    context "that does not respond to path" do
+      before do
+        allow(file).to receive(:respond_to?).with(:path).and_return(false)
+      end
+      context 'that the content responds to path' do
+        let(:content) { instance_double "File", read: ["abc123", nil], rewind: true, path: "abc123" }
+
+        it 'will return false' do
+          expect(system_virus_scanner).to receive(:infected?).with(kind_of(String)).and_return(false)
+          expect(content).not_to receive(:read)
+          expect(virus_checker.file_has_virus?).to eq(false)
+        end
+      end
+      context "that the content does not respond to path" do
+        let(:content) { instance_double "File", read: ["abc123", nil], rewind: true }
+        it 'will return false' do
+          expect(system_virus_scanner).to receive(:infected?).with(kind_of(String)).and_return(false)
+          expect(file).not_to receive(:stream)
+          expect(virus_checker.file_has_virus?).to eq(false)
+        end
+      end
+    end
+  end
+
+  context "with a clean saved file that does not respond to :path" do
+    before do
+      allow(file).to receive(:new_record?).and_return(false)
+    end
     context 'that does not respond to :path' do
-      it 'will return true' do
+      it 'will return false' do
         expect(system_virus_scanner).to receive(:infected?).with(kind_of(String)).and_return(false)
+        expect(content).not_to receive(:read)
         allow(file).to receive(:respond_to?).and_call_original
         allow(file).to receive(:respond_to?).with(:path).and_return(false)
         expect(virus_checker.file_has_virus?).to eq(false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-works
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-pcdm
@@ -196,6 +196,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -225,6 +226,7 @@ files:
 - lib/hydra/works/models/work.rb
 - lib/hydra/works/not_collection_validator.rb
 - lib/hydra/works/not_file_set_validator.rb
+- lib/hydra/works/services/add_external_file_to_file_set.rb
 - lib/hydra/works/services/add_file_to_file_set.rb
 - lib/hydra/works/services/characterization_service.rb
 - lib/hydra/works/services/determine_mime_type.rb
@@ -282,6 +284,7 @@ files:
 - spec/hydra/works/models/concerns/file_set_behavior_spec.rb
 - spec/hydra/works/models/file_set_spec.rb
 - spec/hydra/works/models/work_spec.rb
+- spec/hydra/works/services/add_external_file_to_file_set_spec.rb
 - spec/hydra/works/services/add_file_to_file_set_spec.rb
 - spec/hydra/works/services/characterization_service_spec.rb
 - spec/hydra/works/services/determine_mime_type_spec.rb
@@ -322,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Fundamental repository data model for hydra
@@ -358,6 +361,7 @@ test_files:
 - spec/hydra/works/models/concerns/file_set_behavior_spec.rb
 - spec/hydra/works/models/file_set_spec.rb
 - spec/hydra/works/models/work_spec.rb
+- spec/hydra/works/services/add_external_file_to_file_set_spec.rb
 - spec/hydra/works/services/add_file_to_file_set_spec.rb
 - spec/hydra/works/services/characterization_service_spec.rb
 - spec/hydra/works/services/determine_mime_type_spec.rb