hyrax-active_encode 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34ece920ad0628dac4dc89e5036fcc9fab4456b6
-  data.tar.gz: 15e14410451f633c4de5153969899f75fe98fa7e
+SHA256:
+  metadata.gz: 73154bcb27bea0f2301baba32d6e17ccd449952095b2f7f9a30aa22b7b62f3e1
+  data.tar.gz: a363e2428af93983a0fc555f17bf33db0ba86d4e36dc787403f89634e4c283d9
 SHA512:
-  metadata.gz: 5f953f2a34f1cfe253bc82bb1e01cbddcf5a8341118aadecca634b258cdfe6fdef3adf75f4a970b5388561938f47782789b17676408eadde8a81bf1f2cf2f3dc
-  data.tar.gz: fe90475f0891d184bd569891d7a60abbec0b3d29fa8a36e20f0083720af2febbcd7f6dcb224d5a885891f0cd41e8e2d4dd10afde1e8c64c7958588b532851c80
+  metadata.gz: 876b31f68a51ad973e5e849cb73c794f0e6ae342e120e2e5e0deabc006f8dc90b7758776e556d625bcee4097d6bcce7dfa842bfcc2b6a16b9bdb682e5fd1a179
+  data.tar.gz: b06c533c0d0cac3ff136cf47df067b7e845aad4628509d7f79d634bd878dad9a92bafaa2b606176a681370e385ab799ca3784e8710bcf73b8b9bf73fa6386314

data/.circleci/config.yml

@@ -30,7 +30,7 @@ jobs:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-      ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-coffee --skip-puma --skip-test 
+      ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-coffee --skip-puma --skip-test
       COVERALLS_PARALLEL: true
 
     steps:
@@ -53,7 +53,7 @@ jobs:
 
     - restore_cache:
         keys:
-        - v1-internal-test-app-{{ .Branch }}-{{ checksum "hyrax-active_encode.gemspec" }}
+        - v2-internal-test-app-{{ checksum "hyrax-active_encode.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}
 
     # Download and cache dependencies
     - restore_cache:
@@ -82,7 +82,19 @@ jobs:
     - save_cache:
         paths:
         - ./.internal_test_app
-        key: v1-internal-test-app-{{ .Branch }}-{{ checksum "hyrax-active_encode.gemspec" }}
+        key: v2-internal-test-app-{{ checksum "hyrax-active_encode.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}
+
+    - run:
+        name: Install test app dependencies
+        command: |
+          cd .internal_test_app
+          bundle install
+
+    - run:
+        name: Run the plugin generator
+        command: |
+          cd .internal_test_app
+          bundle exec rails g hyrax:active_encode:install
 
     - run:
         name: Load config into SolrCloud

data/README.md

@@ -12,13 +12,13 @@ gem 'hyrax-active_encode'
 And then execute:
 
     $ bundle
-    
+
 ## Usage
 
 To enable derivative generation through `active_encode` run the install generator which will modify the generated `FileSet` model:
 
     $ rails g hyrax:active_encode:install
-    
+
 ## Configuration
 
 By default, hyrax-active_encode will use ActiveEncode's FFmpeg adapter and default ffmpeg options which will generate derivatives matching the defaults in Hyrax.
@@ -27,3 +27,4 @@ By default, hyrax-active_encode will use ActiveEncode's FFmpeg adapter and defau
 
 `Hyrax::ActiveEncode::ActiveEncodeDerivativeService` can also be passed the ActiveEncode encode class to be used.  By default this will be `ActiveEncode::Base`.
 
+`Hyrax::ActiveEncode::WatchedEncode` is an optional `ActiveEncode::Base` subclass that includes `ActiveEncode::Polling` and `ActiveEncode::Persistence`.  This optional encode class allows for tracking the encode process by saving the data from the encoding service in the `ActiveEncode::EncodeRecord` database table and saving the encode's global id on its associated file set.

data/app/models/concerns/hyrax/active_encode/file_set_behavior.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'active_fedora/with_metadata/external_file_uri_schema'
+require 'active_fedora/with_metadata/file_location_uri_schema'
 
 module Hyrax
   module ActiveEncode
@@ -7,11 +7,11 @@ module Hyrax
       extend ActiveSupport::Concern
 
       included do
-        # Is this too late?  Has the ActiveFedora::File metadata schema been frozen already?
-        ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas += [ActiveFedora::WithMetadata::ExternalFileUriSchema]
+        property :encode_global_id, predicate: ::RDF::URI.new('http://avalonmediasystem.org/rdf/vocab/transcoding#workflowId'), multiple: false do |index|
+          index.as :symbol
+        end
 
-        # The following doesn't work because through isn't allowed on directly_contains even though it is on directly_contains_one
-        # directly_contains :derivatives, through: :files, type: ::RDF::URI('http://pcdm.org/use#ServiceFile'), class_name: 'Hydra::PCDM::File'
+        ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas += [ActiveFedora::WithMetadata::FileLocationUriSchema]
       end
 
       def build_derivative
@@ -26,7 +26,7 @@ module Hyrax
       end
 
       def derivatives_metadata
-        derivatives.collect { |f| { id: f.id, label: f.label.first, external_file_uri: f.external_file_uri.first } }
+        derivatives.collect { |f| { id: f.id, label: f.label.first, file_location_uri: f.file_location_uri.first } }
       end
     end
   end

data/app/models/hyrax/active_encode/watched_encode.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Hyrax
+  module ActiveEncode
+    class WatchedEncode < ::ActiveEncode::Base
+      include ::ActiveEncode::Persistence
+      include ::ActiveEncode::Polling
+
+      around_create do |encode, block|
+        file_set_id = encode.options[:file_set_id]
+        block.call
+        ::FileSet.find(file_set_id).update(encode_global_id: encode.to_global_id.to_s) if file_set_id
+      end
+    end
+  end
+end

data/app/services/hyrax/active_encode/active_encode_derivative_service.rb

@@ -26,7 +26,8 @@ module Hyrax
         end
 
         def default_local_streaming
-          @@default_local_streaming ||= true
+          @@default_local_streaming = true unless defined?(@@default_local_streaming)
+          @@default_local_streaming
         end
       end
 
@@ -51,7 +52,7 @@ module Hyrax
       # What should this return?
       def derivative_url(file_label)
         derivative = file_set.derivatives.find { |d| d.label.first == file_label }
-        derivative.nil? ? nil : derivative.external_file_uri.first
+        derivative.nil? ? nil : derivative.file_location_uri.first
       end
 
       def valid?

data/app/services/hyrax/active_encode/persist_active_encode_derivatives.rb

@@ -9,18 +9,14 @@ module Hyrax
       # @option directives [String] file_set_id the id of the file set to add the derivative
       def self.call(output, directives)
         file_set = ActiveFedora::Base.find(directives[:file_set_id])
-        if directives[:local_streaming]
-          old_url = output.url
-          move_derivative(output, file_set)
-          output.url = Hyrax::Engine.routes.url_helpers.download_path(file_set, file: File.basename(old_url))
-        end
+        output.url = move_derivative(output, file_set) if directives[:local_streaming]
         create_pcdm_file(output, file_set)
       end
 
       def self.create_pcdm_file(output, file_set)
         pcdm_file = file_set.build_derivative
         pcdm_file.label = output.label
-        pcdm_file.external_file_uri = output.url
+        pcdm_file.file_location_uri = output.url
         pcdm_file.content = ''
         file_set.save!
       end

data/hyrax-active_encode.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |s|
     f.match(%r{^(test|spec|features)/})
   end
 
-  s.add_dependency "active_encode", "~> 0.4"
+  s.add_dependency "active_encode", "~> 0.5"
   s.add_dependency "hyrax", "~> 2.1"
 
   s.add_development_dependency 'bixby'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'engine_cart', '~> 2.0'
+  s.add_development_dependency 'engine_cart', '~> 2.2'
   s.add_development_dependency 'fcrepo_wrapper'
   s.add_development_dependency "rspec-rails", "~> 3.8"
   s.add_development_dependency 'solr_wrapper'

data/lib/active_fedora/with_metadata/{external_file_uri_schema.rb → file_location_uri_schema.rb}

@@ -3,9 +3,9 @@
 # added to it. This is most commonly used with ActiveFedora::File, when we want
 # to add rdf triples to a non-rdf resource and have them persisted.
 module ActiveFedora::WithMetadata
-  class ExternalFileUriSchema < ActiveTriples::Schema
+  class FileLocationUriSchema < ActiveTriples::Schema
     # Don't cast to keep values as RDF::URI instead of RDF::Resource
-    property :external_file_uri, predicate: ::RDF::Vocab::EBUCore.locator, cast: false do |index|
+    property :file_location_uri, predicate: ::RDF::Vocab::EBUCore.locator, cast: false do |index|
       index.as :stored_searchable
     end
   end

data/lib/generators/hyrax/active_encode/install_generator.rb

@@ -7,12 +7,20 @@ module Hyrax
       source_root "../templates"
 
       def enhance_file_set
+        # This module include has to come before Hyrax::FileSetBehavior since it finalizes properties
+        insert_into_file 'app/models/file_set.rb', before: 'include ::Hyrax::FileSetBehavior' do
+          "include Hyrax::ActiveEncode::FileSetBehavior\n  "
+        end
+        # The indexer has to be set after Hyrax::FileSetBehavior in order to have effect
         insert_into_file 'app/models/file_set.rb', after: 'include ::Hyrax::FileSetBehavior' do
-          "\n" \
-          "  include Hyrax::ActiveEncode::FileSetBehavior\n" \
-          "  self.indexer = Hyrax::ActiveEncode::ActiveEncodeIndexer"
+          "\n  self.indexer = Hyrax::ActiveEncode::ActiveEncodeIndexer"
         end
       end
+
+      def install_active_encode
+        rake 'active_encode:install:migrations'
+        rake 'db:migrate'
+      end
     end
   end
 end

data/lib/hyrax/active_encode/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Hyrax
   module ActiveEncode
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax-active_encode
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Colvard
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_encode
@@ -20,14 +20,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: hyrax
   requirement: !ruby/object:Gem::Requirement
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -177,12 +177,13 @@ files:
 - app/indexers/concerns/hyrax/active_encode/indexes_file_metadata.rb
 - app/indexers/hyrax/active_encode/active_encode_indexer.rb
 - app/models/concerns/hyrax/active_encode/file_set_behavior.rb
+- app/models/hyrax/active_encode/watched_encode.rb
 - app/services/hyrax/active_encode/active_encode_derivative_service.rb
 - app/services/hyrax/active_encode/default_option_service.rb
 - app/services/hyrax/active_encode/persist_active_encode_derivatives.rb
 - bin/rails
 - hyrax-active_encode.gemspec
-- lib/active_fedora/with_metadata/external_file_uri_schema.rb
+- lib/active_fedora/with_metadata/file_location_uri_schema.rb
 - lib/generators/hyrax/active_encode/install_generator.rb
 - lib/hyrax/active_encode.rb
 - lib/hyrax/active_encode/engine.rb
@@ -207,8 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Hyrax plugin to enable audiovisual derivative generation through active_encode