active-fedora 3.1.0.pre7 → 3.1.0.pre8

data/active-fedora.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("equivalent-xml")
   s.add_dependency("facets")
-  s.add_dependency("rubydora", '~>0.1.7')
+  s.add_dependency("rubydora", '~>0.1.9')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml")
   s.add_development_dependency("yard")

data/lib/active_fedora.rb

@@ -20,6 +20,7 @@ module ActiveFedora #:nodoc:
     autoload :RelationshipsHelper
     autoload :Datastream
     autoload :Delegating
+    autoload :DigitalObject
     autoload :Model
     autoload :MetadataDatastream
     autoload :MetadataDatastreamHelper

data/lib/active_fedora/base.rb

@@ -85,10 +85,10 @@ module ActiveFedora
           attrs = attrs.merge!({:pid=>RubydoraConnection.instance.nextid})  
         end
         @new_object=true
-        @inner_object = RubydoraConnection.instance.connection.find(attrs[:pid])
+        @inner_object = DigitalObject.find(self.class, attrs[:pid])
       else
         @new_object = attrs[:new_object] == false ? false : true
-        @inner_object = RubydoraConnection.instance.connection.find(attrs[:pid])
+        @inner_object = DigitalObject.find(self.class, attrs[:pid])
         load_datastreams_from_fedora
       end
       configure_defined_datastreams
@@ -98,6 +98,10 @@ module ActiveFedora
       self.attributes=attributes
     end
 
+    def self.datastream_class_for_name(dsid)
+      ds_specs[dsid] ? ds_specs[dsid].first : ActiveFedora::Datastream
+    end
+
     #This method is used to specify the details of a datastream. 
     #args must include :name. Note that this method doesn't actually
     #execute the block, but stores it at the class level, to be executed
@@ -196,19 +200,15 @@ module ActiveFedora
     def load_datastreams_from_fedora
       inner_object.datastreams.each do |dsid, datastream|
         ds_spec = self.class.ds_specs[dsid]
+        datastreams[dsid] = datastream
         if (ds_spec)
           klass = ds_spec.first
-          datastreams[dsid] = klass.new(inner_object, dsid, true)
           datastreams[dsid].model = self if klass == RelsExtDatastream
 
           if ds_spec.last.class == Proc
             ds_spec.last.call(datastreams[dsid])
           end
           klass.from_xml(datastreams[dsid].content, datastreams[dsid])  ### TODO, this is loading eagerly, we could load it as needed
-          ### TODO, if rubydora could know which klass to use, we could probably skip this step.
-        else
-          #TODO, this may be a perfomance hit and we may not need it.
-          datastreams[dsid] =Datastream.new(inner_object, dsid)#, true)
         end
       end
     end
@@ -759,11 +759,11 @@ module ActiveFedora
 
     #return the owner id
     def owner_id
-      @inner_object.owner_id
+      @inner_object.ownerId
     end
     
     def owner_id=(owner_id)
-      @inner_object.owner_id=(owner_id)
+      @inner_object.ownerId=(owner_id)
     end
 
     #return the create_date of the inner object (unless it's a new object)

data/lib/active_fedora/datastream.rb

@@ -5,10 +5,10 @@ module ActiveFedora
     
     attr_accessor :dirty, :last_modified, :fields
   
-    def initialize(digital_object, dsid, exists_in_fedora=false )
+    def initialize(digital_object, dsid)
       @fields={}
       @dirty = false
-      super(digital_object, dsid)
+      super
     end
     
     # #Return the xml content representing this Datastream from Fedora
@@ -23,30 +23,6 @@ module ActiveFedora
       self.dirty = true
     end
 
-    # def self.delete(parent_pid, dsid)
-    #   Fedora::Repository.instance.delete("%s/datastreams/%s"%[parent_pid, dsid])
-    # end
-
-    # def delete
-    #   self.class.delete(self.pid, self.dsid)
-    # end
-    
-    # #get this datastreams identifier
-    # def pid
-    #   self.attributes[:pid]
-    # end
-  
-    # #set this datastreams parent identifier
-    # def pid=(pid)
-    #   self.attributes[:pid] = pid
-    # end
-    
-    # #set this datastreams identifier (note: sets both dsID and dsid)
-    # def dsid=(dsid)
-    #   self.attributes[:dsID] = dsid
-    #   self.attributes[:dsid] = dsid
-    # end
-
     def size
       self.profile['dsSize']
     end

data/lib/active_fedora/datastream_hash.rb

@@ -8,8 +8,7 @@ module ActiveFedora
 
     def [] (key)
       if key == 'DC' && !has_key?(key)
-        ds = Datastream.new(@obj.inner_object, key, true)
-        ds.content
+        ds = Datastream.new(@obj.inner_object, key)
         self[key] = ds
       end
       super

data/lib/active_fedora/nokogiri_datastream.rb

@@ -18,7 +18,7 @@ module ActiveFedora
     attr_accessor :internal_solr_doc
     attr_reader :ng_xml
 
-    def initialize(digital_object, dsid, exists_in_fedora=false)
+    def initialize(digital_object, dsid)
       super
       self.class.from_xml(nil, self)
     end

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -15,13 +15,13 @@ module ActiveFedora
     
     #Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist
     #when this method returns. Each term is marked as a multivalue string.
-    def initialize(digital_object, dsid, exists_in_fedora=false )
+    def initialize(digital_object, dsid )
       super(digital_object, dsid)
       DCTERMS.each do |el|
         field el, :string, :multiple=>true
       end
       ###TODO this is loading eagerly, but we could make it lazy
-      self.class.from_xml(exists_in_fedora ? content : nil, self)
+      self.class.from_xml(content, self)
       self
     end
     

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre7"
+    VERSION = "3.1.0.pre8"
 end

data/spec/unit/base_file_management_spec.rb

@@ -89,9 +89,8 @@ describe ActiveFedora::Base do
     it "should set  :dsid  and :label when supplied" do
       mock_file = stub("File", :path=>'foo')
       mock_ds = stub_everything("Datastream")
-      mock_ds.expects(:dsid=).with('__DSID__')
       mock_ds.expects(:dsLabel=).with('My Label')
-      ActiveFedora::Datastream.expects(:new).with(@base.inner_object, 'DS1').returns(mock_ds)
+      ActiveFedora::Datastream.expects(:new).with(@base.inner_object, '__DSID__').returns(mock_ds)
       @base.expects(:add_datastream).with(mock_ds)
       @base.add_file_datastream(mock_file, :label => "My Label", :dsid => "__DSID__")
     end

data/spec/unit/base_spec.rb

@@ -28,7 +28,7 @@ describe ActiveFedora::Base do
 
   before(:each) do
     @mock_repo = mock("repository")
-    Rubydora::DigitalObject.any_instance.expects(:repository).returns(@mock_repo).at_least_once
+    ActiveFedora::DigitalObject.any_instance.expects(:repository).returns(@mock_repo).at_least_once
     @this_pid = increment_pid.to_s
     ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns(@this_pid)
 
@@ -74,8 +74,7 @@ describe ActiveFedora::Base do
 
   ### Methods for ActiveModel::Conversions
   it "should have to_param once it's saved" do
-    @mock_repo.expects(:object).with(:pid => @this_pid).returns("")
-
+    @mock_repo.expects(:object).raises(RuntimeError)
     @test_object.to_param.should be_nil
     @test_object.expects(:create).returns(true)
     @test_object.save
@@ -84,7 +83,7 @@ describe ActiveFedora::Base do
   end
 
   it "should have to_key once it's saved" do 
-    @mock_repo.expects(:object).with(:pid => @this_pid).returns("")
+    @mock_repo.expects(:object).raises(RuntimeError)
     @test_object.to_key.should be_nil
     @test_object.expects(:create).returns(true)
     @test_object.save
@@ -113,15 +112,11 @@ describe ActiveFedora::Base do
   describe "has_metadata" do
     before :each do
       @mock_repo.expects(:datastreams).with(:pid => "monkey:99").returns("")
-      @mock_repo.expects(:object).with(:pid => "monkey:99").returns("")
+      @mock_repo.expects(:object).with(:pid => "monkey:99").raises(RuntimeError)
       @mock_repo.expects(:ingest).with(:pid => "monkey:99").returns("monkey:99")
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'someData',:pid => 'monkey:99').returns('asdf') 
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'someData'}
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'withText',:pid => 'monkey:99').returns('asdf') 
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'withText'}
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'withText2',:pid => 'monkey:99').returns('asdf') 
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'withText2'}
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'RELS-EXT',:pid => 'monkey:99').returns('asdf') 
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'RELS-EXT'}
 
       @n = FooHistory.new(:pid=>"monkey:99")
@@ -276,10 +271,8 @@ describe ActiveFedora::Base do
     
     
     it "should return true and set persisted if object and datastreams all save successfully" do
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'RELS-EXT',:pid => @this_pid).returns('asdf') 
-
       @mock_repo.expects(:ingest).with(:pid => @this_pid).returns(@this_pid)
-      @mock_repo.expects(:object).with(:pid => @this_pid).returns("")
+      @mock_repo.expects(:object).with(:pid => @this_pid).raises(RuntimeError)
       @mock_repo.expects(:datastreams).with(:pid => @this_pid).returns("")
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'RELS-EXT'}
       @test_object.persisted?.should be false 
@@ -309,12 +302,8 @@ describe ActiveFedora::Base do
       to = FooHistory.new
       to.expects(:update_index)
       @mock_repo.expects(:ingest).with(:pid => @this_pid).returns(@this_pid)
-      @mock_repo.expects(:object).with(:pid => @this_pid).returns("")
+      @mock_repo.expects(:object).with(:pid => @this_pid).raises(RuntimeError)
       @mock_repo.expects(:datastreams).with(:pid => @this_pid).returns("")
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'withText',:pid => @this_pid).returns('asdf') 
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'withText2',:pid => @this_pid).returns('asdf') 
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'RELS-EXT',:pid => @this_pid).returns('asdf') 
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'someData',:pid => @this_pid).returns('asdf') 
 
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'withText2'}
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'withText'}
@@ -328,15 +317,13 @@ describe ActiveFedora::Base do
       to.save
     end
     it "should call .save on any datastreams that are new" do
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'ds_to_add',:pid => @this_pid).returns('asdf') 
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'RELS-EXT',:pid => @this_pid).returns('asdf') 
       ds = ActiveFedora::Datastream.new(@test_object.inner_object, 'ds_to_add')
       ds.content = "DS CONTENT"
       @test_object.add_datastream(ds)
       ds.expects(:save)
       @test_object.instance_variable_set(:@new_object, false)
       @test_object.expects(:refresh)
-      @mock_repo.expects(:object).with(:pid => @this_pid).returns("").at_least_once
+      @mock_repo.expects(:object).with(:pid => @this_pid).raises(RuntimeError).at_least_once
       @mock_repo.expects(:ingest).with(:pid => @test_object.pid)
       @mock_repo.expects(:datastreams).with(:pid => @test_object.pid).returns("")
       @mock_repo.expects(:add_datastream).with{ |x| x[:dsid] = "RELS-EXT"}
@@ -352,10 +339,6 @@ describe ActiveFedora::Base do
 
       @test_object.inner_object.expects(:new?).returns(true).twice
       @test_object.inner_object.expects(:datastreams).returns({'someData'=>mock('obj', :changed? => false)})
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'someData',:pid => @test_object.pid).returns('asdf') 
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'withText',:pid => @test_object.pid).returns('asdf') 
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'withText2',:pid => @test_object.pid).returns('asdf') 
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'RELS-EXT',:pid => @test_object.pid).returns('asdf') 
       @test_object.datastreams["someData"].should_not be_nil
       @test_object.datastreams['someData'].stubs(:changed?).returns(false)
       @test_object.datastreams['someData'].stubs(:new?).returns(false)
@@ -368,8 +351,6 @@ describe ActiveFedora::Base do
     it "should update solr index with all metadata if any MetadataDatastreams have changed" do
       @mock_repo.expects(:ingest).with(:pid => nil)
       @mock_repo.expects(:modify_datastream).with{ |x| x[:pid] == nil && x[:dsid] == 'RELS-EXT'}
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'RELS-EXT',:pid => nil).returns('asdf') 
-      @mock_repo.expects(:datastream_dissemination).with(:dsid => 'ds1',:pid => nil).returns('asdf') 
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'ds1'}
       @mock_repo.expects(:datastream).with{ |x| x[:dsid] == 'ds1'}.returns("").at_least_once #raises(RuntimeError, "Fake Not found")
       @test_object.inner_object.expects(:new?).returns(true).twice
@@ -390,7 +371,7 @@ describe ActiveFedora::Base do
       @test_object.save
     end
     it "should NOT update solr index if no MetadataDatastreams have changed" do
-      Rubydora::DigitalObject.any_instance.stubs(:save)
+      ActiveFedora::DigitalObject.any_instance.stubs(:save)
       mock1 = mock("ds1")
       mock1.expects( :changed?).returns(false).at_least_once
       mock1.expects(:serialize!)
@@ -408,8 +389,6 @@ describe ActiveFedora::Base do
       @test_object.expects(:refresh)
       @test_object.instance_variable_set(:@new_object, false)
 
-      @mock_repo.expects(:object).with(:pid => @this_pid).returns("")
-       
       @test_object.save
     end
     it "should update solr index if relationships have changed" do

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -15,7 +15,9 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   
   before(:each) do
     ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns("_nextid_")
+    ActiveFedora::QualifiedDublinCoreDatastream.any_instance.expects(:content).at_least_once
     @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

data/spec/unit/solr_config_options_spec.rb

@@ -89,7 +89,7 @@ describe ActiveFedora do
       @test_object.save
     end
     it "should prevent Base.delete from deleting the corresponding Solr document if false" do
-      Rubydora::DigitalObject.any_instance.expects(:delete)
+      ActiveFedora::DigitalObject.any_instance.expects(:delete)
       ActiveFedora::SolrService.instance.conn.expects(:delete).with(@test_object.pid).never 
       @test_object.delete
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832023
+  hash: 1923832009
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 7
-  version: 3.1.0.pre7
+  - 8
+  version: 3.1.0.pre8
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 -05:00
+date: 2011-10-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -211,12 +211,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 9
         segments: 
         - 0
         - 1
-        - 7
-        version: 0.1.7
+        - 9
+        version: 0.1.9
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -548,7 +548,6 @@ files:
 - COPYING.txt
 - COYING.LESSER.txt
 - Gemfile
-- Gemfile.lock
 - History.txt
 - LICENSE
 - License.txt

data/Gemfile.lock

@@ -1,139 +0,0 @@
-PATH
-  remote: .
-  specs:
-    active-fedora (3.1.0.pre7)
-      activeresource (~> 3.0.0)
-      activesupport (~> 3.0.0)
-      equivalent-xml
-      facets
-      mediashelf-loggable
-      mime-types (>= 1.16)
-      multipart-post (= 1.1.2)
-      nokogiri
-      om (>= 1.0)
-      rdf
-      rdf-rdfxml
-      rubydora (~> 0.1.7)
-      solr-ruby (>= 0.0.6)
-      solrizer (> 1.0.0)
-      xml-simple (>= 1.0.12)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.8)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
-    addressable (2.2.6)
-    akami (1.0.0)
-      gyoku (>= 0.4.0)
-    builder (2.1.2)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
-    columnize (0.3.4)
-    daemons (1.1.4)
-    equivalent-xml (0.2.8)
-      nokogiri (>= 1.4.3)
-    facets (2.9.2)
-    fastercsv (1.5.4)
-    ffi (1.0.9)
-    gyoku (0.4.4)
-      builder (>= 2.1.2)
-    httpi (0.9.5)
-      rack
-    i18n (0.5.0)
-    jettywrapper (1.0.1)
-      activesupport (>= 3.0.0)
-      childprocess
-      i18n
-      logger
-      mediashelf-loggable
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    logger (1.2.8)
-    mediashelf-loggable (0.4.7)
-    metaclass (0.0.1)
-    mime-types (1.16)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    multipart-post (1.1.2)
-    nokogiri (1.5.0)
-    nori (1.0.2)
-    om (1.4.2)
-      mediashelf-loggable
-      nokogiri (>= 1.4.2)
-    rack (1.3.4)
-    rake (0.9.2)
-    rbx-require-relative (0.0.5)
-    rcov (0.9.11)
-    rdf (0.3.4.1)
-      addressable (>= 2.2.6)
-    rdf-rdfxml (0.3.5)
-      nokogiri (>= 1.4.4)
-      rdf (>= 0.3.4)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rsolr (1.0.2)
-      builder (>= 2.1.2)
-    rspec (1.3.2)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    rubydora (0.1.7)
-      activemodel
-      activesupport
-      fastercsv
-      mime-types
-      nokogiri
-      rest-client
-      savon
-    savon (0.9.7)
-      akami (~> 1.0)
-      builder (>= 2.1.2)
-      gyoku (>= 0.4.0)
-      httpi (~> 0.9)
-      nokogiri (>= 1.4.0)
-      nori (~> 1.0)
-      wasabi (~> 2.0)
-    solr-ruby (0.0.8)
-    solrizer (1.1.2)
-      daemons
-      mediashelf-loggable
-      nokogiri
-      om (>= 1.4.0)
-      stomp
-      xml-simple
-    solrizer-fedora (1.1.3)
-      active-fedora (>= 2.3.0)
-      fastercsv
-      rsolr
-      solr-ruby (>= 0.0.6)
-      solrizer (>= 1.0.0)
-    stomp (1.1.9)
-    wasabi (2.0.0)
-      nokogiri (>= 1.4.0)
-    xml-simple (1.1.1)
-    yard (0.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  active-fedora!
-  jettywrapper (>= 1.0.1)
-  mocha (>= 0.9.8)
-  rake
-  rcov
-  rspec (< 2.0.0)
-  ruby-debug
-  solrizer-fedora (>= 1.1.3)
-  yard