From f4a63dd2ce64b6bfd5ee30417e746753a419a9e9 Mon Sep 17 00:00:00 2001
From: Matt Zumwalt <matt.zumwalt@yourmediashelf.com>
Date: Sat, 30 Apr 2011 18:46:07 -0500
Subject: [PATCH] cleaning up some things so they'll be easier to test

---
 app/models/audio_asset.rb    |  1 +
 app/models/image_asset.rb    |  1 +
 app/models/mods_asset.rb     |  2 +-
 app/models/video_asset.rb    |  1 +
 config/role_map_test.yml     | 14 ++++++++++++++
 lib/hydra/rights_metadata.rb |  1 +
 6 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 config/role_map_test.yml

diff --git a/app/models/audio_asset.rb b/app/models/audio_asset.rb
index 26dcbbd3c..c7ee3c6be 100644
--- a/app/models/audio_asset.rb
+++ b/app/models/audio_asset.rb
@@ -1,3 +1,4 @@
+require "file_asset"
 class AudioAsset < FileAsset
   def initialize(attrs = {})
     super(attrs)
diff --git a/app/models/image_asset.rb b/app/models/image_asset.rb
index 2f9d1acf4..131bef26b 100644
--- a/app/models/image_asset.rb
+++ b/app/models/image_asset.rb
@@ -1,3 +1,4 @@
+require "file_asset"
 class ImageAsset < FileAsset
   def initialize(attrs = {})
     super(attrs)
diff --git a/app/models/mods_asset.rb b/app/models/mods_asset.rb
index 909b2741a..4a1e55a1f 100644
--- a/app/models/mods_asset.rb
+++ b/app/models/mods_asset.rb
@@ -2,5 +2,5 @@
 class ModsAsset < ActiveFedora::Base
   include Hydra::ModelMixins::CommonMetadata
   include Hydra::ModelMixins::ModsObject
-  include Hydra::ModelMixins::ModelMethods
+  include Hydra::ModelMethods
 end
\ No newline at end of file
diff --git a/app/models/video_asset.rb b/app/models/video_asset.rb
index ac3e767a5..93facb8c8 100644
--- a/app/models/video_asset.rb
+++ b/app/models/video_asset.rb
@@ -1,3 +1,4 @@
+require "file_asset"
 class VideoAsset < FileAsset
   def initialize(attrs = {})
     super(attrs)
diff --git a/config/role_map_test.yml b/config/role_map_test.yml
new file mode 100644
index 000000000..899371a44
--- /dev/null
+++ b/config/role_map_test.yml
@@ -0,0 +1,14 @@
+archivist:
+  - archivist1
+  - archivist2
+  - leland_himself
+admin_policy_object_editor:
+  - archivist1
+donor:
+  - donor1
+  - leland_himself
+researcher:
+  - researcher1
+patron:
+  - patron1
+  - leland_himself
diff --git a/lib/hydra/rights_metadata.rb b/lib/hydra/rights_metadata.rb
index e30b30de9..e021b978f 100644
--- a/lib/hydra/rights_metadata.rb
+++ b/lib/hydra/rights_metadata.rb
@@ -1,3 +1,4 @@
+require "active-fedora"
 module Hydra
 class RightsMetadata < ActiveFedora::NokogiriDatastream