rubydora 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/rubydora/datastream.rb

@@ -128,8 +128,16 @@ module Rubydora
 
       @content ||= datastream_content
 
-      content = @content.read and @content.rewind if @content.kind_of? IO
-      content ||= @content
+      if @content.kind_of? IO
+        begin
+          @content.rewind
+          @content.read
+        ensure
+          @content.rewind
+        end
+      else
+        @content
+      end
     end
     alias_method :read, :content
 
@@ -169,6 +177,7 @@ module Rubydora
     end
 
     def content_changed?
+      return false if ['E','R'].include? controlGroup
       return true if new? and !content.blank? # new datastreams must have content
 
       return true unless content == datastream_content
@@ -280,6 +289,7 @@ module Rubydora
     def save
       check_if_read_only
       run_callbacks :save do
+        raise RubydoraError.new("Unable to save #{self.inspect} without content") unless has_content?
         return create if new?
         repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
         reset_profile_attributes

data/spec/lib/datastream_spec.rb

@@ -61,6 +61,7 @@ describe Rubydora::Datastream do
     it "should be able to override defaults" do
       @mock_repository.should_receive(:add_datastream).with(hash_including(:controlGroup => 'E'))
       @datastream.controlGroup = 'E'
+      @datastream.dsLocation = "uri:asdf"
       @datastream.save
     end
   end
@@ -140,6 +141,7 @@ describe Rubydora::Datastream do
     end
 
     it "should not be new" do
+      @datastream.stub :content_changed? => false
       @datastream.new?.should == false
       @datastream.changed?.should == false
     end
@@ -157,11 +159,12 @@ describe Rubydora::Datastream do
 
     it "should rewind IO-type contents" do
       @mock_io = File.open('rubydora.gemspec')
-      @mock_io.should_receive(:rewind)
+      @mock_io.readline # start with a dirty file
 
       @datastream.content = @mock_io
 
       @datastream.content.should be_a(String)
+      @datastream.content.should == File.read('rubydora.gemspec')
 
     end
 
@@ -244,6 +247,7 @@ describe Rubydora::Datastream do
 
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+      @datastream.stub :content_changed? => false
       @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
@@ -253,6 +257,7 @@ describe Rubydora::Datastream do
     end
 
     it "should not say changed if the value is set the same" do
+      @datastream.stub :content_changed? => false
       @datastream.dsLabel = "label"
       @datastream.should_not be_changed
     end
@@ -285,6 +290,7 @@ describe Rubydora::Datastream do
   describe "should check if an object is read-only" do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+      @datastream.stub :content_changed? => false
       @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
@@ -392,7 +398,7 @@ describe Rubydora::Datastream do
 
       describe "setter" do
         before do
-          subject.stub(:datastreams => [])
+          subject.stub(:datastreams => [], :content_changed? => false)
         end
         it "should mark the object as changed after setting" do
           subject.send("#{method}=", 'new_value')
@@ -452,6 +458,7 @@ describe Rubydora::Datastream do
 
       it "should appear in the save request" do
           @mock_repository.should_receive(:modify_datastream).with(hash_including(method.to_sym => 'http://example.com'))
+          subject.stub(:content_changed? => false)
           subject.dsLocation = 'http://example.com'
           subject.save
       end
@@ -608,6 +615,7 @@ describe Rubydora::Datastream do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
         @datastream.stub(:new? => false)
+        @datastream.stub(:content_changed? => 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
@@ -626,14 +634,15 @@ describe Rubydora::Datastream do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
         @datastream.stub(:new? => true )
+        @datastream.stub(:content => '123')
         @datastream.stub(:profile) { {} }
       end
       it "should compile parameters to hash" do
-        @datastream.send(:to_api_params).should == {:versionable=>true, :controlGroup=>"M", :dsState=>"A"}
+        @datastream.send(:to_api_params).should == {:versionable=>true, :controlGroup=>"M", :dsState=>"A", :content => '123' }
       end
       it "should not send parameters that are set to nil" do
         @datastream.dsLabel = nil
-        @datastream.send(:to_api_params).should == {:versionable=>true, :controlGroup=>"M", :dsState=>"A"}
+        @datastream.send(:to_api_params).should == {:versionable=>true, :controlGroup=>"M", :dsState=>"A", :content => '123' }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -286,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 206159229600052997
+      hash: -1646482824081762239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 206159229600052997
+      hash: -1646482824081762239
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23