active-fedora 4.0.0.rc7 → 4.0.0.rc8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc7)
+    active-fedora (4.0.0.rc8)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,4 +1,4 @@
-4.0.0.rc7
+4.0.0.rc8
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed
@@ -12,6 +12,7 @@ Find alwasy casts to the appropriate object.
 Run a stub :environment task in the fixture loading rake tasks (which is overridden by rails)
 Find raises ObjectNotFoundError when the object isn't found
 Removed dependency on solrizer-fedora
+Avoid unnecessary reload of RELS-EXT when typecasting
 
 3.3.2
 HYDRA-745 No need to require :url be present on external datastreams

data/lib/active_fedora/base.rb

@@ -107,10 +107,13 @@ module ActiveFedora
     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
+        ## Replace existing unchanged datastreams with the definitions found in this class if they have a different type.
+        ## Any datastream that is deleted here will cause a reload from fedora, so avoid it whenever possible
         ds_specs.keys.each do |key|
-          @inner_object.datastreams.delete(key) unless @inner_object.datastreams[key].changed.include?(:content)
+          if !@inner_object.datastreams[key].changed.include?(:content) && @inner_object.datastreams[key].class != self.class.ds_specs[key][:type]
+            @inner_object.datastreams.delete(key)
+          end
         end
       end
       load_datastreams

data/lib/active_fedora/datastreams.rb

@@ -4,7 +4,7 @@ module ActiveFedora
 
     included do
       class_attribute :ds_specs
-      self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :label=>"Fedora Object-to-Object Relationship Metadata", :control_group=>'X', :block=>nil}}
+      self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"Fedora Object-to-Object Relationship Metadata", :control_group=>'X', :block=>nil}}
       class << self
         def inherited_with_datastreams(kls) #:nodoc:
           ## Do some inheritance logic that doesn't override Base.inherited

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc7"
+    VERSION = "4.0.0.rc8"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424155
+  hash: 15424133
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 7
-  version: 4.0.0.rc7
+  - 8
+  version: 4.0.0.rc8
 platform: ruby
 authors: 
 - Matt Zumwalt