active-fedora 3.0.7 → 3.1.0.pre1

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -14,14 +14,12 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
   
   before(:each) do
-    Fedora::Repository.instance.stubs(:nextid).returns("_nextid_")
-    @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new
+    ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns("_nextid_")
+    @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
   end
   it "from_xml should parse everything correctly" do
     #originally just tested that lcsh encoding and stuff worked, but the other stuff is worth testing
-    mockr= mock('repo')
-    mockr.expects(:nextid).returns("meh:leh")
-    Fedora::Repository.stubs(:instance).returns(mockr)
+    ActiveFedora::RubydoraConnection.instance.expects(:nextid).returns("meh:leh")
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
 
     tmpl.expects(:subject_append).with('sh1')
@@ -46,9 +44,9 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     tmpl.expects(:description_append).with('desc')
 
     sample_xml = fixture('oh_qdc.xml')
-    sample_ds_xml = Nokogiri::XML::Document.parse(sample_xml).xpath('//foxml:datastream').first
+    sample_ds_xml = Nokogiri::XML::Document.parse(sample_xml).xpath('//foxml:datastream/foxml:datastreamVersion/foxml:xmlContent/dc').first
     
-    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, sample_ds_xml)
+    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(sample_ds_xml.to_s, tmpl)
     z.should === tmpl
   end
 
@@ -64,8 +62,9 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   it "should have identity in and out" do
     sample = fixture('oh_qdc.xml')
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
-    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, Nokogiri::XML::Document.parse(sample).root.children.first)
-    y = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, Nokogiri::XML::Document.parse(z.to_dc_xml))
+    x1 = Nokogiri::XML::Document.parse(sample).xpath('/wrapper/foxml:datastream/foxml:datastreamVersion/foxml:xmlContent/dc').first.to_xml
+    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(x1, tmpl)
+    y = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(z.to_dc_xml, tmpl)
     y.to_dc_xml.should == z.to_dc_xml
   end
 
@@ -81,8 +80,8 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
 
   it "should parse dcterms and dcelements from xml" do
     doc = Nokogiri::XML::Document.parse(File.open( File.dirname(__FILE__)+'/../fixtures/changeme155.xml') )
-    stream = doc.xpath('//foxml:datastream[@ID=\'dublin_core\']')
-    n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(ActiveFedora::QualifiedDublinCoreDatastream.new, stream)
+    stream = doc.xpath('//foxml:datastream[@ID=\'dublin_core\']/foxml:datastreamVersion/foxml:xmlContent/dc')
+    n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(stream.to_xml, ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil))
     n.spatial_values.should == ["Boston [7013445]", "Dorchester [7013575]", "Roxbury [7015002]"] 
     n.title_values.should ==  ["Oral history with Frances Addelson, 1997 November 14"]
     n.dirty?.should == false
@@ -122,10 +121,11 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     
   end
   
-  describe '.set_blob_for_save' do
-    it "should call .blob= with to_dc_xml" do
-      @test_ds.expects(:blob=).with(@test_ds.to_dc_xml)
-      @test_ds.set_blob_for_save
+  describe 'serialize!' do
+    it "should call .content= with to_dc_xml" do
+      result = @test_ds.to_dc_xml
+      @test_ds.expects(:content=).with(result)
+      @test_ds.serialize!
     end
   end
   

data/spec/unit/rels_ext_datastream_spec.rb

@@ -18,39 +18,24 @@ describe ActiveFedora::RelsExtDatastream do
   end
   
   before(:each) do
-      @test_ds = ActiveFedora::RelsExtDatastream.new(:pid => @pid)
-  end
-  
-  it "should respond to #new" do  
-    ActiveFedora::RelsExtDatastream.should respond_to(:new)
-  end
-  
-  describe "#new" do
-    it "should create a datastream with DSID of RELS-EXT" do
-      test_datastream = ActiveFedora::RelsExtDatastream.new
-      test_datastream.dsid.should eql("RELS-EXT")  
-    end
+      mock_inner = mock('inner object')
+      @mock_repo = mock('repository')
+      @mock_repo.stubs(:datastream_dissemination=>'My Content')
+      mock_inner.stubs(:repository).returns(@mock_repo)
+      mock_inner.stubs(:pid).returns(@pid)
+      @test_ds = ActiveFedora::RelsExtDatastream.new(mock_inner, "RELS-EXT")
   end
   
   it 'should respond to #save' do
     @test_ds.should respond_to(:save)
   end
   
-  describe '#save' do
-    
-    it "should call super.save" do
-      # Funny jiggering to mock super when RelsExt datstream calls super.save
-      Fedora::Repository.instance.expects(:save).returns(mock("boo"))
-      @test_ds.save
-    end
+  describe '#serialize!' do
     
     it "should generate new rdf/xml as the datastream content if the object has been changed" do
-      @test_ds.dirty = true
-      @test_ds.expects(:to_rels_ext)
-      @test_ds.expects(:content=)
-      # Funny jiggering to mock super when RelsExt datstream calls super.save
-      Fedora::Repository.instance.expects(:save).returns(mock("boo"))
-      @test_ds.save
+      @test_ds.register_triple(:self, :is_member_of, "demo:10") 
+      @test_ds.serialize!
+      @test_ds.content.should == "      <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n        <rdf:Description rdf:about='info:fedora/test:sample_pid'>\n        <isMemberOf rdf:resource='demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/></rdf:Description>\n      </rdf:RDF>\n"
     end
   
   end
@@ -68,11 +53,9 @@ describe ActiveFedora::RelsExtDatastream do
     end
     it "should load RELS-EXT relationships into relationships hash" do
       @test_obj.relationships.should == {:self=>{:is_member_of=>["info:fedora/demo:10"], :is_part_of=>["info:fedora/demo:11"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"], :conforms_to=>["AnInterface"]}}
-      doc = Nokogiri::XML::Document.parse(@test_obj.inner_object.object_xml)
-      el = doc.xpath("/foxml:digitalObject//foxml:datastream[@ID='RELS-EXT']").first
-      new_ds = ActiveFedora::RelsExtDatastream.new
+      new_ds = ActiveFedora::RelsExtDatastream.new(nil, nil)
       new_ds.relationships.should == {:self=>{}}
-      ActiveFedora::RelsExtDatastream.from_xml(new_ds,el)
+      ActiveFedora::RelsExtDatastream.from_xml(@test_obj.rels_ext.content,new_ds)
       new_ds.relationships.should == @test_obj.relationships
     end
     it "should handle un-mapped predicates gracefully" do
@@ -81,6 +64,29 @@ describe ActiveFedora::RelsExtDatastream do
       @test_obj.save
       @test_obj.relationships.should == {:self=>{:is_part_of=>["info:fedora/demo:11"], "foo"=>["info:fedora/foo:bar"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"], :is_member_of=>["info:fedora/demo:10"], :conforms_to=>["AnInterface"]}}
     end
+    it "should handle un-mapped literals" do
+      pending
+      xml = "
+              <foxml:datastream ID=\"RELS-EXT\" STATE=\"A\" CONTROL_GROUP=\"X\" VERSIONABLE=\"true\" xmlns:foxml=\"info:fedora/fedora-system:def/foxml#\">
+              <foxml:datastreamVersion ID=\"RELS-EXT.0\" LABEL=\"\" CREATED=\"2011-09-20T19:48:43.714Z\" MIMETYPE=\"text/xml\" SIZE=\"622\">
+                <foxml:xmlContent>
+                <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">
+                  <rdf:Description rdf:about=\"info:fedora/changeme:3489\">
+                    <hasModel xmlns=\"info:fedora/fedora-system:def/model#\" rdf:resource=\"info:fedora/afmodel:ActiveFedora_Base\"/>
+                    <isPartOf xmlns=\"info:fedora/fedora-system:def/relations-external#\" rdf:resource=\"info:fedora/demo:11\"/>
+                    <isMemberOf xmlns=\"info:fedora/fedora-system:def/relations-external#\" rdf:resource=\"info:fedora/demo:10\"/>
+                    <hasMetadata xmlns=\"info:fedora/fedora-system:def/relations-external#\">oai:hull.ac.uk:hull:2708</hasMetadata>
+                  </rdf:Description>
+                </rdf:RDF>
+              </foxml:xmlContent>
+            </foxml:datastreamVersion>\n</foxml:datastream>\n"
+      doc = Nokogiri::XML::Document.parse(xml)
+      new_ds = ActiveFedora::RelsExtDatastream.new
+      ActiveFedora::RelsExtDatastream.from_xml(new_ds,doc.root)
+      new_ext = new_ds.to_rels_ext('changeme:3489')
+      new_ext.should match "<hasMetadata xmlns=\"info:fedora/fedora-system:def/relations-external#\">oai:hull.ac.uk:hull:2708</hasMetadata>"
+      
+    end
   end
   
   

data/spec/unit/rubydora_connection_spec.rb

@@ -0,0 +1,26 @@
+require File.join( File.dirname(__FILE__),  "../spec_helper" )
+require 'active_fedora/rubydora_connection'
+
+describe ActiveFedora::RubydoraConnection do
+
+  describe 'nextid' do
+    before do
+      @instance = ActiveFedora::RubydoraConnection.instance
+    end
+    it "should get nextid" do
+      one = @instance.nextid
+      two = @instance.nextid
+      one = one.gsub('changeme:', '').to_i
+      two = two.gsub('changeme:', '').to_i
+      two.should == one + 1
+    end
+  end
+
+  describe 'find_model' do
+    
+  end
+
+  
+end
+
+

data/spec/unit/semantic_node_spec.rb

@@ -1,11 +1,6 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
 
-require 'active_fedora'
 require 'xmlsimple'
-#require 'mocha'
-
-#include ActiveFedora::SemanticNode
-#include Mocha::API
 
 @@last_pid = 0
 
@@ -36,6 +31,16 @@ describe ActiveFedora::SemanticNode do
       include ActiveFedora::SemanticNode
       
       attr_accessor :pid
+      def initialize (params={}) 
+        self.pid = params[:pid]
+      end
+    end
+  
+    class AudioRecord
+      attr_accessor :pid
+      def initialize (params={}) 
+        self.pid = params[:pid]
+      end
     end
     
     @node = SpecNode.new
@@ -268,18 +273,12 @@ describe ActiveFedora::SemanticNode do
     
     it "resulting finder should search against solr and use Model#load_instance to build an array of objects" do
       solr_result = (mock("solr result", :is_a? => true, :hits => @sample_solr_hits))
-      mock_repo = mock("repo")
-      mock_repo.expects(:find_model).with("_PID1_", "AudioRecord").returns("AR1")
-      mock_repo.expects(:find_model).with("_PID2_", "AudioRecord").returns("AR2")
-      mock_repo.expects(:find_model).with("_PID3_", "AudioRecord").returns("AR3")
       SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
       local_node = SpecNode.new()
       local_node.expects(:pid).returns("test:sample_pid")
       SpecNode.expects(:relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once()
       ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(solr_result)
-      Fedora::Repository.expects(:instance).returns(mock_repo).times(3)
-      Kernel.expects(:const_get).with("AudioRecord").returns("AudioRecord").times(3)
-      local_node.parts.should == ["AR1", "AR2", "AR3"]
+      local_node.parts.map(&:pid).should == ["_PID1_", "_PID2_", "_PID3_"]
     end
     
     it "resulting finder should accept :solr as :response_format value and return the raw Solr Result" do
@@ -353,11 +352,7 @@ describe ActiveFedora::SemanticNode do
                        {"id"=> "my:_PID3_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}])
 
         ActiveFedora::SolrService.instance.conn.expects(:query).with("id:my\\:_PID1_ OR id:my\\:_PID2_ OR id:my\\:_PID3_").returns(solr_result)
-        mock_repo.expects(:find_model).with("my:_PID1_", SpecNode).returns("AR1")
-        mock_repo.expects(:find_model).with("my:_PID2_", SpecNode).returns("AR2")
-        mock_repo.expects(:find_model).with("my:_PID3_", SpecNode).returns("AR3")
-        Fedora::Repository.expects(:instance).returns(mock_repo).times(3)
-        local_node.containers.should == ["AR1", "AR2", "AR3"]
+        local_node.containers.map(&:pid).should == ["my:_PID1_", "my:_PID2_", "my:_PID3_"]
       end
     
       it "should accept :solr as :response_format value and return the raw Solr Result" do

data/spec/unit/solr_config_options_spec.rb

@@ -1,21 +1,21 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
 
-require 'active_fedora/solr_service'
 
-include ActiveFedora
+#include ActiveFedora
 
 describe ActiveFedora do
   
   before(:all) do
-    module SpecModel
+    module SolrSpecModel
       class Basic
         include ActiveFedora::Model
+        def initialize(opts)
+        end
       end
     end
   end
   
   before(:each) do
-    Fedora::Repository.instance.stubs(:nextid).returns("_nextid_")
     @test_object = ActiveFedora::Base.new
   end
   
@@ -53,11 +53,11 @@ describe ActiveFedora do
       mock_result = mock("MockResult")
       mock_result.expects(:hits).returns([{SOLR_DOCUMENT_ID => "changeme:30"}])
       mock_solr.expects(:query).with(SOLR_DOCUMENT_ID + ':changeme\:30').returns(mock_result)
-      Fedora::Repository.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("fake object")
+      #Fedora::Repository.instance.expects(:find_model).with("changeme:30", SolrSpecModel::Basic).returns("fake object")
 
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
   
-      res = SpecModel::Basic.find("changeme:30")
+      res = SolrSpecModel::Basic.find("changeme:30")
     end
     it "should be used by ActiveFedora::Base#find_by_solr" do
       mock_solr = mock("SolrConnection")
@@ -65,7 +65,7 @@ describe ActiveFedora do
       mock_solr.expects(:query).with(SOLR_DOCUMENT_ID + ':changeme\:30', {}).returns(mock_response)
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
   
-      SpecModel::Basic.find_by_solr("changeme:30").should equal(mock_response)
+      SolrSpecModel::Basic.find_by_solr("changeme:30").should equal(mock_response)
     end
   end
   
@@ -79,18 +79,17 @@ describe ActiveFedora do
     end
     
     it "should prevent Base.save from calling update_index if false" do
-      Fedora::Repository.instance.stubs(:save)
-      dirty_ds = ActiveFedora::MetadataDatastream.new
-      dirty_ds.expects(:dirty?).returns(true)
-      dirty_ds.expects(:save).returns(true)
-      @test_object.instance_variable_set(:@metadata_is_dirty, true)
-      @test_object.stubs(:datastreams_in_memory).returns({:ds1 => dirty_ds})
+      dirty_ds = ActiveFedora::MetadataDatastream.new(@test_object.inner_object, 'ds1')
+      repo = @test_object.inner_object.repository
+      repo.expects(:add_datastream).twice
+      repo.expects(:ingest)
+      @test_object.stubs(:datastreams).returns({:ds1 => dirty_ds})
       @test_object.expects(:update_index).never
       @test_object.expects(:refresh)
       @test_object.save
     end
     it "should prevent Base.delete from deleting the corresponding Solr document if false" do
-      Fedora::Repository.instance.expects(:delete)
+      Rubydora::DigitalObject.any_instance.expects(:delete)
       ActiveFedora::SolrService.instance.conn.expects(:delete).with(@test_object.pid).never 
       @test_object.delete
     end

data/spec/unit/solr_service_spec.rb

@@ -1,8 +1,5 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
 
-require 'active_fedora/solr_service'
-
-include ActiveFedora
 
 describe ActiveFedora::SolrService do
   after(:all) do
@@ -12,34 +9,34 @@ describe ActiveFedora::SolrService do
   it "should take a narg constructor and configure for localhost" do
     mconn = mock('conn')
     Solr::Connection.expects(:new).with('http://localhost:8080/solr', {:autocommit=>:on}).returns(mconn)
-    ss = SolrService.register
+    ss = ActiveFedora::SolrService.register
   end
   it "should accept host arg into constructor" do
     mconn = mock('conn')
     Solr::Connection.expects(:new).with('http://fubar', {:autocommit=>:on}).returns(mconn)
-    ss = SolrService.register('http://fubar')
+    ss = ActiveFedora::SolrService.register('http://fubar')
   end
   it "should merge options" do
     mconn = mock('conn')
     Solr::Connection.expects(:new).with('http://localhost:8080/solr', {:autocommit=>:on, :foo=>'bar'}).returns(mconn)
-    ss = SolrService.register(nil, {:foo=>'bar'})
+    ss = ActiveFedora::SolrService.register(nil, {:foo=>'bar'})
   end
   it "should clobber options" do
     mconn = mock('conn')
     Solr::Connection.expects(:new).with('http://localhost:8080/solr', {:autocommit=>:off, :foo=>:bar}).returns(mconn)
-    ss = SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
+    ss = ActiveFedora::SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
   end
 
   it "should set the threadlocal solr service" do
     mconn = mock('conn')
     Solr::Connection.expects(:new).with('http://localhost:8080/solr', {:autocommit=>:off, :foo=>:bar}).returns(mconn)
-    ss = SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
+    ss = ActiveFedora::SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
     Thread.current[:solr_service].should == ss
-    SolrService.instance.should == ss
+    ActiveFedora::SolrService.instance.should == ss
   end
   it "should fail fast if solr service not initialized" do
     Thread.current[:solr_service].should be_nil
-    proc{SolrService.instance}.should raise_error(SolrNotInitialized)
+    proc{ActiveFedora::SolrService.instance}.should raise_error(ActiveFedora::SolrNotInitialized)
   end
   before do
     Thread.current[:solr_service]=nil
@@ -47,6 +44,12 @@ describe ActiveFedora::SolrService do
   
   describe "#reify_solr_results" do
     before(:each) do
+      class AudioRecord
+        attr_accessor :pid
+        def initialize (params={}) 
+          self.pid = params[:pid]
+        end
+      end
       @sample_solr_hits = [{"id"=>"my:_PID1_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
                             {"id"=>"my:_PID2_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
                             {"id"=>"my:_PID3_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]}]
@@ -58,13 +61,7 @@ describe ActiveFedora::SolrService do
     it "should use Repository.find_model to instantiate objects" do
       solr_result = mock("solr result", :is_a? => true)
       solr_result.expects(:hits).returns(@sample_solr_hits)
-      Kernel.expects(:const_get).with("AudioRecord").returns("AudioRecord").times(3)
-      mock_repo = mock("repo")
-      mock_repo.expects(:find_model).with("my:_PID1_", "AudioRecord").returns("AR1")
-      mock_repo.expects(:find_model).with("my:_PID2_", "AudioRecord").returns("AR2")
-      mock_repo.expects(:find_model).with("my:_PID3_", "AudioRecord").returns("AR3")
-      Fedora::Repository.expects(:instance).returns(mock_repo).times(3)
-      ActiveFedora::SolrService.reify_solr_results(solr_result).should == ["AR1", "AR2", "AR3"]
+      ActiveFedora::SolrService.reify_solr_results(solr_result).map(&:pid).should == ["my:_PID1_", "my:_PID2_", "my:_PID3_"] 
     end
   end
   

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 1923832027
+  prerelease: 6
   segments: 
   - 3
+  - 1
   - 0
-  - 7
-  version: 3.0.7
+  - pre
+  - 1
+  version: 3.1.0.pre1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 -05:00
+date: 2011-10-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,12 +106,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 1
-        - 4
-        - 3
-        version: 1.4.3
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -203,21 +204,23 @@ dependencies:
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rubydora
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 1
+        - 6
+        version: 0.1.6
+  type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: yard
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -231,7 +234,7 @@ dependencies:
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: RedCloth
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
@@ -245,7 +248,7 @@ dependencies:
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rake
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -259,7 +262,7 @@ dependencies:
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: solrizer-fedora
+  name: rcov
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
@@ -273,23 +276,41 @@ dependencies:
   type: :development
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: jettywrapper
+  name: solrizer-fedora
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: jettywrapper
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -301,11 +322,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -317,11 +338,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -331,7 +352,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id022
 description: ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.
 email: 
 - matt.zumwalt@yourmediashelf.com
@@ -527,6 +548,7 @@ files:
 - lib/active_fedora/base.rb
 - lib/active_fedora/content_model.rb
 - lib/active_fedora/datastream.rb
+- lib/active_fedora/datastream_hash.rb
 - lib/active_fedora/delegating.rb
 - lib/active_fedora/fedora_object.rb
 - lib/active_fedora/metadata_datastream.rb
@@ -541,6 +563,7 @@ files:
 - lib/active_fedora/relationship.rb
 - lib/active_fedora/relationships_helper.rb
 - lib/active_fedora/rels_ext_datastream.rb
+- lib/active_fedora/rubydora_connection.rb
 - lib/active_fedora/samples.rb
 - lib/active_fedora/samples/hydra-mods_article_datastream.rb
 - lib/active_fedora/samples/hydra-rights_metadata_datastream.rb
@@ -549,13 +572,6 @@ files:
 - lib/active_fedora/semantic_node.rb
 - lib/active_fedora/solr_service.rb
 - lib/active_fedora/version.rb
-- lib/fedora/base.rb
-- lib/fedora/connection.rb
-- lib/fedora/datastream.rb
-- lib/fedora/fedora_object.rb
-- lib/fedora/formats.rb
-- lib/fedora/generic_search.rb
-- lib/fedora/repository.rb
 - lib/ruby-fedora.rb
 - lib/tasks/active_fedora.rake
 - lib/tasks/active_fedora_dev.rake
@@ -590,8 +606,6 @@ files:
 - spec/integration/base_spec.rb
 - spec/integration/bug_spec.rb
 - spec/integration/datastream_spec.rb
-- spec/integration/datastreams_crud_spec.rb
-- spec/integration/fedora_object_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
 - spec/integration/model_spec.rb
@@ -599,8 +613,6 @@ files:
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/nokogiri_datastream_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
-- spec/integration/repository_spec.rb
-- spec/integration/rf_fedora_object_spec.rb
 - spec/integration/semantic_node_spec.rb
 - spec/integration/solr_service_spec.rb
 - spec/rails3_test_app/.gitignore
@@ -654,11 +666,9 @@ files:
 - spec/unit/base_file_management_spec.rb
 - spec/unit/base_named_datastream_spec.rb
 - spec/unit/base_spec.rb
-- spec/unit/connection_spec.rb
 - spec/unit/content_model_spec.rb
 - spec/unit/datastream_concurrency_spec.rb
 - spec/unit/datastream_spec.rb
-- spec/unit/fedora_object_spec.rb
 - spec/unit/has_many_collection_spec.rb
 - spec/unit/inheritance_spec.rb
 - spec/unit/metadata_datastream_spec.rb
@@ -669,8 +679,7 @@ files:
 - spec/unit/relationship_spec.rb
 - spec/unit/relationships_helper_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb
-- spec/unit/repository_spec.rb
-- spec/unit/rf_datastream_spec.rb
+- spec/unit/rubydora_connection_spec.rb
 - spec/unit/semantic_node_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_service_spec.rb
@@ -695,12 +704,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rubyfedora
@@ -732,8 +743,6 @@ test_files:
 - spec/integration/base_spec.rb
 - spec/integration/bug_spec.rb
 - spec/integration/datastream_spec.rb
-- spec/integration/datastreams_crud_spec.rb
-- spec/integration/fedora_object_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/metadata_datastream_helper_spec.rb
 - spec/integration/model_spec.rb
@@ -741,8 +750,6 @@ test_files:
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/nokogiri_datastream_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
-- spec/integration/repository_spec.rb
-- spec/integration/rf_fedora_object_spec.rb
 - spec/integration/semantic_node_spec.rb
 - spec/integration/solr_service_spec.rb
 - spec/rails3_test_app/.gitignore
@@ -796,11 +803,9 @@ test_files:
 - spec/unit/base_file_management_spec.rb
 - spec/unit/base_named_datastream_spec.rb
 - spec/unit/base_spec.rb
-- spec/unit/connection_spec.rb
 - spec/unit/content_model_spec.rb
 - spec/unit/datastream_concurrency_spec.rb
 - spec/unit/datastream_spec.rb
-- spec/unit/fedora_object_spec.rb
 - spec/unit/has_many_collection_spec.rb
 - spec/unit/inheritance_spec.rb
 - spec/unit/metadata_datastream_spec.rb
@@ -811,8 +816,7 @@ test_files:
 - spec/unit/relationship_spec.rb
 - spec/unit/relationships_helper_spec.rb
 - spec/unit/rels_ext_datastream_spec.rb
-- spec/unit/repository_spec.rb
-- spec/unit/rf_datastream_spec.rb
+- spec/unit/rubydora_connection_spec.rb
 - spec/unit/semantic_node_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_service_spec.rb