active-fedora 3.2.0.pre4 → 3.2.0.pre5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.2.0.pre4)
+    active-fedora (3.2.0.pre5)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/lib/active_fedora/base.rb

@@ -131,6 +131,13 @@ module ActiveFedora
     #   post.properties.title # => 'hello world'
     def init_with(inner_obj)
       @inner_object = inner_obj
+      unless @inner_object.is_a? SolrDigitalObject
+        ## Replace existing unchanged datastreams with the definitions found in this class
+        @inner_object.original_class = self.class
+        ds_specs.keys.each do |key|
+          @inner_object.datastreams.delete(key) unless @inner_object.datastreams[key].changed.include?(:content)
+        end
+      end
       load_datastreams
       run_callbacks :find
       run_callbacks :initialize

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.2.0.pre4"
+    VERSION = "3.2.0.pre5"
 end

data/spec/unit/base_spec.rb

@@ -1,11 +1,4 @@
 require 'spec_helper'
-
-# require 'active_fedora'
-# require 'active_fedora/base'
-# require 'active_fedora/metadata_datastream'
-# require 'time'
-# require 'date'
-# 
 @@last_pid = 0  
 
 describe ActiveFedora::Base do
@@ -25,6 +18,7 @@ describe ActiveFedora::Base do
       delegate :swank, :to=>'someData'
     end
     class FooAdaptation < ActiveFedora::Base
+      has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>'someData'
     end
   end
 
@@ -588,12 +582,20 @@ describe ActiveFedora::Base do
     end
     it "should propagate modified datastreams to the adapted object" do
       @test_object = FooHistory.new()
-      @test_object.datastreams['someData'].content="YYY"
+      orig_ds = @test_object.datastreams['someData']
+      orig_ds.content="YYY"
       adapted = @test_object.adapt_to(FooAdaptation)
       adapted.datastreams.keys.should include 'someData'
+      adapted.datastreams['someData'].should == orig_ds
       adapted.datastreams['someData'].content.should == "YYY"
       adapted.datastreams['someData'].changed?.should be_true
     end
+    it "should use the datastream definitions from the adapted object" do
+      @test_object = FooHistory.new()
+      adapted = @test_object.adapt_to(FooAdaptation)
+      adapted.datastreams.keys.should include 'someData'
+      adapted.datastreams['someData'].class.should == ActiveFedora::NokogiriDatastream
+    end
   end
 
   describe ".to_xml" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832033
+  hash: 1923832035
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - pre
-  - 4
-  version: 3.2.0.pre4
+  - 5
+  version: 3.2.0.pre5
 platform: ruby
 authors: 
 - Matt Zumwalt