active-fedora 8.0.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 871db23f4245cc098c16e0c574421725780ed9a5
-  data.tar.gz: f36930059f1df74329c347afddfe0ba6dc99bf06
+  metadata.gz: f80f162fa9ed3128b27996f14c735381637053d0
+  data.tar.gz: 7fd1c593871f7b7e02176bd4498b65d5c58e5bc9
 SHA512:
-  metadata.gz: 88fcb0f9e49bd039bb2d24bd3187a072e4344c1e63a6c205f75a3539dc2ce2e6bf5317025e2f96abe6fa15b57dc20ecce4a40989beec3fd53b46aed7d12637c1
-  data.tar.gz: 81faaa5d12bf5e92118c503eb3d934db8351f33ae26b00ecc4647e90803fd68a1dc9c8f50a2f9a81ef69408af3a20641087e4422c613a158044febe7dc92db7e
+  metadata.gz: a35dc73b4243b5b5c3c3c647ae84102126e0e7781e6b65b88a140c65407055ba6e846a6281af56d8440f79fba19d1b78e04fbbe0dc079c13a714d042e3278840
+  data.tar.gz: 49a39ac794359b97de9d8165fed133211950b6f2e4ce2b8fdf84d9550dc0a659bad1c39cd09d7dc52cacc957e3019f96ef728614cd412325da6b687cfd95b3fa

data/History.txt

@@ -1,3 +1,18 @@
+8.1.0
+
+  2015-04-27: Patches casting behavior [David Chandek-Stark]
+  See https://github.com/projecthydra/active_fedora/wiki/Patching-ActiveFedora-7.x-&-8.x-Casting-Behavior
+  for detailed information on the problem.
+    
+  The solution offered in this patch preserves the most-specific-class algorithm
+  of `ActiveFedora::ContentModel.best_model_for` and raises a new execption,
+  `ActiveFedora::ModelNotAsserted` in `ActiveFedora::Core#adapt_to_cmodel`.
+    
+  Note that a repository object can still be loaded into a model class not asserted,
+  for example, by using `.find` with `cast: false`.
+    
+  Closes #746 (although not really a backport)
+
 8.0.1
 
   2015-03-11: Backport solr escape patch [Chris Colvard]

data/active-fedora.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.license = "APACHE2"
   s.required_ruby_version     = '>= 1.9.3'
 
-  s.add_dependency 'rsolr', "~> 1.0.10"
+  s.add_dependency 'rsolr', "~> 1.0.11"
   s.add_dependency 'om', '~> 3.1'
   s.add_dependency 'nom-xml', '>= 0.5.1'
   s.add_dependency "activesupport", '>= 3.0.0'

data/lib/active_fedora.rb

@@ -23,7 +23,7 @@ module ActiveFedora #:nodoc:
   class RecordNotSaved < RuntimeError; end # :nodoc:
   class IllegalOperation < RuntimeError; end # :nodoc:
   class Rollback < RuntimeError; end # :nodoc:
-
+  class ModelNotAsserted < RuntimeError; end # :nodoc:
 
   eager_autoload do
     autoload :AssociationRelation

data/lib/active_fedora/content_model.rb

@@ -14,15 +14,14 @@ module ActiveFedora
     end
     
     def self.best_model_for(obj)
-      best_model_match = obj.class unless obj.instance_of? ActiveFedora::Base
+      best_model_match = nil
 
       known_models_for(obj).each do |model_value|
-        # If this is of type ActiveFedora::Base, then set to the first found :has_model.
-        best_model_match ||= model_value
-
-        # If there is an inheritance structure, use the most specific case.
-        if best_model_match > model_value
-          best_model_match = model_value
+        if model_value <= obj.class
+          # If there is an inheritance structure, use the most specific case.
+          if best_model_match.nil? || best_model_match > model_value
+            best_model_match = model_value
+          end
         end
       end
 

data/lib/active_fedora/core.rb

@@ -119,22 +119,16 @@ module ActiveFedora
       klass.allocate.init_with_object(inner_object)
     end
 
-    # Examines the :has_model assertions in the RELS-EXT.
-    #
-    # If the object is of type ActiveFedora::Base, then use the first :has_model
-    # in the RELS-EXT for this object. Due to how the RDF writer works, this is
-    # currently just the first alphabetical model.
-    #
-    # If the object was instantiated with any other class, then use that class
-    # as the base of the type the user wants rather than casting to the first
-    # :has_model found on the object.
-    #
-    # In either case, if an extended model of that initial base model of the two
-    # cases above exists in the :has_model, then instantiate as that extended
-    # model type instead.
+    # Adapts the inner object to the best known model
+    # Raise ActiveFedora::ModelNotAsserted if unable to adapt object
+    # (i.e, best model is nil)
     def adapt_to_cmodel
       best_model_match = ActiveFedora::ContentModel.best_model_for(self)
 
+      if best_model_match.nil?
+        raise ActiveFedora::ModelNotAsserted, "Unable to adapt #{self.inspect} to a model asserted for the resource."
+      end
+
       self.instance_of?(best_model_match) ? self : self.adapt_to(best_model_match)
     end
     

data/lib/active_fedora/rdf/identifiable.rb

@@ -47,7 +47,7 @@ module ActiveFedora::RDF::Identifiable
     # @param [RDF::URI] uri URI that is being looked up.
     def from_uri(uri,_)
       begin
-        self.find(pid_from_subject(uri))
+        ActiveFedora::Base.find(pid_from_subject(uri))
       rescue ActiveFedora::ObjectNotFoundError
         self.ds_specs[resource_datastream.to_s][:type].resource_class.new(uri)
       end

data/lib/active_fedora/relation/finder_methods.rb

@@ -168,10 +168,12 @@ module ActiveFedora
     protected
 
     def load_from_fedora(pid, cast)
-      cast = true if klass == ActiveFedora::Base && cast.nil?
       inner = DigitalObject.find(klass, pid)
-      af_base = klass.allocate.init_with_object(inner)
-      cast ? af_base.adapt_to_cmodel : af_base
+      obj = klass.allocate.init_with_object(inner)
+      if cast != false
+        obj = obj.adapt_to_cmodel
+      end
+      obj
     end
 
     def find_with_ids(ids, cast)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "8.0.1"
+  VERSION = "8.1.0"
 end

data/spec/integration/datastreams_spec.rb

@@ -60,7 +60,7 @@ describe ActiveFedora::Datastreams do
     end
     
     it "should use ds_specs and preserve existing datastreams on migrated objects" do
-      test_obj = HasMetadata.find(@base.pid)
+      test_obj = HasMetadata.find(@base.pid, cast: false)
       expect(test_obj.datastreams["testDS"].dsLabel).to eql "Test DS"
       expect(test_obj.datastreams["testDS"].new?).to be_false
       expect(test_obj.with_versions.dsLabel).to eql "Versioned DS"
@@ -114,17 +114,17 @@ describe ActiveFedora::Datastreams do
     end
     
     it "should use ds_specs on migrated objects" do
-      test_obj = HasFile.find(@base.pid)
+      test_obj = HasFile.find(@base.pid, cast: false)
       expect(test_obj.file_ds.versionable).to be_false
       expect(test_obj.file_ds.new?).to be_true
       test_obj.file_ds.content = "blah blah blah"
       test_obj.save
       expect(test_obj.file_ds.versionable).to be_false
       # look it up again to check datastream profile
-      test_obj = HasFile.find(@base.pid)
+      test_obj = HasFile.find(@base.pid, cast: false)
       expect(test_obj.file_ds.versionable).to be_false
       expect(test_obj.file_ds.dsLabel).to eql "File Datastream"
-      test_obj = HasFile.find(@base2.pid)
+      test_obj = HasFile.find(@base2.pid, cast: false)
       expect(test_obj.file_ds.versionable).to be_true
       expect(test_obj.file_ds.dsLabel).to eql "Pre-existing DS"
     end
@@ -170,4 +170,4 @@ describe ActiveFedora::Datastreams do
       expect(test_obj.datastreams['someMetadata'].controlGroup).to eql 'M'
     end
   end
-end
+end

data/spec/unit/base_spec.rb

@@ -428,9 +428,9 @@ describe ActiveFedora::Base do
     describe ".adapt_to_cmodel with implemented (non-ActiveFedora::Base) cmodel" do
       subject { FooHistory.new }
 
-      it "should not cast to a random first cmodel if it has a specific cmodel already" do
+      it "should raise an exception if the object class is not equal to or a subclass of any known model" do
         ActiveFedora::ContentModel.should_receive(:known_models_for).with(subject).and_return([FooAdaptation])
-        subject.adapt_to_cmodel.should be_kind_of FooHistory
+        expect { subject.adapt_to_cmodel }.to raise_error(ActiveFedora::ModelNotAsserted)
       end
       it "should cast to an inherited model over a random one" do
         ActiveFedora::ContentModel.should_receive(:known_models_for).with(subject).and_return([FooAdaptation, FooInherited])

data/spec/unit/content_model_spec.rb

@@ -19,10 +19,10 @@ describe ActiveFedora::ContentModel do
   end
   
   describe '.best_model_for' do
-    it 'should be the input model if no relationships' do
+    it 'should be nil if no relationships' do
       mock_object = BaseModel.new
       mock_object.should_receive(:relationships).with(:has_model).and_return([])
-      expect(ActiveFedora::ContentModel.best_model_for(mock_object)).to eq BaseModel
+      expect(ActiveFedora::ContentModel.best_model_for(mock_object)).to be_nil
     end
 
     it 'should be based on inheritance hierarchy' do

data/spec/unit/om_datastream_spec.rb

@@ -407,15 +407,15 @@ describe ActiveFedora::OmDatastream do
       @obj = MyObj.new
       @obj.descMetadata.title = 'Foobar'
       @obj.save
+      @obj.reload
     end
     after do
       @obj.destroy
       Object.send(:remove_const, :MyObj)
     end
-    subject { @obj.reload.descMetadata } 
     it "should not load the descMetadata datastream when calling content_changed?" do
       @obj.inner_object.repository.should_not_receive(:datastream_dissemination).with(hash_including(:dsid=>'descMetadata'))
-      subject.should_not be_content_changed
+      @obj.descMetadata.should_not be_content_changed
     end
   end
 end

data/spec/unit/rdf_datastream_spec.rb

@@ -18,13 +18,14 @@ describe ActiveFedora::RDFDatastream do
       @obj = MyObj.new
       @obj.descMetadata.title = 'Foobar'
       @obj.save
+      @obj.reload
     end
     after do
       @obj.destroy
       Object.send(:remove_const, :MyDatastream)
       Object.send(:remove_const, :MyObj)
     end
-    subject { @obj.reload.descMetadata }
+    subject { @obj.descMetadata }
     it "should not load the descMetadata datastream when calling content_changed?" do
       @obj.inner_object.repository.should_not_receive(:datastream_dissemination).with(hash_including(:dsid=>'descMetadata'))
       subject.should_not be_content_changed

data/spec/unit/rdf_resource_datastream_spec.rb

@@ -7,8 +7,6 @@ describe ActiveFedora::RDFDatastream do
       property :relation, :predicate => RDF::DC[:relation]
     end
 
-    class DummyAsset < ActiveFedora::Base; end;
-
     class DummyResource < ActiveFedora::RDFDatastream
       property :title, :predicate => RDF::DC[:title], :class_name => RDF::Literal do |index|
         index.as :searchable, :displayable
@@ -16,7 +14,7 @@ describe ActiveFedora::RDFDatastream do
       property :license, :predicate => RDF::DC[:license], :class_name => DummySubnode do |index|
         index.as :searchable, :displayable
       end
-      property :creator, :predicate => RDF::DC[:creator], :class_name => DummyAsset do |index|
+      property :creator, :predicate => RDF::DC[:creator], :class_name => "DummyAsset" do |index|
         index.as :searchable
       end
       def serialization_format

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.1.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement