hydra-works 0.7.1 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cefb87e089349c82c73439d52e233d4bb75a7d3
-  data.tar.gz: db102c0181dbb73a50e18980d97567466446bd8b
+  metadata.gz: 028f44443d1d3bdcfbff713b15bc1b59cffb8e2c
+  data.tar.gz: 401c0b9112abc87e79319fe6ba0a3bf2849be4db
 SHA512:
-  metadata.gz: 020a75d61769ec1ec016b6a08faab106c620684f3648836cf70d2764b447a754ea1127259f4eaca6fe36dea5ac219d423caf61f4898adc39aa6bd18b7fcb03c8
-  data.tar.gz: 10995a20095c6b0690c957b4fa31fbf3f9ce90b62f2107a90666db92fc98cbef43a97323bccb64f1eb8a1ab63632aa65cff9868b91e29da350753c8378f8a8c5
+  metadata.gz: 93b2a91ae3c98474558c00d1b23d9cc006028aa13f6691adc5850d28ca7efa39a15fdfca577852b3633eabaf259f0d7cc22c0b7964b40c32a32ce5f6f0ed9634
+  data.tar.gz: f0bc3421b8a91e55c20f815b0b6fb2600c2aee1bf287de7e36aca8fe204a3ebe104d10468360018a1ce35792c1d48875285f3cd5b1323598f4365fa4947c362c

data/Gemfile

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

data/README.md

@@ -9,15 +9,20 @@
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/hydra-works)
 [![Stories in Ready](https://badge.waffle.io/projecthydra-labs/hydra-works.png?source=projecthydra-labs%2Fhydra-works&label=ready&title=Ready)](https://waffle.io/projecthydra-labs/hydra-works?source=projecthydra-labs%2Fhydra-works)
 
-The Hydra::Works gem provides a set of [Portland Common Data Model](https://github.com/duraspace/pcdm/wiki)-compliant ActiveFedora models and associated behaviors around the broad concept of multi-file "works", the need for which was expressed by a variety of [community use cases](https://github.com/projecthydra-labs/hydra-works/tree/master/use-cases). The Hydra::Works domain model includes:
+The Hydra::Works gem implements the [PCDM](https://github.com/duraspace/pcdm/wiki) [Works](https://github.com/duraspace/pcdm/blob/master/pcdm-ext/works.rdf) data model using ActiveFedora-based models. In addition to the models, Hydra::Works includes associated behaviors around the broad concept of describable "works" or intellectual entities, the need for which was expressed by a variety of [Hydra community use cases](https://github.com/projecthydra-labs/hydra-works/tree/master/use-cases). The PCDM Works domain model includes the following high-level entities:
 
- * **FileSet**: a *Hydra::PCDM::Object* that encapsulates one or more directly related *Hydra::PCDM::Files*, such as a PDF document, its derivatives, and extracted full-text
- * **Work**: a *Hydra::PCDM::Object* that holds zero or more **FileSets** and zero or more **Works** (often you won't use Work directly, but instead write your own class that mixes in `Hydra::Works::WorkBehavior`)
- * **Collection**: a *Hydra::PCDM::Collection* that indirectly contains zero or more **Works** and zero or more **Collection**s
+ * **Collection**: a *pcdm:Collection* that indirectly contains zero or more **Works** and zero or more **Collection**s
+ * **Work**: a *pcdm:Object* that holds zero or more **FileSets** and zero or more **Works**
+ * **FileSet**: a *pcdm:Object* that groups one or more related *pcdm:Files*, such as an original file (e.g., PDF document), its derivatives (e.g., a thumbnail), and extracted full-text
 
-View [a diagram of the domain model](https://docs.google.com/drawings/d/1-NkkRPpGpZGoTimEpYTaGM1uUPRaT0SamuWDITvtG_8/edit).
+Behaviors included in the model include:
 
-Checkout the readme for [hydra-derivatives](https://github.com/projecthydra/hydra-derivatives#dependencies) for additional dependencies.
+ * Characterization of original files within FileSets
+ * Generation of derivatives from original files
+ * Virus checking of original files
+ * Full-text extraction from original files
+
+Check out the [Hydra::Derivatives README](https://github.com/projecthydra/hydra-derivatives#dependencies) for additional dependencies.
 
 ## Installation
 
@@ -90,12 +95,33 @@ If you'd like to contribute to this effort, please check out the [contributing g
 
 ## Development
 
-To set up for running the test suite, you need a copy of jetty
+### Testing with the continuous integration server
+
+You can test Hydra::Works using the same process as our continuous
+integration server. To do that, run the default rake task which will download Solr and Fedora, start them,
+and run the tests for you.
+
+```bash
+rake
+```
+
+### Testing manually
 
-    $ rake jetty:clean
-    $ rake hydra_works:jetty:config
+If you want to run the tests manually, follow these instructions:
 
-To run the test suite, generate the test app (which goes into spec/internal) and start jetty (if it's not already running)
+```bash
+solr_wrapper -d solr/config/
+```
 
-    $ rake jetty:start
-    $ rake spec
+To start FCRepo, open another shell and run:
+
+```bash
+fcrepo_wrapper -p 8984
+```
+
+Now you’re ready to run the tests. In the directory where hydra-works
+is installed, run:
+
+```bash
+rake spec
+```

data/hydra-works.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'hydra-pcdm', '~> 0.4'
+  spec.add_dependency 'hydra-pcdm', '~> 0.5'
   spec.add_dependency 'hydra-derivatives', '~> 3.0'
   spec.add_dependency 'hydra-file_characterization', '~> 0.3', '>= 0.3.3'
 

data/lib/hydra/works.rb

@@ -23,6 +23,8 @@ module Hydra
     end
 
     autoload :Characterization
+    autoload :NotFileSetValidator
+    autoload :NotCollectionValidator
 
     autoload_under 'models' do
       autoload :Collection

data/lib/hydra/works/models/concerns/collection_behavior.rb

@@ -15,10 +15,16 @@ module Hydra::Works
   #   9) Hydra::Works::Collection can have access metadata
   module CollectionBehavior
     extend ActiveSupport::Concern
-    include Hydra::PCDM::CollectionBehavior
 
     included do
+      def self.type_validator
+        Hydra::PCDM::Validators::CompositeValidator.new(
+          super,
+          Hydra::Works::NotFileSetValidator
+        )
+      end
       type [Hydra::PCDM::Vocab::PCDMTerms.Collection, Vocab::WorksTerms.Collection]
+      include Hydra::PCDM::CollectionBehavior
     end
 
     def ordered_works

data/lib/hydra/works/models/concerns/file_set/mime_types.rb

@@ -23,11 +23,6 @@ module Hydra::Works
       self.class.office_document_mime_types.include? mime_type
     end
 
-    # TODO: remove?
-    def collection?
-      false
-    end
-
     module ClassMethods
       def image_mime_types
         ['image/png', 'image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif', 'image/tiff']

data/lib/hydra/works/models/concerns/file_set_behavior.rb

@@ -10,16 +10,20 @@ module Hydra::Works
   #   6) Hydra::Works::FileSet can have access metadata
   module FileSetBehavior
     extend ActiveSupport::Concern
-    include Hydra::PCDM::ObjectBehavior
 
     included do
+      def self.type_validator
+        Hydra::PCDM::Validators::CompositeValidator.new(
+          Hydra::Works::NotCollectionValidator,
+          super
+        )
+      end
       type [Hydra::PCDM::Vocab::PCDMTerms.Object, Vocab::WorksTerms.FileSet]
-
+      include Hydra::PCDM::ObjectBehavior
       include Hydra::Works::ContainedFiles
       include Hydra::Works::Derivatives
       include Hydra::Works::MimeTypes
       include Hydra::Works::VersionedContent
-
       before_destroy :remove_from_works
     end
 

data/lib/hydra/works/models/concerns/work_behavior.rb

@@ -14,10 +14,17 @@ module Hydra::Works
   #   10) Hydra::Works::Work can have access metadata
   module WorkBehavior
     extend ActiveSupport::Concern
-    include Hydra::PCDM::ObjectBehavior
+    extend Deprecation
 
     included do
+      def self.type_validator
+        Hydra::PCDM::Validators::CompositeValidator.new(
+          Hydra::Works::NotCollectionValidator,
+          super
+        )
+      end
       type [Hydra::PCDM::Vocab::PCDMTerms.Object, Vocab::WorksTerms.Work]
+      include Hydra::PCDM::ObjectBehavior
       before_destroy :remove_from_parents
     end
 
@@ -46,10 +53,12 @@ module Hydra::Works
     end
 
     def ordered_file_sets
+      Deprecation.warn WorkBehavior, "ordered_file_sets is deprecated and will be removed in Hydra::Works 1.0. If you need order, use an interstitial work node."
       ordered_members.to_a.select(&:file_set?)
     end
 
     def ordered_file_set_ids
+      Deprecation.warn WorkBehavior, "ordered_file_set_ids is deprecated and will be removed in Hydra::Works 1.0. If you need order, use an interstitial work node."
       ordered_file_sets.map(&:id)
     end
 

data/lib/hydra/works/not_collection_validator.rb

@@ -0,0 +1,9 @@
+module Hydra::Works
+  class NotCollectionValidator
+    def self.validate!(_association, record)
+      if record.try(:collection?)
+        raise ActiveFedora::AssociationTypeMismatch, "#{record} is a Collection and may not be a member of the association"
+      end
+    end
+  end
+end

data/lib/hydra/works/not_file_set_validator.rb

@@ -0,0 +1,9 @@
+module Hydra::Works
+  class NotFileSetValidator
+    def self.validate!(_association, record)
+      if record.try(:file_set?)
+        raise ActiveFedora::AssociationTypeMismatch, "#{record} is a FileSet and may not be a member of the association"
+      end
+    end
+  end
+end

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

@@ -56,15 +56,10 @@ module Hydra::Works
         # Return mime_type based on methods available to file
         # @param object for mimetype to be determined. Attempts to use methods: :mime_type, :content_type, and :path.
         def determine_mime_type(file)
-          if file.respond_to? :mime_type
-            file.mime_type
-          elsif file.respond_to? :content_type
-            file.content_type
-          elsif file.respond_to? :path
-            Hydra::PCDM::GetMimeTypeForFile.call(file.path)
-          else
-            'application/octet-stream'
-          end
+          return file.mime_type if file.respond_to? :mime_type
+          return file.content_type if file.respond_to? :content_type
+          return Hydra::PCDM::GetMimeTypeForFile.call(file.path) if file.respond_to? :path
+          'application/octet-stream'
         end
 
         # Return original_name based on methods available to file

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

@@ -5,7 +5,9 @@ module Hydra::Works
     ##
     # Persists a derivative to a FileSet
     # This Service conforms to the signature of `Hydra::Derivatives::PersistOutputFileService`.
-    # The purpose of this Service is for use as an alternative to the default Hydra::Derivatives::PersistOutputFileService.  It's necessary because the default behavior in Hydra::Derivatives assumes that you're using LDP Basic Containment. Hydra::Works::FileSets use IndirectContainment.  This Service handles that case.
+    # The purpose of this Service is for use as an alternative to the default Hydra::Derivatives::PersistOutputFileService.
+    # It's necessary because the default behavior in Hydra::Derivatives assumes that you're using LDP Basic Containment.
+    # Hydra::Works::FileSets use IndirectContainment.  This Service handles that case.
     # This service will always update existing and does not do versioning of persisted files.
     #
     # @param [#read] stream the derivative filestream

data/lib/hydra/works/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Works
-    VERSION = '0.7.1'.freeze
+    VERSION = '0.8'.freeze
   end
 end

data/spec/hydra/works/models/characterization/fits_datastream_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Hydra::Works::Characterization::FitsDatastream do
+  it 'defines an xml template' do
+    templ = described_class.xml_template.remove_namespaces!
+    expect(templ.xpath('/fits/identification/identity/@toolname').first.value).to eq('FITS')
+  end
+end

data/spec/hydra/works/models/collection_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe Hydra::Works::Collection do
   let(:collection) { described_class.new }
-
   let(:collection1) { described_class.new }
   let(:work1) { Hydra::Works::Work.new }
 
@@ -89,6 +88,14 @@ describe Hydra::Works::Collection do
     end
   end
 
+  describe "#work_ids" do
+    subject { collection.work_ids }
+    it "returns IDs of works" do
+      collection.members = [work1]
+      expect(subject).to eq [work1.id]
+    end
+  end
+
   describe '#related_objects' do
     subject { collection.related_objects }
     let(:object) { Hydra::PCDM::Object.new }
@@ -110,4 +117,23 @@ describe Hydra::Works::Collection do
     subject { collection.in_collections }
     it { is_expected.to eq [collection1] }
   end
+
+  describe 'adding file_sets to collections' do
+    let(:file_set) { Hydra::Works::FileSet.new }
+    let(:exception) { ActiveFedora::AssociationTypeMismatch }
+    context 'with ordered members' do
+      it 'raises AssociationTypeMismatch' do
+        expect { collection.ordered_members = [file_set] }.to raise_error(exception)
+        expect { collection.ordered_members += [file_set] }.to raise_error(exception)
+        expect { collection.ordered_members << file_set }.to raise_error(exception)
+      end
+    end
+    context 'with unordered members' do
+      it 'raises AssociationTypeMismatch' do
+        expect { collection.members = [file_set] }.to raise_error(exception)
+        expect { collection.members += [file_set] }.to raise_error(exception)
+        expect { collection.members << file_set }.to raise_error(exception)
+      end
+    end
+  end
 end

data/spec/hydra/works/models/concerns/file_set/virus_check_spec.rb

@@ -1,53 +1,87 @@
 require 'spec_helper'
 
 describe Hydra::Works::VirusCheck do
-  before do
-    class FileWithVirusCheck < ActiveFedora::Base
-      include Hydra::Works::FileSetBehavior
-      include Hydra::Works::VirusCheck
-    end
-    class ClamAV
-      def self.instance
-        @instance ||= ClamAV.new
+  context "with ClamAV" do
+    before do
+      class FileWithVirusCheck < ActiveFedora::Base
+        include Hydra::Works::FileSetBehavior
+        include Hydra::Works::VirusCheck
       end
+      class ClamAV
+        def self.instance
+          @instance ||= ClamAV.new
+        end
 
-      def scanfile(path)
-        puts "scanfile: #{path}"
+        def scanfile(path)
+          puts "scanfile: #{path}"
+        end
       end
     end
-  end
-  after do
-    Object.send(:remove_const, :ClamAV)
-    Object.send(:remove_const, :FileWithVirusCheck)
-  end
-
-  subject { FileWithVirusCheck.new }
-  let(:file) { Hydra::PCDM::File.new File.join(fixture_path, 'sample-file.pdf') }
+    after do
+      Object.send(:remove_const, :ClamAV)
+      Object.send(:remove_const, :FileWithVirusCheck)
+    end
 
-  before do
-    allow(subject).to receive(:original_file) { file }
-    allow(subject).to receive(:warn) # suppress virus warning messages
-  end
+    subject { FileWithVirusCheck.new }
+    let(:file) { Hydra::PCDM::File.new File.join(fixture_path, 'sample-file.pdf') }
 
-  context 'with an infected file' do
     before do
-      expect(ClamAV.instance).to receive(:scanfile).and_return(1)
+      allow(subject).to receive(:original_file) { file }
+      allow(subject).to receive(:warn) # suppress virus warning messages
     end
-    it 'fails to save' do
-      expect(subject.save).to eq false
+
+    context 'with an infected file' do
+      before do
+        expect(ClamAV.instance).to receive(:scanfile).and_return(1)
+      end
+      it 'fails to save' do
+        expect(subject.save).to eq false
+      end
+      it 'fails to validate' do
+        expect(subject.validate).to eq false
+      end
     end
-    it 'fails to validate' do
-      expect(subject.validate).to eq false
+
+    context 'with a clean file' do
+      before do
+        expect(ClamAV.instance).to receive(:scanfile).and_return(0)
+      end
+
+      it 'does not detect viruses' do
+        expect(subject.detect_viruses).to eq true
+      end
+    end
+
+    context 'with a file that responds to :path' do
+      before do
+        allow(file).to receive(:path).and_return('/tmp/file.pdf')
+      end
+
+      it 'gets the filename from :path' do
+        expect(subject.send(:local_path_for_file, file)).to eq('/tmp/file.pdf')
+      end
     end
   end
 
-  context 'with a clean file' do
+  context "Without ClamAV" do
+    before do
+      class FileWithVirusCheck < ActiveFedora::Base
+        include Hydra::Works::FileSetBehavior
+        include Hydra::Works::VirusCheck
+      end
+      Object.send(:remove_const, :ClamAV) if defined?(ClamAV)
+    end
+
+    subject { FileWithVirusCheck.new }
+    let(:file) { Hydra::PCDM::File.new File.join(fixture_path, 'sample-file.pdf') }
+
     before do
-      expect(ClamAV.instance).to receive(:scanfile).and_return(0)
+      allow(subject).to receive(:original_file) { file }
     end
 
-    it 'does not detect viruses' do
-      expect(subject.detect_viruses).to eq true
+    it 'warns if ClamAV is not defined' do
+      expect(subject).to receive(:warning) # .with("Virus checking disabled, sample-file.pdf not checked")
+      expect(subject.detect_viruses).to eq nil
     end
   end
 end

data/spec/hydra/works/models/concerns/file_set_behavior_spec.rb

@@ -9,4 +9,8 @@ describe Hydra::Works::FileSetBehavior do
   it 'ensures that objects will be recognized as file_sets' do
     expect(subject).to be_file_set
   end
+
+  it 'ensures that objects will not be collections' do
+    expect(subject.collection?).to be false
+  end
 end

data/spec/hydra/works/models/file_set_spec.rb

@@ -54,4 +54,30 @@ describe Hydra::Works::FileSet do
         .and change { work.reload.ordered_member_proxies.to_a.length }.by(-1)
     end
   end
+
+  describe 'adding collections to file sets' do
+    let(:collection) { Hydra::Works::Collection.new }
+    let(:exception) { ActiveFedora::AssociationTypeMismatch }
+    let(:error_regex) { /is a Collection and may not be a member of the association/ }
+    context 'with ordered members' do
+      it 'raises AssociationTypeMismatch with a helpful error message' do
+        expect { file_set.ordered_members = [collection] }.to raise_error(exception, error_regex)
+        expect { file_set.ordered_members += [collection] }.to raise_error(exception, error_regex)
+        expect { file_set.ordered_members << collection }.to raise_error(exception, error_regex)
+      end
+    end
+    context 'with unordered members' do
+      it 'raises AssociationTypeMismatch with a helpful error message' do
+        expect { file_set.members = [collection] }.to raise_error(exception, error_regex)
+        expect { file_set.members += [collection] }.to raise_error(exception, error_regex)
+        expect { file_set.members << collection }.to raise_error(exception, error_regex)
+      end
+    end
+  end
+
+  describe '#collection?' do
+    it 'is not a collection' do
+      expect(file_set.collection?).to be false
+    end
+  end
 end

data/spec/hydra/works/models/work_spec.rb

@@ -23,7 +23,9 @@ describe Hydra::Works::Work do
       work1.ordered_members << file_set2
 
       expect(work1.file_set_ids).to eq [file_set1.id, file_set2.id]
-      expect(work1.ordered_file_set_ids).to eq [file_set2.id]
+      Deprecation.silence Hydra::Works::WorkBehavior do
+        expect(work1.ordered_file_set_ids).to eq [file_set2.id]
+      end
     end
   end
 
@@ -58,7 +60,9 @@ describe Hydra::Works::Work do
   describe '#ordered_file_set_ids' do
     it 'lists file_set ids' do
       work1.ordered_members = [file_set1, file_set2]
-      expect(work1.ordered_file_set_ids).to eq [file_set1.id, file_set2.id]
+      Deprecation.silence Hydra::Works::WorkBehavior do
+        expect(work1.ordered_file_set_ids).to eq [file_set1.id, file_set2.id]
+      end
     end
   end
 
@@ -71,7 +75,9 @@ describe Hydra::Works::Work do
     subject { TestWork.new(ordered_members: [file_set1]) }
 
     it 'has many file sets' do
-      expect(subject.ordered_file_sets).to eq [file_set1]
+      Deprecation.silence Hydra::Works::WorkBehavior do
+        expect(subject.ordered_file_sets).to eq [file_set1]
+      end
     end
   end
 
@@ -141,12 +147,14 @@ describe Hydra::Works::Work do
       subject.ordered_members << file_set2
     end
     it 'moves file from one work to another' do
-      expect(subject.ordered_file_sets).to eq([file_set1, file_set2])
-      expect(work1.ordered_file_sets).to eq([])
-      subject.ordered_member_proxies.delete_at(0)
-      work1.ordered_members << file_set1
-      expect(subject.ordered_file_sets).to eq([file_set2])
-      expect(work1.ordered_file_sets).to eq([file_set1])
+      Deprecation.silence Hydra::Works::WorkBehavior do
+        expect(subject.ordered_file_sets).to eq([file_set1, file_set2])
+        expect(work1.ordered_file_sets).to eq([])
+        subject.ordered_member_proxies.delete_at(0)
+        work1.ordered_members << file_set1
+        expect(subject.ordered_file_sets).to eq([file_set2])
+        expect(work1.ordered_file_sets).to eq([file_set1])
+      end
     end
   end
 
@@ -154,7 +162,9 @@ describe Hydra::Works::Work do
     it 'returns empty array when only works are aggregated' do
       subject.ordered_members << work1
       subject.ordered_members << work2
-      expect(subject.ordered_file_sets).to eq []
+      Deprecation.silence Hydra::Works::WorkBehavior do
+        expect(subject.ordered_file_sets).to eq []
+      end
     end
 
     context 'with file_sets and works' do
@@ -166,7 +176,9 @@ describe Hydra::Works::Work do
       end
 
       it 'returns only file_sets' do
-        expect(subject.ordered_file_sets).to eq [file_set1, file_set2]
+        Deprecation.silence Hydra::Works::WorkBehavior do
+          expect(subject.ordered_file_sets).to eq [file_set1, file_set2]
+        end
       end
     end
   end
@@ -184,29 +196,57 @@ describe Hydra::Works::Work do
         subject.ordered_members << file_set4
         subject.ordered_members << work1
         subject.ordered_members << file_set5
-        expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set3, file_set4, file_set5]
+        Deprecation.silence Hydra::Works::WorkBehavior do
+          expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set3, file_set4, file_set5]
+        end
       end
 
       it 'removes first collection' do
         subject.ordered_member_proxies.delete_at(0)
-        expect(subject.ordered_file_sets).to eq [file_set2, file_set3, file_set4, file_set5]
+        Deprecation.silence Hydra::Works::WorkBehavior do
+          expect(subject.ordered_file_sets).to eq [file_set2, file_set3, file_set4, file_set5]
+        end
         expect(subject.ordered_works).to eq [work2, work1]
       end
 
       it 'removes last collection' do
         subject.ordered_member_proxies.delete_at(6)
-        expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set3, file_set4]
+        Deprecation.silence Hydra::Works::WorkBehavior do
+          expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set3, file_set4]
+        end
         expect(subject.ordered_works).to eq [work2, work1]
       end
 
       it 'removes middle collection' do
         subject.ordered_member_proxies.delete_at(3)
-        expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set4, file_set5]
+        Deprecation.silence Hydra::Works::WorkBehavior do
+          expect(subject.ordered_file_sets).to eq [file_set1, file_set2, file_set4, file_set5]
+        end
         expect(subject.ordered_works).to eq [work2, work1]
       end
     end
   end
 
+  describe 'adding collections to works' do
+    let(:collection) { Hydra::Works::Collection.new }
+    let(:exception) { ActiveFedora::AssociationTypeMismatch }
+    let(:error_regex) { /is a Collection and may not be a member of the association/ }
+    context 'with ordered members' do
+      it 'raises AssociationTypeMismatch with a helpful error message' do
+        expect { subject.ordered_members = [collection] }.to raise_error(exception, error_regex)
+        expect { subject.ordered_members += [collection] }.to raise_error(exception, error_regex)
+        expect { subject.ordered_members << collection }.to raise_error(exception, error_regex)
+      end
+    end
+    context 'with unordered members' do
+      it 'raises AssociationTypeMismatch with a helpful error message' do
+        expect { subject.members = [collection] }.to raise_error(exception, error_regex)
+        expect { subject.members += [collection] }.to raise_error(exception, error_regex)
+        expect { subject.members << collection }.to raise_error(exception, error_regex)
+      end
+    end
+  end
+
   describe 'parent work and collection accessors' do
     let(:collection1) { Hydra::Works::Collection.new }
     before do

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

@@ -42,6 +42,31 @@ describe Hydra::Works::AddFileToFileSet do
     end
   end
 
+  context 'fall back on :original_filename and application/octet-stream' do
+    before do
+      allow(file).to receive(:original_filename).and_return('original_filename.tif')
+      described_class.call(file_set, file, type)
+    end
+    subject { file_set.filter_files_by_type(type).first }
+    it 'falls back on original_filename' do
+      expect(subject.original_name).to eq('original_filename.tif')
+    end
+  end
+
+  context 'when the file does not support any of the methods' do
+    let(:file3) { double('file') }
+    before do
+      allow(file3).to receive(:read).and_return('')
+      allow(file3).to receive(:size).and_return(0)
+      described_class.call(file_set, file3, type)
+    end
+    subject { file_set.filter_files_by_type(type).first }
+    it 'falls back on "" and "application/octet-stream"' do
+      expect(subject.mime_type).to eq('application/octet-stream')
+      expect(subject.original_name).to eq('')
+    end
+  end
+
   context 'file responds to :path but not to :mime_type nor :original_name' do
     it 'defaults to Hydra::PCDM for mimetype and ::File for basename.' do
       expect(Hydra::PCDM::GetMimeTypeForFile).to receive(:call).with(file.path)
@@ -104,5 +129,9 @@ describe Hydra::Works::AddFileToFileSet do
     it 'converts URI strings to RDF::URI' do
       expect(subject.send(:type_to_uri, 'http://example.com/CustomURI')).to eq(::RDF::URI('http://example.com/CustomURI'))
     end
+
+    it 'returns an error for an invalid type' do
+      expect(-> { subject.send(:type_to_uri, 0) }).to raise_error(ArgumentError, 'Invalid file type.  You must submit a URI or a symbol.')
+    end
   end
 end

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

@@ -31,7 +31,7 @@ describe Hydra::Works::PersistDerivative do
       end
 
       mock_add_file_to_file_set(file_set, file)
-      allow_any_instance_of(Hydra::Works::FileSet).to receive(:mime_type).and_return(mime_type)
+      allow(file).to receive(:mime_type).and_return(mime_type)
       # Mock .save to permit tests to run without hitting fedora persistence layer
       allow(file_set).to receive(:save).and_return(file_set)
     end
@@ -116,5 +116,28 @@ describe Hydra::Works::PersistDerivative do
         expect(file_set.thumbnail.mime_type).to eq('image/jpeg')
       end
     end
+
+    context 'with a pdf document (.pdf) file' do
+      let(:mime_type) { 'application/pdf' }
+      let(:file_name) { 'sample-file.pdf' }
+      let(:file_set) { Hydra::Works::FileSet.new(id: '01/05') }
+
+      it 'lacks a thumbnail' do
+        expect(file_set.thumbnail).to be_nil
+      end
+
+      it 'generates a thumbnail on job run', unless: ENV['CI'] do
+        file_set.create_derivatives
+        expect(file_set.thumbnail).to have_content
+        expect(file_set.thumbnail.mime_type).to eq('image/jpeg')
+      end
+    end
+  end
+
+  describe 'mime type guessing' do
+    it 'has hard-coded mime types for mp4 and webm' do
+      expect(described_class.new_mime_type('mp4')).to eq('video/mp4')
+      expect(described_class.new_mime_type('webm')).to eq('video/webm')
+    end
   end
 end

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

@@ -60,6 +60,21 @@ describe Hydra::Works::UploadFileToFileSet do
     end
   end
 
+  context 'with additional services' do
+    let(:dummy_service) { double('service') }
+    before do
+      allow(file).to receive(:mime_type).and_return(mime_type)
+      allow(file).to receive(:original_name).and_return(original_name)
+    end
+
+    describe 'additional services' do
+      it 'gets called' do
+        expect(dummy_service).to receive(:call)
+        described_class.call(file_set, file, additional_services: [dummy_service])
+      end
+    end
+  end
+
   context 'when updating an existing file' do
     let(:additional_services) { [] }
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-works
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: '0.8'
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-pcdm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +214,8 @@ files:
 - lib/hydra/works/models/concerns/work_behavior.rb
 - lib/hydra/works/models/file_set.rb
 - 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_file_to_file_set.rb
 - lib/hydra/works/services/characterization_service.rb
 - lib/hydra/works/services/persist_derivative.rb
@@ -256,6 +258,7 @@ files:
 - spec/fixtures/test5.mp3
 - spec/fixtures/updated-file.txt
 - spec/fixtures/world.png
+- spec/hydra/works/models/characterization/fits_datastream_spec.rb
 - 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
@@ -300,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Fundamental repository data model for hydra
@@ -325,6 +328,7 @@ test_files:
 - spec/fixtures/test5.mp3
 - spec/fixtures/updated-file.txt
 - spec/fixtures/world.png
+- spec/hydra/works/models/characterization/fits_datastream_spec.rb
 - 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
@@ -340,4 +344,3 @@ test_files:
 - spec/hydra/works_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_set_helper.rb
-has_rdoc: