rubydora 0.1.9 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/lib/rubydora/datastream.rb

@@ -4,8 +4,10 @@ module Rubydora
   # them. 
   class Datastream
     extend ActiveModel::Callbacks
+    define_model_callbacks :save, :create, :destroy
     define_model_callbacks :initialize, :only => :after
 
+
     include ActiveModel::Dirty
 
     include Rubydora::ExtensionParameters
@@ -119,27 +121,33 @@ module Rubydora
     # Add datastream to Fedora
     # @return [Rubydora::Datastream]
     def create
-      repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
-      reset_profile_attributes
-      Datastream.new(digital_object, dsid)
+      run_callbacks :create do
+        repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
+        reset_profile_attributes
+        Datastream.new(digital_object, dsid)
+      end
     end
 
     # Modify or save the datastream
     # @return [Rubydora::Datastream]
     def save
-      return create if new?
-      repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
-      reset_profile_attributes
-      Datastream.new(digital_object, dsid)
+      run_callbacks :save do
+        return create if new?
+        repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
+        reset_profile_attributes
+        Datastream.new(digital_object, dsid)
+      end
     end
 
     # Purge the datastream from Fedora
     # @return [Rubydora::Datastream] `self`
     def delete
-      repository.purge_datastream(:pid => pid, :dsid => dsid) unless self.new?
-      digital_object.datastreams.delete(dsid)
-      reset_profile_attributes
-      self
+      run_callbacks :destroy do
+        repository.purge_datastream(:pid => pid, :dsid => dsid) unless self.new?
+        digital_object.datastreams.delete(dsid)
+        reset_profile_attributes
+        self
+      end
     end
 
     protected

data/lib/rubydora/digital_object.rb

@@ -9,6 +9,7 @@ module Rubydora
   # implementation.
   class DigitalObject
     extend ActiveModel::Callbacks
+    define_model_callbacks :save, :create, :destroy
     define_model_callbacks :initialize, :only => :after
     include ActiveModel::Dirty
     include Rubydora::ExtensionParameters
@@ -51,6 +52,7 @@ module Rubydora
     def self.create pid, options = {}, repository = nil
       repository ||= Rubydora.repository
       assigned_pid = repository.ingest(options.merge(:pid => pid))
+
       self.new assigned_pid, repository
     end
 
@@ -154,14 +156,18 @@ module Rubydora
     # 
     # @return [Rubydora::DigitalObject] a new copy of this object
     def save
-      if self.new?
-        self.pid = repository.ingest to_api_params.merge(:pid => pid)
-      else                       
-        p = to_api_params
-        repository.modify_object p.merge(:pid => pid) unless p.empty?
+      run_callbacks :save do
+        if self.new?
+          run_callbacks :create do
+            self.pid = repository.ingest to_api_params.merge(:pid => pid)
+          end
+        else                       
+          p = to_api_params
+          repository.modify_object p.merge(:pid => pid) unless p.empty?
+        end
       end
 
-      self.datastreams.select { |dsid, ds| ds.changed? }.reject {|dsid, ds| ds.new? }.each { |dsid, ds| ds.save }
+      self.datastreams.select { |dsid, ds| ds.changed? }.each { |dsid, ds| ds.save }
       reset
       self
     end
@@ -169,9 +175,11 @@ module Rubydora
     # Purge the object from Fedora
     # @return [Rubydora::DigitalObject] `self`
     def delete
-      repository.purge_object(:pid => pid)
-      reset
-      self
+      run_callbacks :destroy do
+        repository.purge_object(:pid => pid)
+        reset
+        self
+      end
     end
 
     # repository reference from the digital object

data/spec/digital_object_spec.rb

@@ -135,22 +135,57 @@ describe Rubydora::DigitalObject do
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
 
-    it "should save all changed datastreams" do
-      @ds1 = mock()
-      @ds1.should_receive(:changed?).and_return(false)
-      @ds1.should_not_receive(:save)
-      @ds2 = mock()
-      @ds2.should_receive(:changed?).and_return(true)
-      @ds2.should_receive(:new?).and_return(true)
-      @ds2.should_not_receive(:save)
-      @ds3 = mock()
-      @ds3.should_receive(:changed?).and_return(true)
-      @ds3.should_receive(:new?).and_return(false)
-      @ds3.should_receive(:save)
-
-      @object.should_receive(:datastreams).and_return({:ds1 => @ds1, :ds2 => @ds2, :ds3 => @ds3 })
+    describe "saving an object's datastreams" do
+      before do
+        @new_ds = mock(Rubydora::Datastream)
+        @new_ds.stub(:new? => true, :changed? => true, :content_changed? => true, :content => 'XXX')
+        @new_empty_ds = mock(Rubydora::Datastream)
+        @new_empty_ds.stub(:new? => true, :changed? => false, :content_changed? => false, :content => nil)
+        @existing_ds = mock(Rubydora::Datastream)
+        @existing_ds.stub(:new? => false, :changed? => false, :content_changed? => false, :content => 'YYY')
+        @changed_attr_ds = mock(Rubydora::Datastream)
+        @changed_attr_ds.stub(:new? => false, :changed? => true, :content_changed? => false, :content => 'YYY')
+        @changed_ds = mock(Rubydora::Datastream)
+        @changed_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => 'ZZZ')
+        @changed_empty_ds = mock(Rubydora::Datastream)
+        @changed_empty_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => nil)
 
-      @object.save
+      end
+      it "should save a new datastream with content" do
+        @object.stub(:datastreams) { { :new_ds => @new_ds } }
+        @new_ds.should_receive(:save)
+        @object.save
+      end
+
+      it "should save a datastream whose content has changed" do
+        @object.stub(:datastreams) { { :changed_ds => @changed_ds } }
+        @changed_ds.should_receive(:save)
+        @object.save
+      end
+
+      it "should save a datastream whose attributes have changed" do
+        @object.stub(:datastreams) { { :changed_attr_ds => @changed_attr_ds } }
+        @changed_attr_ds.should_receive(:save)
+        @object.save
+      end
+
+      it "should save an existing datastream whose content is nil" do
+        @object.stub(:datastreams) { { :changed_empty_ds => @changed_empty_ds } }
+        @changed_empty_ds.should_receive(:save)
+        @object.save
+      end
+
+      it "should not save a datastream that is unchanged" do
+        @object.stub(:datastreams) { { :existing_ds => @existing_ds } }
+        @existing_ds.should_not_receive(:save)
+        @object.save
+      end
+
+      it "should not save a new datastream that never received content" do
+        @object.stub(:datastreams) { { :new_empty_ds => @new_empty_ds } }
+        @new_empty_ds.should_not_receive(:save)
+        @object.save
+      end
     end
 
     it "should save all changed attributes" do

data/spec/integration_test_spec.rb

@@ -92,6 +92,16 @@ describe "Integration testing against a live Fedora repository" do
     obj.datastreams.keys.should_not include("Test")
   end
 
+  it "should save changed datastreams when the object is saved" do
+    obj = @repository.find('test:1')
+    obj.datastreams["new_ds"].content = "XXX"
+    obj.datastreams["empty_ds"].new?
+    obj.save
+
+    obj.datastreams["new_ds"].new?.should == false
+    obj.datastreams["empty_ds"].new?.should == true
+  end
+
 
   after(:all) do
     @repository.find('test:1').delete rescue nil

metadata

@@ -1,201 +1,155 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubydora
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 9
-  segments_generated: true
-  version: 0.1.9
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-17 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2185502160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185502160
+- !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2185501640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185501640
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2185501120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185501120
+- !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2185500140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185500140
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2185499680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185499680
+- !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2185499200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185499200
+- !ruby/object:Gem::Dependency
   name: savon
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2185498720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185498720
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2185498020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185498020
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2185497540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185497540
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2185497080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185497080
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &2185496620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2185496620
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &2185496160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id012
-description: "Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+"
-email: 
+  version_requirements: *2185496160
+description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
+email:
 - chris@cbeer.info
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -231,43 +185,37 @@ files:
 - spec/rest_api_client_spec.rb
 - spec/soap_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/cbeer/rubydora
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2479278186315579295
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -448019725647379174
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2479278186315579295
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
+      hash: -448019725647379174
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library
-test_files: 
+test_files:
 - spec/datastream_spec.rb
 - spec/digital_object_spec.rb
 - spec/ext_model_loader_spec.rb