active-fedora 6.5.1 → 6.6.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd2e7e3abce44ee6d01097e229e9299c14f8334
-  data.tar.gz: dec7ba5847ad7417b25a02a82519a3aa9ff0c26b
+  metadata.gz: c819c53e6318b54de501b004a3a907dc223ca7f2
+  data.tar.gz: 9ee7ef31d8c30472b8aa37eacabb5f697bee0778
 SHA512:
-  metadata.gz: 67ed9db96070226172df55c478ddfb0bf698ebd9ec170e5f028b860e9623cd353482a696c2dbf115bbf8a896b5bfffda88abc00c0bc17fce4d3940900612a9e7
-  data.tar.gz: fadc2758f9fe768ad3a2a7b257790876a1bf1b4c16fed656755f113788d9594e1f81c4333b2e6ef7267e89cb7c532593a3c36135a2be9ac818c2716a0bce6ba3
+  metadata.gz: c280347c12e3a7a13ef3b394b2c7df63bc83c49f8f5eee24a4e71565b6da615cb179a437efca408d9b3bef51987215332c5d29704394810f55ba93e2eb9a628a
+  data.tar.gz: 19dad27ff49953e76f6f19d7f599afe81d1df2b9badf7c849373474a44bacf903dd06352e438803652466a3c99914b65463f01753dd6952d21882a9531141b14

data/CONTRIBUTORS.md

@@ -22,4 +22,5 @@ Contributors to this project:
 *  Richard Johnson
 *  Thomas Johnson
 *  mpc3c
+*  Steven Anderson
 

data/README.textile

@@ -61,12 +61,6 @@ You need to have a copy of hydra-jetty running.  To do this, download a working
 java -jar start.jar
 </pre>
 
-Then open a new terminal, go to your ActiveFedora source directory, and import fedora's demo objects.
-
-<pre>
-  rake active_fedora:fixtures environment=test
-</pre>
-
 Now you're ready to run the tests.  In the directory where active_fedora is installed, run
 
 <pre>

data/lib/active_fedora/associations/association_collection.rb

@@ -138,7 +138,7 @@ module ActiveFedora
               end
             end
           rescue ObjectNotFoundError => e
-            logger.error "Solr and Fedora may be out of sync:\n" + e.message
+            ActiveFedora::Base.logger.error "Solr and Fedora may be out of sync:\n" + e.message
             reset
           end
         end
@@ -150,8 +150,13 @@ module ActiveFedora
       def find_target
         return [] if @finder_query.empty?
         solr_result = SolrService.query(@finder_query, :rows=>1000)
+
+        # Set the default classname to base inheritance on.
+        opts = {}
+        opts[:class] = @reflection.class_name.constantize.to_class_uri unless @reflection.class_name.nil?
+
 #TODO, don't reify, just store the solr results and lazily reify.
-        return ActiveFedora::SolrService.reify_solr_results(solr_result)
+        return ActiveFedora::SolrService.reify_solr_results(solr_result, opts)
       end
 
       def load_from_solr

data/lib/active_fedora/base.rb

@@ -118,7 +118,7 @@ module ActiveFedora
         ## 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|
-          if !@inner_object.datastreams[key].content_changed? && @inner_object.datastreams[key].class != self.class.ds_specs[key][:type]
+          if @inner_object.datastreams[key] != nil && !@inner_object.datastreams[key].content_changed? && @inner_object.datastreams[key].class != self.class.ds_specs[key][:type]
             @inner_object.datastreams.delete(key)
           end
         end
@@ -286,10 +286,33 @@ module ActiveFedora
       klass.allocate.init_with(inner_object)
     end
 
-    # Examine the :has_model assertions in the RELS-EXT.  Adapt this class to the first first known model
+    # 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.
     def adapt_to_cmodel
-      the_model = ActiveFedora::ContentModel.known_models_for( self ).first
-      self.class != the_model ? self.adapt_to(the_model) : self
+      best_model_match = self.class unless self.instance_of? ActiveFedora::Base
+
+      ActiveFedora::ContentModel.known_models_for( self ).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
+        end
+      end
+
+      self.instance_of?(best_model_match) ? self : self.adapt_to(best_model_match)
     end
     
     # ** EXPERIMENTAL **

data/lib/active_fedora/delegating.rb

@@ -1,6 +1,7 @@
 module ActiveFedora
   module Delegating
     extend ActiveSupport::Concern
+    extend Deprecation
 
     included do
       after_save :clear_changed_attributes
@@ -53,16 +54,16 @@ module ActiveFedora
       end
       # Provides a delegate class method to expose methods in metadata streams
       # as member of the base object. Pass the target datastream via the
-      # <tt>:to</tt> argument. If you want to return a unique result, (e.g. string
-      # instead of an array) set the <tt>:unique</tt> argument to true.
+      # <tt>:to</tt> argument. If you want to return a multivalue result, (e.g. array
+      # instead of a string) set the <tt>:multiple</tt> argument to true.
       #
       # The optional <tt>:at</tt> argument provides a terminology that the delegate will point to.
       #
       #   class Foo < ActiveFedora::Base
       #     has_metadata :name => "descMetadata", :type => MyDatastream
       #
-      #     delegate :field1, :to=>"descMetadata", :unique=>true
-      #     delegate :field2, :to=>"descMetadata", :at=>[:term1, :term2]
+      #     delegate :field1, :to=>"descMetadata", multiple: false
+      #     delegate :field2, :to=>"descMetadata", :at=>[:term1, :term2], multiple: true
       #   end
       #
       #   foo = Foo.new
@@ -118,7 +119,14 @@ module ActiveFedora
       # @param [Symbol] field the field to query
       # @return [Boolean]
       def unique?(field)
-        delegates[field][:unique]
+        !multiple?(field)
+      end
+
+      # Reveal if the delegated field is multivalued or not
+      # @param [Symbol] field the field to query
+      # @return [Boolean]
+      def multiple?(field)
+        delegates[field][:multiple]
       end
 
       private
@@ -138,11 +146,33 @@ module ActiveFedora
           end
         end
 
-        self.delegates[field][:unique] = args[:unique]
+        if !args[:multiple].nil?
+          self.delegates[field][:multiple] = args[:multiple]
+        elsif !args[:unique].nil?
+          i = 0 
+          begin 
+            match = /in `(delegate.*)'/.match(caller[i])
+            i+=1
+          end while match.nil?
+
+          prev_method = match.captures.first
+          Deprecation.warn Delegating, "The :unique option for `#{prev_method}' is deprecated. Use :multiple instead. :unique will be removed in ActiveFedora 7", caller(i+1)
+          self.delegates[field][:multiple] = !args[:unique]
+        else 
+          i = 0 
+          begin 
+            match = /in `(delegate.*)'/.match(caller[i])
+            i+=1
+          end while match.nil?
+
+          prev_method = match.captures.first
+          Deprecation.warn Delegating, "You have not explicitly set the :multiple option on `#{prev_method}'. The default value will switch from true to false in ActiveFedora 7, so if you want to future-proof this application set `multiple: true'", caller(i+ 1)
+          self.delegates[field][:multiple] = true # this should be false for ActiveFedora 7
+        end
 
         define_method field do |*opts|
           val = array_reader(field, *opts)
-          self.class.unique?(field) ? val.first : val
+          self.class.multiple?(field) ? val : val.first
         end
       end
 

data/lib/active_fedora/querying.rb

@@ -98,6 +98,10 @@ module ActiveFedora
       '"' + value.gsub(/(:)/, '\\:').gsub(/(\/)/, '\\/').gsub(/"/, '\\"') + '"'
     end
 
+
+    extend Deprecation
+    self.deprecation_horizon = 'active-fedora 7.0.0'
+
     # Retrieve the Fedora object with the given pid, explore the returned object, determine its model 
     # using #{ActiveFedora::ContentModel.known_models_for} and cast to that class.
     # Raises a ObjectNotFoundError if the object is not found.
@@ -106,7 +110,11 @@ module ActiveFedora
     #
     # @example because the object hydra:dataset1 asserts it is a Dataset (hasModel info:fedora/afmodel:Dataset), return a Dataset object (not a Book).
     #   Book.find_one("hydra:dataset1") 
-    def find_one(pid, cast=false)
+    def find_one(pid, cast=nil)
+      if cast.nil?
+        cast = false
+        Deprecation.warn(Querying, "find_one's cast parameter will default to true", caller)
+      end
       inner = DigitalObject.find(self, pid)
       af_base = self.allocate.init_with(inner)
       cast ? af_base.adapt_to_cmodel : af_base

data/lib/active_fedora/relation.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   class Relation
-
+    extend Deprecation
     delegate :map, :each, :collect, :all?, :include?, :to => :to_a
 
     attr_reader :loaded
@@ -90,7 +90,10 @@ module ActiveFedora
       relation.order_values += args.flatten
       relation
     end
-    
+
+    extend Deprecation
+    self.deprecation_horizon = 'active-fedora 7.0.0'
+
     # Returns an Array of objects of the Class that +find+ is being 
     # called on
     #
@@ -102,6 +105,9 @@ module ActiveFedora
       options = args.extract_options!
 
       # TODO is there any reason not to cast?
+      if !options.has_key?(:cast)
+        Deprecation.warn(Relation, "find's cast option will default to true", caller)
+      end
       cast = options.delete(:cast)
       if options[:sort]
         # Deprecate sort sometime?
@@ -116,6 +122,7 @@ module ActiveFedora
       else
         case args.first
         when :first, :last, :all
+          Deprecation.warn Relation, "ActiveFedora::Base.find(#{args.first.inspect}) is deprecated.  Use ActiveFedora::Base.#{args.first} instead. This option will be removed in ActiveFedora 7", caller
           send(args.first)
         else
           find_with_ids(args, cast)

data/lib/active_fedora/solr_service.rb

@@ -51,11 +51,28 @@ module ActiveFedora
       classname.send(method, hit[SOLR_DOCUMENT_ID])
     end
   
-    def self.class_from_solr_document(hit)
-        model_value = nil
-        hit[solr_name("has_model", :symbol)].each {|value| model_value ||= Model.from_class_uri(value)}
-        logger.warn "Could not find a model for #{hit["id"]}, defaulting to ActiveFedora::Base" unless model_value
-        model_value || ActiveFedora::Base
+    def self.class_from_solr_document(hit, opts = {})
+      #Set the default starting point to the class specified, if available.
+      best_model_match = Model.from_class_uri(opts[:class]) unless opts[:class].nil?
+
+      hit[solr_name("has_model", :symbol)].each do |value|
+
+        model_value = Model.from_class_uri(value)
+
+        if model_value
+
+          # Set as the first model in case opts[:class] was nil
+          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
+          end
+        end
+      end
+
+      logger.warn "Could not find a model for #{hit["id"]}, defaulting to ActiveFedora::Base" unless best_model_match
+      best_model_match || ActiveFedora::Base
     end
     
     # Construct a solr query for a list of pids

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.5.1"
+  VERSION = "6.6.0.pre1"
 end

data/spec/integration/associations_spec.rb

@@ -15,6 +15,9 @@ describe ActiveFedora::Base do
         has_and_belongs_to_many :collections, :property=>:is_member_of_collection
       end
 
+      class SpecialInheritedBook < Book
+      end
+
       class Person < ActiveFedora::Base
       end
 
@@ -35,6 +38,7 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :Person)
       Object.send(:remove_const, :Collection)
       Object.send(:remove_const, :Topic)
+      Object.send(:remove_const, :SpecialInheritedBook)
     end
 
     describe "an unsaved instance" do
@@ -178,6 +182,7 @@ describe ActiveFedora::Base do
           @topic1 = Topic.create
           @topic2 = Topic.create
           @book = Book.create
+          @special_book = SpecialInheritedBook.create
         end
         it "habtm should set and remove relationships bidirectionally" do
           @book.topics << @topic1
@@ -201,9 +206,23 @@ describe ActiveFedora::Base do
           book2.topics.count.should == 12
         end
 
+        it "Should find inherited objects along with base objects" do
+          @book.topics << @topic1
+          @special_book.topics << @topic1
+          @topic1.books.should == [@book, @special_book]
+          @topic1.reload.books.should == [@book, @special_book]
+        end
+
+        it "Should cast found books to the correct cmodel" do
+          @topic1.books[0].class == Book
+          @topic1.books[1].class == SpecialInheritedBook
+        end
+
         after do
           @topic1.delete
           @topic2.delete
+          @book.delete
+          @special_book.delete
         end
       end
     end
@@ -282,6 +301,28 @@ describe ActiveFedora::Base do
           end
         end
 
+        describe "when dealing with inherited objects" do
+          before do
+            @library2 = Library.create
+            @special_book = SpecialInheritedBook.create
+
+            @book.library = @library2
+            @book.save
+            @special_book.library = @library2
+            @special_book.save
+          end
+
+          it "should cast to the most specific class for the association" do
+            @library2.books[0].class == Book
+            @library2.books[1].class == SpecialInheritedBook
+          end
+
+          after do
+            @library2.delete
+            @special_book.delete
+          end
+        end
+
         after do
           @library.delete
           @book.delete
@@ -727,4 +768,96 @@ describe ActiveFedora::Base do
       end
     end
   end
+
+  describe "casting inheritance additional test cases" do
+    describe "for habtm" do
+      before :all do
+        class SimpleObject < ActiveFedora::Base
+          belongs_to :simple_collection, property: :is_part_of, class_name: 'SimpleCollection'
+          belongs_to :complex_collection, property: :is_part_of, class_name: 'ComplexCollection'
+        end
+
+        class ComplexObject < SimpleObject
+        end
+
+        class SimpleCollection < ActiveFedora::Base
+          has_many :objects, property: :is_part_of, class_name: 'SimpleObject'
+          has_many :complex_objects, property: :is_part_of, class_name: 'ComplexObject'
+        end
+
+        class ComplexCollection < SimpleCollection
+        end
+
+      end
+      after :all do
+        Object.send(:remove_const, :SimpleObject)
+        Object.send(:remove_const, :ComplexObject)
+        Object.send(:remove_const, :SimpleCollection)
+        Object.send(:remove_const, :ComplexCollection)
+      end
+
+      describe "saving between the before and after hooks" do
+        before do
+          @simple_collection = SimpleCollection.create
+          @complex_collection = ComplexCollection.create
+
+          #Need to add the simpler cmodel here as currently inheritance support is read-only.
+          #See ActiveFedora pull request 207 on how to do this programmatically.
+          @complex_collection.add_relationship(:has_model, @complex_object.class.superclass.to_class_uri)
+
+          @simple_object = SimpleObject.create
+          @simple_object_second = SimpleObject.create
+          @complex_object = ComplexObject.create
+
+          #Need to add the simpler cmodel here as currently inheritance support is read-only.
+          #See ActiveFedora pull request 207 on how to do this programmatically.
+          @complex_object.add_relationship(:has_model, @complex_object.class.superclass.to_class_uri)
+
+          @simple_collection.objects = [@simple_object, @simple_object_second, @complex_object]
+          @simple_collection.save!
+          @complex_collection.objects = [@simple_object, @complex_object]
+          @complex_collection.save!
+          @complex_object.save!
+          @simple_object.save!
+          @simple_object_second.save!
+        end
+
+
+        it "casted association methods should work and return the most complex class" do
+          @complex_object.simple_collection.should be_instance_of SimpleCollection
+          @complex_object.complex_collection.should be_instance_of ComplexCollection
+
+          @simple_object.simple_collection.should be_instance_of SimpleCollection
+          @simple_object.complex_collection.should be_instance_of ComplexCollection
+          @simple_object_second.simple_collection.should be_instance_of SimpleCollection
+          @simple_object_second.complex_collection.should be_nil
+
+          @complex_collection.objects[0].should be_instance_of SimpleObject
+          @complex_collection.objects[1].should be_instance_of ComplexObject
+
+          @simple_collection.objects[0].should be_instance_of SimpleObject
+          @simple_collection.objects[1].should be_instance_of SimpleObject
+          @simple_collection.objects[2].should be_instance_of ComplexObject
+
+        end
+
+        it "specified ending relationships should ignore classes not specified" do
+          @complex_collection.complex_objects.length.should == 1
+          @complex_collection.complex_objects[0].should be_instance_of ComplexObject
+          @complex_collection.complex_objects[1].should be_nil
+
+          @simple_collection.complex_objects.length.should == 1
+          @simple_collection.complex_objects[0].should be_instance_of ComplexObject
+          @simple_collection.complex_objects[1].should be_nil
+
+        end
+
+        after do
+          @simple_object.delete
+          @simple_object_second.delete
+          @complex_object.delete
+        end
+      end
+    end
+  end
 end

data/spec/integration/fedora_solr_sync_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'timeout'
+
+describe "fedora_solr_sync_issues" do
+  before :all do
+    class ParentThing < ActiveFedora::Base
+      has_many :things, :class_name=>'ChildThing', :property=>:is_part_of
+    end
+
+    class ChildThing < ActiveFedora::Base
+      belongs_to :parent, :class_name=>'ParentThing', :property=>:is_part_of
+    end
+  end
+
+  after :all do
+    Object.send(:remove_const, :ChildThing)
+    Object.send(:remove_const, :ParentThing)
+  end
+
+  let(:parent) { ParentThing.create }
+  subject { ChildThing.create :parent => parent }
+
+  it "should not go into an infinite loop" do
+    subject.inner_object.delete
+    parent.reload
+    parent.things.should == []
+  end
+end

data/spec/integration/model_spec.rb

@@ -44,6 +44,9 @@ describe ActiveFedora::Model do
     end
     describe "#find with a valid pid without cast" do
       subject { ActiveFedora::Base.find(@test_instance.pid) }
+      before(:each) do
+        Deprecation.should_receive(:warn).at_least(1).times
+      end
       it { should be_instance_of ActiveFedora::Base}
     end
   end

data/spec/integration/nested_attribute_spec.rb

@@ -8,8 +8,8 @@ describe "NestedAttribute behavior" do
         m.field "uno", :string
         m.field "dos", :string
       end
-      delegate :uno, :to=>'someData', :unique=>true
-      delegate :dos, :to=>'someData', :unique=>true
+      delegate :uno, to: 'someData', multiple: false
+      delegate :dos, to: 'someData', multiple: false
     end
 
     # base Car class, used in test for association updates and :allow_destroy flag

data/spec/integration/ntriples_datastream_spec.rb

@@ -18,8 +18,8 @@ describe ActiveFedora::NtriplesRDFDatastream do
     end
     class RdfTest < ActiveFedora::Base 
       has_metadata :name=>'rdf', :type=>MyDatastream
-      delegate_to 'rdf', [:based_near, :related_url, :part, :date_uploaded]
-      delegate :title, :to=>'rdf', :unique=>true
+      delegate_to 'rdf', [:based_near, :related_url, :part, :date_uploaded], multiple: true
+      delegate :title, to: 'rdf', multiple: false
     end
     @subject = RdfTest.new
   end
@@ -198,7 +198,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
       end
       class Foobar < ActiveFedora::Base 
         has_metadata :name=>'rdf', :type=>TitleDatastream
-        delegate :title, :to=>'rdf'
+        delegate :title, :to=>'rdf', multiple: true
       end
       @subject = Foobar.new
       @subject.title = ["title1", "title2", "title3"]

data/spec/integration/persistence_spec.rb

@@ -6,8 +6,8 @@ describe "persisting objects" do
       has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"foo" do |m|
         m.field "name", :string
       end
-      delegate :name, :to=>'foo', :unique=>true
-      validates :name, :presence=>true
+      delegate :name, to: 'foo', multiple: false
+      validates :name, presence: true
     end
   end
   after :all do

data/spec/integration/relation_delegation_spec.rb

@@ -11,7 +11,7 @@ describe ActiveFedora::Model do
           m.field "baz", :string
         end
 
-        delegate_to :properties, [:foo, :bar, :baz]
+        delegate_to :properties, [:foo, :bar, :baz], multiple: true
 
         def to_solr(doc = {})
           doc = super

data/spec/integration/scoped_query_spec.rb

@@ -11,7 +11,7 @@ describe ActiveFedora::Model do
           m.field "baz", :string
         end
 
-        delegate_to :properties, [:foo, :bar, :baz]
+        delegate_to :properties, [:foo, :bar, :baz], multiple: true
 
         def to_solr(doc = {})
           doc = super

data/spec/unit/base_active_model_spec.rb

@@ -28,8 +28,8 @@ describe ActiveFedora::Base do
       end 
 
       has_metadata :type=>BarStream, :name=>"xmlish"
-      delegate :fubar, :to=>'withText', :unique=>true
-      delegate :duck, :to=>'xmlish', :unique=>true
+      delegate :fubar, to: 'withText', multiple: false
+      delegate :duck, to: 'xmlish', multiple: false
     end
     before :each do
       @n = BarHistory.new()

data/spec/unit/base_delegate_spec.rb

@@ -12,6 +12,8 @@ describe ActiveFedora::Base do
           end
           t.donkey()
           t.cow()
+          t.pig()
+          t.horse()
         end
 
         def self.xml_template
@@ -49,8 +51,10 @@ describe ActiveFedora::Base do
         has_metadata :type=>BarStream2, :name=>"xmlish"
         delegate :fubar, :to=>'withText', :unique=>true
         delegate :donkey, :to=>'xmlish', :unique=>true
-        delegate :cow, :to=>'xmlish'
-        delegate :duck, :to=>'xmlish', :at=>[:waterfowl, :ducks]
+        delegate :cow, :to=>'xmlish'  # for testing the default value of multiple
+        delegate :pig, :to=>'xmlish', multiple: false
+        delegate :horse, :to=>'xmlish', multiple: true
+        delegate :duck, :to=>'xmlish', :at=>[:waterfowl, :ducks], multiple: true
       end
     end
 
@@ -72,6 +76,9 @@ describe ActiveFedora::Base do
       subject.donkey="Bray"
       subject.donkey.should == "Bray"
       subject.xmlish.term_values(:donkey).first.should == 'Bray'
+
+      subject.pig="Oink"
+      subject.pig.should == "Oink"
     end
 
     it "should allow passing parameters to the delegate accessor" do
@@ -84,6 +91,9 @@ describe ActiveFedora::Base do
       ### Metadata datastream does not appear to support multiple value setting
       subject.cow=["one", "two"]
       subject.cow.should == ["one", "two"]
+
+      subject.horse=["neigh", "whinny"]
+      subject.horse.should == ["neigh", "whinny"]
     end
 
     it "should be able to delegate deeply into the terminology" do
@@ -123,7 +133,7 @@ describe ActiveFedora::Base do
     before :all do
       class BarHistory2 < ActiveFedora::Base
         has_metadata 'xmlish', :type=>BarStream2
-        delegate_to 'xmlish', [:donkey, :cow]
+        delegate_to 'xmlish', [:donkey, :cow], multiple: true
       end
       class BarHistory3 < BarHistory2
       end
@@ -158,7 +168,7 @@ describe ActiveFedora::Base do
       end
       class BarHistory4 < ActiveFedora::Base
         has_metadata 'rdfish', :type=>BarRdfDatastream
-        delegate_to 'rdfish', [:title, :description]
+        delegate_to 'rdfish', [:title, :description], multiple: true
       end
     end
 

data/spec/unit/base_delegate_to_spec.rb

@@ -37,7 +37,7 @@ describe ActiveFedora::Base do
 
     class Barnyard < ActiveFedora::Base
       has_metadata :type=>BarnyardDocument, :name=>"xmlish"
-      delegate_to :xmlish, [:cow, :chicken, :pig, :duck]
+      delegate_to :xmlish, [:cow, :chicken, :pig, :duck], multiple: true
       delegate_to :xmlish, [:donkey, :horse], :unique=>true
       #delegate :donkey, :to=>'xmlish', :unique=>true
     end

data/spec/unit/base_spec.rb

@@ -28,7 +28,7 @@ describe ActiveFedora::Base do
       end
       describe "assign_pid" do
         it "should use fedora to generate pids" do
-          # TODO: This juggling of Fedora credentials & establishing connections should be handled by an establish_fedora_connection method, 
+          # TODO: This juggling of Fedora credentials & establishing connections should be handled by an establish_fedora_connection method,
           # possibly wrap it all into a fedora_connection method - MZ 06-05-2012
           stubfedora = double("Fedora")
           stubfedora.should_receive(:connection).and_return(double("Connection", :mint =>"sample:newpid"))
@@ -125,21 +125,26 @@ describe ActiveFedora::Base do
         has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel", :autocreate => true do |m|
           m.field "fubar", :text
         end 
-        delegate :fubar, :to=>'withText'
-        delegate :swank, :to=>'someData'
+        delegate :fubar, :to=>'withText', multiple: true
+        delegate :swank, :to=>'someData', multiple: true
       end
       class FooAdaptation < ActiveFedora::Base
         has_metadata :type=>ActiveFedora::OmDatastream, :name=>'someData'
       end
+
+      class FooInherited < FooHistory
+
+      end
     end
 
     after :all do
       Object.send(:remove_const, :FooHistory)
       Object.send(:remove_const, :FooAdaptation)
+      Object.send(:remove_const, :FooInherited)
     end
-    
+
     def increment_pid
-      @@last_pid += 1    
+      @@last_pid += 1
     end
 
     before(:each) do
@@ -161,11 +166,11 @@ describe ActiveFedora::Base do
 
 
     describe '#new' do
-      it "should create an inner object" do  
+      it "should create an inner object" do
         # for doing AFObject.new(params[:foo]) when nothing is in params[:foo]
         Rubydora::DigitalObject.any_instance.should_receive(:save).never
-        result = ActiveFedora::Base.new(nil)  
-        result.inner_object.should be_kind_of(ActiveFedora::UnsavedDigitalObject)    
+        result = ActiveFedora::Base.new(nil)
+        result.inner_object.should be_kind_of(ActiveFedora::UnsavedDigitalObject)
       end
 
       it "should not save or get an pid on init" do
@@ -203,7 +208,7 @@ describe ActiveFedora::Base do
       @test_object.to_param.should == @test_object.pid
     end
 
-    it "should have to_key once it's saved" do 
+    it "should have to_key once it's saved" do
       @test_object.to_key.should be_nil
       @test_object.inner_object.stub(:new? => false)
       @test_object.to_key.should == [@test_object.pid]
@@ -219,8 +224,8 @@ describe ActiveFedora::Base do
       FooHistory.model_name.should == 'FooHistory'
       FooHistory.model_name.human.should == 'Foo history'
     end
-    ### End ActiveModel::Naming 
-    
+    ### End ActiveModel::Naming
+
 
     describe ".datastreams" do
       before do
@@ -272,7 +277,7 @@ describe ActiveFedora::Base do
     describe '#add_relationship' do
       it 'should call #add_relationship on the rels_ext datastream' do
         @test_object.add_relationship("predicate", "info:fedora/object")
-        pred = ActiveFedora::Predicates.vocabularies["info:fedora/fedora-system:def/relations-external#"]["predicate"] 
+        pred = ActiveFedora::Predicates.vocabularies["info:fedora/fedora-system:def/relations-external#"]["predicate"]
         @test_object.relationships.should have_statement(RDF::Statement.new(RDF::URI.new(@test_object.internal_uri), pred, RDF::URI.new("info:fedora/object")))
       end
 
@@ -283,7 +288,7 @@ describe ActiveFedora::Base do
         @test_object.add_relationship(:is_member_of, "info:fedora/demo:5")
         @test_object.add_relationship(:is_member_of, "info:fedora/demo:10")
       end
-      
+
       it 'should add a relationship to an object only if it does not exist already' do
         next_pid = increment_pid.to_s
         ActiveFedora::Base.stub(:assign_pid).and_return(next_pid)
@@ -302,11 +307,11 @@ describe ActiveFedora::Base do
         @test_object.ids_for_outbound(:conforms_to).should == ["AnInterface"]
       end
     end
-    
+
     it 'should provide #remove_relationship' do
       @test_object.should respond_to(:remove_relationship)
     end
-    
+
     describe '#remove_relationship' do
       it 'should remove a relationship from the relationships hash' do
         @test_object3 = ActiveFedora::Base.new()
@@ -333,7 +338,7 @@ describe ActiveFedora::Base do
     describe '#relationships' do
       it 'should return a graph' do
         @test_object.relationships.kind_of?(RDF::Graph).should be_true
-        @test_object.relationships.size.should == 0 
+        @test_object.relationships.size.should == 0
       end
     end
 
@@ -343,7 +348,7 @@ describe ActiveFedora::Base do
         stub_add_ds(@this_pid, ['RELS-EXT'])
         @test_object.assert_content_model
         @test_object.relationships(:has_model).should == ["info:fedora/afmodel:ActiveFedora_Base"]
-        
+
       end
     end
 
@@ -352,14 +357,14 @@ describe ActiveFedora::Base do
         @test_object.stub(:new_record? => true)
         @test_object.should_receive(:create)
         @test_object.should_receive(:update_index)
-        @test_object.save     
+        @test_object.save
       end
 
       it "should update an existing record" do
         @test_object.stub(:new_record? => false)
         @test_object.should_receive(:update_record)
         @test_object.should_receive(:update_index)
-        @test_object.save     
+        @test_object.save
       end
     end
 
@@ -370,7 +375,7 @@ describe ActiveFedora::Base do
         FooHistory.should_receive(:new).and_return(obj)
         @hist = FooHistory.create(:fubar=>'ta', :swank=>'da')
       end
-      
+
     end
 
     describe ".adapt_to" do
@@ -408,18 +413,33 @@ describe ActiveFedora::Base do
       end
     end
 
-    describe ".adapt_to_cmodel" do
-      subject { FooHistory.new } 
-      it "should cast when a cmodel is found" do
-        ActiveFedora::ContentModel.should_receive(:known_models_for).with( subject).and_return([FooAdaptation])
-        subject.adapt_to_cmodel.should be_kind_of FooAdaptation
+    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
+        ActiveFedora::ContentModel.should_receive(:known_models_for).with(subject).and_return([FooAdaptation])
+        subject.adapt_to_cmodel.should be_kind_of FooHistory
+      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])
+        subject.adapt_to_cmodel.should be_kind_of FooInherited
       end
       it "should not cast when a cmodel is same as the class" do
-        ActiveFedora::ContentModel.should_receive(:known_models_for).with( subject).and_return([FooHistory])
+        ActiveFedora::ContentModel.should_receive(:known_models_for).with(subject).and_return([FooHistory])
         subject.adapt_to_cmodel.should === subject
       end
     end
 
+    describe ".adapt_to_cmodel with ActiveFedora::Base" do
+      subject { ActiveFedora::Base.new }
+
+      it "should cast to the first cmodel if ActiveFedora::Base (or no specified cmodel)" do
+        ActiveFedora::ContentModel.should_receive(:known_models_for).with(subject).and_return([FooAdaptation, FooHistory])
+        subject.adapt_to_cmodel.should be_kind_of FooAdaptation
+      end
+    end
+
+
     describe ".to_solr" do
       it "should provide .to_solr" do
         @test_object.should respond_to(:to_solr)
@@ -444,7 +464,7 @@ describe ActiveFedora::Base do
         solr_doc["id"].should be_nil
         solr_doc[ActiveFedora::SolrService.solr_name("has_part", :symbol)].should be_nil
       end
-      
+
       it "should add self.class as the :active_fedora_model" do
         stub_get(@this_pid)
         stub_get_content(@this_pid, ['RELS-EXT', 'someData', 'withText2', 'withText'])
@@ -460,7 +480,7 @@ describe ActiveFedora::Base do
         ngds.should_receive(:solrize_profile)
         mock1.should_receive(:solrize_profile)
         mock2.should_receive(:solrize_profile)
-        
+
         @test_object.should_receive(:datastreams).twice.and_return({:ds1 => mock1, :ds2 => mock2, :ngds => ngds})
         @test_object.should_receive(:solrize_relationships)
         @test_object.to_solr
@@ -468,7 +488,7 @@ describe ActiveFedora::Base do
       it "should call .to_solr on all RDFDatastreams, passing the resulting document to solr" do
         mock = double("ds1", :to_solr => {})
         mock.should_receive(:solrize_profile)
-        
+
         @test_object.should_receive(:datastreams).twice.and_return({:ds1 => mock})
         @test_object.should_receive(:solrize_relationships)
         @test_object.to_solr
@@ -481,16 +501,16 @@ describe ActiveFedora::Base do
         @test_object.should_receive(:solrize_relationships)
         @test_object.to_solr
       end
-      
+
     end
 
     describe ".label" do
-      it "should return the label of the inner object" do 
+      it "should return the label of the inner object" do
         @test_object.inner_object.should_receive(:label).and_return("foo label")
         @test_object.label.should == "foo label"
       end
     end
-    
+
     describe ".label=" do
       it "should set the label of the inner object" do
         @test_object.label.should_not == "foo label"
@@ -498,8 +518,8 @@ describe ActiveFedora::Base do
         @test_object.label.should == "foo label"
       end
     end
-    
-    
+
+
     describe "get_values_from_datastream" do
       it "should look up the named datastream and call get_values with the given pointer/field_name" do
         mock_ds = double("Datastream", :get_values=>["value1", "value2"])
@@ -507,13 +527,13 @@ describe ActiveFedora::Base do
         @test_object.get_values_from_datastream("ds1", "--my xpath--").should == ["value1", "value2"]
       end
     end
-    
+
     describe "update_datastream_attributes" do
       it "should look up any datastreams specified as keys in the given hash and call update_attributes on the datastream" do
         mock_desc_metadata = double("descMetadata")
         mock_properties = double("properties")
         mock_ds_hash = {'descMetadata'=>mock_desc_metadata, 'properties'=>mock_properties}
-        
+
         ds_values_hash = {
           "descMetadata"=>{ [{:person=>0}, :role]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"} },
           "properties"=>{ "notes"=>"foo" }
@@ -535,12 +555,12 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
         m.to_xml.should == untouched_xml
       end
     end
-    
+
     describe "update_attributes" do
       it "should set the attributes and save" do
         m = FooHistory.new
         att= {"fubar"=> '1234', "baz" =>'stuff'}
-        
+
         m.should_receive(:fubar=).with('1234')
         m.should_receive(:baz=).with('stuff')
         m.should_receive(:save)
@@ -552,14 +572,14 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
       it "should set the attributes and save" do
         m = FooHistory.new
         att= {"fubar"=> '1234', "baz" =>'stuff'}
-        
+
         m.should_receive(:fubar=).with('1234')
         m.should_receive(:baz=).with('stuff')
         m.should_receive(:save)
         m.update(att)
       end
     end
-    
+
     describe "update_indexed_attributes" do
       before do
         Deprecation.should_receive(:warn).at_least(1).times
@@ -567,13 +587,13 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
       it "should call .update_indexed_attributes on all metadata datastreams & nokogiri datastreams" do
         m = FooHistory.new
         att= {"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}
-        
+
         m.datastreams['someData'].should_receive(:update_indexed_attributes)
         m.datastreams["withText"].should_receive(:update_indexed_attributes)
         m.datastreams['withText2'].should_receive(:update_indexed_attributes)
         m.update_indexed_attributes(att)
       end
-      it "should take a :datastreams argument" do 
+      it "should take a :datastreams argument" do
         att= {"fubar"=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}}
         stub_get(@this_pid)
         stub_get_content(@this_pid, ['RELS-EXT', 'someData', 'withText2', 'withText'])
@@ -583,7 +603,7 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
         m.datastreams['someData'].fubar.should == []
         m.datastreams["withText"].fubar.should == ['mork', 'york', 'mangle']
         m.datastreams['withText2'].fubar.should == []
-        
+
         att= {"fubar"=>{"-1"=>"tork", "0"=>"work", "1"=>"bork"}}
         m.update_indexed_attributes(att, :datastreams=>["someData", "withText2"])
         m.should_not be_nil

data/spec/unit/callback_spec.rb

@@ -7,8 +7,8 @@ describe ActiveFedora::Base do
         m.field "fubar", :string
         m.field "swank", :text
       end
-      delegate :fubar, :to=>'someData'
-      delegate :swank, :to=>'someData'
+      delegate :fubar, :to=>'someData', multiple: true
+      delegate :swank, :to=>'someData', multiple: true
 
       after_initialize :a_init
       before_save :b_save

data/spec/unit/ntriples_datastream_spec.rb

@@ -200,12 +200,12 @@ describe ActiveFedora::NtriplesRDFDatastream do
       before(:each) do
         class Foo < ActiveFedora::Base
           has_metadata :name => "descMetadata", :type => MyDatastream
-          delegate :created, :to => :descMetadata
-          delegate :title, :to => :descMetadata
-          delegate :publisher, :to => :descMetadata
-          delegate :based_near, :to => :descMetadata
-          delegate :related_url, :to => :descMetadata
-          delegate :rights, :to => :descMetadata
+          delegate :created, :to => :descMetadata, multiple: true
+          delegate :title, :to => :descMetadata, multiple: true
+          delegate :publisher, :to => :descMetadata, multiple: true
+          delegate :based_near, :to => :descMetadata, multiple: true
+          delegate :related_url, :to => :descMetadata, multiple: true
+          delegate :rights, :to => :descMetadata, multiple: true
         end
         @obj = MyDatastream.new(@inner_object, 'solr_rdf')
         repository = double()

data/spec/unit/query_spec.rb

@@ -15,6 +15,15 @@ describe ActiveFedora::Base do
     Object.send(:remove_const, :SpecModel)
   end
   
+  describe '#find_one' do
+    it 'should notify of deprecation if no cast parameter is passed' do
+      Deprecation.should_receive(:warn).at_least(1).times
+      expect {
+        ActiveFedora::Base.find_one('_PID_')
+      }.to raise_error(ActiveFedora::ObjectNotFoundError)
+    end
+  end
+
   describe '#find' do
     describe "without :cast" do
       describe ":all" do

data/spec/unit/validations_spec.rb

@@ -7,8 +7,8 @@ describe ActiveFedora::Base do
         m.field "fubar", :string
         m.field "swank", :text
       end
-      delegate :fubar, :to=>'someData'
-      delegate :swank, :to=>'someData', unique: true
+      delegate :fubar, :to=>'someData', multiple: true
+      delegate :swank, :to=>'someData', multiple: false
 
       validates_presence_of :fubar
       validates_length_of :swank, :minimum=>5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 6.6.0.pre1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -422,6 +422,7 @@ files:
 - spec/integration/datastreams_spec.rb
 - spec/integration/delegating_spec.rb
 - spec/integration/delete_all_spec.rb
+- spec/integration/fedora_solr_sync_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/has_many_associations_spec.rb
 - spec/integration/model_spec.rb
@@ -549,12 +550,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
@@ -586,6 +587,7 @@ test_files:
 - spec/integration/datastreams_spec.rb
 - spec/integration/delegating_spec.rb
 - spec/integration/delete_all_spec.rb
+- spec/integration/fedora_solr_sync_spec.rb
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/has_many_associations_spec.rb
 - spec/integration/model_spec.rb