rubydora 1.2.1 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/lib/rubydora/datastream.rb

@@ -122,12 +122,18 @@ module Rubydora
       digital_object.nil? || digital_object.new? || profile_xml.blank?
     end
 
+    # This method is overridden in ActiveFedora, so we didn't
+    def content
+      local_or_remote_content(true)
+    end
+
     # Retrieve the content of the datastream (and cache it)
+    # @param [Boolean] ensure_fetch <true> if true, it will grab the content from the repository if is not already loaded
     # @return [String]
-    def content
-      return @content if new?
+    def local_or_remote_content(ensure_fetch = true)
+      return @content if new? 
 
-      @content ||= datastream_content
+      @content ||= ensure_fetch ? datastream_content : @datastream_content
 
       if behaves_like_io?(@content)
         begin
@@ -166,27 +172,23 @@ module Rubydora
     # @param [String or IO] 
     # @return [String or IO]
     def content= new_content
-       content_will_change! if (self.eager_load_datastream_content and content != new_content) or (@content.nil? or @content != new_content)
-       @content = new_content
-    end
-
-    # Content_will_change! would be dynamically created by ActiveModel::Dirty, but it would eagerly load the content.
-    # We don't want to do that.
-    def content_will_change!
       raise "Can't change values on older versions" if @asOfDateTime
-      changed_attributes['content'] = nil
+       @content = new_content
     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 if new? and !local_or_remote_content(false).blank? # new datastreams must have content
 
       if controlGroup == "X"
-        return true unless EquivalentXml.equivalent?(Nokogiri::XML(content), Nokogiri::XML(datastream_content))
+        return !EquivalentXml.equivalent?(Nokogiri::XML(content), Nokogiri::XML(datastream_content))
       else
-        return true unless content == datastream_content
+        if self.eager_load_datastream_content
+          return local_or_remote_content(false) != datastream_content
+        else
+          return local_or_remote_content(false) != @datastream_content
+        end
       end
-
       super
     end
 
@@ -345,6 +347,7 @@ module Rubydora
       @profile = nil
       @profile_xml = nil
       @datastream_content = nil
+      @content = nil
       @changed_attributes = {}
     end
 

data/lib/rubydora/rest_api_client.rb

@@ -194,7 +194,7 @@ module Rubydora
       dsid = query_options.delete(:dsid)
       query_options[:format] ||= 'xml'
       val = nil
-      message = dsid.nil? ? "Loaded datastream list for #{pid}" : "Loaded datastream #{pid}/#{dsid}"
+      message = dsid.nil? ? "Loaded datastream list for #{pid}" : "Loaded datastream profile #{pid}/#{dsid}"
       benchmark message, :level=>:debug do
         val = client[datastream_url(pid, dsid, query_options)].get
       end
@@ -262,7 +262,11 @@ module Rubydora
       else
         resource = client[datastream_content_url(pid, dsid, query_options)]
       end
-      resource.send(method)
+      val = nil
+      benchmark "Loaded datastream content #{pid}/#{dsid}", :level=>:debug do
+        val = resource.send(method)
+      end
+      val
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end

data/spec/lib/datastream_spec.rb

@@ -158,6 +158,11 @@ describe Rubydora::Datastream do
       @datastream.content.should == "asdf"
     end
 
+    it "should not load contents if they say not to" do
+      @mock_repository.should_not_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid'))
+      @datastream.local_or_remote_content(false).should be_nil
+    end
+
     it "should rewind IO-type contents" do
       @mock_io = File.open('rubydora.gemspec')
       @mock_io.readline # start with a dirty file
@@ -188,6 +193,10 @@ describe Rubydora::Datastream do
       @datastream.content
       @datastream.content_changed?.should == false
     end
+    it "should not load content just to check and see if it was changed." do
+      @mock_repository.should_not_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid'))
+      @datastream.content_changed?.should == false
+    end
     it "should be changed when the new content is different than the old content" do
       @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
       @datastream.content = "test"
@@ -245,10 +254,8 @@ describe Rubydora::Datastream do
   end
 
   describe "update" 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>
@@ -257,35 +264,41 @@ describe Rubydora::Datastream do
       XML
     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
+    describe "when content is unchanged" do
+      before do
+        @datastream.stub :content_changed? => false
+      end
+      it "should not say changed if the value is set the same" do
+        @datastream.dsLabel = "label"
+        @datastream.should_not be_changed
+      end
 
-    it "should allow profile attributes to be replaced" do
-      @datastream.dsLabel = "New Label"
-      @datastream.dsLabel.should == "New Label"
-    end
+      it "should allow profile attributes to be replaced" do
+        @datastream.dsLabel = "New Label"
+        @datastream.dsLabel.should == "New Label"
+      end
 
-    it "should call the appropriate api with any dirty attributes" do
-      @mock_repository.should_receive(:modify_datastream).with(hash_including(:dsLabel => "New Label"))
-      @datastream.dsLabel = "New Label"
-      @datastream.save
+      it "should call the appropriate api with any dirty attributes" do
+        @mock_repository.should_receive(:modify_datastream).with(hash_including(:dsLabel => "New Label"))
+        @datastream.dsLabel = "New Label"
+        @datastream.save
+      end
     end
 
-    it "should update the datastream when the content is changed" do
-      @mock_repository.should_receive(:modify_datastream).with(hash_including(:content => 'test'))
-      @datastream.content = "test"
-      @datastream.save
-    end
+    describe "update when content is changed" do
+      it "should update the datastream when the content is changed" do
+        @mock_repository.should_receive(:modify_datastream).with(hash_including(:content => 'test'))
+        @datastream.content = "test"
+        @datastream.save
+      end
 
-    it "should be marked as changed when the content is updated" do
-      @datastream.changed?.should be_false
-      @datastream.content = "test"
-      @datastream.changed?.should be_true
-    end
+      it "should be marked as changed when the content is updated" do
+        @datastream.changed?.should be_false
+        @datastream.content = "test"
+        @datastream.changed?.should be_true
+      end
 
+    end
   end
 
   describe "should check if an object is read-only" do
@@ -635,7 +648,7 @@ describe Rubydora::Datastream do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
         @datastream.stub(:new? => true )
-        @datastream.stub(:content => '123')
+        @datastream.stub(:local_or_remote_content => '123')
         @datastream.stub(:profile) { {} }
       end
       it "should compile parameters to hash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -64,7 +64,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -72,7 +72,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -80,7 +80,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -88,7 +88,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -96,7 +96,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -104,7 +104,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -112,7 +112,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -120,7 +120,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -128,7 +128,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -136,7 +136,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -144,7 +144,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
@@ -152,7 +152,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -160,7 +160,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -168,7 +168,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -176,7 +176,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -184,7 +184,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -192,7 +192,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.14
   type: :development
@@ -200,7 +200,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.14
 - !ruby/object:Gem::Dependency
@@ -208,7 +208,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -216,7 +216,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -224,7 +224,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -232,7 +232,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -240,7 +240,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -248,7 +248,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Fedora Commons REST API ruby library
@@ -258,8 +258,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
+- ".gitignore"
+- ".gitmodules"
 - Gemfile
 - History.textile
 - LICENSE.txt
@@ -297,24 +297,24 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 3546053973135231573
+      hash: -1210235886615853572
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 3546053973135231573
+      hash: -1210235886615853572
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library