rubydora 1.4.0 → 1.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eb805d0cbe4b4b6f349d9442f434398e3e0a3a21
+  data.tar.gz: afc120790e2ede734a69255bccf9d4fedff4dae2
+SHA512:
+  metadata.gz: 37630017fda75875cd34ed2f152693675c408af25aa237f9e38a169d067ca33956efd5cdc9eb76ddfb536f5d0eeb5edcb25b6c0d2e669730e48587df5a9b9f32
+  data.tar.gz: 3ea433dfa7e1d4b5fe0518dfa64f2dbe12b62a2fb4295112d7b14d2bff267067db3a2a3abdfcbd0dea8f483347efc4cb37fdf4282501f926553d4e6ff8794f4e

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/rubydora/datastream.rb

@@ -181,7 +181,11 @@ module Rubydora
       return true if new? and !local_or_remote_content(false).blank? # new datastreams must have content
 
       if controlGroup == "X"
-        return !EquivalentXml.equivalent?(Nokogiri::XML(content), Nokogiri::XML(datastream_content))
+        if self.eager_load_datastream_content
+          return !EquivalentXml.equivalent?(Nokogiri::XML(local_or_remote_content(false)), Nokogiri::XML(datastream_content))
+        else
+          return !EquivalentXml.equivalent?(Nokogiri::XML(local_or_remote_content(false)), Nokogiri::XML(@datastream_content))
+        end
       else
         if self.eager_load_datastream_content
           return local_or_remote_content(false) != datastream_content

data/spec/lib/datastream_spec.rb

@@ -208,49 +208,75 @@ describe Rubydora::Datastream do
   end
 
   describe "content changed behavior" do
-    before(:each) do
-      @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-      @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
-        <datastreamProfile>
-          <dsLocation>some:uri</dsLocation>
-          <dsLabel>label</dsLabel>
-        </datastreamProfile>
-      XML
-    end
+    describe "for a managed datastream" do
+      before(:each) do
+        @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+        @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
+          <datastreamProfile>
+            <dsLocation>some:uri</dsLocation>
+            <dsLabel>label</dsLabel>
+          </datastreamProfile>
+        XML
+      end
 
-    it "should not be changed after a read-only access" do
-      @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
-      @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"
-      @datastream.content_changed?.should == true 
-    end
+      it "should not be changed after a read-only access" do
+        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
+        @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"
+        @datastream.content_changed?.should == true 
+      end
 
-    it "should not be changed when the new content is the same as the existing content (when eager-loading is enabled)" do
-      @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
-      @datastream.eager_load_datastream_content = true
-      @datastream.content = "test"
-      @datastream.content_changed?.should  == false 
-    end
+      it "should not be changed when the new content is the same as the existing content (when eager-loading is enabled)" do
+        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
+        @datastream.eager_load_datastream_content = true
+        @datastream.content = "test"
+        @datastream.content_changed?.should  == false 
+      end
 
-    it "should  be changed when the new content is the same as the existing content (without eager loading, the default)" do
-      @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
-      @datastream.content = "test"
-      @datastream.content_changed?.should  == true
+      it "should  be changed when the new content is the same as the existing content (without eager loading, the default)" do
+        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
+        @datastream.content = "test"
+        @datastream.content_changed?.should  == true
+      end
+
+      it "should not be changed when the new content is the same as the existing content (and we have accessed #content previously)" do
+        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
+        @datastream.content
+        @datastream.content = "test"
+        @datastream.content_changed?.should  == false 
+      end
     end
 
-    it "should not be changed when the new content is the same as the existing content (and we have accessed #content previously)" do
-      @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
-      @datastream.content
-      @datastream.content = "test"
-      @datastream.content_changed?.should  == false 
+    describe "for an inline datastream" do
+      before(:each) do
+        @mock_repository.should_receive(:datastream).any_number_of_times.and_return <<-XML
+          <datastreamProfile>
+            <dsLocation>some:uri</dsLocation>
+            <dsLabel>label</dsLabel>
+          </datastreamProfile>
+        XML
+        @datastream = Rubydora::Datastream.new @mock_object, 'dsid', :controlGroup => 'X'
+      end
+      it "should not be changed when the new content is the same as the existing content (when eager-loading is enabled)" do
+        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('<xml>test</xml>') 
+        @datastream.eager_load_datastream_content = true
+        @datastream.content = "<xml>test</xml>"
+        @datastream.content_changed?.should  == false 
+      end
+
+      it "should  be changed when the new content is the same as the existing content (without eager loading, the default)" do
+        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('<xml>test</xml>') 
+        @datastream.content = "<xml>test</xml>"
+        @datastream.content_changed?.should  == true
+      end
     end
   end
 

metadata

@@ -1,254 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-03-06 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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hooks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.14
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Fedora Commons REST API ruby library
@@ -258,8 +227,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitmodules"
+- .gitignore
+- .gitmodules
 - Gemfile
 - History.textile
 - LICENSE.txt
@@ -290,33 +259,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/cbeer/rubydora
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4150652175357095183
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4150652175357095183
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fedora Commons REST API ruby library
 test_files:
 - spec/lib/datastream_spec.rb