active-fedora 4.5.2 → 4.5.3

data/lib/active_fedora/digital_object.rb

@@ -5,7 +5,8 @@ module ActiveFedora
     
     module DatastreamBootstrap
       def datastream_object_for dsid, ds_spec=nil
-        ds_spec ||= original_class.ds_specs[dsid] || {}
+        # ds_spec is nil when called from Rubydora for existing datastreams, so it should not be autocreated
+        ds_spec ||= (original_class.ds_specs[dsid] || {}).merge(:autocreate=>false)
         ds = ds_spec.fetch(:type, ActiveFedora::Datastream).new(self, dsid)
         attributes = {}
         attributes[:asOfDateTime] ||= asOfDateTime if self.respond_to? :asOfDateTime
@@ -20,7 +21,10 @@ module ActiveFedora
           attributes[:dsLocation]= ds_spec[:url]
         end
         ds.default_attributes = attributes
-        ds.datastream_will_change! if ds_spec[:autocreate]
+        # would rather not load profile here in the call to .new?, so trusting :autocreate attribute
+        if ds_spec[:autocreate] # and ds.new?
+          ds.datastream_will_change!
+        end
         ds
       end
     end    

data/lib/active_fedora/rels_ext_datastream.rb

@@ -46,6 +46,7 @@ module ActiveFedora
           end
         end
         tmpl.model.relationships_are_dirty = false
+        tmpl.changed_attributes.clear
         tmpl
       end
     end

data/lib/active_fedora/semantic_node.rb

@@ -30,7 +30,7 @@ module ActiveFedora
     # @param object Either a string URI or an object that is a kind of ActiveFedora::Base 
     def add_relationship(predicate, target, literal=false)
       object_relations.add(predicate, target, literal)
-      rels_ext.dirty = true
+      rels_ext.dirty = true if object_relations.dirty
     end
 
     # Clears all relationships with the specified predicate
@@ -39,7 +39,7 @@ module ActiveFedora
       relationships(predicate).each do |target|
         object_relations.delete(predicate, target) 
       end
-      rels_ext.dirty = true
+      rels_ext.dirty = true if object_relations.dirty
     end
 
     # Checks that this object is matches the model class passed in.

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "4.5.2"
+  VERSION = "4.5.3"
 end

data/spec/integration/datastreams_spec.rb

@@ -52,6 +52,7 @@ describe ActiveFedora::Datastreams do
     before :all do
       class HasFile < ActiveFedora::Base
         has_file_datastream :name => "file_ds", :versionable => false
+        has_file_datastream :name => "file_ds2", :versionable => false, :autocreate => false
       end
     end
     after :all do
@@ -77,13 +78,23 @@ describe ActiveFedora::Datastreams do
     it "should create datastreams from the spec on new objects" do
       @has_file.file_ds.versionable.should be_false
       @has_file.file_ds.content = "blah blah blah"
+      @has_file.file_ds.changed?.should be_true
+      @has_file.file_ds2.changed?.should be_false # no autocreate
+      @has_file.file_ds2.new?.should be_true
       @has_file.save
       @has_file.file_ds.versionable.should be_false
-      HasFile.find(@has_file.pid).file_ds.versionable.should be_false
+      test_obj = HasFile.find(@has_file.pid)
+      test_obj.file_ds.versionable.should be_false
+      test_obj.dc.changed?.should be_false
+      test_obj.rels_ext.changed?.should be_false
+      test_obj.file_ds.changed?.should be_false
+      test_obj.file_ds2.changed?.should be_false
+      test_obj.file_ds2.new?.should be_true
     end
     
     it "should use ds_specs on migrated objects" do
       test_obj = HasFile.find(@base.pid)
+      test_obj.dc.changed?.should be_false
       test_obj.file_ds.versionable.should be_false
       test_obj.file_ds.new?.should be_true
       test_obj.file_ds.content = "blah blah blah"

data/spec/spec_helper.rb

@@ -27,6 +27,9 @@ def restore_spec_configuration
 end
 restore_spec_configuration
 
+# Shut those Rails deprecation warnings up
+ActiveSupport::Deprecation.behavior= Proc.new { |message, callstack| }
+
 RSpec.configure do |config|
   config.mock_with :mocha
   config.color_enabled = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 4.5.2
+  version: 4.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -520,21 +520,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -146245566086376860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -146245566086376860
 requirements: []
 rubyforge_project: rubyfedora
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A convenience libary for manipulating documents in the Fedora Repository.