Remove DerivativeService & FileCharacterization

Moved to https://github.com/samvera-labs/valkyrie-derivatives.
samvera · Feb 28, 2018 · b7c1b3d · b7c1b3d
1 parent e4345d8
commit b7c1b3d
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 289 deletions.
diff --git a/lib/valkyrie.rb b/lib/valkyrie.rb
@@ -17,21 +17,17 @@
 require 'rdf/vocab'
 require 'rails'
 require 'active_fedora'
-require 'ruby_tika_app'
 
-# frozen_string_literal: true
 module Valkyrie
   require 'valkyrie/id'
   require 'valkyrie/change_set'
   require 'valkyrie/value_mapper'
   require 'valkyrie/persistence'
   require 'valkyrie/types'
   require 'valkyrie/resource'
-  require 'valkyrie/derivative_service'
   require 'valkyrie/storage_adapter'
   require 'valkyrie/metadata_adapter'
   require 'valkyrie/adapter_container'
-  require 'valkyrie/file_characterization_service'
   require 'valkyrie/resource/access_controls'
   require 'valkyrie/indexers/access_controls_indexer'
   require 'valkyrie/storage'

diff --git a/lib/valkyrie/derivative_service.rb b/lib/valkyrie/derivative_service.rb
diff --git a/lib/valkyrie/file_characterization_service.rb b/lib/valkyrie/file_characterization_service.rb
diff --git a/lib/valkyrie/indexers/access_controls_indexer.rb b/lib/valkyrie/indexers/access_controls_indexer.rb
@@ -42,7 +42,7 @@ def to_solr
 
       # rubocop:disable Metrics/MethodLength
       def default_config
-        if Hydra.respond_to?(:config)
+        if defined?(Hydra) && Hydra.respond_to?(:config)
           {
             read_groups: Hydra.config[:permissions][:read].group,
             read_users: Hydra.config[:permissions][:read].individual,

diff --git a/lib/valkyrie/local_file_service.rb b/lib/valkyrie/local_file_service.rb
diff --git a/lib/valkyrie/persist_derivatives.rb b/lib/valkyrie/persist_derivatives.rb
diff --git a/lib/valkyrie/specs/shared_specs.rb b/lib/valkyrie/specs/shared_specs.rb
@@ -4,8 +4,6 @@
 require 'valkyrie/specs/shared_specs/metadata_adapter'
 require 'valkyrie/specs/shared_specs/resource.rb'
 require 'valkyrie/specs/shared_specs/storage_adapter.rb'
-require 'valkyrie/specs/shared_specs/derivative_service.rb'
-require 'valkyrie/specs/shared_specs/file_characterization_service.rb'
 require 'valkyrie/specs/shared_specs/change_set_persister.rb'
 require 'valkyrie/specs/shared_specs/file.rb'
 require 'valkyrie/specs/shared_specs/change_set.rb'
diff --git a/lib/valkyrie/specs/shared_specs/derivative_service.rb b/lib/valkyrie/specs/shared_specs/derivative_service.rb
diff --git a/lib/valkyrie/specs/shared_specs/file_characterization_service.rb b/lib/valkyrie/specs/shared_specs/file_characterization_service.rb
diff --git a/spec/valkyrie/derivative_service_spec.rb b/spec/valkyrie/derivative_service_spec.rb
diff --git a/spec/valkyrie/file_characterization_service_spec.rb b/spec/valkyrie/file_characterization_service_spec.rb
diff --git a/spec/valkyrie/indexers/access_controls_indexer_spec.rb b/spec/valkyrie/indexers/access_controls_indexer_spec.rb
@@ -65,7 +65,7 @@ def configure(_ = nil)
         end
       end
       after do
-        Hydra.remove_possible_method(:configure)
+        Object.send(:remove_const, :Hydra)
       end
 
       it "indexes with Hydra::AccessControls" do

diff --git a/spec/valkyrie/local_file_service_spec.rb b/spec/valkyrie/local_file_service_spec.rb
diff --git a/spec/valkyrie/persist_derivatives_spec.rb b/spec/valkyrie/persist_derivatives_spec.rb
diff --git a/valkyrie.gemspec b/valkyrie.gemspec
@@ -36,8 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json-ld'
   spec.add_dependency 'json'
   spec.add_dependency 'active-triples'
-  spec.add_dependency 'hydra-derivatives'
-  spec.add_dependency 'ruby_tika_app'
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"