Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

The Big Rename: Hydrant -> Avalon

  • Loading branch information...
commit 24e37f919bfd8b917bcdbaf0bbe453bf9bc14d8c 1 parent d40f634
Michael B. Klein mbklein authored
Showing with 250 additions and 252 deletions.
  1. +1 −1  .gitignore
  2. +1 −0  .ruby-version
  3. +1 −1  .rvmrc
  4. +2 −2 Gemfile
  5. +14 −14 Gemfile.lock
  6. +2 −2 README.md
  7. +1 −1  Rakefile
  8. +2 −2 app/assets/javascripts/application.js
  9. 0  app/assets/javascripts/{hydrant.js → avalon.js}
  10. +3 −3 app/assets/stylesheets/application.scss
  11. 0  app/assets/stylesheets/{hydrant.css.scss → avalon.css.scss}
  12. 0  app/assets/stylesheets/blacklight_themes/{hydrant.css.scss → avalon.css.scss}
  13. +1 −1  app/assets/stylesheets/branding.css.scss
  14. +1 −1  app/controllers/admin/groups_controller.rb
  15. +1 −1  app/controllers/application_controller.rb
  16. +1 −1  app/controllers/catalog_controller.rb
  17. +2 −2 app/controllers/comments_controller.rb
  18. +2 −2 app/controllers/dropbox_controller.rb
  19. +3 −3 app/controllers/master_files_controller.rb
  20. +4 −4 app/controllers/media_objects_controller.rb
  21. +2 −2 app/controllers/users/sessions_controller.rb
  22. +1 −1  app/helpers/application_helper.rb
  23. +1 −1  app/mailers/comments_mailer.rb
  24. +6 −6 app/mailers/ingest_batch_mailer.rb
  25. +2 −2 app/models/admin/group.rb
  26. +1 −1  app/models/{hydrant_file_resource.rb → avalon_file_resource.rb}
  27. +2 −0  app/models/avalon_local_resource.rb
  28. +2 −0  app/models/avalon_remote_resource.rb
  29. +1 −1  app/models/derivative.rb
  30. +2 −2 app/models/file_upload_step.rb
  31. +0 −2  app/models/hydrant_local_resource.rb
  32. +0 −2  app/models/hydrant_remote_resource.rb
  33. +3 −6 app/models/master_file.rb
  34. 0  {lib/hydrant → app/models}/matterhorn_jobs.rb
  35. +1 −1  app/models/stream_token.rb
  36. +1 −1  app/views/devise/sessions/new.html.erb
  37. 0  app/views/layouts/{hydrant.html.erb → avalon.html.erb}
  38. +1 −1  app/views/media_objects/_dropbox_details.html.erb
  39. +1 −1  app/views/media_objects/mobile.html.erb
  40. +3 −3 config.ru
  41. +1 −2  config/application.rb
  42. 0  config/{hydrant.yml.example → avalon.yml.example}
  43. +3 −3 config/deploy.rb
  44. +6 −6 config/deploy/staging.rb
  45. +1 −1  config/environment.rb
  46. +1 −1  config/environments/development.rb
  47. +1 −1  config/environments/production.rb
  48. +1 −1  config/environments/test.rb
  49. +1 −1  config/initializers/assign_pid.rb
  50. +1 −1  config/initializers/authn_providers.rb
  51. +10 −9 config/initializers/{hydrant.rb → avalon.rb}
  52. +1 −1  config/initializers/devise.rb
  53. +1 −1  config/initializers/mailer.rb
  54. +1 −1  config/initializers/secret_token.rb
  55. +2 −2 config/initializers/session_store.rb
  56. +1 −1  config/routes.rb
  57. +1 −1  config/schedule.rb
  58. +1 −1  fedora_conf/conf/development/fedora.fcfg
  59. +1 −1  fedora_conf/conf/test/fedora.fcfg
  60. +1 −1  felix
  61. +7 −7 lib/{hydrant → avalon}/batch_ingest.rb
  62. +1 −1  lib/{hydrant → avalon}/controller/controller_behavior.rb
  63. +3 −3 lib/{hydrant → avalon}/dropbox.rb
  64. +1 −1  lib/{hydrant → avalon}/stream_auth.rb
  65. +4 −4 lib/tasks/{hydrant-fixtures.rake → avalon-fixtures.rake}
  66. +8 −8 lib/tasks/{hydrant.rake → avalon.rake}
  67. +5 −5 lib/tasks/delayed_job.rake
  68. 0  public/javascripts/{hydrant → avalon}/iuplayer.js
  69. 0  public/javascripts/{hydrant → avalon}/jquery.rdfquery.rdfa.min-1.0.js
  70. 0  public/javascripts/{hydrant → avalon}/oac_rdf.js
  71. 0  public/javascripts/{hydrant → avalon}/oac_rdfjson.js
  72. 0  public/javascripts/{hydrant → avalon}/oac_utils.js
  73. 0  public/javascripts/{hydrant → avalon}/uuid.js
  74. +2 −2 spec/controllers/dropbox_controller_spec.rb
  75. +13 −13 spec/controllers/master_files_controller_spec.rb
  76. +42 −42 spec/controllers/media_objects_controller_spec.rb
  77. +8 −8 spec/fixtures/{hydrant_electronic-resource.foxml.xml → avalon_electronic-resource.foxml.xml}
  78. +7 −7 spec/fixtures/{hydrant_musical-performance.foxml.xml → avalon_musical-performance.foxml.xml}
  79. +7 −7 spec/fixtures/{hydrant_print-publication.foxml.xml → avalon_print-publication.foxml.xml}
  80. +7 −7 spec/fixtures/{hydrant_video-segment.foxml.xml → avalon_video-segment.foxml.xml}
  81. +2 −2 spec/fixtures/matterhorn_workflow_doc.xml
  82. +7 −7 spec/lib/{hydrant → avalon}/batch_ingest_spec.rb
  83. +4 −4 spec/lib/{hydrant → avalon}/dropbox_spec.rb
  84. +2 −2 spec/mailers/ingest_batch_mailer_spec.rb
  85. +2 −2 spec/models/ingest_batch_spec.rb
  86. +6 −6 spec/models/media_object_spec.rb
  87. +4 −4 spec/spec_helper.rb
2  .gitignore
View
@@ -74,6 +74,6 @@ lib/tasks/cucumber.rake
cucumber-results/
.idea
public/media_objects
-config/hydrant.yml
+config/avalon.yml
/dropbox
public/streams
1  .ruby-version
View
@@ -0,0 +1 @@
+1.9.3-p327-perf
2  .rvmrc
View
@@ -1 +1 @@
-rvm use ruby-1.9.3@hydrant --create >/dev/null 2>&1
+rvm use ruby-1.9.3@avalon --create >/dev/null 2>&1
4 Gemfile
View
@@ -10,8 +10,8 @@
gem 'active-fedora', '~> 5.0.0'
gem 'avalon-workflow', git: 'https://github.com/variations-on-video/avalon-workflow.git'
- gem 'hydrant-engage', git: "https://github.com/variations-on-video/hydrant-engage.git"
- gem 'hydrant-batch', git: "https://github.com/variations-on-video/hydrant-batch.git"
+ gem 'avalon-engage', git: "https://github.com/variations-on-video/avalon-engage.git"
+ gem 'avalon-batch', git: "https://github.com/variations-on-video/avalon-batch.git"
platforms :jruby do
gem 'jruby-openssl'
28 Gemfile.lock
View
@@ -37,27 +37,27 @@ GIT
mediashelf-loggable
GIT
- remote: https://github.com/variations-on-video/avalon-workflow.git
- revision: 1c573cef34b5ac4177de0bc872de57f3a37763a9
- specs:
- avalon-workflow (0.0.2a)
-
-GIT
- remote: https://github.com/variations-on-video/hydrant-batch.git
- revision: 6b38f9012b4138870c5e9b5287d9a3cb4d5642f5
+ remote: https://github.com/variations-on-video/avalon-batch.git
+ revision: 7ea0ae79b1db1f8301e5251c1d65fc0ee7404186
specs:
- hydrant-batch (0.0.1)
+ avalon-batch (0.0.1)
activesupport
roo
GIT
- remote: https://github.com/variations-on-video/hydrant-engage.git
- revision: 9e06f6ceb61588ad0b0414c066b841bd08519962
+ remote: https://github.com/variations-on-video/avalon-engage.git
+ revision: f2480900eb96f960d1ed1c7cd184e21375535d7d
specs:
- hydrant-engage (0.0.1)
+ avalon-engage (0.0.1)
less-rails (~> 2.2.3)
GIT
+ remote: https://github.com/variations-on-video/avalon-workflow.git
+ revision: 1c573cef34b5ac4177de0bc872de57f3a37763a9
+ specs:
+ avalon-workflow (0.0.2a)
+
+GIT
remote: https://github.com/variations-on-video/rubyhorn.git
revision: deab1f0bd069e7666338bf265f6323e3c6f61c0c
specs:
@@ -492,6 +492,8 @@ PLATFORMS
DEPENDENCIES
active-fedora (~> 5.0.0)
activerecord-jdbcsqlite3-adapter
+ avalon-batch!
+ avalon-engage!
avalon-workflow!
blacklight (~> 4.0.0)
builder (~> 3.0.0)
@@ -515,8 +517,6 @@ DEPENDENCIES
haml
headless
hydra-head (~> 5.0.0)
- hydrant-batch!
- hydrant-engage!
jdbc-sqlite3
jettywrapper
jquery-rails (~> 2.1.4)
4 README.md
View
@@ -10,11 +10,11 @@ Instructions on how to get a local installation of Avalon Media System installed
* ```git submodule init```
* ```git submodule update```
* Install Mediainfo cli: http://mediainfo.sourceforge.net
-* Copy config/hydrant.yml.example to config/hydrant.yml and change as necessary
+* Copy config/avalon.yml.example to config/avalon.yml and change as necessary
* ```rake db:migrate```
* ```rake jetty:start```
* ```rake felix:start```
* ```rake spec```
# For batch ingest:
-* rake hydrant:batch:ingest
+* rake avalon:batch:ingest
2  Rakefile
View
@@ -4,4 +4,4 @@
require File.expand_path('../config/application', __FILE__)
require 'rake'
-Hydrant::Application.load_tasks
+Avalon::Application.load_tasks
4 app/assets/javascripts/application.js
View
@@ -31,8 +31,8 @@
//= require jquery.ui.nestedSortable
/*
- * Place any local overrides in hydrant.js (for Blacklight, Hydra, jQuery,
+ * Place any local overrides in avalon.js (for Blacklight, Hydra, jQuery,
* etc)
*/
-//= require hydrant
+//= require avalon
//= require_self
0  app/assets/javascripts/hydrant.js → app/assets/javascripts/avalon.js
View
File renamed without changes
6 app/assets/stylesheets/application.scss
View
@@ -2,7 +2,7 @@
@import "bootstrap";
@import "bootstrap-responsive";
@import "font-awesome";
-@import "blacklight_themes/hydrant";
+@import "blacklight_themes/avalon";
@import "blacklight_themes/_facets";
@import "blacklight_themes/_facets_responsive";
@import "blacklight/blacklight";
@@ -17,7 +17,7 @@ body {
/*
* This is the default theme. You can modify many of the settings
* by editing your local app/assets/stylesheets/blacklight_themes/standard.css
- * require 'blacklight_themes/hydrant'
+ * require 'blacklight_themes/avalon'
*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
@@ -38,5 +38,5 @@ body {
*= require 'hydrant-engage'
*= require self
*/
-@import "hydrant";
+@import "avalon";
0  app/assets/stylesheets/hydrant.css.scss → app/assets/stylesheets/avalon.css.scss
View
File renamed without changes
0  ...ts/stylesheets/blacklight_themes/hydrant.css.scss → ...ets/stylesheets/blacklight_themes/avalon.css.scss
View
File renamed without changes
2  app/assets/stylesheets/branding.css.scss
View
@@ -1,5 +1,5 @@
/**
- * Custom branding for Hydrant to override Bootstrap, Hydra, and Blacklight
+ * Custom branding for Avalon to override Bootstrap, Hydra, and Blacklight
* defaults. This should be included at the top of the application.scss file
* so it is preferred over the defaults. */
$sansFontFamily: Arial, Helvetica, sans-serif;
2  app/controllers/admin/groups_controller.rb
View
@@ -2,7 +2,7 @@
require "role_controls"
class Admin::GroupsController < ApplicationController
before_filter :auth
- layout "hydrant"
+ layout "avalon"
# Currently assumes that to do anything you have to be able to manage Group
# TODO: finer controls
2  app/controllers/application_controller.rb
View
@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
include AccessControlsHelper
def layout_name
- 'hydrant'
+ 'avalon'
end
# Please be sure to implement current_user and user_session. Blacklight depends on
2  app/controllers/catalog_controller.rb
View
@@ -181,6 +181,6 @@ def limit_to_non_hidden_items(solr_parameters, user_parameters)
end
end
- layout 'hydrant'
+ layout 'avalon'
end
4 app/controllers/comments_controller.rb
View
@@ -1,6 +1,6 @@
class CommentsController < ApplicationController
before_filter :set_subjects
- layout 'hydrant'
+ layout 'avalon'
# Index replaces new in this context
def index
@@ -22,7 +22,7 @@ def create
logger.warn "The mail server does not appear to be responding"
logger.warn e
- flash[:notice] = "The message could not be sent in a timely fashion. Contact us at #{Hydrant::Configuration['email']['support']} to report the problem."
+ flash[:notice] = "The message could not be sent in a timely fashion. Contact us at #{Avalon::Configuration['email']['support']} to report the problem."
render action: "index"
end
else
4 app/controllers/dropbox_controller.rb
View
@@ -9,12 +9,12 @@ def bulk_delete
# failsafe for spaces that might be attached to string
filenames = params[:filenames].map(&:strip)
- dropbox_filenames = Hydrant::DropboxService.all.map{|f| f[:name] }
+ dropbox_filenames = Avalon::DropboxService.all.map{|f| f[:name] }
deleted_filenames = []
filenames.each do |filename|
if dropbox_filenames.include?( filename )
- if Hydrant::DropboxService.delete( filename )
+ if Avalon::DropboxService.delete( filename )
deleted_filenames << filename
logger.info "The user #{current_user.username} deleted #{filename} from the dropbox."
end
6 app/controllers/master_files_controller.rb
View
@@ -1,10 +1,10 @@
require 'net/http/digest_auth'
require 'net/http/post/multipart'
require 'rubyhorn'
-require 'hydrant/controller/controller_behavior'
+require 'avalon/controller/controller_behavior'
class MasterFilesController < ApplicationController
- include Hydrant::Controller::ControllerBehavior
+ include Avalon::Controller::ControllerBehavior
skip_before_filter :verify_authenticity_token, :only => [:update]
before_filter :authenticate_user!, :only => [:create]
@@ -69,7 +69,7 @@ def create
elsif params.has_key?(:dropbox)
@master_files = []
params[:dropbox].each do |file|
- file_path = Hydrant::DropboxService.find(file[:id])
+ file_path = Avalon::DropboxService.find(file[:id])
master_file = MasterFile.create
master_file.mediaobject = media_object
master_file.setContent(File.open(file_path, 'rb'))
8 app/controllers/media_objects_controller.rb
View
@@ -1,14 +1,14 @@
-require 'hydrant/controller/controller_behavior'
+require 'avalon/controller/controller_behavior'
class MediaObjectsController < ApplicationController
include Avalon::Workflow::WorkflowControllerBehavior
- include Hydrant::Controller::ControllerBehavior
+ include Avalon::Controller::ControllerBehavior
before_filter :enforce_access_controls
before_filter :inject_workflow_steps, only: [:edit, :update]
before_filter :load_player_context, only: [:show, :remove]
- layout 'hydrant'
+ layout 'avalon'
# Catch exceptions when you try to reference an object that doesn't exist.
# Attempt to resolve it to a close match if one exists and offer a link to
@@ -154,7 +154,7 @@ def self.initialize_media_object( user_key )
def matterhorn_service_config
respond_to do |format|
- format.any(:xml, :json) { render request.format.to_sym => Hydrant.matterhorn_config }
+ format.any(:xml, :json) { render request.format.to_sym => Avalon.matterhorn_config }
end
end
4 app/controllers/users/sessions_controller.rb
View
@@ -1,7 +1,7 @@
class Users::SessionsController < Devise::SessionsController
def new
- if Hydrant::Authentication::Providers.length == 1
- redirect_to user_omniauth_authorize_path(Hydrant::Authentication::Providers.first[:provider])
+ if Avalon::Authentication::Providers.length == 1
+ redirect_to user_omniauth_authorize_path(Avalon::Authentication::Providers.first[:provider])
else
super
end
2  app/helpers/application_helper.rb
View
@@ -1,6 +1,6 @@
module ApplicationHelper
def application_name
- 'Hydrant'
+ 'Avalon'
end
def image_for(item_id)
2  app/mailers/comments_mailer.rb
View
@@ -1,5 +1,5 @@
class CommentsMailer < ActionMailer::Base
- default :to => Hydrant::Configuration['email']['comments']
+ default :to => Avalon::Configuration['email']['comments']
def contact_email(comment)
@comment = comment
12 app/mailers/ingest_batch_mailer.rb
View
@@ -4,30 +4,30 @@ class IngestBatchMailer < ActionMailer::Base
def status_email( ingest_batch_id )
@ingest_batch = IngestBatch.find(ingest_batch_id)
@media_objects = @ingest_batch.media_objects
- @email = @ingest_batch.email || Hydrant::Configuration['email']['notification']
+ @email = @ingest_batch.email || Avalon::Configuration['email']['notification']
mail(
to: @email,
- from: Hydrant::Configuration['email']['notification'],
+ from: Avalon::Configuration['email']['notification'],
subject: "Batch ingest status for: #{@ingest_batch.name}"
)
end
def batch_ingest_validation_error( package )
@package = package
- email = package.manifest.email || Hydrant::Configuration['email']['notification']
+ email = package.manifest.email || Avalon::Configuration['email']['notification']
mail(
to: email,
- from: Hydrant::Configuration['email']['notification'],
+ from: Avalon::Configuration['email']['notification'],
subject: "Failed batch ingest processing errors for: #{package.manifest.name}",
)
end
def batch_ingest_validation_success( package )
@package = package
- email = package.manifest.email || Hydrant::Configuration['email']['notification']
+ email = package.manifest.email || Avalon::Configuration['email']['notification']
mail(
to: email,
- from: Hydrant::Configuration['email']['notification'],
+ from: Avalon::Configuration['email']['notification'],
subject: "Successfully processed batch ingest: #{package.manifest.name}",
)
end
4 app/models/admin/group.rb
View
@@ -13,8 +13,8 @@ class Admin::Group
def self.non_system_groups
groups = all
- if Hydrant::Configuration['groups'] && Hydrant::Configuration['groups']['non_system_groups']
- non_system_groups = Hydrant::Configuration['groups']['non_system_groups'].map{|k,groups| groups}.flatten
+ if Avalon::Configuration['groups'] && Avalon::Configuration['groups']['non_system_groups']
+ non_system_groups = Avalon::Configuration['groups']['non_system_groups'].map{|k,groups| groups}.flatten
groups.reject! { |g| non_system_groups.include? g.name }
end
groups
2  app/models/hydrant_file_resource.rb → app/models/avalon_file_resource.rb
View
@@ -1,3 +1,3 @@
-class HydrantFileResource
+class AvalonFileResource
attr_accessor :id, :name, :size, :label, :mime_type
end
2  app/models/avalon_local_resource.rb
View
@@ -0,0 +1,2 @@
+class AvalonLocalFileResource < AvalonFileResource
+end
2  app/models/avalon_remote_resource.rb
View
@@ -0,0 +1,2 @@
+class AvalonRemoteFileResource < AvalonFileResource
+end
2  app/models/derivative.rb
View
@@ -100,7 +100,7 @@ def streaming_url(is_mobile=false)
(application, prefix, media_id, stream_id, filename, extension) = uri.path.scan(regex).flatten
template = ERB.new(self.class.url_handler.patterns[protocol][format])
- result = File.join(Hydrant::Configuration['streaming']["#{protocol}_base"],template.result(binding))
+ result = File.join(Avalon::Configuration['streaming']["#{protocol}_base"],template.result(binding))
end
def format
4 app/models/file_upload_step.rb
View
@@ -1,4 +1,4 @@
-require 'hydrant/dropbox'
+require 'avalon/dropbox'
class FileUploadStep < Avalon::Workflow::BasicStep
def initialize(step = 'file-upload',
@@ -12,7 +12,7 @@ def initialize(step = 'file-upload',
# just need to ask the dropbox if there are any files. If so load
# them into a variable that can be referred to later
def before_step context
- dropbox_files = Hydrant::DropboxService.all
+ dropbox_files = Avalon::DropboxService.all
context[:dropbox_files] = dropbox_files
context
end
2  app/models/hydrant_local_resource.rb
View
@@ -1,2 +0,0 @@
-class HydrantLocalFileResource < HydrantFileResource
-end
2  app/models/hydrant_remote_resource.rb
View
@@ -1,2 +0,0 @@
-class HydrantRemoteFileResource < HydrantFileResource
-end
9 app/models/master_file.rb
View
@@ -1,4 +1,3 @@
-require 'hydrant/matterhorn_jobs'
require 'fileutils'
class MasterFile < ActiveFedora::Base
@@ -97,7 +96,6 @@ def delete
end
def process
- puts URI.escape(file_location)
args = {"url" => "file://" + URI.escape(file_location),
"title" => pid,
"flavor" => "presenter/source",
@@ -106,10 +104,9 @@ def process
if file_format == 'Sound'
args['workflow'] = "fullaudio"
elsif file_format == 'Moving image'
- args['workflow'] = "hydrant"
+ args['workflow'] = "avalon"
end
- puts "ARGS: #{args}"
m = MatterhornJobs.new
m.send_request args
end
@@ -286,10 +283,10 @@ def determine_format(file, content_type = nil)
def saveOriginal(file, original_name)
realpath = File.realpath(file.path)
if !original_name.nil?
- config_path = Hydrant::Configuration['matterhorn']['media_path']
+ config_path = Avalon::Configuration['matterhorn']['media_path']
newpath = nil
if !config_path.nil? and File.directory?(config_path)
- newpath = File.join(Hydrant::Configuration['matterhorn']['media_path'], original_name)
+ newpath = File.join(Avalon::Configuration['matterhorn']['media_path'], original_name)
FileUtils.cp(realpath, newpath)
else
newpath = File.join(File.dirname(realpath), original_name)
0  lib/hydrant/matterhorn_jobs.rb → app/models/matterhorn_jobs.rb
View
File renamed without changes
2  app/models/stream_token.rb
View
@@ -23,6 +23,6 @@ def self.validate_token(value)
end
def renew!
- self.update_attribute :expires, ( Time.now + Hydrant::Configuration['streaming']['stream_token_ttl'].minutes )
+ self.update_attribute :expires, ( Time.now + Avalon::Configuration['streaming']['stream_token_ttl'].minutes )
end
end
2  app/views/devise/sessions/new.html.erb
View
@@ -4,7 +4,7 @@
<h2 style="text-align: center">Select an Authentication Provider</h2>
<ul class="login">
- <% Hydrant::Authentication::Providers.each do |provider| %>
+ <% Avalon::Authentication::Providers.each do |provider| %>
<li class="btn btn-large">
<% provider_logo = provider[:logo] || 'signin_local.png' %>
<%= link_to image_tag(provider_logo, :title => provider[:name], :class => 'logo') + " #{provider[:name]}", user_omniauth_authorize_path(provider[:provider]) %>
0  app/views/layouts/hydrant.html.erb → app/views/layouts/avalon.html.erb
View
File renamed without changes
2  app/views/media_objects/_dropbox_details.html.erb
View
@@ -1,4 +1,4 @@
<div class="well well-info muted">
- Dropbox location: <em><%= Hydrant::Configuration['dropbox']['upload_uri'] %></em> Contact your system administrator for more information.<br>
+ Dropbox location: <em><%= Avalon::Configuration['dropbox']['upload_uri'] %></em> Contact your system administrator for more information.<br>
See <a href="https://wiki.dlib.indiana.edu/x/R5OfHg">Batch Ingest Package Format</a> for instructions and templates.
</div>
2  app/views/media_objects/mobile.html.erb
View
@@ -3,7 +3,7 @@
<title><%= @mediaobject.title %> (<%= @mediaobject.pid %>)</title>
<%= stylesheet_link_tag "application" %>
- <%= stylesheet_link_tag "hydrant" %>
+ <%= stylesheet_link_tag "avalon" %>
<%= javascript_include_tag "application" %>
</head>
6 config.ru
View
@@ -1,6 +1,6 @@
# This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__)
-require 'hydrant/stream_auth'
+require 'avalon/stream_auth'
-use Hydrant::StreamAuth, :prefix => '/streams/'
-run Hydrant::Application
+use Avalon::StreamAuth, :prefix => '/streams/'
+run Avalon::Application
3  config/application.rb
View
@@ -11,9 +11,8 @@
# Bundler.require(:default, :assets, Rails.env)
end
-module Hydrant
+module Avalon
class Application < Rails::Application
- require 'hydrant/matterhorn_jobs'
require 'rubyhorn/rest_client/ingest'
# Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers
0  config/hydrant.yml.example → config/avalon.yml.example
View
File renamed without changes
6 config/deploy.rb
View
@@ -4,8 +4,8 @@
require 'rvm/capistrano'
require 'whenever/capistrano'
-set :application, "hydrant"
-set :repository, "git://github.com/variations-on-video/hydrant.git"
+set :application, "avalon"
+set :repository, "git://github.com/variations-on-video/avalon.git"
set :scm, :git
# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
@@ -15,7 +15,7 @@
set :use_sudo, false
#set :rvm_type, :root
-set :rvm_ruby_string, 'ruby-1.9.3@hydrant' # Or:
+set :rvm_ruby_string, 'ruby-1.9.3@avalon' # Or:
#set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"") # Read from local system
task :uname do
12 config/deploy/staging.rb
View
@@ -39,17 +39,17 @@
end
task :start, :roles => :app do
- run "cd #{current_release}; rake hydrant:services:start"
+ run "cd #{current_release}; rake avalon:services:start"
end
task :stop, :roles => :app do
- run "cd #{current_release}; rake hydrant:services:stop"
+ run "cd #{current_release}; rake avalon:services:stop"
end
desc "Restart Application"
task :restart, :roles => :app do
- run "cd #{current_release}; rake hydrant:services:stop"
- run "cd #{current_release}; rake hydrant:services:start"
+ run "cd #{current_release}; rake avalon:services:stop"
+ run "cd #{current_release}; rake avalon:services:start"
end
task :quick_update, :roles => :app do
@@ -106,11 +106,11 @@
end
end
- namespace :hydrant do
+ namespace :avalon do
task :load_fixtures, :roles => :app do
run "rm #{dropbox_path}/demo_fixtures/*.processed"
#XXX Do something fancy like get dropbox location from the server then scp or local fs copy the whole batch into place from source control
-# run "rails r \"p Hydrant::Configuration['dropbox']['path']\"" do |channel, stream, data|
+# run "rails r \"p Avalon::Configuration['dropbox']['path']\"" do |channel, stream, data|
# dropbox_path = data
# return if dropbox_path.blank?
# p "Dropbox path: #{dropbox_path}"
2  config/environment.rb
View
@@ -4,4 +4,4 @@
require File.expand_path('../application', __FILE__)
# Initialize the rails application
-Hydrant::Application.initialize!
+Avalon::Application.initialize!
2  config/environments/development.rb
View
@@ -1,4 +1,4 @@
-Hydrant::Application.configure do
+Avalon::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
config.log_level = :debug
2  config/environments/production.rb
View
@@ -1,4 +1,4 @@
-Hydrant::Application.configure do
+Avalon::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# Code is not reloaded between requests
2  config/environments/test.rb
View
@@ -1,4 +1,4 @@
-Hydrant::Application.configure do
+Avalon::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
# The test environment is used exclusively to run your application's
2  config/initializers/assign_pid.rb
View
@@ -2,7 +2,7 @@ module ActiveFedora
class UnsavedDigitalObject
def assign_pid
pid_opts = {}
- if Hydrant::Configuration['fedora'] && ns = Hydrant::Configuration['fedora']['namespace']
+ if Avalon::Configuration['fedora'] && ns = Avalon::Configuration['fedora']['namespace']
pid_opts[:namespace] = ns
end
@pid ||= Nokogiri::XML(ActiveFedora::Base.connection_for_pid(0).next_pid(pid_opts)).at_xpath('//xmlns:pid').text
2  config/initializers/authn_providers.rb
View
@@ -1,4 +1,4 @@
-module Hydrant
+module Avalon
module Authentication
Providers = YAML.load(File.read(File.expand_path('../../authentication.yml',__FILE__)))
end
19 config/initializers/hydrant.rb → config/initializers/avalon.rb
View
@@ -1,13 +1,14 @@
# Loads configuration information from the YAML file and then sets up the
-# dropbox so that it can monitor using the guard-hydrant gem
+# dropbox
#
# This makes a Dropbox object accessible in the controllers to query and find
-# out what is available. See lib/hydrant/dropbox.rb for details on the API
-require 'hydrant/dropbox'
+# out what is available. See lib/avalon/dropbox.rb for details on the API
+require 'avalon/dropbox'
-module Hydrant
+module Avalon
DEFAULT_CONFIGURATION = {
"dropbox"=>{},
+ "fedora"=>{"namespace"=>"avalon"},
"matterhorn"=>{},
"mediainfo"=>{"path"=>"/usr/local/bin/mediainfo"},
"email"=>{},
@@ -20,15 +21,15 @@ module Hydrant
}
env = ENV['RAILS_ENV'] || 'development'
- Configuration = DEFAULT_CONFIGURATION.deep_merge(YAML::load(File.read(Rails.root.join('config', 'hydrant.yml')))[env])
+ Configuration = DEFAULT_CONFIGURATION.deep_merge(YAML::load(File.read(Rails.root.join('config', 'avalon.yml')))[env])
['dropbox','matterhorn','mediainfo','email','streaming'].each { |key| Configuration[key] ||= {} }
- DropboxService = Dropbox.new Hydrant::Configuration['dropbox']['path']
+ DropboxService = Dropbox.new Avalon::Configuration['dropbox']['path']
begin
- mipath = Hydrant::Configuration['mediainfo']['path']
+ mipath = Avalon::Configuration['mediainfo']['path']
unless mipath.blank?
- Mediainfo.path = Hydrant::Configuration['mediainfo']['path']
+ Mediainfo.path = Avalon::Configuration['mediainfo']['path']
end
- url_handler_class = Hydrant::Configuration['streaming']['server'].to_s.classify
+ url_handler_class = Avalon::Configuration['streaming']['server'].to_s.classify
Derivative.url_handler = UrlHandler.const_get(url_handler_class.to_sym)
rescue
#TODO log some helpful error here instead of silently failing
2  config/initializers/devise.rb
View
@@ -198,7 +198,7 @@
# up on your models and hooks.
# config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
- Hydrant::Authentication::Providers.each do |provider|
+ Avalon::Authentication::Providers.each do |provider|
config.omniauth provider[:provider], provider[:params]
end
2  config/initializers/mailer.rb
View
@@ -1,3 +1,3 @@
unless Rails.env.test?
- Hydrant::Application.config.action_mailer.smtp_settings = Hydrant::Configuration['email']['mailer']['smtp']
+ Avalon::Application.config.action_mailer.smtp_settings = Avalon::Configuration['email']['mailer']['smtp']
end
2  config/initializers/secret_token.rb
View
@@ -4,4 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
-Hydrant::Application.config.secret_token = '1dec111de07690d5e60d72104ef2d85103fa654aac7d9a7507ae030bc3de1850ea8bfa5ca3b358950165300c7944917c44a1486978efb8704edf66524e3da24c'
+Avalon::Application.config.secret_token = '1dec111de07690d5e60d72104ef2d85103fa654aac7d9a7507ae030bc3de1850ea8bfa5ca3b358950165300c7944917c44a1486978efb8704edf66524e3da24c'
4 config/initializers/session_store.rb
View
@@ -1,8 +1,8 @@
# Be sure to restart your server when you modify this file.
-Hydrant::Application.config.session_store :cookie_store, :key => '_hydrant_session'
+Avalon::Application.config.session_store :cookie_store, :key => '_avalon_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
# (create the session table with "rails generate session_migration")
-# Hydrant::Application.config.session_store :active_record_store
+# Avalon::Application.config.session_store :active_record_store
2  config/routes.rb
View
@@ -1,4 +1,4 @@
-Hydrant::Application.routes.draw do
+Avalon::Application.routes.draw do
Blacklight.add_routes(self, except: [:bookmarks, :feedback, :catalog])
# HydraHead.add_routes(self)
2  config/schedule.rb
View
@@ -1,5 +1,5 @@
set :output, "log/whenever_cron.log"
every 1.minute do
- rake 'hydrant:batch:ingest', :environment => "development"
+ rake 'avalon:batch:ingest', :environment => "development"
end
2  fedora_conf/conf/development/fedora.fcfg
View
@@ -156,7 +156,7 @@
context-appropriate DOReaders and DOWriters for reflecting on and
writing to the objects stored in the repository. It also provides
methods for reflecting on the contents of the repository as a whole..</comment>
- <param name="pidNamespace" value="hydrant">
+ <param name="pidNamespace" value="changeme">
<comment>This is the namespace id for pids of newly-created objects.
This should be unique for a repository. It can be from 1 to 17
characters, and may only contain A-Z, a-z, 0-9, &apos;.&apos;, or &apos;-&apos; (dash).</comment>
2  fedora_conf/conf/test/fedora.fcfg
View
@@ -156,7 +156,7 @@
context-appropriate DOReaders and DOWriters for reflecting on and
writing to the objects stored in the repository. It also provides
methods for reflecting on the contents of the repository as a whole..</comment>
- <param name="pidNamespace" value="hydrant">
+ <param name="pidNamespace" value="changeme">
<comment>This is the namespace id for pids of newly-created objects.
This should be unique for a repository. It can be from 1 to 17
characters, and may only contain A-Z, a-z, 0-9, &apos;.&apos;, or &apos;-&apos; (dash).</comment>
2  felix
@@ -1 +1 @@
-Subproject commit 7d828d7edd2a307e469171679325dd3da51db664
+Subproject commit 10f522ccc20bd6b1f739a4293e443aa3ade00979
14 lib/hydrant/batch_ingest.rb → lib/avalon/batch_ingest.rb
View
@@ -1,21 +1,21 @@
require 'iconv'
require 'avalon/workflow/workflow_controller_behavior'
-require 'hydrant/controller/controller_behavior'
-require 'hydrant/dropbox'
+require 'avalon/controller/controller_behavior'
+require 'avalon/dropbox'
-module Hydrant
+module Avalon
module Batch
- include Hydrant::Controller::ControllerBehavior
+ include Avalon::Controller::ControllerBehavior
def self.ingest
# Scans dropbox for new batch packages
logger.debug "============================================"
logger.debug "<< Starts scanning for new batch packages >>"
- #dropbox = Hydrant::Dropbox.new( Hydrant::Configuration['dropbox']['path'] )
+ #dropbox = Avalon::Dropbox.new( Avalon::Configuration['dropbox']['path'] )
- new_packages = Hydrant::DropboxService.find_new_packages
+ new_packages = Avalon::DropboxService.find_new_packages
logger.debug "<< Found #{new_packages.count} new packages >>"
@@ -25,7 +25,7 @@ def self.ingest
logger.debug "<< Processing package #{index} >>"
media_objects = []
- email_address = package.manifest.email || Hydrant::Configuration['email']['notification']
+ email_address = package.manifest.email || Avalon::Configuration['email']['notification']
package.validate do |entry|
mo = MediaObject.new
2  lib/hydrant/controller/controller_behavior.rb → lib/avalon/controller/controller_behavior.rb
View
@@ -1,4 +1,4 @@
-module Hydrant
+module Avalon
module Controller
module ControllerBehavior
def self.included(base)
6 lib/hydrant/dropbox.rb → lib/avalon/dropbox.rb
View
@@ -1,5 +1,5 @@
require 'digest/md5'
-module Hydrant
+module Avalon
class Dropbox
attr_reader :base_directory
@@ -63,12 +63,12 @@ def delete( filename )
# Gets completed, uningested batch packages
def find_new_packages()
- Hydrant::Batch::Package.locate(@base_directory)
+ Avalon::Batch::Package.locate(@base_directory)
end
# protected
def find_open_files(files)
- Hydrant::Batch.find_open_files(files, @base_directory)
+ Avalon::Batch.find_open_files(files, @base_directory)
end
end
end
2  lib/hydrant/stream_auth.rb → lib/avalon/stream_auth.rb
View
@@ -1,4 +1,4 @@
-module Hydrant
+module Avalon
class StreamAuth
def initialize(app, options={})
@app = app
8 lib/tasks/hydrant-fixtures.rake → lib/tasks/avalon-fixtures.rake
View
@@ -1,11 +1,11 @@
-namespace :hydrant do
+namespace :avalon do
- desc "Init Hydrant configuration"
+ desc "Init Avalon configuration"
task :init => [:environment] do
# We need to just start rails so that all the models are loaded
end
- desc "Load hydrant models"
+ desc "Load avalon models"
task :load_models do
require "hydra-head"
require File.expand_path(File.dirname(__FILE__) + '../../../config/environment')
@@ -51,7 +51,7 @@ namespace :hydrant do
end
end
- desc "Refresh default Hydrant fixtures"
+ desc "Refresh default Avalon fixtures"
task :refresh => [:load_models, :delete, :load]
end
16 lib/tasks/hydrant.rake → lib/tasks/avalon.rake
View
@@ -1,19 +1,19 @@
-namespace :hydrant do
+namespace :avalon do
namespace :services do
services = ["jetty", "felix", "delayed_job"]
- desc "Start Hydrant's dependent services"
+ desc "Start Avalon's dependent services"
task :start do
services.map { |service| Rake::Task["#{service}:start"].invoke }
end
- desc "Stop Hydrant's dependent services"
+ desc "Stop Avalon's dependent services"
task :stop do
services.map { |service| Rake::Task["#{service}:stop"].invoke }
end
- desc "Status of Hydrant's dependent services"
+ desc "Status of Avalon's dependent services"
task :status do
services.map { |service| Rake::Task["#{service}:status"].invoke }
end
- desc "Restart Hydrant's dependent services"
+ desc "Restart Avalon's dependent services"
task :restart do
services.map { |service| Rake::Task["#{service}:restart"].invoke }
end
@@ -26,11 +26,11 @@ namespace :hydrant do
end
end
namespace :batch do
- desc "Starts Hydrant batch ingest"
+ desc "Starts Avalon batch ingest"
task :ingest => :environment do
# Starts the ingest process
- require 'hydrant/batch_ingest'
- Hydrant::Batch.ingest
+ require 'avalon/batch_ingest'
+ Avalon::Batch.ingest
end
end
end
10 lib/tasks/delayed_job.rake
View
@@ -1,27 +1,27 @@
namespace :delayed_job do
require 'delayed/command'
- desc "Starts Hydrant's delayed_job worker"
+ desc "Starts Avalon's delayed_job worker"
task :start => :environment do
Delayed::Command.new(["-n", "2", "start"]).daemonize
end
- desc "Stop Hydrant's delayed_job worker"
+ desc "Stop Avalon's delayed_job worker"
task :stop => :environment do
Delayed::Command.new(["stop"]).daemonize
end
- desc "Restarts Hydrant's delayed_job worker"
+ desc "Restarts Avalon's delayed_job worker"
task :restart => :environment do
Delayed::Command.new(["restart"]).daemonize
end
- desc "Reloads Hydrant's delayed_job worker"
+ desc "Reloads Avalon's delayed_job worker"
task :restart => :environment do
Delayed::Command.new(["reload"]).daemonize
end
- desc "Returns Hydrant's delayed_job worker status"
+ desc "Returns Avalon's delayed_job worker status"
task :status => :environment do
Delayed::Command.new(["status"]).daemonize
end
0  public/javascripts/hydrant/iuplayer.js → public/javascripts/avalon/iuplayer.js
View
File renamed without changes
0  ...vascripts/hydrant/jquery.rdfquery.rdfa.min-1.0.js → ...avascripts/avalon/jquery.rdfquery.rdfa.min-1.0.js
View
File renamed without changes
0  public/javascripts/hydrant/oac_rdf.js → public/javascripts/avalon/oac_rdf.js
View
File renamed without changes
0  public/javascripts/hydrant/oac_rdfjson.js → public/javascripts/avalon/oac_rdfjson.js
View
File renamed without changes
0  public/javascripts/hydrant/oac_utils.js → public/javascripts/avalon/oac_utils.js
View
File renamed without changes
0  public/javascripts/hydrant/uuid.js → public/javascripts/avalon/uuid.js
View
File renamed without changes
4 spec/controllers/dropbox_controller_spec.rb
View
@@ -10,11 +10,11 @@
login_as_archivist
@temp_files = (0..20).map{|index| { name: "a_movie_#{index}.mov" } }
- Hydrant::DropboxService.stub(:all).and_return @temp_files
+ Avalon::DropboxService.stub(:all).and_return @temp_files
end
it 'deletes video/audio files' do
- Hydrant::DropboxService.should_receive(:delete).exactly(@temp_files.count).times
+ Avalon::DropboxService.should_receive(:delete).exactly(@temp_files.count).times
delete :bulk_delete, { :filenames => @temp_files.map{|f| f[:name] } }
end
26 spec/controllers/master_files_controller_spec.rb
View
@@ -5,7 +5,7 @@
before(:each) do
login_as_archivist
- load_fixture 'hydrant:video-segment'
+ load_fixture 'avalon:video-segment'
end
context "must provide a container id" do
@@ -24,7 +24,7 @@
@file = fixture_file_upload('/videoshort.mp4', 'video/mp4')
@file.stub(:size).and_return(MasterFile::MAXIMUM_UPLOAD_SIZE + 2^21)
- lambda { post :create, Filedata: [@file], original: 'any', container_id: 'hydrant:video-segment'}.should_not change { MasterFile.count }
+ lambda { post :create, Filedata: [@file], original: 'any', container_id: 'avalon:video-segment'}.should_not change { MasterFile.count }
logger.debug "<< Flash message is present? #{flash[:notice]} >>"
flash[:errors].should_not be_nil
@@ -37,9 +37,9 @@
post :create,
Filedata: [@file],
original: 'any',
- container_id: 'hydrant:video-segment'
+ container_id: 'avalon:video-segment'
- mediaobject = MediaObject.find('hydrant:video-segment')
+ mediaobject = MediaObject.find('avalon:video-segment')
master_file = mediaobject.parts.first
master_file.file_format.should eq "Moving image"
@@ -51,19 +51,19 @@
post :create,
Filedata: [@file],
original: 'any',
- container_id: 'hydrant:video-segment'
+ container_id: 'avalon:video-segment'
- mediaobject = MediaObject.find('hydrant:video-segment')
+ mediaobject = MediaObject.find('avalon:video-segment')
master_file = mediaobject.parts.first
master_file.file_format.should eq "Sound"
end
it "should reject non audio/video format" do
request.env["HTTP_REFERER"] = "/"
- load_fixture 'hydrant:electronic-resource'
+ load_fixture 'avalon:electronic-resource'
@file = fixture_file_upload('/public-domain-book.txt', 'application/json')
- lambda { post :create, Filedata: [@file], original: 'any', container_id: 'hydrant:electronic-resource' }.should_not change { MasterFile.count }
+ lambda { post :create, Filedata: [@file], original: 'any', container_id: 'avalon:electronic-resource' }.should_not change { MasterFile.count }
logger.debug "<< Flash errors is present? #{flash[:errors]} >>"
flash[:errors].should_not be_nil
@@ -75,7 +75,7 @@
post :create,
Filedata: [@file],
original: 'any',
- container_id: 'hydrant:video-segment'
+ container_id: 'avalon:video-segment'
master_file = MasterFile.find(:all, order: "created_on ASC").last
master_file.file_format.should eq "Moving image"
@@ -91,12 +91,12 @@ class << @file
attr_reader :tempfile
end
- post :create, Filedata: [@file], original: 'any', container_id: 'hydrant:video-segment'
+ post :create, Filedata: [@file], original: 'any', container_id: 'avalon:video-segment'
master_file = MasterFile.find(:all, order: "created_on ASC").last
- mediaobject = MediaObject.find('hydrant:video-segment')
+ mediaobject = MediaObject.find('avalon:video-segment')
mediaobject.parts.should include master_file
- master_file.mediaobject.pid.should eq('hydrant:video-segment')
+ master_file.mediaobject.pid.should eq('avalon:video-segment')
flash[:errors].should be_nil
end
@@ -110,7 +110,7 @@ class << @file
attr_reader :tempfile
end
- post :create, Filedata: [@file], original: 'any', container_id: 'hydrant:video-segment'
+ post :create, Filedata: [@file], original: 'any', container_id: 'avalon:video-segment'
master_file = MasterFile.find(:all, order: "created_on ASC").last
master_file.edit_groups.should include "archivist"
84 spec/controllers/media_objects_controller_spec.rb
View
@@ -36,28 +36,28 @@
describe "#edit" do
it "should redirect to sign in page with a notice on when unauthenticated" do
- load_fixture 'hydrant:electronic-resource'
+ load_fixture 'avalon:electronic-resource'
- get 'edit', id: 'hydrant:electronic-resource'
+ get 'edit', id: 'avalon:electronic-resource'
flash[:notice].should_not be_nil
response.should redirect_to(new_user_session_path)
end
it "should redirect to show page with a notice when authenticated but unauthorized" do
- load_fixture 'hydrant:print-publication'
+ load_fixture 'avalon:print-publication'
login_as('student')
- get 'edit', id: 'hydrant:print-publication'
+ get 'edit', id: 'avalon:print-publication'
flash[:notice].should_not be_nil
- response.should redirect_to(media_object_path 'hydrant:print-publication')
+ response.should redirect_to(media_object_path 'avalon:print-publication')
end
it "should redirect to first workflow step if authorized to edit" do
- load_fixture "hydrant:print-publication"
+ load_fixture "avalon:print-publication"
login_as 'cataloger'
- get 'edit', id: 'hydrant:print-publication'
+ get 'edit', id: 'avalon:print-publication'
response.should be_success
response.should render_template HYDRANT_STEPS.first.template
end
@@ -66,13 +66,13 @@
it "should ignore the PID if provided as a parameter"
it "should ignore invalid attributes"
it "should be able to retrieve an existing record from Fedora" do
- load_fixture 'hydrant:video-segment'
- mo = MediaObject.find 'hydrant:video-segment'
+ load_fixture 'avalon:video-segment'
+ mo = MediaObject.find 'avalon:video-segment'
mo.workflow.last_completed_step = 'resource-description'
# Set the task so that it can get to the resource-description step
login_as 'cataloger'
- get :edit, {id: 'hydrant:video-segment', step: 'resource-description'}
+ get :edit, {id: 'avalon:video-segment', step: 'resource-description'}
response.response_code.should == 200
end
end
@@ -81,8 +81,8 @@
describe "#show" do
context "Known items should be retrievable" do
it "should be accesible by its PID" do
- load_fixture 'hydrant:video-segment'
- get :show, id: 'hydrant:video-segment'
+ load_fixture 'avalon:video-segment'
+ get :show, id: 'avalon:video-segment'
response.response_code.should == 200
end
@@ -93,30 +93,30 @@
end
it "should be available to an archivist when unpublished" do
- load_fixture 'hydrant:video-segment'
- mo = MediaObject.find('hydrant:video-segment')
+ load_fixture 'avalon:video-segment'
+ mo = MediaObject.find('avalon:video-segment')
mo.access = "public"
mo.save
login_as('cataloger')
- get 'show', id: 'hydrant:video-segment'
+ get 'show', id: 'avalon:video-segment'
response.should_not redirect_to new_user_session_path
end
it "should provide a JSON stream description to the client" do
- fixtures = ['hydrant:video-segment',
- 'hydrant:electronic-resource',
- 'hydrant:print-publication',
- 'hydrant:musical-performance']
+ fixtures = ['avalon:video-segment',
+ 'avalon:electronic-resource',
+ 'avalon:print-publication',
+ 'avalon:musical-performance']
fixtures.collect { |f| load_fixture f }
- mo = MediaObject.find 'hydrant:print-publication'
+ mo = MediaObject.find 'avalon:print-publication'
mo.access = "public"
mo.save
mo.parts.collect { |part|
package_id = part.mediapackage_id
- get 'show', id: 'hydrant:print-publication', format: 'json', content: part.pid
+ get 'show', id: 'avalon:print-publication', format: 'json', content: part.pid
json_obj = JSON.parse(response.body)
json_obj['mediapackage_id'].should == part.mediapackage_id
}
@@ -125,13 +125,13 @@
context "Items should not be available to unauthorized users" do
it "should not be available when unpublished" do
- load_fixture 'hydrant:electronic-resource'
+ load_fixture 'avalon:electronic-resource'
- mo = MediaObject.find 'hydrant:electronic-resource'
+ mo = MediaObject.find 'avalon:electronic-resource'
mo.access = "private"
mo.save
- get 'show', id: 'hydrant:electronic-resource'
+ get 'show', id: 'avalon:electronic-resource'
response.should redirect_to new_user_session_path
end
end
@@ -140,19 +140,19 @@
describe "#destroy" do
before(:each) do
login_as 'cataloger'
- load_fixture 'hydrant:electronic-resource'
+ load_fixture 'avalon:electronic-resource'
end
it "should remove the MediaObject from the system" do
- load_fixture 'hydrant:electronic-resource'
- delete :destroy, id: 'hydrant:electronic-resource'
+ load_fixture 'avalon:electronic-resource'
+ delete :destroy, id: 'avalon:electronic-resource'
- MediaObject.exists?('hydrant:electronic-resource').should == false
+ MediaObject.exists?('avalon:electronic-resource').should == false
end
it "should not be accessible through the search interface" do
- load_fixture 'hydrant:electronic-resource'
- delete :destroy, id: 'hydrant:electronic-resource'
+ load_fixture 'avalon:electronic-resource'
+ delete :destroy, id: 'avalon:electronic-resource'
pending "Figure out how to make the right query against Solr"
end
@@ -161,7 +161,7 @@
# for the time being
it "should not be possible to delete an object which does not exist" do
pending "Fix access controls to stop throwing exception"
- delete :destroy, id: 'hydrant:this-pid-is-fake'
+ delete :destroy, id: 'avalon:this-pid-is-fake'
response.should redirect_to root_path
end
end
@@ -169,50 +169,50 @@
describe "#update_status" do
before(:each) do
login_as('content_provider')
- @media_object = MediaObject.new(pid: 'hydrant:1')
+ @media_object = MediaObject.new(pid: 'avalon:1')
request.env["HTTP_REFERER"] = '/'
end
it 'publishes media object' do
@media_object.save(validate: false)
- get 'update_status', :id => 'hydrant:1', :status => 'publish'
- MediaObject.find('hydrant:1').published?.should be_true
+ get 'update_status', :id => 'avalon:1', :status => 'publish'
+ MediaObject.find('avalon:1').published?.should be_true
end
it 'unpublishes media object' do
@media_object.avalon_publisher = 'archivist'
@media_object.save(validate: false)
- get 'update_status', :id => 'hydrant:1', :status => 'unpublish'
- MediaObject.find('hydrant:1').published?.should be_false
+ get 'update_status', :id => 'avalon:1', :status => 'unpublish'
+ MediaObject.find('avalon:1').published?.should be_false
end
end
describe "#deliver_content" do
before(:each) do
- load_fixture 'hydrant:electronic-resource'
+ load_fixture 'avalon:electronic-resource'
end
it 'cannot inspect metadata anonymously' do
- get 'deliver_content', :id => 'hydrant:electronic-resource', :datastream => 'descMetadata'
+ get 'deliver_content', :id => 'avalon:electronic-resource', :datastream => 'descMetadata'
response.response_code.should == 401
end
it 'cannot inspect metadata without authorization' do
login_as 'student'
- get 'deliver_content', :id => 'hydrant:electronic-resource', :datastream => 'descMetadata'
+ get 'deliver_content', :id => 'avalon:electronic-resource', :datastream => 'descMetadata'
response.response_code.should == 401
end
it 'can inspect metadata with authorization' do
login_as 'content_provider'
- get 'deliver_content', :id => 'hydrant:electronic-resource', :datastream => 'descMetadata'
+ get 'deliver_content', :id => 'avalon:electronic-resource', :datastream => 'descMetadata'
response.response_code.should == 200
- response.body.should be_equivalent_to(MediaObject.find('hydrant:electronic-resource').descMetadata.content)
+ response.body.should be_equivalent_to(MediaObject.find('avalon:electronic-resource').descMetadata.content)
end
it 'returns a not found error for nonexistent datastreams' do
login_as 'content_provider'
- get 'deliver_content', :id => 'hydrant:electronic-resource', :datastream => 'nonExistentMetadata'
+ get 'deliver_content', :id => 'avalon:electronic-resource', :datastream => 'nonExistentMetadata'
response.response_code.should == 404
end
end
16 spec/fixtures/hydrant_electronic-resource.foxml.xml → spec/fixtures/avalon_electronic-resource.foxml.xml
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="hydrant:electronic-resource"
+<foxml:digitalObject VERSION="1.1" PID="avalon:electronic-resource"
xmlns:foxml="info:fedora/fedora-system:def/foxml#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
@@ -126,7 +126,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2012-10-29T14:04:24.549Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="356">
<foxml:xmlContent>
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- <dc:identifier>hydrant:electronic-resource</dc:identifier>
+ <dc:identifier>avalon:electronic-resource</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -134,7 +134,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:xmlContent>
<oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<dc:creator>jlhardes</dc:creator>
- <dc:identifier>hydrant:electronic-resource</dc:identifier>
+ <dc:identifier>avalon:electronic-resource</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -143,7 +143,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<dc:creator>jlhardes</dc:creator>
<dc:publisher>jlhardes</dc:publisher>
- <dc:identifier>hydrant:electronic-resource</dc:identifier>
+ <dc:identifier>avalon:electronic-resource</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -152,7 +152,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:datastreamVersion ID="RELS-EXT.0" LABEL="Fedora Object-to-Object Relationship Metadata" CREATED="2012-10-29T14:04:24.644Z" MIMETYPE="application/rdf+xml" SIZE="301">
<foxml:xmlContent>
<rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <rdf:Description rdf:about="info:fedora/hydrant:electronic-resource">
+ <rdf:Description rdf:about="info:fedora/avalon:electronic-resource">
<ns0:hasModel rdf:resource="info:fedora/afmodel:MediaObject"></ns0:hasModel>
</rdf:Description>
</rdf:RDF>
@@ -421,7 +421,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<languageTerm authority="iso639-2b" type="code">eng</languageTerm>
</languageOfCataloging>
</recordInfo>
- <identifier>hydrant:electronic-resource</identifier>
+ <identifier>avalon:electronic-resource</identifier>
</mods>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -457,7 +457,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<subject>
<topic>Baseball--Japan--History--20th century.</topic>
</subject>
- <identifier>hydrant:electronic-resource</identifier>
+ <identifier>avalon:electronic-resource</identifier>
<recordInfo>
<recordOrigin>Avalon Media System</recordOrigin>
<recordContentSource>IEN</recordContentSource>
@@ -503,7 +503,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<subject>
<topic>Baseball--Japan--History--20th century.</topic>
</subject>
- <identifier>hydrant:electronic-resource</identifier>
+ <identifier>avalon:electronic-resource</identifier>
<recordInfo>
<recordOrigin>Avalon Media System</recordOrigin>
<recordContentSource>IEN</recordContentSource>
14 spec/fixtures/hydrant_musical-performance.foxml.xml → spec/fixtures/avalon_musical-performance.foxml.xml
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="hydrant:musical-performance"
+<foxml:digitalObject VERSION="1.1" PID="avalon:musical-performance"
xmlns:foxml="info:fedora/fedora-system:def/foxml#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
@@ -118,7 +118,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2012-10-29T13:42:49.915Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="356">
<foxml:xmlContent>
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- <dc:identifier>hydrant:musical-performance</dc:identifier>
+ <dc:identifier>avalon:musical-performance</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -126,7 +126,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:xmlContent>
<oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<dc:creator>jlhardes</dc:creator>
- <dc:identifier>hydrant:musical-performance</dc:identifier>
+ <dc:identifier>avalon:musical-performance</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -135,7 +135,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<dc:creator>jlhardes</dc:creator>
<dc:publisher>jlhardes</dc:publisher>
- <dc:identifier>hydrant:musical-performance</dc:identifier>
+ <dc:identifier>avalon:musical-performance</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -144,7 +144,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:datastreamVersion ID="RELS-EXT.0" LABEL="Fedora Object-to-Object Relationship Metadata" CREATED="2012-10-29T13:42:50.025Z" MIMETYPE="application/rdf+xml" SIZE="301">
<foxml:xmlContent>
<rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <rdf:Description rdf:about="info:fedora/hydrant:musical-performance">
+ <rdf:Description rdf:about="info:fedora/avalon:musical-performance">
<ns0:hasModel rdf:resource="info:fedora/afmodel:MediaObject"></ns0:hasModel>
</rdf:Description>
</rdf:RDF>
@@ -469,7 +469,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<languageTerm authority="iso639-2b" type="code">eng</languageTerm>
</languageOfCataloging>
</recordInfo>
- <identifier>hydrant:musical-performance</identifier>
+ <identifier>avalon:musical-performance</identifier>
</mods>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -519,7 +519,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<subject>
<topic>Beethoven, Ludwig van, 1770-1827. Quartets, strings, no. 16, op. 135, F major.</topic>
</subject>
- <identifier>hydrant:musical-performance</identifier>
+ <identifier>avalon:musical-performance</identifier>
<recordInfo>
<recordOrigin>Avalon Media System</recordOrigin>
<recordContentSource>IEN</recordContentSource>
14 spec/fixtures/hydrant_print-publication.foxml.xml → spec/fixtures/avalon_print-publication.foxml.xml
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="hydrant:print-publication"
+<foxml:digitalObject VERSION="1.1" PID="avalon:print-publication"
xmlns:foxml="info:fedora/fedora-system:def/foxml#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
@@ -118,7 +118,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2012-10-29T14:30:50.265Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="354">
<foxml:xmlContent>
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- <dc:identifier>hydrant:print-publication</dc:identifier>
+ <dc:identifier>avalon:print-publication</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -126,7 +126,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:xmlContent>
<oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<dc:creator>jlhardes</dc:creator>
- <dc:identifier>hydrant:print-publication</dc:identifier>
+ <dc:identifier>avalon:print-publication</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -135,7 +135,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<dc:creator>jlhardes</dc:creator>
<dc:publisher>jlhardes</dc:publisher>
- <dc:identifier>hydrant:print-publication</dc:identifier>
+ <dc:identifier>avalon:print-publication</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -144,7 +144,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:datastreamVersion ID="RELS-EXT.0" LABEL="Fedora Object-to-Object Relationship Metadata" CREATED="2012-10-29T14:30:50.335Z" MIMETYPE="application/rdf+xml" SIZE="299">
<foxml:xmlContent>
<rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <rdf:Description rdf:about="info:fedora/hydrant:print-publication">
+ <rdf:Description rdf:about="info:fedora/avalon:print-publication">
<ns0:hasModel rdf:resource="info:fedora/afmodel:MediaObject"></ns0:hasModel>
</rdf:Description>
</rdf:RDF>
@@ -429,7 +429,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<languageTerm authority="iso639-2b" type="code">eng</languageTerm>
</languageOfCataloging>
</recordInfo>
- <identifier>hydrant:print-publication</identifier>
+ <identifier>avalon:print-publication</identifier>
</mods>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -469,7 +469,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
</originInfo>
<physicalDescription></physicalDescription>
<abstract></abstract>
- <identifier>hydrant:print-publication</identifier>
+ <identifier>avalon:print-publication</identifier>
<recordInfo>
<recordOrigin>Avalon Media System</recordOrigin>
<recordContentSource>IEN</recordContentSource>
14 spec/fixtures/hydrant_video-segment.foxml.xml → spec/fixtures/avalon_video-segment.foxml.xml
View
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="hydrant:video-segment"
+<foxml:digitalObject VERSION="1.1" PID="avalon:video-segment"
xmlns:foxml="info:fedora/fedora-system:def/foxml#"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
@@ -118,7 +118,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2012-10-29T14:34:29.791Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="350">
<foxml:xmlContent>
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
- <dc:identifier>hydrant:video-segment</dc:identifier>
+ <dc:identifier>avalon:video-segment</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -126,7 +126,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:xmlContent>
<oai_dc:dc xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<dc:creator>jlhardes</dc:creator>
- <dc:identifier>hydrant:video-segment</dc:identifier>
+ <dc:identifier>avalon:video-segment</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -135,7 +135,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
<dc:creator>jlhardes</dc:creator>
<dc:publisher>jlhardes</dc:publisher>
- <dc:identifier>hydrant:video-segment</dc:identifier>
+ <dc:identifier>avalon:video-segment</dc:identifier>
</oai_dc:dc>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -144,7 +144,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
<foxml:datastreamVersion ID="RELS-EXT.0" LABEL="Fedora Object-to-Object Relationship Metadata" CREATED="2012-10-29T14:34:29.853Z" MIMETYPE="application/rdf+xml" SIZE="295">
<foxml:xmlContent>
<rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <rdf:Description rdf:about="info:fedora/hydrant:video-segment">
+ <rdf:Description rdf:about="info:fedora/avalon:video-segment">
<ns0:hasModel rdf:resource="info:fedora/afmodel:MediaObject"></ns0:hasModel>
</rdf:Description>
</rdf:RDF>
@@ -381,7 +381,7 @@ In between workouts kittens playing, studying in a ridiculous dance choir and le
<languageTerm authority="iso639-2b" type="code">eng</languageTerm>
</languageOfCataloging>
</recordInfo>
- <identifier>hydrant:video-segment</identifier>
+ <identifier>avalon:video-segment</identifier>
</mods>
</foxml:xmlContent>
</foxml:datastreamVersion>
@@ -409,7 +409,7 @@ In between workouts kittens playing, studying in a ridiculous dance choir and le
<physicalDescription></physicalDescription>
<abstract>Ninja Kittens (aka &quot;Crouching Tiger&quot;) studied martial arts, learned how to run, climb, stalk, attack, and now began preparations for the flight to Mars!
In between workouts kittens playing, studying in a ridiculous dance choir and learn to dive. And then again to study science. In this video, kittens learn physics.</abstract>
- <identifier>hydrant:video-segment</identifier>
+ <identifier>avalon:video-segment</identifier>
<recordInfo>
<recordOrigin>Avalon Media System</recordOrigin>
<recordContentSource>IEN</recordContentSource>
4 spec/fixtures/matterhorn_workflow_doc.xml
View
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><workflow xmlns="http://workflow.opencastproject.org" xmlns:ns2="http://org.opencastproject.security" xmlns:ns3="http://mediapackage.opencastproject.org" state="SUCCEEDED" id="1103"><template>hydrant</template><title>Encode, Analyze, and Distribute (Hydrant)</title><description>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><workflow xmlns="http://workflow.opencastproject.org" xmlns:ns2="http://org.opencastproject.security" xmlns:ns3="http://mediapackage.opencastproject.org" state="SUCCEEDED" id="1103"><template>avalon</template><title>Encode, Analyze, and Distribute (Avalon)</title><description>
A simple workflow that transcodes the media into distribution formats, then sends the resulting distribution files,
along with their associated metadata, to the distribution channels.
- </description><parent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/><ns2:creator><ns2:userName>admin</ns2:userName><ns2:roles>ROLE_ADMIN</ns2:roles><ns2:roles>ROLE_ANONYMOUS</ns2:roles><ns2:roles>ROLE_OAUTH_USER</ns2:roles><ns2:roles>ROLE_USER</ns2:roles><ns2:organization>mh_default_org</ns2:organization></ns2:creator><ns2:organization id="mh_default_org"><ns2:name>Opencast Project</ns2:name><ns2:serverName>localhost</ns2:serverName><ns2:serverPort>8080</ns2:serverPort><ns2:adminRole>ROLE_ADMIN</ns2:adminRole><ns2:anonymousRole>ROLE_ANONYMOUS</ns2:anonymousRole><ns2:properties><ns2:property key="engageui.links_media_module.enable">false</ns2:property><ns2:property key="logo_small">/xengage/ui/img/mh_logos/OpencastLogo.png</ns2:property><ns2:property key="adminui.chunksize">2024</ns2:property><ns2:property key="engageui.link_mobile_redirect.description">For more information have a look at the official site.</ns2:property><ns2:property key="engageui.annotations.enable">false</ns2:property><ns2:property key="adminui.series_prepopulate.enable">false</ns2:property><ns2:property key="adminui.i18n_tab_users.enable">false</ns2:property><ns2:property key="engageui.link_download.enable">false</ns2:property><ns2:property key="engageui.link_mobile_redirect.url">http://opencast.org/matterhorn/</ns2:property><ns2:property key="logo_large">/xengage/ui/img/mh_logos/MatterhornLogo_large.png</ns2:property><ns2:property key="adminui.i18n_tab_episode.enable">false</ns2:property><ns2:property key="engageui.link_mobile_redirect.enable">false</ns2:property></ns2:properties></ns2:organization><ns3:mediapackage start="2013-01-04T16:57:00Z" id="bd22e816-9cd1-4586-8357-6217ef8f2bbf" duration="6339"><ns3:title>Test quality tags</ns3:title><ns3:media><ns3:track type="presenter/source" id="track-1"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags/><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/d8746563-335e-4afd-9eb9-616d89009784/videoshort.mp4</ns3:url><ns3:checksum type="md5">7ae24368ccb7a6c6422a14ff73f33c9a</ns3:checksum><ns3:duration>6314</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>171030.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>74477.0</ns3:bitrate><ns3:framerate>23.719</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track type="presenter/work" id="track-2"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags/><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/d8746563-335e-4afd-9eb9-616d89009784/videoshort.mp4</ns3:url><ns3:checksum type="md5">7ae24368ccb7a6c6422a14ff73f33c9a</ns3:checksum><ns3:duration>6314</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>171030.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>74477.0</ns3:bitrate><ns3:framerate>23.719</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:track-2" type="presenter/trimmed" id="track-3"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags/><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/d8746563-335e-4afd-9eb9-616d89009784/videoshort.mp4</ns3:url><ns3:checksum type="md5">7ae24368ccb7a6c6422a14ff73f33c9a</ns3:checksum><ns3:duration>6314</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>171030.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>74477.0</ns3:bitrate><ns3:framerate>23.719</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:track-3" type="presenter/delivery" id="cf45a7a9-94eb-48b9-9d77-56a84749882c"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>quality-low</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/cf45a7a9-94eb-48b9-9d77-56a84749882c/videoshort.mp4</ns3:url><ns3:checksum type="md5">4bebcae0cc965ecfd0dc56a2b1b66f6e</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>250000.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:track-3" type="presenter/delivery" id="5ac6953a-1a0e-441c-b21a-4d653948b9c9"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>quality-medium</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/5ac6953a-1a0e-441c-b21a-4d653948b9c9/videoshort.mp4</ns3:url><ns3:checksum type="md5">ee735e0d435e814a60b75b9821a83c98</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>500000.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:track-3" type="presenter/delivery" id="42e8e472-61e9-45f9-8331-18c97eb4f3a6"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>quality-high</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/42e8e472-61e9-45f9-8331-18c97eb4f3a6/videoshort.mp4</ns3:url><ns3:checksum type="md5">caec0f1412223810ec4dc202b8f674d1</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>791469.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:42e8e472-61e9-45f9-8331-18c97eb4f3a6" type="presenter/delivery" id="track-7"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>publish</ns3:tag><ns3:tag>quality-high</ns3:tag><ns3:tag>streaming</ns3:tag></ns3:tags><ns3:url>rtmp://mallorn.dlib.indiana.edu/avalon/mp4:bd22e816-9cd1-4586-8357-6217ef8f2bbf/42e8e472-61e9-45f9-8331-18c97eb4f3a6/videoshort.mp4</ns3:url><ns3:checksum type="md5">caec0f1412223810ec4dc202b8f674d1</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>791469.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:5ac6953a-1a0e-441c-b21a-4d653948b9c9" type="presenter/delivery" id="track-8"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>publish</ns3:tag><ns3:tag>quality-medium</ns3:tag><ns3:tag>streaming</ns3:tag></ns3:tags><ns3:url>rtmp://mallorn.dlib.indiana.edu/avalon/mp4:bd22e816-9cd1-4586-8357-6217ef8f2bbf/5ac6953a-1a0e-441c-b21a-4d653948b9c9/videoshort.mp4</ns3:url><ns3:checksum type="md5">ee735e0d435e814a60b75b9821a83c98</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>500000.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:cf45a7a9-94eb-48b9-9d77-56a84749882c" type="presenter/delivery" id="track-9"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>publish</ns3:tag><ns3:tag>quality-low</ns3:tag><ns3:tag>streaming</ns3:tag></ns3:tags><ns3:url>rtmp://mallorn.dlib.indiana.edu/avalon/mp4:bd22e816-9cd1-4586-8357-6217ef8f2bbf/cf45a7a9-94eb-48b9-9d77-56a84749882c/videoshort.mp4</ns3:url><ns3:checksum type="md5">4bebcae0cc965ecfd0dc56a2b1b66f6e</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>250000.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track></ns3:media><ns3:metadata><ns3:catalog type="dublincore/episode" id="4c57e417-22f9-4edc-bad6-ca8d804cf6c5"><ns3:mimetype>text/xml</ns3:mimetype><ns3:tags/><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/4c57e417-22f9-4edc-bad6-ca8d804cf6c5/dublincore.xml</ns3:url></ns3:catalog></ns3:metadata><ns3:attachments><ns3:attachment ref="track:track-3" type="presenter/player+preview" id="attachment-1"><ns3:mimetype>image/jpeg</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/attachment-1/videoshort.jpg</ns3:url></ns3:attachment><ns3:attachment ref="track:track-3" type="presenter/search+preview" id="attachment-2"><ns3:mimetype>image/jpeg</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/attachment-2/videoshort.jpg</ns3:url></ns3:attachment><ns3:attachment ref="track:track-3" type="presenter/feed+preview" id="attachment-3"><ns3:mimetype>image/jpeg</ns3:mimetype><ns3:tags><ns3:tag>atom</ns3:tag><ns3:tag>rss</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/attachment-3/videoshort.jpg</ns3:url></ns3:attachment></ns3:attachments></ns3:mediapackage><operations><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Inspecting the media package" state="SUCCEEDED" job="1104" id="inspect"><configurations/><started>1357318556903</started><completed>1357318567224</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="false" description="Splitting Media (if needed)" state="SUCCEEDED" job="1106" id="compose"><configurations><configuration key="target-flavor">presenter/source</configuration><configuration key="encoding-profile">epiphan.presenter</configuration><configuration key="source-flavor">multitrack/source</configuration></configurations><started>1357318572201</started><completed>1357318572370</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Preparing presenter audio and video work versions" state="SUCCEEDED" job="1107" id="prepare-av"><configurations><configuration key="target-flavor">presenter/work</configuration><configuration key="rewrite">false</configuration><configuration key="promiscuous-audio-muxing">true</configuration><configuration key="source-flavor">presenter/source</configuration></configurations><started>1357318577267</started><completed>1357318577425</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" if="${trimHold}" fail-on-error="true" description="Encoding presenter (camera) video for preview" state="SKIPPED" job="1108" id="compose"><configurations><configuration key="target-flavor">presenter/preview</configuration><configuration key="encoding-profile">flash-preview.http</configuration><configuration key="source-flavor">presenter/work</configuration></configurations><started>1357318582344</started><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" if="${trimHold}" fail-on-error="true" description="Waiting for user to review / trim recording" state="SKIPPED" job="1109" id="trim"><configurations><configuration key="encoding-profile">trim.work</configuration><configuration key="target-flavor-subtype">trimmed</configuration><configuration key="source-flavor">*/work</configuration></configurations><started>1357318587411</started><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) to player preview image" state="SUCCEEDED" job="1110" id="image"><configurations><configuration key="target-flavor">presenter/player+preview</configuration><configuration key="source-tags"></configuration><configuration key="time">1</configuration><configuration key="encoding-profile">player-preview.http</configuration><configuration key="target-tags">engage</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318592485</started><completed>1357318602656</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) video to mp4-low" state="SUCCEEDED" job="1112" id="compose"><configurations><configuration key="target-flavor">presenter/delivery</configuration><configuration key="encoding-profile">mp4-low.http</configuration><configuration key="target-tags">engage, quality-low</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318607643</started><completed>1357318622870</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) video to mp4-medium" state="SUCCEEDED" job="1115" id="compose"><configurations><configuration key="target-flavor">presenter/delivery</configuration><configuration key="encoding-profile">mp4-medium.http</configuration><configuration key="target-tags">engage, quality-medium</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318627894</started><completed>1357318643143</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) video to mp4-high" state="SUCCEEDED" job="1118" id="compose"><configurations><configuration key="target-flavor">presenter/delivery</configuration><configuration key="encoding-profile">mp4-high.http</configuration><configuration key="target-tags">engage, quality-high</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318648151</started><completed>1357318663362</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) to search result preview image" state="SUCCEEDED" job="1121" id="image"><configurations><configuration key="target-flavor">presenter/search+preview</configuration><configuration key="source-tags"></configuration><configuration key="time">1</configuration><configuration key="encoding-profile">search-cover.http</configuration><configuration key="target-tags">engage</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318668399</started><completed>1357318678549</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) to feed preview image" state="SUCCEEDED" job="1123" id="image"><configurations><configuration key="target-flavor">presenter/feed+preview</configuration><configuration key="source-tags"></configuration><configuration key="time">1</configuration><configuration key="encoding-profile">feed-cover.http</configuration><configuration key="target-tags">rss, atom</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318683555</started><completed>1357318688741</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Applying access control rules" state="SUCCEEDED" job="1125" id="apply-acl"><configurations/><started>1357318693697</started><completed>1357318693823</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="2" exception-handler-workflow="error" if="rtmp://mallorn.dlib.indiana.edu/avalon" fail-on-error="true" description="Distributing to streaming server" state="SUCCEEDED" job="1126" id="distribute-streaming"><configurations><configuration key="source-tags">engage,-publish</configuration><configuration key="target-tags">publish,streaming</configuration></configurations><started>1357318698760</started><completed>1357318709114</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Published" state="SUCCEEDED" job="1132" id="publish"><configurations><configuration key="source-tags">publish</configuration></configurations><started>1357318714250</started><completed>1357318714531</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" fail-on-error="false" description="Cleaning up" state="SUCCEEDED" job="1134" id="cleanup"><configurations/><started>1357318719319</started><completed>1357318719446</completed><time-in-queue>0</time-in-queue><execution-history/></operation></operations><configurations><configuration key="distribution">Matterhorn Media Module</configuration><configuration key="workflowDefinitionId">hydrant</configuration></configurations><errors/></workflow>
+ </description><parent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/><ns2:creator><ns2:userName>admin</ns2:userName><ns2:roles>ROLE_ADMIN</ns2:roles><ns2:roles>ROLE_ANONYMOUS</ns2:roles><ns2:roles>ROLE_OAUTH_USER</ns2:roles><ns2:roles>ROLE_USER</ns2:roles><ns2:organization>mh_default_org</ns2:organization></ns2:creator><ns2:organization id="mh_default_org"><ns2:name>Opencast Project</ns2:name><ns2:serverName>localhost</ns2:serverName><ns2:serverPort>8080</ns2:serverPort><ns2:adminRole>ROLE_ADMIN</ns2:adminRole><ns2:anonymousRole>ROLE_ANONYMOUS</ns2:anonymousRole><ns2:properties><ns2:property key="engageui.links_media_module.enable">false</ns2:property><ns2:property key="logo_small">/xengage/ui/img/mh_logos/OpencastLogo.png</ns2:property><ns2:property key="adminui.chunksize">2024</ns2:property><ns2:property key="engageui.link_mobile_redirect.description">For more information have a look at the official site.</ns2:property><ns2:property key="engageui.annotations.enable">false</ns2:property><ns2:property key="adminui.series_prepopulate.enable">false</ns2:property><ns2:property key="adminui.i18n_tab_users.enable">false</ns2:property><ns2:property key="engageui.link_download.enable">false</ns2:property><ns2:property key="engageui.link_mobile_redirect.url">http://opencast.org/matterhorn/</ns2:property><ns2:property key="logo_large">/xengage/ui/img/mh_logos/MatterhornLogo_large.png</ns2:property><ns2:property key="adminui.i18n_tab_episode.enable">false</ns2:property><ns2:property key="engageui.link_mobile_redirect.enable">false</ns2:property></ns2:properties></ns2:organization><ns3:mediapackage start="2013-01-04T16:57:00Z" id="bd22e816-9cd1-4586-8357-6217ef8f2bbf" duration="6339"><ns3:title>Test quality tags</ns3:title><ns3:media><ns3:track type="presenter/source" id="track-1"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags/><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/d8746563-335e-4afd-9eb9-616d89009784/videoshort.mp4</ns3:url><ns3:checksum type="md5">7ae24368ccb7a6c6422a14ff73f33c9a</ns3:checksum><ns3:duration>6314</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>171030.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>74477.0</ns3:bitrate><ns3:framerate>23.719</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track type="presenter/work" id="track-2"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags/><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/d8746563-335e-4afd-9eb9-616d89009784/videoshort.mp4</ns3:url><ns3:checksum type="md5">7ae24368ccb7a6c6422a14ff73f33c9a</ns3:checksum><ns3:duration>6314</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>171030.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>74477.0</ns3:bitrate><ns3:framerate>23.719</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:track-2" type="presenter/trimmed" id="track-3"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags/><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/d8746563-335e-4afd-9eb9-616d89009784/videoshort.mp4</ns3:url><ns3:checksum type="md5">7ae24368ccb7a6c6422a14ff73f33c9a</ns3:checksum><ns3:duration>6314</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>171030.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>74477.0</ns3:bitrate><ns3:framerate>23.719</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:track-3" type="presenter/delivery" id="cf45a7a9-94eb-48b9-9d77-56a84749882c"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>quality-low</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/cf45a7a9-94eb-48b9-9d77-56a84749882c/videoshort.mp4</ns3:url><ns3:checksum type="md5">4bebcae0cc965ecfd0dc56a2b1b66f6e</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>250000.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:track-3" type="presenter/delivery" id="5ac6953a-1a0e-441c-b21a-4d653948b9c9"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>quality-medium</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/5ac6953a-1a0e-441c-b21a-4d653948b9c9/videoshort.mp4</ns3:url><ns3:checksum type="md5">ee735e0d435e814a60b75b9821a83c98</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>500000.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:track-3" type="presenter/delivery" id="42e8e472-61e9-45f9-8331-18c97eb4f3a6"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>quality-high</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/42e8e472-61e9-45f9-8331-18c97eb4f3a6/videoshort.mp4</ns3:url><ns3:checksum type="md5">caec0f1412223810ec4dc202b8f674d1</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>791469.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:42e8e472-61e9-45f9-8331-18c97eb4f3a6" type="presenter/delivery" id="track-7"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>publish</ns3:tag><ns3:tag>quality-high</ns3:tag><ns3:tag>streaming</ns3:tag></ns3:tags><ns3:url>rtmp://mallorn.dlib.indiana.edu/avalon/mp4:bd22e816-9cd1-4586-8357-6217ef8f2bbf/42e8e472-61e9-45f9-8331-18c97eb4f3a6/videoshort.mp4</ns3:url><ns3:checksum type="md5">caec0f1412223810ec4dc202b8f674d1</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>791469.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:5ac6953a-1a0e-441c-b21a-4d653948b9c9" type="presenter/delivery" id="track-8"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>publish</ns3:tag><ns3:tag>quality-medium</ns3:tag><ns3:tag>streaming</ns3:tag></ns3:tags><ns3:url>rtmp://mallorn.dlib.indiana.edu/avalon/mp4:bd22e816-9cd1-4586-8357-6217ef8f2bbf/5ac6953a-1a0e-441c-b21a-4d653948b9c9/videoshort.mp4</ns3:url><ns3:checksum type="md5">ee735e0d435e814a60b75b9821a83c98</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>500000.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track><ns3:track ref="track:cf45a7a9-94eb-48b9-9d77-56a84749882c" type="presenter/delivery" id="track-9"><ns3:mimetype>video/mp4</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag><ns3:tag>publish</ns3:tag><ns3:tag>quality-low</ns3:tag><ns3:tag>streaming</ns3:tag></ns3:tags><ns3:url>rtmp://mallorn.dlib.indiana.edu/avalon/mp4:bd22e816-9cd1-4586-8357-6217ef8f2bbf/cf45a7a9-94eb-48b9-9d77-56a84749882c/videoshort.mp4</ns3:url><ns3:checksum type="md5">4bebcae0cc965ecfd0dc56a2b1b66f6e</ns3:checksum><ns3:duration>6339</ns3:duration><ns3:audio id="audio-1"><ns3:device/><ns3:encoder type="AAC"/><ns3:channels>2</ns3:channels><ns3:bitrate>76508.0</ns3:bitrate></ns3:audio><ns3:video id="video-1"><ns3:device/><ns3:encoder type="AVC"/><ns3:bitrate>250000.0</ns3:bitrate><ns3:framerate>24.0</ns3:framerate><ns3:resolution>200x110</ns3:resolution><ns3:scantype type="Progressive"/></ns3:video></ns3:track></ns3:media><ns3:metadata><ns3:catalog type="dublincore/episode" id="4c57e417-22f9-4edc-bad6-ca8d804cf6c5"><ns3:mimetype>text/xml</ns3:mimetype><ns3:tags/><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/4c57e417-22f9-4edc-bad6-ca8d804cf6c5/dublincore.xml</ns3:url></ns3:catalog></ns3:metadata><ns3:attachments><ns3:attachment ref="track:track-3" type="presenter/player+preview" id="attachment-1"><ns3:mimetype>image/jpeg</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/attachment-1/videoshort.jpg</ns3:url></ns3:attachment><ns3:attachment ref="track:track-3" type="presenter/search+preview" id="attachment-2"><ns3:mimetype>image/jpeg</ns3:mimetype><ns3:tags><ns3:tag>engage</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/attachment-2/videoshort.jpg</ns3:url></ns3:attachment><ns3:attachment ref="track:track-3" type="presenter/feed+preview" id="attachment-3"><ns3:mimetype>image/jpeg</ns3:mimetype><ns3:tags><ns3:tag>atom</ns3:tag><ns3:tag>rss</ns3:tag></ns3:tags><ns3:url>http://mallorn.dlib.indiana.edu:8080/files/mediapackage/bd22e816-9cd1-4586-8357-6217ef8f2bbf/attachment-3/videoshort.jpg</ns3:url></ns3:attachment></ns3:attachments></ns3:mediapackage><operations><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Inspecting the media package" state="SUCCEEDED" job="1104" id="inspect"><configurations/><started>1357318556903</started><completed>1357318567224</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="false" description="Splitting Media (if needed)" state="SUCCEEDED" job="1106" id="compose"><configurations><configuration key="target-flavor">presenter/source</configuration><configuration key="encoding-profile">epiphan.presenter</configuration><configuration key="source-flavor">multitrack/source</configuration></configurations><started>1357318572201</started><completed>1357318572370</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Preparing presenter audio and video work versions" state="SUCCEEDED" job="1107" id="prepare-av"><configurations><configuration key="target-flavor">presenter/work</configuration><configuration key="rewrite">false</configuration><configuration key="promiscuous-audio-muxing">true</configuration><configuration key="source-flavor">presenter/source</configuration></configurations><started>1357318577267</started><completed>1357318577425</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" if="${trimHold}" fail-on-error="true" description="Encoding presenter (camera) video for preview" state="SKIPPED" job="1108" id="compose"><configurations><configuration key="target-flavor">presenter/preview</configuration><configuration key="encoding-profile">flash-preview.http</configuration><configuration key="source-flavor">presenter/work</configuration></configurations><started>1357318582344</started><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" if="${trimHold}" fail-on-error="true" description="Waiting for user to review / trim recording" state="SKIPPED" job="1109" id="trim"><configurations><configuration key="encoding-profile">trim.work</configuration><configuration key="target-flavor-subtype">trimmed</configuration><configuration key="source-flavor">*/work</configuration></configurations><started>1357318587411</started><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) to player preview image" state="SUCCEEDED" job="1110" id="image"><configurations><configuration key="target-flavor">presenter/player+preview</configuration><configuration key="source-tags"></configuration><configuration key="time">1</configuration><configuration key="encoding-profile">player-preview.http</configuration><configuration key="target-tags">engage</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318592485</started><completed>1357318602656</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) video to mp4-low" state="SUCCEEDED" job="1112" id="compose"><configurations><configuration key="target-flavor">presenter/delivery</configuration><configuration key="encoding-profile">mp4-low.http</configuration><configuration key="target-tags">engage, quality-low</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318607643</started><completed>1357318622870</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) video to mp4-medium" state="SUCCEEDED" job="1115" id="compose"><configurations><configuration key="target-flavor">presenter/delivery</configuration><configuration key="encoding-profile">mp4-medium.http</configuration><configuration key="target-tags">engage, quality-medium</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318627894</started><completed>1357318643143</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) video to mp4-high" state="SUCCEEDED" job="1118" id="compose"><configurations><configuration key="target-flavor">presenter/delivery</configuration><configuration key="encoding-profile">mp4-high.http</configuration><configuration key="target-tags">engage, quality-high</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318648151</started><completed>1357318663362</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) to search result preview image" state="SUCCEEDED" job="1121" id="image"><configurations><configuration key="target-flavor">presenter/search+preview</configuration><configuration key="source-tags"></configuration><configuration key="time">1</configuration><configuration key="encoding-profile">search-cover.http</configuration><configuration key="target-tags">engage</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318668399</started><completed>1357318678549</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Encoding presenter (camera) to feed preview image" state="SUCCEEDED" job="1123" id="image"><configurations><configuration key="target-flavor">presenter/feed+preview</configuration><configuration key="source-tags"></configuration><configuration key="time">1</configuration><configuration key="encoding-profile">feed-cover.http</configuration><configuration key="target-tags">rss, atom</configuration><configuration key="source-flavor">presenter/trimmed</configuration></configurations><started>1357318683555</started><completed>1357318688741</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Applying access control rules" state="SUCCEEDED" job="1125" id="apply-acl"><configurations/><started>1357318693697</started><completed>1357318693823</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="2" exception-handler-workflow="error" if="rtmp://mallorn.dlib.indiana.edu/avalon" fail-on-error="true" description="Distributing to streaming server" state="SUCCEEDED" job="1126" id="distribute-streaming"><configurations><configuration key="source-tags">engage,-publish</configuration><configuration key="target-tags">publish,streaming</configuration></configurations><started>1357318698760</started><completed>1357318709114</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" exception-handler-workflow="error" fail-on-error="true" description="Published" state="SUCCEEDED" job="1132" id="publish"><configurations><configuration key="source-tags">publish</configuration></configurations><started>1357318714250</started><completed>1357318714531</completed><time-in-queue>0</time-in-queue><execution-history/></operation><operation retry-strategy="none" execution-host="http://mallorn.dlib.indiana.edu:8080" failed-attempts="0" max-attempts="1" fail-on-error="false" description="Cleaning up" state="SUCCEEDED" job="1134" id="cleanup"><configurations/><started>1357318719319</started><completed>1357318719446</completed><time-in-queue>0</time-in-queue><execution-history/></operation></operations><configurations><configuration key="distribution">Matterhorn Media Module</configuration><configuration key="workflowDefinitionId">avalon</configuration></configurations><errors/></workflow>
14 spec/lib/hydrant/batch_ingest_spec.rb → spec/lib/avalon/batch_ingest_spec.rb
View
@@ -1,8 +1,8 @@
require 'spec_helper'
-require 'hydrant/dropbox'
-require 'hydrant/batch_ingest'
+require 'avalon/dropbox'
+require 'avalon/batch_ingest'
-describe Hydrant::Batch do
+describe Avalon::Batch do
# Get rid of all .processing stubs left over in case something was aborted
# mid test
before :all do
@@ -11,7 +11,7 @@
end
before :each do
- Hydrant::DropboxService = Hydrant::Dropbox.new 'spec/fixtures/dropbox'
+ Avalon::DropboxService = Avalon::Dropbox.new 'spec/fixtures/dropbox'
end
after :each do
@@ -28,13 +28,13 @@
end
it 'creates an ingest batch object' do
- Hydrant::Batch.ingest
+ Avalon::Batch.ingest
IngestBatch.count.should == 1
end
it 'does not create an ingest batch object when there are zero packages' do
- Hydrant::DropboxService.stub(:find_new_packages).and_return []
- Hydrant::Batch.ingest
+ Avalon::DropboxService.stub(:find_new_packages).and_return []
+ Avalon::Batch.ingest
IngestBatch.count.should == 0
end
end
8 spec/lib/hydrant/dropbox_spec.rb → spec/lib/avalon/dropbox_spec.rb
View
@@ -1,18 +1,18 @@
require 'spec_helper'
-require 'hydrant/dropbox'
+require 'avalon/dropbox'
-describe Hydrant::Dropbox do
+describe Avalon::Dropbox do
describe "#delete" do
it 'returns true if the file is found' do
File.stub(:delete).and_return true
- Hydrant::DropboxService.delete('some_file.mov')
+ Avalon::DropboxService.delete('some_file.mov')
end
it 'returns false if the file is not found' do
- Hydrant::DropboxService.delete('some_file.mov').should be_false
+ Avalon::DropboxService.delete('some_file.mov').should be_false
end
end
4 spec/mailers/ingest_batch_mailer_spec.rb
View
@@ -19,7 +19,7 @@
end
it 'shows the title of one media object' do
- load_fixture 'hydrant:video-segment'
+ load_fixture 'avalon:video-segment'
media_object = MediaObject.all.first
ingest_batch = IngestBatch.create(media_object_ids: [media_object.id])
@email = IngestBatchMailer.status_email(ingest_batch.id)
@@ -33,7 +33,7 @@
media_object.update_datastream(:descMetadata, date_issued: 'January 2007')
media_object.save
- master_file = MasterFile.new(pid:'hydrant:hiking-movie')
+ master_file = MasterFile.new(pid:'avalon:hiking-movie')
master_file.status_code = ['STOPPED']
master_file.file_location = 'something/granite-mountain-hike.mov'
master_file.percent_complete = ['100']
4 spec/models/ingest_batch_spec.rb
View
@@ -22,11 +22,11 @@
it 'returns false when one or more master files are not finished' do
pending "Fix problems with this test"
- media_object = MediaObject.new(pid:'hydrant:ingest-batch-test')
+ media_object = MediaObject.new(pid:'avalon:ingest-batch-test')
media_object.add_relationship(:has_part, MasterFile.new(status_code: ['STOPPED']))
media_object.parts << MasterFile.create(status_code: ['RUNNING'])
media_object.save(validate: false)
- ingest_batch = IngestBatch.new(media_object_ids: ['hydrant:ingest-batch-test'], email: 'email@something.com')
+ ingest_batch = IngestBatch.new(media_object_ids: ['avalon:ingest-batch-test'], email: 'email@something.com')
ingest_batch.finished?.should be_false
end
end
12 spec/models/media_object_spec.rb
View
@@ -42,8 +42,8 @@
describe "Field persistence" do
it "should reject unknown fields"
it "should update the contributors field" do
- load_fixture 'hydrant:electronic-resource'
- mediaobject = MediaObject.find 'hydrant:electronic-resource'
+ load_fixture 'avalon:electronic-resource'
+ mediaobject = MediaObject.find 'avalon:electronic-resource'
mediaobject.update_attribute_in_metadata :contributor, 'Updated contributor'
mediaobject.save
@@ -52,8 +52,8 @@
end
it "should support multiple contributors" do
- load_fixture 'hydrant:print-publication'
- mediaobject = MediaObject.find 'hydrant:print-publication'
+ load_fixture 'avalon:print-publication'
+ mediaobject = MediaObject.find 'avalon:print-publication'
mediaobject.contributor = ['Chris Colvard', 'Phuong Dinh', 'Michael Klein',
'Nathan Rogers']
mediaobject.save
@@ -61,8 +61,8 @@
end
it "should support multiple publishers" do
- load_fixture 'hydrant:video-segment'
- mediaobject = MediaObject.find 'hydrant:video-segment'
+ load_fixture 'avalon:video-segment'
+ mediaobject = MediaObject.find 'avalon:video-segment'
mediaobject.publisher.length.should == 1
mediaobject.publisher = ['Indiana University', 'Northwestern University',
8 spec/spec_helper.rb
View
@@ -53,10 +53,10 @@
# Put named fixtures from the fixtures directory here so they are cleaned
# up if they exist
- test_fixtures = ['hydrant:video-segment',
- 'hydrant:electronic-resource',
- 'hydrant:musical-performance',
- 'hydrant:print-publication']
+ test_fixtures = ['avalon:video-segment',
+ 'avalon:electronic-resource',
+ 'avalon:musical-performance',
+ 'avalon:print-publication']
test_fixtures.each do |fixture|
logger.debug "Removing test object #{fixture} if present"
MediaObject.find(fixture).delete if MediaObject.exists?(fixture)
Please sign in to comment.
Something went wrong with that request. Please try again.