hydra-works 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9644ed57243027ef42177906f69fdcb3df5b55bdd6be3cb6d5f0b57e437e751
-  data.tar.gz: 7b595df2b895ce803159e9a271d942e28eaba862c946733790d844fa65322d8c
+  metadata.gz: 2e59b8a3c691e329daaa38e524c2042a10135c137165c89cbcffc27ac82f955a
+  data.tar.gz: 73b6203943cdd78963127d7c998645f4e8763eaa3f85e8a2d57fddce0e3aa043
 SHA512:
-  metadata.gz: fe8abe34fe9e5d86c009fe0c395082d327397d62edeae40c7b6944e0949f5b7a37c19f0893d9c570ca2d973be033f4e42163c71f35a5a216d00f75d848d645fe
-  data.tar.gz: 434a3bd6a93e403a58c4e9236a2dbced0b71eea63a562ae8641bcab9a9e43e00ae18359328d3ba822b47bea9e04e89045460eec1886218e5474ec8596827d2ca
+  metadata.gz: 730f2f0abdc3e7451924e4d95b03be499c7de24eeefcc4f282b9bde0cc0167a1a70d52ed39534c5de5d7d76c013aa41f1e8b6dfbd61000201b658f2b039463e7
+  data.tar.gz: 3720b79fe1ef451ef274638c2373b8c48b425c6010b57638dc396e28a21920252c7c895f44e4a114b100936cb3192754cbf5642a617250c62070692ac9927b6a

data/.circleci/config.yml

@@ -0,0 +1,59 @@
+---
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@0
+jobs:
+  test:
+    parameters:
+      ruby_version:
+        type: string
+      bundler_version:
+        type: string
+        default: 1.17.3
+      rails_version:
+        type: string
+    environment:
+      RAILS_VERSION: << parameters.rails_version >>
+      NOKOGIRI_USE_SYSTEM_LIBRARIES: true
+    executor:
+      name: 'samvera/ruby_fcrepo_solr'
+      ruby_version: << parameters.ruby_version >>
+    steps:
+      - run: 'sudo apt-get update && sudo apt-get install clamav'
+      - run: 'sudo freshclam'
+      - samvera/cached_checkout
+      - samvera/bundle_for_gem:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          project: hydra-works
+      - samvera/install_solr_active_fedora_core
+      - samvera/parallel_rspec
+
+workflows:
+  version: 2
+  ci:
+    jobs:
+      - test:
+          name: ruby2-7_rails6-0
+          ruby_version: 2.7.1
+          rails_version: 6.0.3.1
+      - test:
+          name: ruby2-6_rails6-0
+          ruby_version: 2.6.6
+          rails_version: 6.0.3.1
+      - test:
+          name: ruby2-5_rails6-0
+          ruby_version: 2.5.8
+          rails_version: 6.0.3.1
+      - test:
+          name: ruby2-7_rails5-2
+          ruby_version: 2.7.1
+          rails_version: 5.2.4.3
+      - test:
+          name: ruby2-6_rails5-2
+          ruby_version: 2.6.6
+          rails_version: 5.2.4.3
+      - test:
+          name: ruby2-5_rails5-2
+          ruby_version: 2.5.8
+          rails_version: 5.2.4.3

data/.solr_wrapper

@@ -0,0 +1 @@
+version: 7.7.2

data/Gemfile

@@ -6,8 +6,16 @@ gemspec
 gem 'slop', '~> 3.6' # For byebug
 
 group :development, :test do
-  gem 'rubocop', '~> 0.47.0', require: false
-  gem 'rubocop-rspec', '~> 1.13.0', require: false
-  gem 'pry' unless ENV['CI']
+  gem 'clamby'
   gem 'pry-byebug' unless ENV['CI']
+  gem 'rubocop', require: false
+  gem 'rubocop-rspec', require: false
+end
+
+if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION'] == 'edge'
+    gem 'rails', github: 'rails/rails'
+  else
+    gem 'rails', ENV['RAILS_VERSION']
+  end
 end

data/README.md

@@ -1,7 +1,7 @@
 # Hydra::Works
 
 [![Version](https://badge.fury.io/rb/hydra-works.png)](http://badge.fury.io/rb/hydra-works)
-[![Build Status](https://travis-ci.org/samvera/hydra-works.svg?branch=master)](https://travis-ci.org/samvera/hydra-works)
+[![CircleCI](https://circleci.com/gh/samvera/hydra-works.svg?style=svg)](https://circleci.com/gh/samvera/hydra-works)
 [![Coverage Status](https://coveralls.io/repos/samvera/hydra-works/badge.svg?branch=master)](https://coveralls.io/r/samvera/hydra-works?branch=master)
 [![Code Climate](https://codeclimate.com/github/samvera/hydra-works/badges/gpa.svg)](https://codeclimate.com/github/samvera/hydra-works)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
@@ -43,7 +43,19 @@ Behaviors included in the model include:
  * Virus checking of original files
  * Full-text extraction from original files
 
-Check out the [Hydra::Derivatives README](https://github.com/samvera/hydra-derivatives#dependencies) for additional dependencies.
+## Dependencies
+
+Check out the [Hydra::Derivatives README](https://github.com/samvera/hydra-derivatives#dependencies) for dependencies.
+
+## Additional dependencies required for specs
+
+#### ClamAV
+* Mac installation
+  ```
+  $ brew install clamav
+  $ cp /usr/local/etc/clamav/freshclam.conf.sample /usr/local/etc/clamav/freshclam.conf
+  $ freshclam
+  ```
 
 ## Installation
 
@@ -93,9 +105,11 @@ page.save
 
 ## Virus Detection
 
-To turn on virus detection, install clamav on your system and add the `clamav` gem to your Gemfile
+To turn on virus detection, install [ClamAV](https://www.clamav.net/documents/installing-clamav) on your system and add the `clamby` gem to your Gemfile
 
-    gem 'clamav'
+```ruby
+gem 'clamby'
+```
 
 Then include the `VirusCheck` module in your `FileSet` class:
 

data/hydra-works.gemspec

@@ -19,17 +19,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 4.2.10', '< 6.0'
-  spec.add_dependency 'hydra-derivatives', '~> 3.0'
+  spec.add_dependency 'activesupport', '>= 5.2', '< 7.0'
+  spec.add_dependency 'hydra-derivatives', '~> 3.6'
   spec.add_dependency 'hydra-file_characterization', '~> 1.0'
   spec.add_dependency 'hydra-pcdm', '>= 0.9'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-rails', '~> 3.1'
+  spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'solr_wrapper', '~> 2.0'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'rspec_junit_formatter'
 end

data/lib/hydra/works/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Works
-    VERSION = '1.2.0'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/lib/hydra/works/virus_scanner.rb

@@ -30,16 +30,32 @@ module Hydra::Works
     # Override this method to use your own virus checking software
     # @return [Boolean]
     def infected?
-      defined?(ClamAV) ? clam_av_scanner : null_scanner
+      if defined?(Clamby)
+        clamby_scanner
+      elsif defined?(ClamAV)
+        clam_av_scanner
+      else
+        null_scanner
+      end
     end
 
     def clam_av_scanner
+      Deprecation.warn(self, "The ClamAV has been replaced by Clamby " \
+        "as the supported virus scanner for hydra-works. " \
+        "ClamAV support will be removed in hydra-works 2.0 ")
       scan_result = ClamAV.instance.method(:scanfile).call(file)
       return false if scan_result == 0
       warning "A virus was found in #{file}: #{scan_result}"
       true
     end
 
+    # @return [Boolean]
+    def clamby_scanner
+      scan_result = Clamby.virus?(file)
+      warning("A virus was found in #{file}") if scan_result
+      scan_result
+    end
+
     # Always return zero if there's nothing available to check for viruses. This means that
     # we assume all files have no viruses because we can't conclusively say if they have or not.
     def null_scanner

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

@@ -19,7 +19,7 @@ describe Hydra::Works::CharacterizationService do
       # Persist our file with some content and reload
       file.content = "junk"
       expect(file.save).to be true
-      expect(file.reload).to eq({})
+      expect(file.reload).to be_empty
       # Re-check property values
       expect(file.file_size).to eq(["7618"])
       expect(file.file_title).to eq(["sample-file"])

data/spec/hydra/works/virus_scanner_spec.rb

@@ -10,6 +10,8 @@ describe Hydra::Works::VirusScanner do
 
   context 'when ClamAV is defined' do
     before do
+      hide_const('Clamby')
+
       class ClamAV
         def self.instance
           @instance ||= ClamAV.new
@@ -20,9 +22,11 @@ describe Hydra::Works::VirusScanner do
         end
       end
     end
+
     after do
       Object.send(:remove_const, :ClamAV)
     end
+
     context 'with a clean file' do
       before { allow(ClamAV.instance).to receive(:scanfile).with('/tmp/path').and_return(0) }
       it 'returns false with no warning' do
@@ -30,6 +34,7 @@ describe Hydra::Works::VirusScanner do
         is_expected.not_to be_infected
       end
     end
+
     context 'with an infected file' do
       before { allow(ClamAV.instance).to receive(:scanfile).with('/tmp/path').and_return(1) }
       it 'returns true with a warning' do
@@ -40,9 +45,35 @@ describe Hydra::Works::VirusScanner do
   end
 
   context 'when ClamAV is not defined' do
+    before do
+      hide_const('Clamby')
+    end
+
     it 'returns false with a warning' do
       expect(ActiveFedora::Base.logger).to receive(:warn).with(kind_of(String))
       is_expected.not_to be_infected
     end
   end
+
+  context 'Clamby integration tests' do
+    before do
+      require 'clamby'
+    end
+
+    context "when it's infected" do
+      let(:file) { File.join(fixture_path, 'eicar.txt') }
+
+      it 'finds a virus' do
+        is_expected.to be_infected
+      end
+    end
+
+    context "when it's clean" do
+      let(:file) { File.join(fixture_path, 'piano_note.wav') }
+
+      it 'finds no virus' do
+        is_expected.not_to be_infected
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-works
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.10
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: hydra-file_characterization
   requirement: !ruby/object:Gem::Requirement
@@ -76,14 +76,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -146,16 +146,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Using this data model should enable easy collaboration amongst Samvera
   projects.
 email:
@@ -192,12 +206,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
+- ".solr_wrapper"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -210,7 +225,6 @@ files:
 - lib/hydra/works.rb
 - lib/hydra/works/characterization.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
 - lib/hydra/works/characterization/schema/document_schema.rb
@@ -301,7 +315,7 @@ homepage: https://github.com/samvera/hydra-works
 licenses:
 - APACHE2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -317,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Fundamental repository data model for Samvera applications
 test_files:

data/.travis.yml

@@ -1,15 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-bundler_args: --without debug
-env:
-  global:
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-rvm:
-  - 2.5.1
-  - 2.4.4
-before_script:
-  - jdk_switcher use oraclejdk8
-
-before_install:
-  - gem update --system