hydra-works 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fca7c38076bbdfc973e048b9c9a313c861566213
-  data.tar.gz: 3a4734587bccdc93b9c355536133a48241955ace
+  metadata.gz: b5992ee7b9f7184fd70053978e0604cd9ed10ccc
+  data.tar.gz: 20f024bb82a6b76da36d5197dc7709879d44c690
 SHA512:
-  metadata.gz: 49fbe343eccfbc3ec73163dd1cd334636d8268ddb55a350fa2de50f780cfd1185909d9e9c40cf87fdbd31fceda4ed2eaf9e9cc5b5af106fff9e11f33207beb07
-  data.tar.gz: 1f84ba460edfafc07cec0f66e1a1bf14372d8d7b896cf836b16a33b8a77abba0a6edc97ecdfc30e265ea6b7cfcd1c71223464d4cd3c5f26864fcaa3bd350de67
+  metadata.gz: 76b34210f7d2fbb513108ed8637d0d7b302ee35f205ed9a2333dd479f34d576caf7bc8c3c399724de9100980ebe2a2e18efc6500e437924f41d657735ab9c593
+  data.tar.gz: 3a213fa47a3feafd53474ede6e5b2211ee9706e647694e393655b3744e1b0f8b062a37adc461731561300876b123702ab6a65cf709aafe5f630dc9999187ce1e

data/.rubocop.yml

@@ -14,7 +14,7 @@ Metrics/LineLength:
 
 Metrics/ClassLength:
   Exclude:
-    - lib/hydra/works/characterization/fits_datastream.rb
+    - lib/hydra/works/characterization/fits_document.rb
 
 Style/CollectionMethods:
   PreferredMethods:

data/.travis.yml

@@ -6,6 +6,7 @@ env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 rvm:
+  - 2.2.5
   - 2.3.1
 before_script:
   - jdk_switcher use oraclejdk8

data/README.md

@@ -1,15 +1,14 @@
 # Hydra::Works
 
 [![Version](https://badge.fury.io/rb/hydra-works.png)](http://badge.fury.io/rb/hydra-works)
-[![Build Status](https://travis-ci.org/projecthydra-labs/hydra-works.svg?branch=master)](https://travis-ci.org/projecthydra-labs/hydra-works)
-[![Coverage Status](https://coveralls.io/repos/projecthydra-labs/hydra-works/badge.svg?branch=master)](https://coveralls.io/r/projecthydra-labs/hydra-works?branch=master)
-[![Code Climate](https://codeclimate.com/github/projecthydra-labs/hydra-works/badges/gpa.svg)](https://codeclimate.com/github/projecthydra-labs/hydra-works)
+[![Build Status](https://travis-ci.org/projecthydra/hydra-works.svg?branch=master)](https://travis-ci.org/projecthydra/hydra-works)
+[![Coverage Status](https://coveralls.io/repos/projecthydra/hydra-works/badge.svg?branch=master)](https://coveralls.io/r/projecthydra/hydra-works?branch=master)
+[![Code Climate](https://codeclimate.com/github/projecthydra/hydra-works/badges/gpa.svg)](https://codeclimate.com/github/projecthydra/hydra-works)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
 [![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 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:
+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/hydra-works/tree/master/use-cases). The PCDM Works domain model includes the following high-level entities:
 
  * **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**

data/hydra-works.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'active-fedora', '>= 9', '< 11.a'
   spec.add_dependency 'hydra-pcdm', '>= 0.8'
   spec.add_dependency 'hydra-derivatives', '~> 3.0'
   spec.add_dependency 'hydra-file_characterization', '~> 0.3', '>= 0.3.3'
+  spec.add_dependency 'om', '~> 3.1'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/hydra/works/characterization/{fits_datastream.rb → fits_document.rb}

@@ -1,5 +1,7 @@
+require 'om'
+
 module Hydra::Works::Characterization
-  class FitsDatastream < ActiveFedora::OmDatastream
+  class FitsDocument
     include OM::XML::Document
 
     set_terminology do |t|
@@ -87,7 +89,7 @@ module Hydra::Works::Characterization
       # fits_version needs a different name than it's target node since they're at the same level
       t.fits_version(proxy: [:fits, :fits_v])
       t.format_label(proxy: [:identification, :identity, :format_label])
-      # Can't use .mime_type because it's already defined for datastream so method missing won't work.
+      # Can't use .mime_type because it's already defined for this dcoument so method missing won't work.
       t.file_mime_type(proxy: [:identification, :identity, :mime_type])
       t.exif_tool_version(proxy: [:identification, :identity, :tool, :exif_tool_version])
       t.file_size(proxy: [:fileinfo, :file_size])

data/lib/hydra/works/characterization.rb

@@ -16,7 +16,7 @@ module Hydra::Works
       end
     end
 
-    autoload :FitsDatastream, 'hydra/works/characterization/fits_datastream.rb'
+    autoload :FitsDocument, 'hydra/works/characterization/fits_document.rb'
 
     autoload_under 'schema' do
       autoload :AudioSchema

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

@@ -3,10 +3,15 @@ module Hydra::Works
     extend ActiveSupport::Concern
 
     included do
-      validate :detect_viruses
-      def detect_viruses
-        return true unless original_file && original_file.new_record? # We have a new file to check
-        return true unless VirusCheckerService.file_has_virus?(original_file)
+      validate :must_not_detect_viruses
+
+      def viruses?
+        return false unless original_file && original_file.new_record? # We have a new file to check
+        VirusCheckerService.file_has_virus?(original_file)
+      end
+
+      def must_not_detect_viruses
+        return true unless viruses?
         errors.add(:base, "Failed to verify uploaded file is not a virus")
         false
       end

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

@@ -16,12 +16,12 @@ module Hydra::Works
       @object       = object
       @source       = source
       @mapping      = options.fetch(:parser_mapping, Hydra::Works::Characterization.mapper)
-      @parser_class = options.fetch(:parser_class, Hydra::Works::Characterization::FitsDatastream)
+      @parser_class = options.fetch(:parser_class, Hydra::Works::Characterization::FitsDocument)
       @tools        = options.fetch(:ch12n_tool, :fits)
     end
 
     # Get given source into form that can be passed to Hydra::FileCharacterization
-    # Use Hydra::FileCharacterization to extract metadata (an OM Datastream)
+    # Use Hydra::FileCharacterization to extract metadata (an OM XML document)
     # Get the terms (and their values) from the extracted metadata
     # Assign the values of the terms to the properties of the object
     def characterize
@@ -59,19 +59,19 @@ module Hydra::Works
 
       # Use OM to parse metadata
       def parse_metadata(metadata)
-        datastream = parser_class.new
-        datastream.ng_xml = metadata if metadata.present?
-        characterization_terms(datastream)
+        omdoc = parser_class.new
+        omdoc.ng_xml = Nokogiri::XML(metadata) if metadata.present?
+        characterization_terms(omdoc)
       end
 
       # Get proxy terms and values from the parser
-      def characterization_terms(datastream)
+      def characterization_terms(omdoc)
         h = {}
-        datastream.class.terminology.terms.each_pair do |key, target|
+        omdoc.class.terminology.terms.each_pair do |key, target|
           # a key is a proxy if its target responds to proxied_term
           next unless target.respond_to? :proxied_term
           begin
-            h[key] = datastream.send(key)
+            h[key] = omdoc.send(key)
           rescue NoMethodError
             next
           end

data/lib/hydra/works/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Works
-    VERSION = '0.12.1'.freeze
+    VERSION = '0.13.0'.freeze
   end
 end

data/lib/hydra/works.rb

@@ -1,6 +1,7 @@
 require 'hydra/works/version'
 require 'hydra/pcdm'
 require 'hydra/derivatives'
+require 'rdf/vocab'
 
 module Hydra
   module Works

data/spec/hydra/works/models/characterization/{fits_datastream_spec.rb → fits_document_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Hydra::Works::Characterization::FitsDatastream do
+describe Hydra::Works::Characterization::FitsDocument 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')

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

@@ -34,7 +34,7 @@ describe Hydra::Works::VirusCheck do
 
       it 'does not detect viruses' do
         expect(Hydra::Works::VirusCheckerService).to receive(:file_has_virus?).and_return(false)
-        subject.detect_viruses
+        expect(subject).not_to be_viruses
       end
     end
   end

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

@@ -17,7 +17,7 @@ describe Hydra::Works::FileSet do
 
   describe "#type" do
     it "returns Object and FileSet" do
-      expect(subject.type).to eq [Hydra::PCDM::Vocab::PCDMTerms.Object, Hydra::Works::Vocab::WorksTerms.FileSet]
+      expect(subject.type).to contain_exactly(Hydra::PCDM::Vocab::PCDMTerms.Object, Hydra::Works::Vocab::WorksTerms.FileSet)
     end
   end
 
@@ -34,7 +34,7 @@ describe Hydra::Works::FileSet do
 
     subject { described_class.find(file_set.id).files }
 
-    it { is_expected.to eq [file1, file2] }
+    it { is_expected.to contain_exactly(file1, file2) }
   end
 
   describe '#in_works' do

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

@@ -130,7 +130,7 @@ describe Hydra::Works::CharacterizationService do
       it 'assigns expected values to image properties.' do
         expect(file.file_size).to eq(["11043"])
         expect(file.byte_order).to eq(["big endian"])
-        expect(file.compression).to eq(["JPEG 2000 Lossless", "JPEG 2000"])
+        expect(file.compression).to contain_exactly("JPEG 2000 Lossless", "JPEG 2000")
         expect(file.width).to eq(["512"])
         expect(file.height).to eq(["465"])
         expect(file.color_space).to eq(["sRGB"])

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hydra-works
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: active-fedora
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 11.a
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 11.a
 - !ruby/object:Gem::Dependency
   name: hydra-pcdm
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.3
+- !ruby/object:Gem::Dependency
+  name: om
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -211,7 +205,7 @@ files:
 - hydra-works.gemspec
 - lib/hydra/works.rb
 - lib/hydra/works/characterization.rb
-- lib/hydra/works/characterization/fits_datastream.rb
+- lib/hydra/works/characterization/fits_document.rb
 - lib/hydra/works/characterization/fits_mapper.rb
 - lib/hydra/works/characterization/schema/audio_schema.rb
 - lib/hydra/works/characterization/schema/base_schema.rb
@@ -277,7 +271,7 @@ files:
 - spec/fixtures/updated-file.txt
 - spec/fixtures/world.png
 - spec/hydra/works/characterization_spec.rb
-- spec/hydra/works/models/characterization/fits_datastream_spec.rb
+- spec/hydra/works/models/characterization/fits_document_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
@@ -324,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Fundamental repository data model for hydra
@@ -351,7 +345,7 @@ test_files:
 - spec/fixtures/updated-file.txt
 - spec/fixtures/world.png
 - spec/hydra/works/characterization_spec.rb
-- spec/hydra/works/models/characterization/fits_datastream_spec.rb
+- spec/hydra/works/models/characterization/fits_document_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