hydra-core 7.0.0.rc1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0dc08c45008a91c9a811309e7046e13c285c2e4
-  data.tar.gz: 4bffc5b296a5e622b4ab50be22493e2edb6d206b
+  metadata.gz: 49c8a1e875c79d9755f8b70f052efd056e804411
+  data.tar.gz: 833a9c78e91293b4597d6ed8badee944ff3f4cbb
 SHA512:
-  metadata.gz: b6203bbee0370a95eac826762d41b48689867426c7eb649cf6aeb656fda50615244c6bcc2884a8ad7e59bde32022bfccb3f2100a8e2e61ec2c3872f8c1a5c74a
-  data.tar.gz: ca856202ea8a63dd572076bc42114717eb4bfbd9837548b998b317dfe3657986679b030323e5c245ca412bb51d8423239569cd18f89c1302a587cf7fd1c81bde
+  metadata.gz: ffe8839308cdf3dd9d3b7f5fc6ebefd0243c38012da3488b63bc4d764550b1bb940bfc184bbb50e62e0023ae1b509f8332d427d5aea067c02ef468eae04ca88e
+  data.tar.gz: 8d441b1be8af28f9ec9c99999d3b8e3c68c126ca4411c013f59b9308610c839ebce2a980a739f9b225a1fce7fc4e29323534c30048450c0d65d01670aff42bcd

data/app/helpers/hydra/blacklight_helper_behavior.rb

@@ -2,21 +2,20 @@ module Hydra
   module BlacklightHelperBehavior
     include Blacklight::BlacklightHelperBehavior
     
+    ##
     # Given a Fedora uri, generate a reasonable partial name
     # Rails thinks that periods indicate a filename, so escape them with slashes.
-    # @param [Hash] document the solr document (hash of fields & values)
-    # @return [String] the name for the display partial
+    #
+    # @param [SolrDocument] document
+    # @param [String, Array] display_type a value suggestive of a partial
+    # @return [String] the name of the partial to render
     # @example
-    #   document_partial_name('has_model_s' => ["info:fedora/hull-cModel:genericContent"])
-    #    => "generic_content"
-    #   document_partial_name('has_model_s' => ["info:fedora/hull-cModel:text.pdf"])
-    #    => "text_pdf"
-    def document_partial_name(document)
-      display_type = document[blacklight_config.show.display_type_field]
-
-      return 'default' unless display_type 
-
-      Array(display_type).first.gsub(/^[^\/]+\/[^:]+:/,"").gsub(/\./, '_').underscore
-    end    
+    #   type_field_to_partial_name(["info:fedora/hull-cModel:genericContent"])
+    #   => 'generic_content'
+    #   type_field_to_partial_name(["info:fedora/hull-cModel:text.pdf"])
+    #   => 'text_pdf'
+    def type_field_to_partial_name(document, display_type)
+      Array(display_type).first.gsub(/^[^\/]+\/[^:]+:/,"").gsub("-","_").underscore.parameterize("_")
+    end
   end
 end

data/lib/generators/hydra/head_generator.rb

@@ -1,85 +1,76 @@
 # -*- encoding : utf-8 -*-
 require 'rails/generators'
-require 'rails/generators/migration'
 
 module Hydra
-class HeadGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
+  class HeadGenerator < Rails::Generators::Base
 
-  source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('../templates', __FILE__)
 
-  argument     :model_name, :type => :string , :default => "user"
+    argument :model_name, :type => :string , :default => "user"
 
-    desc """
-  This generator makes the following changes to your application:
-    1. Creates a database migration for superusers if they do not exist in /db/migrate
-    2. Adds additional mime types to you application in the file '/config/initializers/mime_types.rb'
-    3. Creates config/initializers/hydra_config.rb
-    4. Creates config/fedora.yml and config/solr.yml which you may need to modify to tell the hydra head where to find fedora & solr
-    5. Creates a number of role_map config files that are used in the placeholder user roles implementation
-  Enjoy building your Hydra Head!
-         """
+      desc """
+    This generator makes the following changes to your application:
+      1. Creates config/initializers/hydra_config.rb
+      2. Creates config/fedora.yml and config/solr.yml which you may need to modify to tell the hydra head where to find fedora & solr
+      3. Creates a number of role_map config files that are used in the placeholder user roles implementation
+    Enjoy building your Hydra Head!
+           """
 
-  #
-  # Config Files & Initializers
-  #
+    #
+    # Config Files & Initializers
+    #
 
-  def inject_test_framework
-    application("\n" <<
-      "    config.generators do |g|\n" <<
-      "      g.test_framework :rspec, :spec => true\n" <<
-      "    end\n\n"
-    )
+    def inject_test_framework
+      application("\n" <<
+        "    config.generators do |g|\n" <<
+        "      g.test_framework :rspec, :spec => true\n" <<
+        "    end\n\n"
+      )
 
-    gem_group :development, :test do
-      gem "rspec-rails"
-      gem 'jettywrapper'
-    end
+      gem_group :development, :test do
+        gem "rspec-rails"
+        gem 'jettywrapper'
+      end
 
-    Bundler.with_clean_env do
-      run "bundle install"
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
     end
-  end
 
-  # Copy all files in templates/config directory to host config
-  def create_configuration_files
-    copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
+    # Copy all files in templates/config directory to host config
+    def create_configuration_files
+      copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
 
-    # Initializers
-    file_path = "config/initializers/hydra_config.rb"
-    copy_file "config/initializers/hydra_config.rb", file_path
-    unless model_name == 'user'
-      insert_into_file file_path, :after => 'Hydra.configure do |config|' do
-          "\n  config.user_model = '#{model_name.classify}'"
+      # Initializers
+      file_path = "config/initializers/hydra_config.rb"
+      copy_file "config/initializers/hydra_config.rb", file_path
+      unless model_name == 'user'
+        insert_into_file file_path, :after => 'Hydra.configure do |config|' do
+            "\n  config.user_model = '#{model_name.classify}'"
+        end
       end
-    end
-
-    copy_file "config/initializers/action_dispatch_http_upload_monkey_patch.rb", "config/initializers/action_dispatch_http_upload_monkey_patch.rb"
 
-    # Role Mappings
-    copy_file "config/role_map_cucumber.yml", "config/role_map_cucumber.yml"
-    copy_file "config/role_map_development.yml", "config/role_map_development.yml"
-    copy_file "config/role_map_production.yml", "config/role_map_production.yml"
-    copy_file "config/role_map_test.yml", "config/role_map_test.yml"
+      # Role Mappings
+      copy_file "config/role_map.yml", "config/role_map.yml"
 
-    # CanCan ability.rb
-    copy_file "ability.rb", "app/models/ability.rb"
+      # CanCan ability.rb
+      copy_file "ability.rb", "app/models/ability.rb"
 
-    # Fedora & Solr YAML files
-    invoke('active_fedora:config')
-  end
+      # Fedora & Solr YAML files
+      invoke('active_fedora:config')
+    end
 
-  # Add Hydra behaviors to the user model
-  def inject_hydra_user_behavior
-    file_path = "app/models/#{model_name.underscore}.rb"
-    if File.exists?(file_path)
-      inject_into_class file_path, model_name.classify do
-        "# Connects this user object to Hydra behaviors. " +
-        "\n include Hydra::User\n"
+    # Add Hydra behaviors to the user model
+    def inject_hydra_user_behavior
+      file_path = "app/models/#{model_name.underscore}.rb"
+      if File.exists?(file_path)
+        inject_into_class file_path, model_name.classify do
+          "# Connects this user object to Hydra behaviors. " +
+          "\n include Hydra::User\n"
+        end
+      else
+        puts "     \e[31mFailure\e[0m  Hydra requires a user object in order to apply access controls. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g hydra:head client"
       end
-    else
-      puts "     \e[31mFailure\e[0m  Hydra requires a user object in order to apply access controls. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g hydra:head client"
     end
-  end
-end # HeadGenerator
+  end # HeadGenerator
 end # Hydra

data/lib/generators/hydra/templates/catalog_controller.rb

@@ -9,8 +9,6 @@ class CatalogController < ApplicationController
   before_filter :enforce_show_permissions, :only=>:show
   # This applies appropriate access controls to all solr queries
   CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
-  # This filters out objects that you want to exclude from search results, like FileAssets
-  CatalogController.solr_search_params_logic += [:exclude_unwanted_models]
 
 
   configure_blacklight do |config|

data/lib/generators/hydra/templates/config/role_map.yml

@@ -0,0 +1,19 @@
+development:
+  archivist:
+    - archivist1@example.com
+test:
+  archivist:
+    - archivist1@example.com
+    - archivist2@example.com
+    - leland_himself@example.com
+  admin_policy_object_editor:
+    - archivist1@example.com
+  donor:
+    - donor1@example.com
+    - leland_himself@example.com
+  researcher:
+    - archivist1@example.com
+    - researcher1@example.com
+  patron:
+    - patron1@example.com
+    - leland_himself@example.com

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "7.0.0.rc1"
+  VERSION = "7.0.0"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc1
+  version: 7.0.0
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc1
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc1
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
@@ -143,34 +143,24 @@ files:
 - app/controllers/concerns/hydra/controller.rb
 - app/controllers/concerns/hydra/controller/controller_behavior.rb
 - app/controllers/concerns/hydra/controller/download_behavior.rb
-- app/controllers/concerns/hydra/controller/upload_behavior.rb
 - app/helpers/blacklight_helper.rb
 - app/helpers/hydra/blacklight_helper_behavior.rb
 - app/models/concerns/hydra/model_methods.rb
 - app/models/concerns/hydra/models.rb
-- app/models/concerns/hydra/models/file_asset.rb
 - app/models/concerns/hydra/solr.rb
-- app/models/file_asset.rb
 - app/models/hydra/datastream/properties.rb
 - app/models/mods_asset.rb
 - config/jetty.yml
 - config/locales/hydra.en.yml
 - hydra-core.gemspec
 - lib/application_helper.rb
-- lib/generators/hydra/cucumber_support_generator.rb
 - lib/generators/hydra/head_generator.rb
 - lib/generators/hydra/hyhead_fixtures_generator.rb
 - lib/generators/hydra/jetty_generator.rb
 - lib/generators/hydra/templates/ability.rb
 - lib/generators/hydra/templates/catalog_controller.rb
-- lib/generators/hydra/templates/config/fedora.yml
-- lib/generators/hydra/templates/config/initializers/action_dispatch_http_upload_monkey_patch.rb
 - lib/generators/hydra/templates/config/initializers/hydra_config.rb
-- lib/generators/hydra/templates/config/role_map_cucumber.yml
-- lib/generators/hydra/templates/config/role_map_development.yml
-- lib/generators/hydra/templates/config/role_map_production.yml
-- lib/generators/hydra/templates/config/role_map_test.yml
-- lib/generators/hydra/templates/config/solr.yml
+- lib/generators/hydra/templates/config/role_map.yml
 - lib/hydra-core.rb
 - lib/hydra-head/engine.rb
 - lib/hydra-head/version.rb
@@ -183,10 +173,8 @@ files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/helpers/upload_behavior_spec.rb
 - spec/lib/catalog_spec.rb
 - spec/lib/model_methods_spec.rb
-- spec/models/file_asset_spec.rb
 - spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
@@ -225,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -241,10 +229,8 @@ test_files:
 - spec/controllers/downloads_controller_spec.rb
 - spec/factories.rb
 - spec/helpers/blacklight_helper_spec.rb
-- spec/helpers/upload_behavior_spec.rb
 - spec/lib/catalog_spec.rb
 - spec/lib/model_methods_spec.rb
-- spec/models/file_asset_spec.rb
 - spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb

data/app/controllers/concerns/hydra/controller/upload_behavior.rb

@@ -1,38 +0,0 @@
-module Hydra::Controller::UploadBehavior
-  
-  # Creates a File Asset, adding the posted blob to the File Asset's datastreams and saves the File Asset
-  #
-  # @return [FileAsset] the File Asset  
-  def create_and_save_file_assets_from_params
-    if params.has_key?(:Filedata)
-      @file_assets = []
-      params[:Filedata].each do |file|
-        @file_asset = FileAsset.new
-        @file_asset.label = file.original_filename
-        add_posted_blob_to_asset(@file_asset, file, file.original_filename)
-        @file_asset.save!
-        @file_assets << @file_asset
-      end
-      return @file_assets
-    else
-      render :text => "400 Bad Request", :status => 400
-    end
-  end
-  
-  # Puts the contents of params[:Filedata] (posted blob) into a datastream within the given @asset
-  # Sets asset label and title to filename if they're empty
-  #
-  # @param [FileAsset] asset the File Asset to add the blob to
-  # @param [#read] file the IO object that is the blob
-  # @param [String] file the IO object that is the blob
-  # @return [FileAsset] file the File Asset  
-  def add_posted_blob_to_asset(asset, file, file_name)
-    file_name ||= file.original_filename
-    asset.add_file(file, datastream_id, file_name)
-  end
-
-  #Override this if you want to specify the datastream_id (dsID) for the created blob
-  def datastream_id
-    "content"
-  end
-end

data/app/models/concerns/hydra/models/file_asset.rb

@@ -1,75 +0,0 @@
-# will move to lib/hydra/model/file_asset_behavior in release 5.x
-module Hydra
-  module Models
-    # Defines Behaviors for a FileAsset Model
-    # Conforms to the Hydra genericContent cModel -- the "content" is in a datastream called content
-    # TODO:   Could we just move this behavior into app/models/file_asset.rb? 
-    module FileAsset
-      extend ActiveSupport::Concern
-      included do
-        include Hydra::ModelMethods
-        
-        belongs_to :container, :class_name=>'ActiveFedora::Base', :property=>:is_part_of
-        has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
-        end
-      end
-
-
-      # Returns a human readable filesize appropriate for the given number of bytes (ie. automatically chooses 'bytes','KB','MB','GB','TB')
-      # Based on a bit of python code posted here: http://blogmag.net/blog/read/38/Print_human_readable_file_size
-      # @param [Numeric] num file size in bits
-      def bits_to_human_readable(num)
-          ['bytes','KB','MB','GB','TB'].each do |x|
-            if num < 1024.0
-              return "#{num.to_i} #{x}"
-            else
-              num = num/1024.0
-            end
-          end
-      end
-      
-
-      def label
-        descMetadata.title.first
-      end
-          
-      def label=(label)
-        super
-        descMetadata.title = label
-      end    
-      
-      # augments add_file_datastream to also put file size (in bytes/KB/MB/GB/TB) in dc:extent 
-      def add_file_datastream(file, opts={})
-        super
-        if file.respond_to?(:size)
-          size = bits_to_human_readable(file.size)
-        elsif file.kind_of?(File)
-          size = bits_to_human_readable(File.size(file))
-        else
-          size = ""
-        end
-        datastreams["descMetadata"].extent = size
-      end
-
-      # Override ActiveFedora::Base.to_solr to...
-      # Check if we are dealing with a child of FileAsset and if so when calling to_solr from Solrizer indexer we want to skip loading parent metadata again 
-      #
-      # if known models greater than one (without ActiveFedora::Base) and
-      #   known models contains a child of FileAsset and
-      #   opts[:model_only] == true and
-      #   current object class is FileAsset
-      # that means that the child already has had to_solr called which included metadata from FileAsset
-      # if any of the above is false then call to_solr as normal
-      def to_solr(solr_doc=Hash.new, opts={})
-
-        active_fedora_model_s = solr_doc["active_fedora_model_s"] if solr_doc["active_fedora_model_s"]
-        actual_class = active_fedora_model_s.constantize if active_fedora_model_s
-        if actual_class && actual_class != self.class && actual_class.superclass == ::FileAsset
-          solr_doc
-        else
-          super(solr_doc,opts)
-        end
-      end
-    end
-  end
-end

data/app/models/file_asset.rb

@@ -1,5 +0,0 @@
-# model for a FileAsset   ActiveFedora object 
-#   a file asset is a generic notion of a file, which could have, for example, image or text or video behaviors.
-class FileAsset < ActiveFedora::Base
-  include Hydra::Models::FileAsset
-end

data/lib/generators/hydra/cucumber_support_generator.rb

@@ -1,29 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-module Hydra
-class CucumberSupportGenerator < Rails::Generators::Base
-
-  source_root File.expand_path('../../../../test_support/features', __FILE__)
-
-  argument :features_dir, :type => :string , :default => "features"
-
-  desc """
-  This Generator copies Hydra's cucumber step definitions and paths into your application's features directory.
-  We have plans to provide the step definitions directly through the hydra-head gem without requiring this step of copying the files.
-  In the meantime, you need to copy the files in order to use them.
-
-  Defaults to assuming that your cucumber features live in a directory called \"features\".  To pass in an alternative path to your features directory,
-
-  rails generate hydra:cucumber_support test_support/features
-
-  """
-
-  def copy_cucumber_support
-    directory("step_definitions", "#{features_dir}/step_definitions")
-    copy_file("support/paths.rb", "#{features_dir}/support/paths.rb")
-  end
-
-end
-end

data/lib/generators/hydra/templates/config/fedora.yml

@@ -1,14 +0,0 @@
-development:
-  user: fedoraAdmin
-  password: fedoraAdmin
-  url: http://127.0.0.1:8983/fedora
-test: &TEST
-  user: fedoraAdmin
-  password: fedoraAdmin
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/fedora-test" %>
-production:
-  user: fedoraAdmin
-  password: fedoraAdmin
-  url: http://your.production.server:8080/fedora
-cucumber:
-  <<: *TEST

data/lib/generators/hydra/templates/config/initializers/action_dispatch_http_upload_monkey_patch.rb

@@ -1,12 +0,0 @@
-module ActionDispatch
-  module Http
-    class UploadedFile
-      def closed?
-        @tempfile.closed?
-      end
-      def close
-        @tempfile.close
-      end
-    end
-  end
-end

data/lib/generators/hydra/templates/config/role_map_cucumber.yml

@@ -1,10 +0,0 @@
-archivist:
-  - archivist1@example.com
-donor:
-  - donor1@example.com
-researcher:
-  - researcher1@example.com
-patron:
-  - patron1@example.com
-admin_policy_object_editor:
-  - archivist1@example.com

data/lib/generators/hydra/templates/config/role_map_development.yml

@@ -1,12 +0,0 @@
-uva-only:
-  - uva-only
-archivist:
-  - archivist1@example.com
-donor:
-  - donor1@example.com
-researcher:
-  - researcher1@example.com
-patron:
-  - patron1@example.com
-admin_policy_object_editor:
-  - archivist1@example.com

data/lib/generators/hydra/templates/config/role_map_production.yml

@@ -1,2 +0,0 @@
-uva-only:
-public:

data/lib/generators/hydra/templates/config/role_map_test.yml

@@ -1,15 +0,0 @@
-archivist:
-  - archivist1@example.com
-  - archivist2@example.com
-  - leland_himself@example.com
-admin_policy_object_editor:
-  - archivist1@example.com
-donor:
-  - donor1@example.com
-  - leland_himself@example.com
-researcher:
-  - archivist1@example.com
-  - researcher1@example.com
-patron:
-  - patron1@example.com
-  - leland_himself@example.com

data/lib/generators/hydra/templates/config/solr.yml

@@ -1,10 +0,0 @@
-# This is a sample config file that does not have multiple solr instances. You will also need to be sure to
-# edit the fedora.yml file to match the solr URL for active-fedora.
-development:
-  url: http://localhost:8983/solr/development
-test: &TEST
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
-cucumber:
-  <<: *TEST
-production:
-  url: http://your.production.server:8080/bl_solr/core0

data/spec/helpers/upload_behavior_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe Hydra::Controller::UploadBehavior do
-
-  it "should respond to datastream_id" do
-    helper.should respond_to :datastream_id  ### API method, test that it's there to be overridden
-  end
-
-  describe "add_posted_blob_to_asset" do
-    it "should set object title and label, relying on datastream_id to set dsId" do
-      mock_file = double("File")
-      file_name = "Posted Filename.foo"
-      helper.stub(:params).and_return( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
-      mock_fa = double("file asset")
-      helper.stub(:datastream_id).and_return('bar')
-      mock_fa.should_receive(:add_file).with(mock_file, 'bar', file_name)
-      helper.add_posted_blob_to_asset(mock_fa,mock_file, file_name) # this is the deprecated 2 argument method
-    end
-    
-    it "should support submissions from swfupload" do
-      mock_file = double("File")
-      file_name = "Posted Filename.foo"
-      helper.stub(:params).and_return( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
-      mock_fa = double("file asset")
-      mock_fa.should_receive(:add_file).with(mock_file, 'content', file_name)
-      helper.add_posted_blob_to_asset(mock_fa,mock_file, file_name)
-    end
-    it "should support submissions from single-file uploader, defaulting to dsId of content" do
-      mock_file = double("File")
-      file_name = "Posted Filename.foo"
-      helper.stub(:params).and_return( :Filedata=>[mock_file], :container_id=>"hydrangea:2973" )      
-      mock_fa = double("file asset")
-      mock_fa.should_receive(:add_file).with(mock_file, 'content', file_name)
-      helper.add_posted_blob_to_asset(mock_fa,mock_file, file_name)
-    end
-  end
-end

data/spec/models/file_asset_spec.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe FileAsset do
-  
-  before(:each) do
-    @file_asset = FileAsset.new
-    @file_asset.stub(:create_date).and_return("2008-07-02T05:09:42.015Z")
-    @file_asset.stub(:modified_date).and_return("2008-09-29T21:21:52.892Z")
-  end
-  
-  it "Should be a kind of ActiveFedora::Base" do
-    @file_asset.should be_kind_of(ActiveFedora::Base)
-  end
-  
-  it "should include Hydra Model Methods" do
-    @file_asset.class.included_modules.should include(Hydra::ModelMethods)
-    @file_asset.should respond_to(:apply_depositor_metadata)
-  end
-  
-  describe 'label' do
-    asset = FileAsset.new
-    asset.label = 'image.jp2'
-    asset.label.should == 'image.jp2'
-  end
-end