active-fedora 3.2.0.pre3 → 3.2.0.pre4

data/lib/active_fedora/model.rb

@@ -1,5 +1,3 @@
-require 'active_fedora/fedora_object'
-
 SOLR_DOCUMENT_ID = "id" unless defined?(SOLR_DOCUMENT_ID)
 
 module ActiveFedora
@@ -7,7 +5,6 @@ module ActiveFedora
   # This module mixes various methods into the including class,
   # much in the way ActiveRecord does.  
   module Model 
-    extend ActiveFedora::FedoraObject
     DEFAULT_NS = 'afmodel'
 
     def self.included(klass) # :nodoc:

data/lib/active_fedora/persistence.rb

@@ -0,0 +1,116 @@
+module ActiveFedora
+  # = Active Fedora Persistence
+  module Persistence
+
+    #Saves a Base object, and any dirty datastreams, then updates 
+    #the Solr index for this object.
+    def save(*)
+      # If it's a new object, set the conformsTo relationship for Fedora CMA
+      if new_object? 
+        result = create
+      else
+        result = update
+      end
+      update_index if @metadata_is_dirty == true && ENABLE_SOLR_UPDATES
+      @metadata_is_dirty = false
+      return result
+    end
+
+    def save!(*)
+      save
+    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
+
+
+    def update_attributes(properties)
+      self.attributes=properties
+      save
+    end
+
+    # Refreshes the object's info from Fedora
+    # Note: Currently just registers any new datastreams that have appeared in fedora
+    def refresh
+#      inner_object.load_attributes_from_fedora
+    end
+
+    #Deletes a Base object, also deletes the info indexed in Solr, and 
+    #the underlying inner_object.  If this object is held in any relationships (ie inbound relationships
+    #outside of this object it will remove it from those items rels-ext as well
+    def delete
+      inbound_relationships(:objects).each_pair do |predicate, objects|
+        objects.each do |obj|
+          if obj.respond_to?(:remove_relationship)
+            obj.remove_relationship(predicate,self)
+            obj.save
+          end 
+        end
+      end
+      
+      #Fedora::Repository.instance.delete(@inner_object)
+      pid = self.pid ## cache so it's still available after delete
+      begin
+        @inner_object.delete
+      rescue RestClient::ResourceNotFound =>e
+        raise ObjectNotFoundError, "Unable to find #{pid} in the repository"
+      end
+      if ENABLE_SOLR_UPDATES
+        ActiveFedora::SolrService.instance.conn.delete(pid) 
+        # if defined?( Solrizer::Solrizer ) 
+        #   solrizer = Solrizer::Solrizer.new
+        #   solrizer.solrize_delete(pid)
+        # end
+      end
+    end
+
+
+
+  private
+    
+    # Updates Solr index with self.
+    def update_index
+      if defined?( Solrizer::Fedora::Solrizer ) 
+        #logger.info("Trying to solrize pid: #{pid}")
+        solrizer = Solrizer::Fedora::Solrizer.new
+        solrizer.solrize( self )
+      else
+        #logger.info("Trying to update solr for pid: #{pid}")
+        SolrService.instance.conn.update(self.to_solr)
+      end
+    end
+
+    # Deals with preparing new object to be saved to Fedora, then pushes it and its datastreams into Fedora. 
+    def create
+      @inner_object = @inner_object.save #replace the unsaved digital object with a saved digital object
+      assert_content_model
+      @metadata_is_dirty = true
+      persist
+    end
+    
+    # Pushes the object and all of its new or dirty datastreams into Fedora
+    def update
+      persist
+    end
+
+    def persist
+      datastreams.each {|k, ds| ds.serialize! }
+      @metadata_is_dirty = datastreams.any? {|k,ds| ds.changed? && (ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.instance_of?(ActiveFedora::RelsExtDatastream))}
+
+      result = @inner_object.save
+
+      ### Rubydora re-inits the datastreams after a save, so ensure our copy stays in synch
+      @inner_object.datastreams.each do |dsid, ds|
+        datastreams[dsid] = ds
+        ds.model = self if ds.kind_of? RelsExtDatastream
+      end 
+      refresh
+      return !!result
+    end
+
+
+  end
+end

data/lib/active_fedora/rubydora_connection.rb

@@ -44,7 +44,7 @@ module ActiveFedora
     end
 
     def find_model(pid, klass)
-      klass.new(:pid=>pid)
+      klass.allocate.init_with(DigitalObject.find(klass, pid))
     end
 
   end

data/lib/active_fedora/solr_digital_object.rb

@@ -0,0 +1,19 @@
+module ActiveFedora
+  class SolrDigitalObject
+    attr_accessor :pid, :attributes, :datastreams
+    
+    def initialize(attr)
+      self.datastreams = {}
+      self.attributes = attr
+      self.pid = attr[:pid]
+    end
+
+    def new?
+      false
+    end
+
+    def profile
+      attributes
+    end
+  end
+end

data/lib/active_fedora/unsaved_digital_object.rb

@@ -3,14 +3,15 @@ module ActiveFedora
   class UnsavedDigitalObject 
     attr_accessor :original_class, :datastreams, :label, :namespace
     
-    def initialize(original_class, namespace)
+    def initialize(original_class, namespace, pid=nil)
+      @pid = pid
       self.original_class = original_class
       self.namespace = namespace
       self.datastreams = {}
     end
 
     def pid
-      '__DO_NOT_USE__'
+      @pid || '__DO_NOT_USE__'
     end
 
     def new?
@@ -28,9 +29,11 @@ module ActiveFedora
     end
 
     def assign_pid
+        return @pid if @pid
         args = {}
         args[:namespace] = self.namespace if self.namespace
-        RubydoraConnection.instance.nextid args
+        @pid = RubydoraConnection.instance.nextid args
+        @pid
     end
 
 

data/lib/active_fedora/validations.rb

@@ -0,0 +1,82 @@
+module ActiveFedora
+  # = Active Fedora RecordInvalid, adapted from Active Record
+  #
+  # Raised by <tt>save!</tt> and <tt>create!</tt> when the record is invalid.  Use the
+  # +record+ method to retrieve the record which did not validate.
+  #
+  #   begin
+  #     complex_operation_that_calls_save!_internally
+  #   rescue ActiveFedora::RecordInvalid => invalid
+  #     puts invalid.record.errors
+  #   end
+  class RecordInvalid < StandardError
+    attr_reader :record
+    def initialize(record)
+      @record = record
+      errors = @record.errors.full_messages.join(", ")
+      super(I18n.t("activefedora.errors.messages.record_invalid", :errors => errors))
+    end
+  end
+
+  # = Active Fedora Validations, adapted from Active Record
+  #
+  # Active Fedora includes the majority of its validations from <tt>ActiveModel::Validations</tt>
+  # all of which accept the <tt>:on</tt> argument to define the context where the
+  # validations are active. Active Record will always supply either the context of
+  # <tt>:create</tt> or <tt>:update</tt> dependent on whether the model is a
+  # <tt>new_record?</tt>.
+  module Validations
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+
+    module ClassMethods
+      # Creates an object just like Base.create but calls <tt>save!</tt> instead of +save+
+      # so an exception is raised if the record is invalid.
+      def create!(attributes = nil, options = {}, &block)
+        if attributes.is_a?(Array)
+          attributes.collect { |attr| create!(attr, options, &block) }
+        else
+          object = new(attributes, options)
+          yield(object) if block_given?
+          object.save!
+          object
+        end
+      end
+    end
+
+    # The validation process on save can be skipped by passing <tt>:validate => false</tt>. The regular Base#save method is
+    # replaced with this when the validations module is mixed in, which it is by default.
+    def save(options={})
+      perform_validations(options) ? super : false
+    end
+
+    # Attempts to save the record just like Base#save but will raise a +RecordInvalid+ exception instead of returning false
+    # if the record is not valid.
+    def save!(options={})
+      perform_validations(options) ? super : raise(RecordInvalid.new(self))
+    end
+
+    # Runs all the validations within the specified context. Returns true if no errors are found,
+    # false otherwise.
+    #
+    # If the argument is false (default is +nil+), the context is set to <tt>:create</tt> if
+    # <tt>new_record?</tt> is true, and to <tt>:update</tt> if it is not.
+    #
+    # Validations with no <tt>:on</tt> option will run no matter the context. Validations with
+    # some <tt>:on</tt> option will only run in the specified context.
+    def valid?(context = nil)
+      context ||= (new_record? ? :create : :update)
+      output = super(context)
+      errors.empty? && output
+    end
+
+  protected
+
+    def perform_validations(options={})
+      perform_validation = options[:validate] != false
+      perform_validation ? valid?(options[:context]) : true
+    end
+  end
+end
+
+

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.2.0.pre3"
+    VERSION = "3.2.0.pre4"
 end

data/spec/integration/base_loader_spec.rb

@@ -26,8 +26,7 @@ describe ActiveFedora::Base do
   
   describe "load_instance" do
     it "should retain all datastream attributes pulled from fedora" do
-      # raw_object = Fedora::Repository.instance.find_objects("pid=#{@test_object.pid}").first
-      raw_object = ActiveFedora::Base.new(:pid=>@test_object.pid, :new_object=>false)
+      raw_object = ActiveFedora::Base.find(@test_object.pid)
       loaded = OralHistorySampleModel.load_instance(@test_object.pid)
       raw_datastreams = raw_object.datastreams
       loaded_datastreams = loaded.datastreams

data/spec/integration/full_featured_model_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'rexml/document'
+require 'lib/active_fedora/samples/hydra-mods_article_datastream'
 
 include ActiveFedora
 

data/spec/support/mock_fedora.rb

@@ -17,9 +17,9 @@ def stub_get(pid, datastreams=nil, record_exists=false)
     mock_client.stubs(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").returns(@getter)
   end
 end
-def stub_ingest(pid)
-  n = pid.gsub(/:/, '%3A')
-  mock_client.stubs(:[]).with("objects/#{n || 'new'}").returns(stub("ingester", :post=>pid))
+def stub_ingest(pid=nil)
+  n = pid ? pid.gsub(/:/, '%3A') : nil
+  mock_client.expects(:[]).with("objects/#{n || 'new'}").returns(stub("ingester", :post=>pid))
 end
 
 def stub_add_ds(pid, dsids)

data/spec/unit/base_active_model_spec.rb

@@ -33,7 +33,7 @@ describe ActiveFedora::Base do
       delegate :duck, :to=>'xmlish', :unique=>true
     end
     before :each do
-      @n = BarHistory.new(:pid=>"monkey:99")
+      @n = BarHistory.new()
     end
     describe "attributes=" do
       it "should set attributes" do
@@ -47,7 +47,7 @@ describe ActiveFedora::Base do
     describe "update_attributes" do
       it "should set attributes and save " do
         @n.update_attributes(:fubar=>"baz", :duck=>"Quack")
-        @q = BarHistory.find('monkey:99')
+        @q = BarHistory.find(@n.pid)
         @q.fubar.should == "baz"
         @q.duck.should == "Quack"
       end

data/spec/unit/base_delegate_spec.rb

@@ -48,7 +48,7 @@ describe ActiveFedora::Base do
       delegate :duck, :to=>'xmlish', :at=>[:waterfowl, :ducks]
     end
     before :each do
-      @n = BarHistory2.new(:pid=>"monkey:99")
+      @n = BarHistory2.new()
     end
     it "should save a delegated property uniquely" do
       @n.fubar="Quack"

data/spec/unit/base_extra_spec.rb

@@ -84,12 +84,12 @@ describe ActiveFedora::Base do
 
       @test_object.expects(:datastreams).returns(mock_datastreams)
       @test_object.expects(:solrize_relationships)
-      @test_object.update_index
+      @test_object.send :update_index
     end
 
     it "should retrieve a solr Connection and call Connection.update" do
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock("SolrConnection", :update)))
-      @test_object.update_index
+      @test_object.send :update_index
     end
 
   end

data/spec/unit/base_spec.rb

@@ -1,28 +1,37 @@
 require 'spec_helper'
 
-require 'active_fedora'
-require 'active_fedora/base'
-require 'active_fedora/metadata_datastream'
-require 'time'
-require 'date'
-class FooHistory < ActiveFedora::Base
-  has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
-    m.field "fubar", :string
-    m.field "swank", :text
-  end
-  has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText" do |m|
-    m.field "fubar", :text
-  end
-  has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText2", :label=>"withLabel" do |m|
-    m.field "fubar", :text
-  end 
-end
-class FooAdaptation < ActiveFedora::Base
-end
-
+# require 'active_fedora'
+# require 'active_fedora/base'
+# require 'active_fedora/metadata_datastream'
+# require 'time'
+# require 'date'
+# 
 @@last_pid = 0  
 
 describe ActiveFedora::Base do
+  before :all do
+    class FooHistory < ActiveFedora::Base
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
+        m.field "fubar", :string
+        m.field "swank", :text
+      end
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText" do |m|
+        m.field "fubar", :text
+      end
+      has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText2", :label=>"withLabel" do |m|
+        m.field "fubar", :text
+      end 
+      delegate :fubar, :to=>'withText'
+      delegate :swank, :to=>'someData'
+    end
+    class FooAdaptation < ActiveFedora::Base
+    end
+  end
+
+  after :all do
+    Object.send(:remove_const, :FooHistory)
+    Object.send(:remove_const, :FooAdaptation)
+  end
   
   def increment_pid
     @@last_pid += 1    
@@ -46,21 +55,23 @@ describe ActiveFedora::Base do
   end
 
   describe '#new' do
-    it "should create a new inner object" do
-      Rubydora::DigitalObject.any_instance.expects(:save).never
-      stub_get_content(@this_pid, ['RELS-EXT', 'someData', 'withText2', 'withText'])
-
-      result = ActiveFedora::Base.new(:pid=>@this_pid)  
-      result.inner_object.should be_kind_of(Rubydora::DigitalObject)    
-    end
-
-    it "should allow initialization with nil" do  
+    it "should create an inner object" do  
       # for doing AFObject.new(params[:foo]) when nothing is in params[:foo]
       Rubydora::DigitalObject.any_instance.expects(:save).never
       result = ActiveFedora::Base.new(nil)  
       result.inner_object.should be_kind_of(ActiveFedora::UnsavedDigitalObject)    
     end
 
+    it "should not save or get an pid on init" do
+      Rubydora::DigitalObject.any_instance.expects(:save).never
+      ActiveFedora::RubydoraConnection.instance.expects(:nextid).never
+      f = FooHistory.new
+    end
+
+    it "should be able to create with a custom pid" do
+      f = FooHistory.new(:pid=>'numbnuts:1')
+      f.pid.should == 'numbnuts:1'
+    end
   end
 
   describe ".internal_uri" do
@@ -104,17 +115,10 @@ describe ActiveFedora::Base do
   describe "has_metadata" do
     describe "creates datastreams" do
       before :each do
-        @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams?format=xml").returns(@getter)
-        @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams/RELS-EXT/content").returns(@getter)
-
-        #Update record
-        @mock_client.stubs(:[]).with("objects/monkey%3A99").returns(stub('post', :post=>'monkey:99'))
-        #Update datastream
-        ['someData', 'withText', 'withText2', 'RELS-EXT'].each do |dsid|
-          @mock_client.stubs(:[]).with {|params| /objects\/monkey%3A99\/datastreams\/#{dsid}/.match(params)}.returns(stub('post', :post=>'monkey:99', :get=>''))
-        end
+        stub_ingest(@this_pid)
+        stub_add_ds(@this_pid, ['RELS-EXT', 'someData', 'withText', 'withText2'])
 
-        @n = FooHistory.new(:pid=>"monkey:99")
+        @n = FooHistory.new()
         @n.datastreams['RELS-EXT'].expects(:changed?).returns(true).at_least_once
         @n.expects(:update_index)
         @n.save
@@ -130,9 +134,10 @@ describe ActiveFedora::Base do
 
 
     it "should create specified datastreams with appropriate control group" do
-      stub_ingest('monkey:99')
-      stub_add_ds('monkey:99', ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
-      stub_get('monkey:99', ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
+      ActiveFedora::RubydoraConnection.instance.options.stubs(:[]).returns({:url=>'sub_url'})
+      stub_ingest(@this_pid)
+      stub_add_ds(@this_pid, ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
+      stub_get(@this_pid, ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
       class UketdObject < ActiveFedora::Base
         has_metadata :name => "rightsMetadata", :label=>"Rights metadata", :type => ActiveFedora::NokogiriDatastream 
         
@@ -151,7 +156,7 @@ describe ActiveFedora::Base do
         end
 
       end
-      @n = UketdObject.new(:pid=>"monkey:99")
+      @n = UketdObject.new()
       @n.save
       @n.datastreams["DC"].controlGroup.should eql("X")
       @n.datastreams["rightsMetadata"].controlGroup.should eql("X")
@@ -162,7 +167,7 @@ describe ActiveFedora::Base do
 
     context ":control_group => 'E'" do
       before do
-        stub_ingest(@this_pid)
+        stub_get(@this_pid)
         stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator', 'externalUrl'])
       end
 
@@ -181,6 +186,7 @@ describe ActiveFedora::Base do
         class MoreFooHistory < ActiveFedora::Base
           has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E", :url => "http://exampl.com/mypic.jpg"
         end
+        stub_ingest(@this_pid)
         @n = MoreFooHistory.new
         @n.save
       end
@@ -199,7 +205,7 @@ describe ActiveFedora::Base do
 
     context ":control_group => 'R'" do
       before do
-        stub_ingest(@this_pid)
+        stub_get(@this_pid)
         stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator' ])
       end
       it "should raise an error without :url option" do
@@ -210,6 +216,7 @@ describe ActiveFedora::Base do
       end
       
       it "should work with a valid  :url option" do
+        stub_ingest(@this_pid)
         class MoreFooHistory < ActiveFedora::Base
           has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R", :url => "http://exampl.com/mypic.jpg"
         end
@@ -356,14 +363,10 @@ describe ActiveFedora::Base do
   
   describe '#remove_relationship' do
     it 'should remove a relationship from the relationships hash' do
-      next_pid = increment_pid.to_s
-      ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns(next_pid)
-      stub_get(next_pid)
-      @test_object3 = ActiveFedora::Base.new(:pid=>next_pid)
-      next_pid = increment_pid.to_s
-      ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns(next_pid)
-      stub_get(next_pid)
-      @test_object4 = ActiveFedora::Base.new(:pid=>next_pid)
+      @test_object3 = ActiveFedora::Base.new()
+      @test_object3.stubs(:pid=>'7')
+      @test_object4 = ActiveFedora::Base.new()
+      @test_object4.stubs(:pid=>'8')
       @test_object.add_relationship(:has_part,@test_object3)
       @test_object.add_relationship(:has_part,@test_object4)
       #check both are there
@@ -390,7 +393,7 @@ describe ActiveFedora::Base do
 
   describe '.assert_content_model' do
     it "should default to the name of the class" do
-      stub_ingest(@this_pid)
+      stub_get(@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"]
@@ -402,7 +405,7 @@ describe ActiveFedora::Base do
     
     
     it "should return true and set persisted if object and datastreams all save successfully" do
-      stub_ingest(@this_pid)
+      stub_get(@this_pid)
       stub_add_ds(@this_pid, ['RELS-EXT'])
       @test_object.persisted?.should be false
       @test_object.expects(:update_index)
@@ -511,6 +514,19 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe "#create" do
+    before do
+      stub_ingest(@this_pid)
+      stub_add_ds(@this_pid, ['someData', 'withText', 'withText2', 'RELS-EXT'])
+    end
+    it "should build a new record and save it" do
+      @hist = FooHistory.create(:fubar=>'ta', :swank=>'da')
+      @hist.fubar.should == ['ta']
+      @hist.swank.should == ['da']
+    end
+    
+  end
+
   describe "#create_datastream" do
     it 'should create a datastream object using the type of object supplied in the string (does reflection)' do
       f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
@@ -554,30 +570,16 @@ describe ActiveFedora::Base do
   end
 
   describe ".adapt_to" do
-    before(:each) do
-      @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams?format=xml").returns(@getter)
-      @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams/MY_DSID?format=xml").returns(@getter)
-      @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams/RELS-EXT/content").returns(@getter)
-      @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams/MY_DSID/content").returns("XXX")
-      #Update record
-      @mock_client.stubs(:[]).with("objects/monkey%3A99").returns(stub('post', :post=>'monkey:99'))
-      #Update datastream
-      ['someData', 'withText', 'withText2', 'RELS-EXT'].each do |dsid|
-        @mock_client.stubs(:[]).with {|params| /objects\/monkey%3A99\/datastreams\/#{dsid}/.match(params)}.returns(stub('post', :post=>'monkey:99', :get=>''))
-      end
-      @mock_file = mock('file')
-    end
     it "should return an adapted object of the requested type" do
-      @test_object = FooHistory.new(:pid=>"monkey:99")
+      @test_object = FooHistory.new()
       @test_object.adapt_to(FooAdaptation).class.should == FooAdaptation
     end
     it "should not make an additional call to fedora to create the adapted object" do
-      @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams?format=xml").returns(@getter).once
-      @test_object = FooHistory.new(:pid=>"monkey:99")
+      @test_object = FooHistory.new()
       adapted = @test_object.adapt_to(FooAdaptation)
     end
     it "should propagate new datastreams to the adapted object" do
-      @test_object = FooHistory.new(:pid=>"monkey:99")
+      @test_object = FooHistory.new()
       @test_object.add_file_datastream("XXX", :dsid=>'MY_DSID')
       adapted = @test_object.adapt_to(FooAdaptation)
       adapted.datastreams.keys.should include 'MY_DSID'
@@ -585,7 +587,7 @@ describe ActiveFedora::Base do
       adapted.datastreams['MY_DSID'].changed?.should be_true
     end
     it "should propagate modified datastreams to the adapted object" do
-      @test_object = FooHistory.new(:pid=>"monkey:99")
+      @test_object = FooHistory.new()
       @test_object.datastreams['someData'].content="YYY"
       adapted = @test_object.adapt_to(FooAdaptation)
       adapted.datastreams.keys.should include 'someData'
@@ -649,7 +651,7 @@ describe ActiveFedora::Base do
     it "should add self.class as the :active_fedora_model" do
       stub_get(@this_pid)
       stub_get_content(@this_pid, ['RELS-EXT', 'someData', 'withText2', 'withText'])
-      @test_history = FooHistory.new(:pid=>@this_pid)
+      @test_history = FooHistory.new()
       solr_doc = @test_history.to_solr
       solr_doc["active_fedora_model_s"].should eql("FooHistory")
     end
@@ -696,13 +698,6 @@ describe ActiveFedora::Base do
     end
     
   end
-  
-
-  describe ".update_index" do
-    it "should provide .update_index" do
-      @test_object.should respond_to(:update_index)
-    end
-  end
 
   describe ".label" do
     it "should return the label of the inner object" do 
@@ -719,21 +714,6 @@ describe ActiveFedora::Base do
     end
   end
   
-  it "should not save or get an pid on init" do
-    Rubydora::DigitalObject.any_instance.expects(:save).never
-    ActiveFedora::RubydoraConnection.instance.expects(:nextid).never
-    f = FooHistory.new
-  end
-  it "should not clobber a pid if i'm creating!" do
-    @mock_client.stubs(:[]).with("objects/numbnuts%3A1/datastreams?format=xml").returns(@getter)
-
-    ['someData', 'withText', 'withText2', 'RELS-EXT'].each do |dsid|
-      @mock_client.stubs(:[]).with {|params| /objects\/numbnuts%3A1\/datastreams\/#{dsid}/.match(params)}.returns(@getter)
-    end
-    f = FooHistory.new(:pid=>'numbnuts:1')
-    f.pid.should == 'numbnuts:1'
-
-  end
   
   describe "get_values_from_datastream" do
     it "should look up the named datastream and call get_values with the given pointer/field_name" do
@@ -797,7 +777,7 @@ describe ActiveFedora::Base do
       att= {"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}
       stub_get(@this_pid)
       stub_get_content(@this_pid, ['RELS-EXT', 'someData', 'withText2', 'withText'])
-      m = FooHistory.new(:pid=>@this_pid)
+      m = FooHistory.new()
       m.update_indexed_attributes(att, :datastreams=>"withText")
       m.should_not be_nil
       m.datastreams['someData'].fubar_values.should == []