rubydora 0.7.0 → 0.8.0

data/.gitmodules

@@ -1,3 +1,4 @@
 [submodule "jetty"]
 	path = jetty
 	url = git://github.com/projecthydra/hydra-jetty.git
+  ignore = dirty

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/rubydora/datastream.rb

@@ -118,7 +118,7 @@ module Rubydora
     # Does this datastream already exist?
     # @return [Boolean]
     def new?
-      profile.empty?
+      digital_object.nil? || digital_object.new? || profile_xml.blank?
     end
 
     # Retrieve the content of the datastream (and cache it)
@@ -178,18 +178,31 @@ module Rubydora
         ## Force a recheck of the profile if they've passed :validateChecksum and we don't have dsChecksumValid
         return @profile
       end
+      
       return @profile = {} unless digital_object.respond_to? :repository
+      
       @profile = begin
+        xml = profile_xml(opts)
+
+        (self.profile_xml_to_hash(xml) unless xml.blank?) || {}
+      end
+    end
+
+    def profile_xml opts = {}
+      @profile_xml = nil unless opts.empty?
+      
+      @profile_xml ||= begin
+
         options = { :pid => pid, :dsid => dsid }
         options.merge!(opts)
         options[:asOfDateTime] = asOfDateTime if asOfDateTime
         options[:validateChecksum] = true if repository.config[:validateChecksum]
-        self.profile_xml_to_hash(repository.datastream(options))
+        repository.datastream(options)
       rescue RestClient::Unauthorized => e
         raise e
       rescue RestClient::ResourceNotFound
         # the datastream is new
-        {}
+        ''
       end
     end
 
@@ -231,7 +244,7 @@ module Rubydora
     def create
       check_if_read_only
       run_callbacks :create do
-        repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
+        repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid, :content => content })
         reset_profile_attributes
         self.class.new(digital_object, dsid, @options)
       end
@@ -290,6 +303,7 @@ module Rubydora
     # @return [Hash]
     def reset_profile_attributes
       @profile = nil
+      @profile_xml = nil
       @changed_attributes = {}
     end
 

data/lib/rubydora/digital_object.rb

@@ -90,7 +90,6 @@ module Rubydora
       _run_initialize_callbacks do
         self.pid = pid
         @repository = repository
-        @new = true
         @options = options
 
         options.each do |key, value|
@@ -110,8 +109,7 @@ module Rubydora
     # Does this object already exist?
     # @return [Boolean]
     def new?
-      self.profile  ### Make sure we've checked the repository at least once
-      @new
+      self.profile_xml.blank?
     end
 
     def asOfDateTime asOfDateTime = nil
@@ -129,10 +127,9 @@ module Rubydora
     # Retrieve the object profile as a hash (and cache it)
     # @return [Hash] see Fedora #getObject documentation for keys
     def profile
+      return {} if profile_xml.nil?
+
       @profile ||= begin
-        options = { :pid => pid }
-        options[:asOfDateTime] = asOfDateTime if asOfDateTime
-        profile_xml = repository.object(options)
         profile_xml.gsub! '<objectProfile', '<objectProfile xmlns="http://www.fedora.info/definitions/1/0/access/"' unless profile_xml =~ /xmlns=/
         doc = Nokogiri::XML(profile_xml)
         h = doc.xpath('/access:objectProfile/*', {'access' => "http://www.fedora.info/definitions/1/0/access/"} ).inject({}) do |sum, node|
@@ -153,11 +150,20 @@ module Rubydora
         @new = false
 
         h
-      rescue RestClient::ResourceNotFound => e
-        {}
+      
       end.freeze
     end
 
+    def profile_xml
+      @profile_xml ||= begin
+        options = { :pid => pid }
+        options[:asOfDateTime] = asOfDateTime if asOfDateTime
+        repository.object(options)
+      rescue RestClient::ResourceNotFound => e
+        ''
+      end
+    end
+
     def versions
       versions_xml = repository.object_versions(:pid => pid)
       versions_xml.gsub! '<fedoraObjectHistory', '<fedoraObjectHistory xmlns="http://www.fedora.info/definitions/1/0/access/"' unless versions_xml =~ /xmlns=/
@@ -210,6 +216,7 @@ module Rubydora
         if self.new?
           self.pid = repository.ingest to_api_params.merge(:pid => pid)
           @profile = nil #will cause a reload with updated data
+          @profile_xml = nil
         else                       
           p = to_api_params
           repository.modify_object p.merge(:pid => pid) unless p.empty?
@@ -228,6 +235,7 @@ module Rubydora
       run_callbacks :destroy do
         @datastreams = nil
         @profile = nil
+        @profile_xml = nil
         @pid = nil
         nil
       end

data/spec/lib/datastream_spec.rb

@@ -4,7 +4,7 @@ describe Rubydora::Datastream do
   before do
     @mock_repository = mock(Rubydora::Repository, :config=>{})
     @mock_object = mock(Rubydora::DigitalObject)
-    @mock_object.stub(:repository => @mock_repository, :pid => 'pid')
+    @mock_object.stub(:repository => @mock_repository, :pid => 'pid', :new? => false)
   end
 
 
@@ -53,7 +53,8 @@ describe Rubydora::Datastream do
 
 
     it "should call the appropriate api on save" do
-      @mock_repository.should_receive(:add_datastream).with(hash_including(:pid => 'pid', :dsid => 'dsid', :controlGroup => 'M', :dsState => 'A'))
+      @datastream.stub(:content => 'content')
+      @mock_repository.should_receive(:add_datastream).with(hash_including(:content => 'content', :pid => 'pid', :dsid => 'dsid', :controlGroup => 'M', :dsState => 'A'))
       @datastream.save
     end
 
@@ -211,7 +212,11 @@ describe Rubydora::Datastream do
   end
 
   describe "has_content?" do
-    subject { Rubydora::Datastream.new mock(:pid => 'asdf'), 'asdf' }
+    before(:each) do
+      subject.stub(:new? => true)
+    end
+
+    subject { Rubydora::Datastream.new mock(:pid => 'asdf', :new? => false), 'asdf' }
     it "should have content if it is persisted" do
       subject.stub(:new? => false)
       subject.should have_content     
@@ -223,6 +228,7 @@ describe Rubydora::Datastream do
     end
 
     it "should have content if it has a dsLocation" do
+
       subject.dsLocation = "urn:abc"
       subject.controlGroup = 'E'
       subject.should have_content     
@@ -310,6 +316,7 @@ describe Rubydora::Datastream do
     describe "when versions are in the repo" do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+        @datastream.stub(:new? => false)
         @mock_repository.should_receive(:datastream_versions).any_number_of_times.and_return <<-XML
         <datastreamHistory>
           <datastreamProfile>
@@ -334,6 +341,7 @@ describe Rubydora::Datastream do
 
       it "should lookup content of datastream using the asOfDateTime parameter" do
         @mock_repository.should_receive(:datastream_dissemination).with(hash_including(:asOfDateTime => '2008-08-05T01:30:05.012Z'))
+        Rubydora::Datastream.any_instance.stub(:new? => false)
         @datastream.versions.last.content
       end
     end
@@ -599,6 +607,7 @@ describe Rubydora::Datastream do
     describe "with existing properties" do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+        @datastream.stub(:new? => false)
         @datastream.stub(:profile) { {'dsMIME' => 'application/rdf+xml', 'dsChecksumType' =>'DISABLED', 'dsVersionable'=>true, 'dsControlGroup'=>'M', 'dsState'=>'A'} }
       end
       it "should not set unchanged values except for mimeType" do
@@ -616,6 +625,7 @@ describe Rubydora::Datastream do
     describe "without existing properties" do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+        @datastream.stub(:new? => true )
         @datastream.stub(:profile) { {} }
       end
       it "should compile parameters to hash" do

data/spec/lib/digital_object_spec.rb

@@ -92,6 +92,7 @@ describe Rubydora::DigitalObject do
         "<objectDatastreams><datastream dsid='a'></datastream>><datastream dsid='b'></datastream>><datastream dsid='c'></datastream></objectDatastreams>"
       end
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
+      @object.stub(:new? => false)
     end
 
     describe "datastreams" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv