active-fedora 6.4.2 → 6.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3121b41531277d5c0351a7e657d063fb628ba733
-  data.tar.gz: 48e5886abd01bc9afb4329004c8293401a89708d
+  metadata.gz: a9395c7f327612946bfc5d90b4f8cdcf93af0a49
+  data.tar.gz: 13f08cd89e3b35e3b3b437cc13d5db8df934b022
 SHA512:
-  metadata.gz: 3757c8465f920bf90ce99c8319d58137c335929c8d5b115b157491e2f86a5df1a7686675f2e5c516ab434e28e55fa309afd0b0f4db02f58be10baf01684769e7
-  data.tar.gz: 6e3b6a10c6bc56d075df2779e2cc18b3574dd254e18df6fda760c8478177cf191281e6dad210f74cc4cb52dcc522756da66a43cff215d6d1eb265965bb41c14b
+  metadata.gz: 036af5cc43ab70dcca4ca55da21f1961bb6e1047a96f48256019102adac6b43e35dacc6ed5b0776a44ff949c15c4c1144d1c54e6d8979dcbb6b51482cd0b66e7
+  data.tar.gz: 025ae1503457b5427a05d9bd408e84594d137fbb94bd2e7b8d98f433f505ee3988ccab442de9a5e67b421c30981a137024e18b3b513d2a30d0da54825b31982d

data/.mailmap

@@ -1,9 +1,18 @@
-Mark Bussey <mark@curationexperts.com> mark-dce <mark@curationexperts.com>
 Andrew Myers <andrew_myers@wgbh.org> afred <afredmyers@gmail.com>
-Richard Johnson <rick.johnson@nd.edu> rjohns14@github.com <rjohns14@LIB-1224.library.nd.edu>
-Richard Johnson <rick.johnson@nd.edu> rjohns14 <rjohns14@LIB-1224.library.nd.edu>
-Richard Johnson <rick.johnson@nd.edu> rickjohnson <rick.johnson@nd.edu>
-Justin Coyne <justin@curationexperts.com> jcoyne <digger250@gmail.com>
+Chris Beer <chris@cbeer.info> <cabeer@stanford.edu>
+Chris Beer <chris@cbeer.info> <chris@cbeer.info>
+Chris Beer <chris@cbeer.info> <chris_beer@wgbh.org>
 Chris Colvard <cjcolvar@indiana.edu> cjcolvar <cjcolvar@indiana.edu>
 David Chandek-Stark <dchandekstark@gmail.com> dchandekstark <dchandekstark@gmail.com>
-Matt Zumwalt <matt.zumwalt@yourmediashelf.com> flyingzumwalt <matt.zumwalt@gmail.com>
+Justin Coyne <justin@curationexperts.com> <digger250@gmail.com>
+Justin Coyne <justin@curationexperts.com> <justin.coyne@yourmediashelf.com>
+Justin Coyne <justin@curationexperts.com> jcoyne <digger250@gmail.com>
+Justin Coyne <justin@curationexperts.com> <jcoyne@justincoyne.com>
+Jesse Keck <jessie.keck@gmail.com> <jkeck@stanford.edu>
+Jesse Keck <jessie.keck@gmail.com> <jessie.keck@gmail.com>
+Mark Bussey <mark@curationexperts.com> mark-dce <mark@curationexperts.com>
+Matt Zumwalt <matt.zumwalt@yourmediashelf.com> flyingzumwalt <matt.zumwalt@gmail.com>
+Richard Johnson <rick.johnson@nd.edu> rickjohnson <rick.johnson@nd.edu>
+Richard Johnson <rick.johnson@nd.edu> rjohns14 <rjohns14@LIB-1224.library.nd.edu>
+Richard Johnson <rick.johnson@nd.edu> rjohns14@github.com <rjohns14@LIB-1224.library.nd.edu>
+Michael B. Klein <mbklein@gmail.com>

data/active-fedora.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = %q{https://github.com/projecthydra/active_fedora}
   s.summary     = %q{A convenience libary for manipulating documents in the Fedora Repository.}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
-
+  s.license = "APACHE2"
   s.required_ruby_version     = '>= 1.9.3'
 
   s.add_dependency('rsolr')
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("rubydora", '~>1.6', '>= 1.6.5')
   s.add_dependency("rdf")
-  s.add_dependency("rdf-rdfxml", '~>1.0.0')
+  s.add_dependency("rdf-rdfxml", '1.0.1')
   s.add_dependency("deprecation")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("yard")

data/gemfiles/gemfile.rails4

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec :path=>"../"
 
-gem 'activemodel', '4.0.0.rc2'
+gem 'activemodel', '~> 4.0.0'
 
 group :development, :test do
   gem 'simplecov', :platform => :mri_19

data/lib/active_fedora.rb

@@ -157,20 +157,16 @@ module ActiveFedora #:nodoc:
   # @example Search within ActiveFedora::RdfNode for a class called "TermProxy"
   #   ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode)
   #   => ActiveFedora::RdfNode::TermProxy  
-  def self.class_from_string(class_name, container_class=nil)
-    if class_name.include?("::")
-      # result = eval(class_name)
-      class_name.split('::').inject(Object) do |mod, class_name|
+  def self.class_from_string(class_name, container_class=Kernel)
+    container_class = container_class.name if container_class.is_a? Module
+    container_parts = container_class.split('::')
+    (container_parts + class_name.split('::')).flatten.inject(Kernel) do |mod, class_name|
+      if mod.const_defined? class_name.to_sym
         mod.const_get(class_name)
+      else
+        container_parts.pop
+        class_from_string(class_name, container_parts.join('::'))
       end
-    elsif !container_class.nil?
-      begin
-        container_class.const_get(class_name.to_sym)
-      rescue NameError
-        Kernel.const_get(class_name)
-      end
-    else
-      Kernel.const_get(class_name)
     end
   end
 

data/lib/active_fedora/digital_object.rb

@@ -31,6 +31,7 @@ module ActiveFedora
     include DatastreamBootstrap
 
     def self.find(original_class, pid)
+      raise ActiveFedora::ObjectNotFoundError.new("Unable to find #{pid.inspect} in fedora. ") unless pid.present?
       conn = original_class.connection_for_pid(pid)
       obj = begin
         super(pid, conn)

data/lib/active_fedora/model.rb

@@ -37,15 +37,15 @@ module ActiveFedora
     # Returns a suitable uri object for :has_model
     # Should reverse Model#from_class_uri
     def to_class_uri(attrs = {})
-      unless self.respond_to? :pid_suffix
-        pid_suffix = attrs.has_key?(:pid_suffix) ? attrs[:pid_suffix] : ContentModel::CMODEL_PID_SUFFIX
-      else
+      if self.respond_to? :pid_suffix
         pid_suffix = self.pid_suffix
-      end
-      unless self.respond_to? :pid_namespace
-        namespace = attrs.has_key?(:namespace) ? attrs[:namespace] : ContentModel::CMODEL_NAMESPACE   
       else
+        pid_suffix = attrs.fetch(:pid_suffix, ContentModel::CMODEL_PID_SUFFIX)
+      end
+      if self.respond_to? :pid_namespace
         namespace = self.pid_namespace
+      else
+        namespace = attrs.fetch(:namespace, ContentModel::CMODEL_NAMESPACE)
       end
       "info:fedora/#{namespace}:#{ContentModel.sanitized_class_name(self)}#{pid_suffix}" 
     end

data/lib/active_fedora/om_datastream.rb

@@ -108,9 +108,20 @@ module ActiveFedora
     end
     
     def content=(new_content)
-      ng_xml_will_change! unless EquivalentXml.equivalent?(datastream_content, new_content)
-      @ng_xml = Nokogiri::XML::Document.parse(new_content)
-      super(@ng_xml.to_s)
+      if inline?
+        # inline datastreams may be transformed by fedora 3, so we test for equivalence instead of equality
+        if !EquivalentXml.equivalent?(datastream_content, new_content)
+          ng_xml_will_change! 
+          @ng_xml = Nokogiri::XML::Document.parse(new_content)
+          super(@ng_xml.to_s)
+        end
+      else
+        if datastream_content != new_content
+          ng_xml_will_change! 
+          @ng_xml = Nokogiri::XML::Document.parse(new_content)
+          super(@ng_xml.to_s)
+        end
+      end
     end
 
     def content_changed?

data/lib/active_fedora/querying.rb

@@ -68,13 +68,14 @@ module ActiveFedora
     end
 
 
-    # Returns true if the pid exists in the repository 
-    # @param[String] pid 
-    # @return[boolean] 
+    # Returns true if the pid exists in the repository
+    # @param[String] pid
+    # @return[boolean]
     def exists?(pid)
       return false if pid.nil? || pid.empty?
-      inner = DigitalObject.find_or_initialize(self, pid)
-      !inner.new?
+      !!DigitalObject.find(self, pid)
+    rescue ActiveFedora::ObjectNotFoundError
+      false
     end
 
     # Returns a solr result matching the supplied conditions

data/lib/active_fedora/solr_service.rb

@@ -32,18 +32,23 @@ module ActiveFedora
       raise SolrNotInitialized unless Thread.current[:solr_service]
       Thread.current[:solr_service]
     end
-    
-    def self.reify_solr_results(solr_result,opts={})
-      results = []
-      solr_result.each do |hit|
-        classname = class_from_solr_document(hit)
-        if opts[:load_from_solr]
-          results << classname.load_instance_from_solr(hit[SOLR_DOCUMENT_ID])
-        else
-          results << classname.find(hit[SOLR_DOCUMENT_ID])
+
+    def self.lazy_reify_solr_results(solr_results, opts = {})
+      Enumerator.new do |yielder|
+        solr_results.each do |hit|
+          yielder.yield(reify_solr_result(hit, opts))
         end
       end
-      return results
+    end
+    
+    def self.reify_solr_results(solr_results, opts = {})
+      solr_results.collect {|hit| reify_solr_result(hit, opts)}
+    end
+
+    def self.reify_solr_result(hit, opts = {})
+      classname = class_from_solr_document(hit)
+      method = opts[:load_from_solr] ? :load_instance_from_solr : :find
+      classname.send(method, hit[SOLR_DOCUMENT_ID])
     end
   
     def self.class_from_solr_document(hit)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.4.2"
+  VERSION = "6.4.3"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -36,21 +36,6 @@ require 'rspec/core/rake_task'
     spec.rcov = true
   end
 
-  desc "Loads or refreshes the fixtures needed to run the tests"
-  task :fixtures => :environment do
-    ENV["pid"] = "test:fixture_mods_article1"
-    Rake::Task["repo:refresh"].invoke
-    ENV["pid"] = nil
-
-    Rake::Task["repo:delete"].reenable
-    Rake::Task["repo:load"].reenable
-    Rake::Task["repo:refresh"].reenable
-
-    ENV["pid"] = "test:fixture_mods_article2"
-    Rake::Task["repo:refresh"].invoke
-    ENV["pid"] = nil
-  end
-
   desc "Copies the default SOLR config for the bundled Testing Server"
   task :configure_jetty do
     FileList['lib/generators/active_fedora/config/solr/templates/solr_conf/conf/*'].each do |f|  
@@ -79,9 +64,8 @@ task :coverage do
   ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
   ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
 
-  Rake::Task["active_fedora:fixtures"].invoke
+ # Rake::Task["active_fedora:fixtures"].invoke
   Rake::Task["active_fedora:rspec"].invoke
 end
 
 end
-

data/spec/config_helper.rb

@@ -1,5 +1,5 @@
 def mock_yaml(hash, path)
-  mock_file = mock(path.split("/")[-1])
+  mock_file = double(path.split("/")[-1])
   File.stub(:exist?).with(path).and_return(true)
   File.stub(:open).with(path).and_return(mock_file)
   YAMLAdaptor.stub(:load).and_return(hash)

data/spec/{unit → integration}/auditable_spec.rb

@@ -6,25 +6,23 @@ describe ActiveFedora::Auditable do
     class AuditableModel < ActiveFedora::Base
       include ActiveFedora::Auditable
     end
-    path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'auditable.foxml.xml')
-    pid = ActiveFedora::FixtureLoader.import_to_fedora(path)
-    ActiveFedora::FixtureLoader.index(pid)
-    @test_object = AuditableModel.find(pid)
+    @test_object = AuditableModel.create
+    @test_object.reload
   end
   after(:all) do
     @test_object.delete
   end
   it "should have the correct number of audit records" do
-    @test_object.audit_trail.records.length.should == 3
+    @test_object.audit_trail.records.length.should == 1
   end
   it "should return all the data from each audit record" do
-    record = @test_object.audit_trail.records.first
+    record = @test_object.audit_trail.records.last
     record.id.should == "AUDREC1"
     record.process_type.should == "Fedora API-M"
     record.action.should == "addDatastream"
     record.component_id.should == "RELS-EXT"
     record.responsibility.should == "fedoraAdmin"
-    record.date.should == "2013-02-25T16:43:06.219Z"
+    record.date.should == @test_object.modified_date
     record.justification.should == ""
   end
   

data/spec/integration/base_spec.rb

@@ -415,7 +415,8 @@ describe ActiveFedora::Base do
   
   describe "#exists?" do
     it "should return true for objects that exist" do
-      ActiveFedora::Base.exists?('test:fixture_mods_article1').should be_true
+      @obj = ActiveFedora::Base.create
+      ActiveFedora::Base.exists?(@obj.pid).should be_true
     end
     it "should return false for objects that don't exist" do
       ActiveFedora::Base.exists?('test:missing_object').should be_false

data/spec/integration/bug_spec.rb

@@ -20,6 +20,12 @@ describe 'bugs' do
     Object.send(:remove_const, :FooHistory)
   end
 
+  it 'should raise ActiveFedora::ObjectNotFoundError when find("")' do
+    expect {
+      FooHistory.find('')
+    }.to raise_error(ActiveFedora::ObjectNotFoundError)
+  end
+
   it "should not clobber everything when setting a value" do
     @test_object.someData.fubar=['initial']
     @test_object.save!

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -23,7 +23,7 @@ describe "Nested Rdf Objects" do
     end
 
     let (:ds) do
-      mock_obj = stub(:mock_obj, :pid=>'test:124', :new? => true)
+      mock_obj = double(:mock_obj, :pid=>'test:124', :new? => true)
       ds = SpecDatastream.new(mock_obj)
     end
 
@@ -140,7 +140,7 @@ END
       end
 
       let (:ds) do
-        mock_obj = stub(:mock_obj, :pid=>'test:124', :new? => true)
+        mock_obj = double(:mock_obj, :pid=>'test:124', :new? => true)
         ds = SpecDatastream.new(mock_obj)
       end
 
@@ -209,7 +209,7 @@ END
       end
 
       let (:ds) do
-        mock_obj = stub(:mock_obj, :pid=>'test:124', :new? => true)
+        mock_obj = double(:mock_obj, :pid=>'test:124', :new? => true)
         ds = SpecDatastream.new(mock_obj)
       end
 

data/spec/integration/model_spec.rb

@@ -10,6 +10,7 @@ describe ActiveFedora::Model do
         def self.pid_namespace
           "foo"
         end
+        has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream, :autocreate => true 
       end
       class Basic < Base
       end
@@ -38,28 +39,28 @@ describe ActiveFedora::Model do
       end
     end
     describe "#find with a valid pid with cast" do
-      subject { ActiveFedora::Base.find('test:fixture_mods_article1', :cast=>true) }
-      it { should be_instance_of ModsArticle}
+      subject { ActiveFedora::Base.find(@test_instance.pid, :cast=>true) }
+      it { should be_instance_of ModelIntegrationSpec::Basic}
     end
     describe "#find with a valid pid without cast" do
-      subject { ActiveFedora::Base.find('test:fixture_mods_article1') }
+      subject { ActiveFedora::Base.find(@test_instance.pid) }
       it { should be_instance_of ActiveFedora::Base}
     end
   end
 
   describe "#load_instance_from_solr" do
     describe "with a valid pid" do
-      subject { ActiveFedora::Base.load_instance_from_solr('test:fixture_mods_article1') }
-      it { should be_instance_of ModsArticle}
+      subject { ActiveFedora::Base.load_instance_from_solr(@test_instance.pid) }
+      it { should be_instance_of ModelIntegrationSpec::Basic}
     end
     describe "with metadata datastream spec" do
-      subject { ActiveFedora::Base.load_instance_from_solr('test:fixture_mods_article1') }
+      subject { ActiveFedora::Base.load_instance_from_solr(@test_instance.pid) }
       it "should create an xml datastream" do
         subject.datastreams['properties'].should be_kind_of ActiveFedora::SimpleDatastream
       end
 
       it "should know the datastreams properties" do
-        subject.properties.dsSize.should == 19
+        subject.properties.dsSize.should == 9
       end
     end
   end

data/spec/integration/om_datastream_spec.rb

@@ -3,22 +3,32 @@ require "solrizer"
 
 describe ActiveFedora::OmDatastream do
   
-  describe "an new instance with a inline datastream" do
-    before do 
+  describe "a new instance with an inline datastream" do
+    before(:all) do 
       class ModsArticle3 < ActiveFedora::Base
         # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :control_group => 'X'
-
+        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :control_group => 'X', :autocreate => true
       end
+    end
 
+    after(:all) do
+      Object.send(:remove_const, :ModsArticle3)
+    end
+
+    before(:each) do
       @obj = ModsArticle3.new
       @obj.save
-      @obj.descMetadata.should be_inline
+      @obj.reload
     end
-    after do
+
+    after(:each) do
       @obj.destroy
-      Object.send(:remove_const, :ModsArticle3)
     end
+
+    it "should report being inline" do
+      @obj.descMetadata.should be_inline
+    end
+
     it "should not be changed when no fields have been set" do
       @obj.descMetadata.should_not be_content_changed
     end
@@ -28,30 +38,25 @@ describe ActiveFedora::OmDatastream do
     end
     describe "#changed?" do
       it "should not be changed if the new xml matches the old xml" do
-        @pid = "test:fixture_mods_article2"
-        @test_object = ModsArticle3.find(@pid)
-
-        @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
-        @test_object.descMetadata.should_not be_changed
+        @obj.descMetadata.content = @obj.descMetadata.content
+        @obj.descMetadata.should_not be_changed
       end
 
       it "should not be changed if there are minor differences in whitespace" do
-        obj = ModsArticle3.new
-        obj.descMetadata.content = "<a>1</a>"
-        obj.save
-        obj.descMetadata.should_not be_changed
-        obj.descMetadata.content = "<a>1</a>\n"
-        obj.descMetadata.should_not be_changed
+        @obj.descMetadata.content = "<a><b>1</b></a>"
+        @obj.save
+        @obj.descMetadata.should_not be_changed
+        @obj.descMetadata.content = "<a>\n<b>1</b>\n</a>"
+        @obj.descMetadata.should_not be_changed
       end
     end
   end
 
-
   describe "an instance that is a managed datastream" do
     before(:all) do
       class ModsArticle2 < ActiveFedora::Base
         # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
-        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream
+        has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :autocreate => true
       end
     end
 
@@ -59,67 +64,71 @@ describe ActiveFedora::OmDatastream do
       Object.send(:remove_const, :ModsArticle2)
     end
 
+    before(:each) do
+      @obj = ModsArticle2.new
+      @obj.save
+      @obj.reload
+    end
+
+    after(:each) do
+      @obj.destroy
+    end
+
+    it "should not report being inline" do
+      @obj.descMetadata.should be_managed
+    end
+
     describe "#changed?" do
       it "should not be changed if the new xml matches the old xml" do
-        @pid = "test:fixture_mods_article2"
-        @test_object = ModsArticle2.find(@pid)
-
-        @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
-        @test_object.descMetadata.should_not be_changed
+        @obj.descMetadata.content = @obj.descMetadata.content
+        @obj.descMetadata.should_not be_changed
       end
 
       it "should be changed if there are minor differences in whitespace" do
-        obj = ModsArticle2.new
-        obj.descMetadata.content = "<a>1</a>"
-        obj.save
-        obj.descMetadata.should_not be_changed
-        obj.descMetadata.content = "<a>1</a>\n"
-        obj.descMetadata.should be_changed
+        @obj.descMetadata.content = "<a><b>1</b></a>"
+        @obj.save
+        @obj.descMetadata.should_not be_changed
+        @obj.descMetadata.content = "<a>\n<b>1</b>\n</a>"
+        @obj.descMetadata.should be_changed
       end
     end
 
-
-
     describe "empty datastream content" do
       it "should not break when there is empty datastream content" do
-        obj = ModsArticle2.new
-        obj.descMetadata.content = ""
-        obj.save
-
+        @obj.descMetadata.content = ""
+        @obj.save
       end
     end
 
     describe '.term_values' do
       before do
-        @pid = "test:fixture_mods_article2"
-        @test_object = ModsArticle2.find(@pid)
-        @test_object.descMetadata.content = File.read(fixture('mods_articles/mods_article1.xml'))
-        @test_object.save
-        @test_object = ModsArticle2.find(@pid)
-        @test_solr_object = ActiveFedora::Base.load_instance_from_solr(@pid)
+        @obj.descMetadata.content = File.read(fixture('mods_articles/mods_article1.xml'))
+        @obj.save
+        @obj.reload
+        @solr_obj = ActiveFedora::Base.load_instance_from_solr(@obj.pid)
       end
 
       it "should return the same values whether getting from solr or Fedora" do
-        @test_solr_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
-        @test_solr_object.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
-        @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
-        @test_solr_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
-        @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
-        @test_solr_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
-        ar = @test_solr_object.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
+        @solr_obj.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
+        @solr_obj.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
+        @solr_obj.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
+        @solr_obj.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
+        @solr_obj.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
+        @solr_obj.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
+        ar = @solr_obj.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
         ar.length.should == 4
         ar.include?("Creator").should == true
         ar.include?("Contributor").should == true
         ar.include?("Funder").should == true
         ar.include?("Host").should == true
 
-        @test_object.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
-        @test_object.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
-        @test_object.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
-        @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
-        @test_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
-        @test_object.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
-        ar = @test_object.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
+        @obj.datastreams["descMetadata"].term_values(:name,:role,:text).should == ["Creator","Contributor","Funder","Host"]
+        @obj.datastreams["descMetadata"].term_values({:name=>0},:role,:text).should == ["Creator"]
+        @obj.datastreams["descMetadata"].term_values({:name=>1},:role,:text).should == ["Contributor"]
+        @obj.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Creator"]
+        @obj.datastreams["descMetadata"].term_values({:name=>1},{:role=>0},:text).should == ["Contributor"]
+        @obj.datastreams["descMetadata"].term_values({:name=>1},{:role=>1},:text).should == []
+        ar = @obj.datastreams["descMetadata"].term_values(:name,{:role=>0},:text)
         ar.length.should == 4
         ar.include?("Creator").should == true
         ar.include?("Contributor").should == true
@@ -130,33 +139,29 @@ describe ActiveFedora::OmDatastream do
     
     describe '.update_values' do
       before do
-        @pid = "test:fixture_mods_article2"
-        @test_object = ModsArticle2.find(@pid)
-        @test_object.descMetadata.content = File.read(fixture('mods_articles/mods_article1.xml'))
-        @test_object.save
-        @test_object = ModsArticle2.find(@pid)
+        @obj.descMetadata.content = File.read(fixture('mods_articles/mods_article1.xml'))
+        @obj.save
+        @obj.reload
       end
 
       it "should not be dirty after .update_values is saved" do
-        @test_object.datastreams["descMetadata"].update_values([{:name=>0},{:role=>0},:text] =>"Funder")
-        @test_object.datastreams["descMetadata"].should be_changed
-        @test_object.save
-        @test_object.datastreams["descMetadata"].should_not be_changed
-        @test_object.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Funder"]
+        @obj.datastreams["descMetadata"].update_values([{:name=>0},{:role=>0},:text] =>"Funder")
+        @obj.datastreams["descMetadata"].should be_changed
+        @obj.save
+        @obj.datastreams["descMetadata"].should_not be_changed
+        @obj.datastreams["descMetadata"].term_values({:name=>0},{:role=>0},:text).should == ["Funder"]
       end    
     end
 
 
     describe ".to_solr" do
       before do
-        object = ModsArticle2.new
-        object.descMetadata.journal.issue.publication_date = Date.parse('2012-11-02')
-        object.save!
-        @test_object = ModsArticle2.find(object.pid)
-
+        @obj.descMetadata.journal.issue.publication_date = Date.parse('2012-11-02')
+        @obj.save!
+        @obj.reload
       end
       it "should solrize terms with :type=>'date' to *_dt solr terms" do
-        @test_object.to_solr[ActiveFedora::SolrService.solr_name('mods_journal_issue_publication_date', type: :date)].should == ['2012-11-02T00:00:00Z']
+        @obj.to_solr[ActiveFedora::SolrService.solr_name('mods_journal_issue_publication_date', type: :date)].should == ['2012-11-02T00:00:00Z']
       end
     end
   end