active-fedora 3.1.4 → 3.1.5

data/Gemfile

@@ -3,3 +3,6 @@ source "http://rubygems.org"
 # Bundler will rely on active-fedora.gemspec for dependency information.
 
 gemspec
+
+gem 'ruby-debug', :platform => :ruby_18
+gem 'ruby-debug19', :platform => :ruby_19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.4)
+    active-fedora (3.1.5)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -21,7 +21,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.8)
+    RedCloth (4.2.9)
     activemodel (3.0.11)
       activesupport (= 3.0.11)
       builder (~> 2.1.2)
@@ -33,11 +33,13 @@ GEM
     addressable (2.2.6)
     akami (1.0.0)
       gyoku (>= 0.4.0)
+    archive-tar-minitar (0.5.2)
     builder (2.1.2)
-    childprocess (0.2.2)
+    childprocess (0.2.3)
       ffi (~> 1.0.6)
-    columnize (0.3.4)
+    columnize (0.3.5)
     daemons (1.1.4)
+    diff-lcs (1.1.3)
     equivalent-xml (0.2.8)
       nokogiri (>= 1.4.3)
     facets (2.9.2)
@@ -48,7 +50,7 @@ GEM
     httpi (0.9.5)
       rack
     i18n (0.5.0)
-    jettywrapper (1.1.0)
+    jettywrapper (1.2.0)
       activesupport (>= 3.0.0)
       childprocess
       i18n
@@ -56,8 +58,10 @@ GEM
       mediashelf-loggable
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     logger (1.2.8)
-    mediashelf-loggable (0.4.7)
+    mediashelf-loggable (0.4.9)
     metaclass (0.0.1)
     mime-types (1.17.2)
     mocha (0.10.0)
@@ -79,14 +83,31 @@ GEM
       rdf (>= 0.3.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rsolr (1.0.2)
+    rsolr (1.0.6)
       builder (>= 2.1.2)
-    rspec (1.3.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     rubydora (0.2.6)
       activemodel
       activesupport
@@ -111,17 +132,19 @@ GEM
       om (>= 1.4.0)
       stomp
       xml-simple
-    solrizer-fedora (1.1.3)
-      active-fedora (>= 2.3.0)
+    solrizer-fedora (1.2.1)
+      active-fedora (~> 3.1.0)
+      activesupport
       fastercsv
+      jettywrapper (>= 1.1.0)
       rsolr
       solr-ruby (>= 0.0.6)
       solrizer (>= 1.0.0)
-    stomp (1.1.9)
+    stomp (1.1.10)
     wasabi (2.0.0)
       nokogiri (>= 1.4.0)
     xml-simple (1.1.1)
-    yard (0.7.3)
+    yard (0.7.4)
 
 PLATFORMS
   ruby
@@ -129,11 +152,12 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   active-fedora!
-  jettywrapper (>= 1.1.0)
+  jettywrapper (>= 1.2.0)
   mocha (>= 0.9.8)
   rake
   rcov
-  rspec (< 2.0.0)
+  rspec (~> 2.0)
   ruby-debug
+  ruby-debug19
   solrizer-fedora (>= 1.1.3)
   yard

data/History.txt

@@ -1,3 +1,11 @@
+3.1.5
+HYDRA-722 updating AF::Base#label= and then saving doesn't persist the change
+JettyWrapper to 1.2.0
+Upgrade to rspec2
+add_file_datastream should take a prefix option.
+Added assert_content_model method 
+Updates for ruby 1.9 compatibility
+
 3.1.4
 Update rubydora to 0.2.6
 Created a consistent implementation of Model.classname_from_uri

data/Rakefile

@@ -3,9 +3,6 @@ require 'rubygems'
 require 'bundler'
 require "bundler/setup"
 
-
-$: << 'lib'
-
 Bundler::GemHelper.install_tasks
 
 # load rake tasks defined in lib/tasks
@@ -13,4 +10,8 @@ Dir["lib/tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake)
 
 CLEAN.include %w[**/.DS_Store tmp *.log *.orig *.tmp **/*~]
 
+task :spec => ['active_fedora:rspec']
+task :rcov => ['active_fedora:rcov']
+
+
 task :default => [:spec]

data/active-fedora.gemspec

@@ -35,10 +35,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("rcov")
   s.add_development_dependency("solrizer-fedora", ">=1.1.3") # used by the fixtures rake tasks
-  s.add_development_dependency("jettywrapper", ">=1.1.0")
-  s.add_development_dependency("rspec", "<2.0.0")
+  s.add_development_dependency("jettywrapper", ">=1.2.0")
+  s.add_development_dependency("rspec", "~> 2.0")
   s.add_development_dependency("mocha", ">= 0.9.8")
-  s.add_development_dependency("ruby-debug")  
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/config/jetty.yml

@@ -1,3 +1,5 @@
-jetty_port: 8983
-java_opts:
-  - "-Xmx256m -XX:MaxPermSize=128m"
+default:
+  jetty_port: 8983
+  java_opts:
+    - "-Xmx256m" 
+    - "-XX:MaxPermSize=128m"

data/lib/active_fedora/base.rb

@@ -300,10 +300,10 @@ module ActiveFedora
     # Add the given file as a datastream in the object
     #
     # @param [File] file the file to add
-    # @param [Hash] opts options: :dsid, :label, :mimeType
+    # @param [Hash] opts options: :dsid, :label, :mimeType, :prefix
     def add_file_datastream(file, opts={})
       label = opts.has_key?(:label) ? opts[:label] : ""
-      attrs = {:dsLabel => label, :controlGroup => 'M', :blob => file}
+      attrs = {:dsLabel => label, :controlGroup => 'M', :blob => file, :prefix=>opts[:prefix]}
       if opts.has_key?(:mime_type)
         attrs.merge!({:mimeType=>opts[:mime_type]})
       elsif opts.has_key?(:mimeType)
@@ -655,10 +655,8 @@ module ActiveFedora
       end
       
       self.send(:define_method,:"#{append_method_name}") do |*args| 
-        opts = *args
-        opts ||= {}
         #call add_named_datastream instead of add_file_named_datastream in case not managed datastream
-        add_named_datastream(name,opts)
+        add_named_datastream(name,*args)
       end
     end 
     
@@ -788,7 +786,7 @@ module ActiveFedora
     end
     
     def label=(new_label)
-      @inner_object.profile["objLabel"] = new_label
+      @inner_object.label = new_label
     end
 
     #Return a hash of all available metadata fields for all 
@@ -933,9 +931,10 @@ module ActiveFedora
     #  m.update_attributes({"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}, :datastreams=>["my_ds", "my_other_ds"])
     #
     def update_indexed_attributes(params={}, opts={})
-      if opts[:datastreams]
+      if ds = opts[:datastreams]
         ds_array = []
-        opts[:datastreams].each do |dsname|
+        ds = [ds] unless ds.respond_to? :each
+        ds.each do |dsname|
           ds_array << datastreams[dsname]
         end
       else
@@ -990,6 +989,12 @@ module ActiveFedora
       end
     end
     
+    # This can be overriden to assert a different model
+    # It's normally called once in the lifecycle, by #create#
+    def assert_content_model
+      add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(self.class))
+    end
+
     private
     def configure_defined_datastreams
       if self.class.ds_specs
@@ -1032,11 +1037,10 @@ module ActiveFedora
     end
 
 
-
     
     # Deals with preparing new object to be saved to Fedora, then pushes it and its datastreams into Fedora. 
     def create
-      add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(self.class))
+      assert_content_model
       @metadata_is_dirty = true
       update
     end

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -35,7 +35,9 @@ module ActiveFedora::MetadataDatastreamHelper
     fields.each do |field_key, field_info|
       if field_info.has_key?(:values) && !field_info[:values].nil?
         field_symbol = ActiveFedora::SolrService.solr_name(field_key, field_info[:type])
-        field_info[:values].each do |val|    
+        values = field_info[:values]
+        values = [values] unless values.respond_to? :each
+        values.each do |val|    
           ::Solrizer::Extractor.insert_solr_field_value(solr_doc, field_symbol, val )         
         end
       end
@@ -80,7 +82,9 @@ module ActiveFedora::MetadataDatastreamHelper
     builder = Nokogiri::XML::Builder.with(xml_insertion_point) do |xml|
       fields.each_pair do |field,field_info|
         element_attrs = field_info[:element_attrs].nil? ? {} : field_info[:element_attrs]
-        field_info[:values].each do |val|
+        values = field_info[:values]
+        values = [values] unless values.respond_to? :each
+        values.each do |val|
           builder_arg = "xml.#{field}(val, element_attrs)"
           eval(builder_arg)
         end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.4"
+    VERSION = "3.1.5"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -1,32 +1,9 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
-require 'jettywrapper'
 
-$: << 'lib'
-
-desc "Run active-fedora rspec tests"
-task :spec do
-  Rake::Task["active_fedora:rspec"].invoke
-end
+require 'jettywrapper'
 
 desc "Hudson build"
 task :hudson do
-  
   ENV['environment'] = "test"
   Rake::Task["active_fedora:doc"].invoke
   Rake::Task["active_fedora:configure_jetty"].invoke
@@ -40,13 +17,13 @@ task :hudson do
 end
 
 namespace :active_fedora do
-  require 'lib/active-fedora'
+  require 'active-fedora'
 
   # Use yard to build docs
   begin
     require 'yard'
     require 'yard/rake/yardoc_task'
-    project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
+    project_root = APP_ROOT
     doc_destination = File.join(project_root, 'doc')
 
     YARD::Rake::YardocTask.new(:doc) do |yt|
@@ -61,12 +38,16 @@ namespace :active_fedora do
     end
   end
 
+require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:rspec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.pattern += FileList['spec/*_spec.rb']
+  end
 
-  Spec::Rake::SpecTask.new(:rspec) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts << ['--exclude', 'gems']
-    t.rcov_opts << ['--exclude', 'spec']
+  RSpec::Core::RakeTask.new(:rcov) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.pattern += FileList['spec/*_spec.rb']
+    spec.rcov = true
   end
 
   task :clean_jetty do
@@ -99,6 +80,6 @@ end
 desc 'Set up ActiveFedora environment.  !! Only for use while working within a working copy of active-fedora'
 task :environment do
   puts "Initializing ActiveFedora Rake environment.  This should only be called when working within a workign copy of the active-fedora code."
-  require 'spec/samples/models/hydrangea_article'
+  require "#{APP_ROOT}/spec/samples/models/hydrangea_article"
   require 'active_fedora/samples'
 end

data/spec/integration/base_file_management_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
   

data/spec/integration/base_find_by_fields_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 
 class MockAFBaseQuerySolr < ActiveFedora::Base
   has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|

data/spec/integration/base_loader_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 require 'active_fedora'
 require 'active_fedora/base'
 require 'active_fedora/metadata_datastream'

data/spec/integration/base_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 class MockAFBaseRelationship < ActiveFedora::Base
   has_relationship "testing", :has_part, :type=>MockAFBaseRelationship
@@ -700,8 +700,8 @@ describe ActiveFedora::Base do
     it 'should add a datastream with the given name to the object in fedora' do
       @test_object2 = MockAFBaseDatastream.new
 #      @test_object2.new_object = true
-      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
-      f2 = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ))
+      f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
+      f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
       f2.stubs(:original_filename).returns("dino.jpg")
       f.stubs(:content_type).returns("image/jpeg")
       @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})
@@ -734,7 +734,7 @@ describe ActiveFedora::Base do
     it 'should add a file datastream with the given name to the object in fedora' do
       @test_object2 = MockAFBaseDatastream.new
 #      @test_object2.new_object = true
-      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
+      f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
       f.stubs(:content_type).returns("image/jpeg")
       @test_object2.add_named_file_datastream("thumbnail",f)
       ds = @test_object2.thumbnail.first
@@ -758,10 +758,10 @@ describe ActiveFedora::Base do
   describe '#update_named_datastream' do
     it 'should update a named datastream to have a new file' do
       @test_object2 = MockAFBaseDatastream.new
-      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
+      f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
       minivan = f.read
       f.rewind
-      f2 = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ))
+      f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
       dino = f2.read
       f2.rewind
       f.stubs(:content_type).returns("image/jpeg")
@@ -802,8 +802,8 @@ describe ActiveFedora::Base do
     it 'should return a hash of datastream name to an array of dsids' do
       @test_object2 = MockAFBaseDatastream.new
 #      @test_object2.new_object = true
-      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
-      f2 = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ))
+      f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
+      f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
       f2.stubs(:original_filename).returns("dino.jpg")
       f.stubs(:content_type).returns("image/jpeg")
       @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})

data/spec/integration/bug_spec.rb

@@ -1,9 +1,8 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'
 require "rexml/document"
-require 'ftools'
 require 'mocha'
 
 include ActiveFedora::Model
@@ -37,13 +36,13 @@ end
 
     @test_object.pid.should_not be_nil
 
-    x = *FooHistory.find(@test_object.pid)
+    x = FooHistory.find(@test_object.pid)
     ds2 = x.datastreams["someData"]
     ds2.fubar_values.should == ['bar']
     ds2.fubar_values = ["meh"]
     ds2.fubar_values.should == ["meh"]
     x.save
-    x = *FooHistory.find(@test_object.pid)
+    x = FooHistory.find(@test_object.pid)
     x.datastreams['someData'].fubar_values.should == ["meh"]
     x.save
   end

data/spec/integration/datastream_spec.rb

@@ -1,8 +1,7 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "rexml/document"
-require 'ftools'
 
 describe ActiveFedora::Datastream do
   

data/spec/integration/full_featured_model_spec.rb

@@ -1,4 +1,5 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+# encoding: WINDOWS-1252
+require 'spec_helper'
 require 'rexml/document'
 require "active_fedora/samples"
 

data/spec/integration/metadata_datastream_helper_spec.rb

@@ -1,8 +1,7 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active-fedora'
 require "rexml/document"
-require 'ftools'
 
 class MockMetaHelperSolr < ActiveFedora::Base
   has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|

data/spec/integration/model_spec.rb

@@ -1,9 +1,8 @@
-require File.join( File.dirname(__FILE__), "..", "spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'
 require "rexml/document"
-require 'ftools'
 require 'mocha'
 
 include ActiveFedora::Model

data/spec/integration/mods_article_integration_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require "active_fedora/samples"
 
 describe ActiveFedora::Base do

data/spec/integration/nokogiri_datastream_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require "active_fedora/samples"
 require "solrizer"
 

data/spec/integration/rels_ext_datastream_spec.rb

@@ -1,8 +1,7 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "rexml/document"
-require 'ftools'
 
 class MockAFRelsSolr < ActiveFedora::Base
   has_relationship "testing", :has_part, :type=>MockAFRelsSolr

data/spec/integration/semantic_node_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 

data/spec/integration/solr_service_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 

data/spec/rails3_test_app/spec/unit/rails_3_init.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '../spec_helper')
+require 'spec_helper'
 
 describe "initializing active-fedora in a rails 3 app" do
   it "should include ActiveFedora::Railtie" do

data/spec/spec_helper.rb

@@ -1,25 +1,23 @@
 ENV["environment"] ||= 'test'
 require "bundler/setup"
 require 'active-fedora'
-require 'spec'
+require 'rspec'
 require 'equivalent-xml/rspec_matchers'
 
 require 'support/mock_fedora'
 
 
 logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
 $VERBOSE=nil
 
 # This loads the Fedora and Solr config info from /config/fedora.yml
 # You can load it from a different location by passing a file path as an argument.
 ActiveFedora.init(:fedora_config_path=>File.join(File.dirname(__FILE__), "..", "config", "fedora.yml"))
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end
 
 def fixture(file)
-  File.new(File.join(File.dirname(__FILE__), 'fixtures', file))
+  File.open(File.join(File.dirname(__FILE__), 'fixtures', file), 'rb')
 end

data/spec/unit/active_fedora_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 # For testing Module-level methods like ActiveFedora.init
 
@@ -6,7 +6,6 @@ describe ActiveFedora do
   
   after :all do
     unstub_rails
-    unstub_blacklight
     # Restore to default fedora configs
     fedora_config_path = File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml")
     ActiveFedora.init(:environment=>"test", :fedora_config_path=>fedora_config_path)
@@ -339,8 +338,7 @@ describe ActiveFedora do
     
     after(:all) do
       # Restore to default fedora configs
-      ActiveFedora.init(:fedora_config_path => File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
-
+      ActiveFedora.init(:environment => "test", :fedora_config_path => File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
     end
 
     describe "outside of rails" do
@@ -400,6 +398,11 @@ end
 
 
 describe ActiveFedora do
+    after(:all) do
+      # Restore to default fedora configs
+      ActiveFedora.init(:environment => "test", :fedora_config_path => File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
+    end
+
   # Put methods whose tests require registering Fedora & Solr here.
   # to allow tests to run fast, keep these to a minimum.
   describe "register_solr_and_fedora" do
@@ -435,19 +438,6 @@ def unstub_rails
   Object.send(:remove_const,:Rails) if defined?(Rails)
 end
     
-def stub_blacklight(opts={})
-  Object.const_set("Blacklight",Class)
-  Blacklight.send(:undef_method,:solr_config) if Blacklight.respond_to?(:solr_config)
-  if opts[:solr_config]
-    Blacklight.send(:define_method,:solr_config) do
-      opts[:solr_config]
-    end
-  end
-end
-
-def unstub_blacklight
-  Object.send(:remove_const,:Blacklight) if defined?(Blacklight)
-end
 
 def setup_pretest_env
   ENV['RAILS_ENV']='test'

data/spec/unit/base_active_model_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
 

data/spec/unit/base_cma_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
   

data/spec/unit/base_datastream_management_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
   

data/spec/unit/base_delegate_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::Base do
 

data/spec/unit/base_extra_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require 'active_fedora'
 require 'active_fedora/base'
 require 'active_fedora/metadata_datastream'

data/spec/unit/base_file_management_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 # Some tentative extensions to ActiveFedora::Base
 

data/spec/unit/base_named_datastream_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 require "active_fedora"
 
 # Some tentative extensions to ActiveFedora::Base

data/spec/unit/base_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/base'
@@ -169,6 +169,11 @@ describe ActiveFedora::Base do
         stub_ingest(@this_pid)
         stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator', 'externalUrl'])
       end
+
+      after(:all) do
+        # clean up test class
+        Object.send(:remove_const, :MoreFooHistory)
+      end
       it "should raise an error without :disseminator or :url option" do
         class MoreFooHistory < ActiveFedora::Base
           has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "E"
@@ -371,6 +376,16 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe '.assert_content_model' do
+    it "should default to the name of the class" do
+      stub_ingest(@this_pid)
+      stub_add_ds(@this_pid, ['RELS-EXT'])
+      @test_object.assert_content_model
+      @test_object.relationships(:has_model).should == ["info:fedora/afmodel:ActiveFedora_Base"]
+      
+    end
+  end
+
   describe '.save' do
     
     
@@ -384,20 +399,13 @@ describe ActiveFedora::Base do
       @test_object.persisted?.should be true
     end
 
-    
-    it "should raise an exception if object fails to save" do
-      pending # Not using Fedora::Repository anymore
-      server_response = mock("Server Error")
-      Fedora::Repository.instance.expects(:save).with(@test_object.inner_object).raises(Fedora::ServerError, server_response)
-      lambda {@test_object.save}.should raise_error(Fedora::ServerError)
-      #lambda {@test_object.save}.should raise_error(Fedora::ServerError, "Error Saving object #{@test_object.pid}. Server Error: RubyFedora Error Msg")
-    end
-    
-    it "should raise an exception if any of the datastreams fail to save" do
-      pending # Not using Fedora::Repository anymore
-      Fedora::Repository.instance.expects(:save).with(@test_object.inner_object).returns(true)
-      Fedora::Repository.instance.expects(:save).with(kind_of(ActiveFedora::RelsExtDatastream)).raises(Fedora::ServerError,  mock("Server Error")) 
-      lambda {@test_object.save}.should raise_error(Fedora::ServerError)
+    it "should call assert_content_model" do
+      stub_ingest(@this_pid)
+      stub_add_ds(@this_pid, ['RELS-EXT'])
+      @test_object.expects(:assert_content_model)
+      @test_object.save.should == true
+      
+      
     end
     
     it "should call .save on any datastreams that are dirty" do
@@ -492,6 +500,29 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe ".add_file_datastream" do
+    before do
+      @mock_file = mock('file')
+    end
+    it "should pass prefix" do
+      #@test_object.expects(:create_datastream).with(ActiveFedora::Datastream, nil, attrs)
+      stub_add_ds(@test_object.pid, ['content1'])
+      @test_object.add_file_datastream(@mock_file, :prefix=>'content' )
+      @test_object.datastreams.keys.should include 'content1'
+    end
+    it "should pass dsid" do
+      #@test_object.expects(:create_datastream).with(ActiveFedora::Datastream, "MY_DSID", attrs)
+      stub_add_ds(@test_object.pid, ['MY_DSID'])
+      @test_object.add_file_datastream(@mock_file, :dsid=>'MY_DSID')
+      @test_object.datastreams.keys.should include 'MY_DSID'
+    end
+    it "without dsid or prefix" do
+      #@test_object.expects(:create_datastream).with(ActiveFedora::Datastream, nil, attrs)
+      stub_add_ds(@test_object.pid, ['DS1'])
+      @test_object.add_file_datastream(@mock_file, {} )
+      @test_object.datastreams.keys.should include 'DS1'
+    end
+  end
 
   describe ".to_xml" do
     it "should provide .to_xml" do
@@ -729,7 +760,7 @@ describe ActiveFedora::Base do
     sinmock = mock('solr instance')
     conmock = mock("solr conn")
     sinmock.expects(:conn).returns(conmock)
-    conmock.expects(:query).with('pid: foobar', {:ding, :dang}).returns({:baz=>:bif})
+    conmock.expects(:query).with('pid: foobar', {:ding => :dang}).returns({:baz=>:bif})
     ActiveFedora::SolrService.expects(:instance).returns(sinmock)
     FooHistory.solr_search("pid: foobar", {:ding=>:dang}).should == {:baz=>:bif}
   end

data/spec/unit/content_model_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'mocha'

data/spec/unit/datastream_concurrency_spec.rb

@@ -1,8 +1,7 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "rexml/document"
-require 'ftools'
 
 describe ActiveFedora::Datastream do
   

data/spec/unit/datastream_spec.rb

@@ -1,8 +1,7 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "nokogiri"
-require 'ftools'
 
 describe ActiveFedora::Datastream do
   

data/spec/unit/has_many_collection_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 describe ActiveFedora::Associations::HasManyAssociation do
   it "should be able to replace the collection" do
-    @owner = stub(:new_record? => false)
+    @owner = stub(:new_record? => false, :to_ary => nil)
     @reflection = stub(:klass => Mocha::Mock, :options=>{:property=>'predicate'})
     #ac = ActiveFedora::Associations::AssociationCollection.new(@owner, @reflection)
     ac = ActiveFedora::Associations::HasManyAssociation.new(@owner, @reflection)
-    @target = [stub(:new_record? => false, :remove_relationship=>true), stub(:new_record? => false, :remove_relationship=>true), stub(:new_record? => false, :remove_relationship=>true)]
+    @target = [stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true), stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true), stub(:to_ary => nil, :new_record? => false, :remove_relationship=>true)]
     ac.target = @target 
 
-    @expected1 = stub(:new_record? => false, :add_relationship=>true, :save=>true)
-    @expected2 = stub(:new_record? => false, :add_relationship=>true, :save=>true)
+    @expected1 = stub(:new_record? => false, :add_relationship=>true, :save=>true, :to_ary => nil)
+    @expected2 = stub(:new_record? => false, :add_relationship=>true, :save=>true, :to_ary => nil)
     ac.replace([@expected1, @expected2])
     ac.target.should == [@expected1, @expected2]
 

data/spec/unit/inheritance_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/base'

data/spec/unit/metadata_datastream_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/metadata_datastream'

data/spec/unit/model_spec.rb

@@ -1,9 +1,8 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'
 require "rexml/document"
-require 'ftools'
 require 'mocha'
 
 

data/spec/unit/nokogiri_datastream_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require "active_fedora/samples"
 describe ActiveFedora::NokogiriDatastream do
   

data/spec/unit/property_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'active_fedora/model'

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -1,8 +1,9 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'xmlsimple'
 require 'nokogiri'
+require 'equivalent-xml'
 
 describe ActiveFedora::QualifiedDublinCoreDatastream do
 
@@ -61,7 +62,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
 
   it "should have unmodifiable constants" do
-    proc {ActiveFedora::QualifiedDublinCoreDatastream::DCTERMS<<:foo}.should raise_error(TypeError, 'can\'t modify frozen array')
+    proc {ActiveFedora::QualifiedDublinCoreDatastream::DCTERMS<<:foo}.should raise_error((TypeError if RUBY_VERSION < "1.9.0") || RuntimeError, /can't modify frozen array/i)
 
   end
 
@@ -80,8 +81,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     tmpl.expects(:content).returns('')
     tmpl.field :mycomplicated, :string, :xml_node=>'alt', :element_attrs=>{:foo=>'bar'}
     tmpl.mycomplicated_values='fubar'
-    tmpl.to_dc_xml.should == '<dc xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:dcterms=\'http://purl.org/dc/terms/\'><dcterms:alt foo=\'bar\'>fubar</dcterms:alt></dc>'
-
+    Nokogiri::XML(tmpl.to_dc_xml).should be_equivalent_to('<dc xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:dcterms=\'http://purl.org/dc/terms/\'><dcterms:alt foo=\'bar\'>fubar</dcterms:alt></dc>')
   end
 
 

data/spec/unit/rdf_xml_writer.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 require File.join( File.dirname(__FILE__), "../../lib/active_fedora/rdf_xml_writer" )
 
 describe ActiveFedora::RDFXMLWriter do

data/spec/unit/relationship_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require "rexml/document"

data/spec/unit/relationships_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'active_fedora'
 require 'xmlsimple'

data/spec/unit/rels_ext_datastream_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 describe ActiveFedora::RelsExtDatastream do
   describe "short_predicate" do

data/spec/unit/rubydora_connection_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__),  "../spec_helper" )
+require 'spec_helper'
 require 'active_fedora/rubydora_connection'
 
 describe ActiveFedora::RubydoraConnection do

data/spec/unit/semantic_node_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 require 'xmlsimple'
 

data/spec/unit/solr_config_options_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 
 #include ActiveFedora

data/spec/unit/solr_service_spec.rb

@@ -1,4 +1,4 @@
-require File.join( File.dirname(__FILE__), "../spec_helper" )
+require 'spec_helper'
 
 
 describe ActiveFedora::SolrService do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 1
-  - 4
-  version: 3.1.4
+  - 5
+  version: 3.1.5
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 -06:00
+date: 2011-12-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -327,12 +327,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   requirement: *id021
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -341,14 +341,13 @@ dependencies:
   version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
+        version: "2.0"
   requirement: *id022
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -366,20 +365,6 @@ dependencies:
         - 8
         version: 0.9.8
   requirement: *id023
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  type: :development
-  prerelease: false
-  version_requirements: &id024 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id024
 description: ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.
 email: 
 - matt.zumwalt@yourmediashelf.com