active-fedora 6.4.0 → 6.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ed505bd4c93e672099b6338c7835745b8b3c0da
-  data.tar.gz: 1a3ecd688f69dc30eadfad3712e173793a9971a7
+  metadata.gz: 967a4215aac7cba00431147cd02fd5e9f96b04f1
+  data.tar.gz: 3eb487a369aa83bfe1d9de8f1d016a5950ffa5a7
 SHA512:
-  metadata.gz: 1379046abbce3ef04db6542c3ff0905899acd5395771700d23ce04ba1157a68874930c3d5c7fd4ac3ba7523db1362c127cb9734287bdff3922b69540c2437337
-  data.tar.gz: a667ef87332c2d4656624cdf8cab47f3a27fdde1838023d85f5765d5b9c412656b82d94c10e2a6d7ca055bc13d9f831b09dc13c0f80fe472364d0f01c0967573
+  metadata.gz: 9fd89f5819540cb4cd994f4009151d089b5d45f4502a7a0ee1480c4e6eadf2a6386c83e0ae95ea182e9054f324a8b20ee011a34d6bfec987f07459048911cdae
+  data.tar.gz: 43f479f7be5b7a683eb748ac06e03150c897bc1b0ac9d1ea650a5b9c158fef9039aeeb1582b707a2136ac6c5b218aa011812e6492aa4b75e8f9e34078b75cb14

data/lib/active_fedora.rb

@@ -22,6 +22,7 @@ module ActiveFedora #:nodoc:
   class AssociationTypeMismatch < RuntimeError; end # :nodoc:
   class UnregisteredPredicateError < RuntimeError; end # :nodoc:
   class RecordNotSaved < RuntimeError; end # :nodoc:
+  class RecordNotFound < RuntimeError; end # :nodoc:
 
 
   eager_autoload do

data/lib/active_fedora/associations.rb

@@ -36,7 +36,6 @@ module ActiveFedora
     module ClassMethods
 
       def has_many(association_id, options={})
-        raise "You must specify a property name for #{name}" if !options[:property]
         reflection = create_has_many_reflection(association_id, options)
         add_association_callbacks(reflection.name, reflection.options)
         collection_accessor_methods(reflection, HasManyAssociation)

data/lib/active_fedora/associations/association_collection.rb

@@ -180,13 +180,40 @@ module ActiveFedora
         end
 
         def construct_query
-          clauses = {@reflection.options[:property] => @owner.internal_uri}
+
+          clauses = {find_predicate => @owner.internal_uri}
           clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base'
           @counter_query = @finder_query = ActiveFedora::SolrService.construct_query_for_rel(clauses)
         end
 
 
       private 
+
+        def find_predicate
+          if @reflection.options[:property]
+            @reflection.options[:property]
+          elsif @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base' && @reflection.macro != :has_and_belongs_to_many
+            inverse_relation = @owner.class.to_s.underscore.to_sym
+            begin
+            find_class_for_relation(@reflection.class_name.constantize)
+            rescue NameError
+              raise "No :property attribute was set or could be inferred for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class}"
+            end
+          end
+        end
+
+        def find_class_for_relation(klass, inverse_relation=@owner.class.to_s.underscore.to_sym)
+          raise "Unable to find #{klass}." if inverse_relation == :'active_fedora/base'
+          if klass.reflections.key?(inverse_relation)
+            # Try it singular
+            return klass.reflections[inverse_relation].options[:property]
+          elsif klass.reflections.key?(inverse_relation.to_s.pluralize.to_sym)
+            # Try it plural 
+            return klass.reflections[inverse_relation.to_s.pluralize.to_sym].options[:property]
+          end
+          find_class_for_relation(klass, @owner.class.superclass.to_s.underscore.to_sym)
+        end
+
         def create_record(attrs)
           attrs.update(@reflection.options[:conditions]) if @reflection.options[:conditions].is_a?(Hash)
           ensure_owner_is_not_new

data/lib/active_fedora/associations/has_many_association.rb

@@ -45,7 +45,7 @@ module ActiveFedora
         # Deletes the records according to the <tt>:dependent</tt> option.
         def delete_records(records)
           records.each do |r| 
-            r.remove_relationship(@reflection.options[:property], @owner)
+            r.remove_relationship(find_predicate, @owner)
           end
         end
 

data/lib/active_fedora/om_datastream.rb

@@ -2,7 +2,6 @@ require  "om"
 
 module ActiveFedora
   class OmDatastream < Datastream
-    # right now, OmDatastream is just an alias for NokogiriDatastream
 
     before_save do
       if content.blank?

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -76,8 +76,9 @@ module ActiveFedora
                :tableOfContents,
                :temporal,
                :title,
+               :type,
                :valid
-              ] # removed :type, :format
+              ] # removed :format
     DCTERMS.freeze
 
     #Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist
@@ -122,7 +123,8 @@ module ActiveFedora
       self.class.class_fields << name.to_s
       # add term to terminology
       unless self.class.terminology.has_term?(name.to_sym)
-        term = OM::XML::Term.new(name.to_sym, {:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms"}, self.class.terminology)
+        om_term_opts = {:xmlns=>"http://purl.org/dc/terms/", :namespace_prefix => "dcterms", :path => opts[:path]}
+        term = OM::XML::Term.new(name.to_sym, om_term_opts, self.class.terminology)
         self.class.terminology.add_term(term)
         term.generate_xpath_queries!
       end

data/lib/active_fedora/railtie.rb

@@ -3,6 +3,11 @@ module ActiveFedora
     rake_tasks do
       load "tasks/active_fedora.rake"
     end
+
+   initializer 'activefedora.autoload', :before => :set_autoload_paths do |app|
+     app.config.autoload_paths << 'app/models/datastreams'
+    end
+
     generators do
       require(
         'generators/active_fedora/config/config_generator'

data/lib/active_fedora/rdf/nested_attributes.rb

@@ -12,14 +12,35 @@ module ActiveFedora
 
       UNASSIGNABLE_KEYS = %w( id _destroy )
 
+      # @params [Symbol] association_name
+      # @params [Hash, Array] attributes_collection
+      # @example
+      #
+      #   assign_nested_attributes_for_collection_association(:people, {
+      #     '1' => { id: '1', name: 'Peter' },
+      #     '2' => { name: 'John' },
+      #     '3' => { id: '2', _destroy: true }
+      #   })
+      #
+      # Will update the name of the Person with ID 1, build a new associated
+      # person with the name 'John', and mark the associated Person with ID 2
+      # for destruction.
+      #
+      # Also accepts an Array of attribute hashes:
+      #
+      #   assign_nested_attributes_for_collection_association(:people, [
+      #     { id: '1', name: 'Peter' },
+      #     { name: 'John' },
+      #     { id: '2', _destroy: true }
+      #   ])
       def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
         options = self.nested_attributes_options[association_name]
 
         # TODO
         #check_record_limit!(options[:limit], attributes_collection)
 
-        if attributes_collection.is_a?(Hash) || attributes_collection.is_a?(String)
-          attributes_collection = [attributes_collection]
+        if attributes_collection.is_a?(Hash)# || attributes_collection.is_a?(String)
+          attributes_collection = attributes_collection.values
         end
 
         association = self.send(association_name)
@@ -35,7 +56,7 @@ module ActiveFedora
               assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
             end
           else
-            raise_nested_attributes_record_not_found(association_name, record.rdf_subject.to_s)
+            raise_nested_attributes_record_not_found(association_name, attributes['id'].to_s)
           end
         end
       end
@@ -48,7 +69,7 @@ module ActiveFedora
       end
 
       def raise_nested_attributes_record_not_found(association_name, record_id)
-        raise RecordNotFound, "Couldn't find #{association_name} with ID=#{record_id} for #{self.class.name} with ID=#{id}"
+        raise RecordNotFound, "Couldn't find #{association_name} with ID=#{record_id} for #{self.class.name} with ID=#{rdf_subject.to_s}"
       end
 
       def call_reject_if(association_name, attributes)

data/lib/active_fedora/rdf_node.rb

@@ -64,6 +64,14 @@ module ActiveFedora
       @marked_for_destruction
     end
 
+    def new_record= val
+      @new_record = val
+    end
+
+    def new_record?
+      @new_record
+    end
+
     # if there are any existing statements with this predicate, replace them
     # @param [RDF::URI] subject  the subject to insert into the graph
     # @param [Symbol, RDF::URI] predicate  the predicate to insert into the graph

data/lib/active_fedora/rdf_node/term_proxy.rb

@@ -21,7 +21,9 @@ module ActiveFedora
         node = mint_node(attributes)
         parent.graph.insert([subject, predicate, node.rdf_subject])
         reset!
-        target.find { |n| n.rdf_subject == node.rdf_subject}
+        new_node = target.find { |n| n.rdf_subject == node.rdf_subject}
+        new_node.new_record = true
+        new_node
       end
 
       def reset!

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.4.0"
+  VERSION = "6.4.1"
 end

data/lib/generators/active_fedora/model/USAGE

@@ -6,4 +6,6 @@ Example:
 
   This will create:
     app/models/journal.rb
+    app/models/datastreams/journal_metadata.rb
     spec/models/journal_spec.rb
+    spec/models/datastreams/journal_metadata_spec.rb

data/lib/generators/active_fedora/model/model_generator.rb

@@ -6,18 +6,25 @@ module ActiveFedora
     check_class_collision
 
     class_option :directory, :type => :string, :default => 'models', :desc => "Which directory to generate? (i.e. app/DIRECTORY)"
+    class_option :datastream_directory, :type => :string, :default => 'models/datastreams', :desc => "Which datastream directory to generate? (i.e. models/datastreams)"
     class_option :has_file_datastream, :type => :string, :default => nil, :desc => "Name a file datastream to create"
     class_option :descMetadata, :type => :string, :default => nil, :desc => "Add a descMetadata metadata datastream"
 
     def install
       template('model.rb.erb',File.join('app', directory, "#{file_name}.rb"))
+      template('datastream.rb.erb',File.join('app', datastream_directory, "#{file_name}_metadata.rb"))
       template('model_spec.rb.erb',File.join('spec', directory, "#{file_name}_spec.rb"))
+      template('datastream_spec.rb.erb',File.join('spec', datastream_directory, "#{file_name}_metadata_spec.rb"))
     end
 
     protected
 
     def directory
-      options[:directory] || 'models'
+      options[:directory]
+    end
+
+    def datastream_directory
+      options[:datastream_directory]
     end
   end
 end

data/lib/generators/active_fedora/model/templates/datastream.rb.erb

@@ -0,0 +1,32 @@
+# Generated via
+#  `rails generate active_fedora::model <%= class_name %>`
+class <%= class_name %>Metadata < ActiveFedora::OmDatastream
+
+  # Define a terminology for parsing this XML document
+  # See: https://github.com/projecthydra/om/wiki/Tame-your-XML-with-OM
+  #
+  # set_terminology do |t|
+  #   t.root(path: "fields")
+  #   t.title
+  #   t.author
+  # end
+
+
+  # Describe what an empty document looks like
+  #
+  # def self.xml_template
+  #   Nokogiri::XML.parse("<fields/>")
+  # end
+  #
+
+
+  # "If you need to add additional attributes to the SOLR document, define the
+  # #to_solr method and make sure to use super"
+  #
+  # def to_solr(solr_document={}, options={})
+  #   super(solr_document, options)
+  #   solr_document["my_attribute_s"] = my_attribute
+  #   return solr_document
+  # end
+
+end

data/lib/generators/active_fedora/model/templates/datastream_spec.rb.erb

@@ -0,0 +1,13 @@
+# Generated via
+#  `rails generate active_fedora::model <%= class_name %>`
+require 'spec_helper'
+
+describe <%= class_name %>Metadata do
+  it 'should have a title' do
+    pending "Create a terminology for <%= class_name %>Metadata, then enable this test"
+    subject.title = 'War and Peace'
+    subject.title.should == ['War and Peace']
+  end
+
+end
+

data/lib/generators/active_fedora/model/templates/model.rb.erb

@@ -1,15 +1,12 @@
 # Generated via
 #  `rails generate active_fedora::model <%= class_name %>`
-require 'active_fedora/base'
 class <%= class_name %> < ActiveFedora::Base
   <% if options['descMetadata'] %>
-  has_metadata name: "descMetadata", type: <%= options['descMetadata'] %>
+  has_metadata "descMetadata", type: <%= options['descMetadata'] %>
   <% else %>
-  # Uncomment the following lines to add a #descMetadata method that is a
-  #   datastream. You will need to specify the :type:, which may involve
-  #   creating a new Datastream object.
+  # Creating a #descMetadata method that returns the datastream. 
   #
-  # has_metadata name: "descMetadata", type: <%= class_name %>MetadataDatastream
+  has_metadata "descMetadata", type: <%= class_name %>Metadata
   <%- end -%>
   <% if options['has_file_datastream'] %>
   has_file_datastream "<%= options['has_file_datastream'] %>"

data/lib/generators/active_fedora/model/templates/model_spec.rb.erb

@@ -16,4 +16,8 @@ describe <%= class_name %> do
     subject.destroy
   end
 
-end
+  it 'should have a descMetadata datastream' do
+    subject.descMetadata.should be_kind_of <%= options['descMetadata'] ? options['descMetadata'] : "#{class_name}Metadata" %>
+  end
+
+end

data/spec/integration/associations_spec.rb

@@ -1,357 +1,369 @@
 require 'spec_helper'
 
-class Library < ActiveFedora::Base 
-  has_many :books, :property=>:has_constituent
-end
-
-class Book < ActiveFedora::Base 
-  belongs_to :library, :property=>:has_constituent
-  belongs_to :author, :property=>:has_member, :class_name=>'Person'
-  has_and_belongs_to_many :topics, :property=>:has_topic, :inverse_of=>:is_topic_of
-  has_and_belongs_to_many :collections, :property=>:is_member_of_collection
-end
-
-class Person < ActiveFedora::Base
-end
-
-class Collection < ActiveFedora::Base
-end
-
-class Topic < ActiveFedora::Base 
-  has_and_belongs_to_many :books, :property=>:is_topic_of
-end
-
 describe ActiveFedora::Base do
-  describe "an unsaved instance" do
-    describe "of has_many" do
-      before do
-        @library = Library.new()
-        @book = Book.new
-        @book.save
-        @book2 = Book.new
-        @book2.save
-      end
-
-      it "should build child" do
-        new_book = @library.books.build({})
-        new_book.should be_new_record
-        new_book.should be_kind_of Book
-        new_book.library.should be_nil
-        @library.books.should == [new_book]
-        #TODO save the associated children too, requires something like ActiveRecord::AutosaveAssociation (ver 3.0.12) 
-        #@library.save
-        #new_book.library.should == @library
-      end
-
-      it "should not create children if the parent isn't saved" do
-        lambda {@library.books.create({})}.should raise_error ActiveFedora::RecordNotSaved, "You cannot call create unless the parent is saved"
-      end
-
-      it "should create children" do
-        @library.save!
-        new_book = @library.books.create({})
-        new_book.should_not be_new_record
-        new_book.should be_kind_of Book
-        new_book.library.should == @library
-      end
-
-      it "should build parent" do
-        new_library = @book.build_library({})
-        new_library.should be_new_record
-        new_library.should be_kind_of Library
-        @book.library.should == new_library
+  describe "complex example" do
+    before do
+      class Library < ActiveFedora::Base 
+        has_many :books, :property=>:has_constituent
       end
 
-      it "should create parent" do
-        new_library = @book.create_library({})
-        new_library.should_not be_new_record
-        new_library.should be_kind_of Library
-        @book.library.should == new_library
+      class Book < ActiveFedora::Base 
+        belongs_to :library, :property=>:has_constituent
+        belongs_to :author, :property=>:has_member, :class_name=>'Person'
+        has_and_belongs_to_many :topics, :property=>:has_topic, :inverse_of=>:is_topic_of
+        has_and_belongs_to_many :collections, :property=>:is_member_of_collection
       end
 
-      it "should let you shift onto the association" do
-        @library.new_record?.should be_true
-        @library.books.size == 0
-        @library.books.should == []
-        @library.book_ids.should ==[]
-        @library.books << @book
-        @library.books.should == [@book]
-        @library.book_ids.should ==[@book.pid]
-
+      class Person < ActiveFedora::Base
       end
 
-      it "should let you set an array of objects" do
-        @library.books = [@book, @book2]
-        @library.books.should == [@book, @book2]
-        @library.save
-
-        @library.books = [@book]
-        @library.books.should == [@book]
-      
-      end
-      it "should let you set an array of object ids" do
-        @library.book_ids = [@book.pid, @book2.pid]
-        @library.books.should == [@book, @book2]
+      class Collection < ActiveFedora::Base
       end
 
-      it "setter should wipe out previously saved relations" do
-        @library.book_ids = [@book.pid, @book2.pid]
-        @library.book_ids = [@book2.pid]
-        @library.books.should == [@book2]
-        
+      class Topic < ActiveFedora::Base 
+        has_and_belongs_to_many :books, :property=>:is_topic_of
       end
+    end
 
-      it "saving the parent should save the relationships on the children" do
-        @library.save
-        @library.books = [@book, @book2]
-        @library.save
-        @library = Library.find(@library.pid)
-        @library.books.should == [@book, @book2]
-      end
+    after do
+      Object.send(:remove_const, :Library)
+      Object.send(:remove_const, :Book)
+      Object.send(:remove_const, :Person)
+      Object.send(:remove_const, :Collection)
+      Object.send(:remove_const, :Topic)
+    end
 
+    describe "an unsaved instance" do
+      describe "of has_many" do
+        before do
+          @library = Library.new()
+          @book = Book.new
+          @book.save
+          @book2 = Book.new
+          @book2.save
+        end
 
-      it "should let you lookup an array of objects with solr" do
-        @library.save
-        @book.library = @library
-        @book2.library = @library
-        @book.save
-        @book2.save
+        it "should build child" do
+          new_book = @library.books.build({})
+          new_book.should be_new_record
+          new_book.should be_kind_of Book
+          new_book.library.should be_nil
+          @library.books.should == [new_book]
+          #TODO save the associated children too, requires something like ActiveRecord::AutosaveAssociation (ver 3.0.12) 
+          #@library.save
+          #new_book.library.should == @library
+        end
 
-        @library = Library.find(@library.pid)
-        @library.books.should == [@book, @book2]
-      
-        solr_resp =  @library.books(:response_format=>:solr)
-        solr_resp.size.should == 2
-        solr_resp[0]['id'].should == @book.pid 
-        solr_resp[1]['id'].should == @book2.pid 
-      
-      end
+        it "should not create children if the parent isn't saved" do
+          lambda {@library.books.create({})}.should raise_error ActiveFedora::RecordNotSaved, "You cannot call create unless the parent is saved"
+        end
 
+        it "should create children" do
+          @library.save!
+          new_book = @library.books.create({})
+          new_book.should_not be_new_record
+          new_book.should be_kind_of Book
+          new_book.library.should == @library
+        end
 
+        it "should build parent" do
+          new_library = @book.build_library({})
+          new_library.should be_new_record
+          new_library.should be_kind_of Library
+          @book.library.should == new_library
+        end
 
-      after do
-        @book.delete
-        @book2.delete
-      end
-    end
+        it "should create parent" do
+          new_library = @book.create_library({})
+          new_library.should_not be_new_record
+          new_library.should be_kind_of Library
+          @book.library.should == new_library
+        end
 
-    describe "of belongs to" do
-      before do
-        @library = Library.new()
-        @library.save
-        @book = Book.new
-        @book.save
-      end
-      it "shouldn't do anything if you set a nil id" do
-        @book.library_id = nil
-      end
-      it "should be settable from the book side" do
-        @book.library_id = @library.pid
-        @book.library.should == @library
-        @book.library.pid.should == @library.pid
-        @book.attributes= {:library_id => ""}
-        @book.library_id.should be_nil
-      end
-      after do
-        @library.delete
-        @book.delete
-      end
-    end
+        it "should let you shift onto the association" do
+          @library.new_record?.should be_true
+          @library.books.size == 0
+          @library.books.should == []
+          @library.book_ids.should ==[]
+          @library.books << @book
+          @library.books.should == [@book]
+          @library.book_ids.should ==[@book.pid]
 
-    describe "of has_many_and_belongs_to" do
-      before do
-        @topic1 = Topic.create
-        @topic2 = Topic.create
-        @book = Book.create
-      end
-      it "habtm should set and remove relationships bidirectionally" do
-        @book.topics << @topic1
-        @book.topics.should == [@topic1]
-        @topic1.books.should == [@book]
-        @topic1.reload.books.should == [@book]
+        end
 
-        @book.topics.delete(@topic1)
-        #@topic1.books.delete(@book)
-        @book.topics.should == []
-        @topic1.books.should == []
-      end
-      after do
-        @topic1.delete
-        @topic2.delete
-      end
-    end
-  end
+        it "should let you set an array of objects" do
+          @library.books = [@book, @book2]
+          @library.books.should == [@book, @book2]
+          @library.save
 
-  
+          @library.books = [@book]
+          @library.books.should == [@book]
+        
+        end
+        it "should let you set an array of object ids" do
+          @library.book_ids = [@book.pid, @book2.pid]
+          @library.books.should == [@book, @book2]
+        end
 
+        it "setter should wipe out previously saved relations" do
+          @library.book_ids = [@book.pid, @book2.pid]
+          @library.book_ids = [@book2.pid]
+          @library.books.should == [@book2]
+          
+        end
 
-  describe "a saved instance" do
-    describe "of belongs_to" do
-      before do
-        @library = Library.new()
-        @library.save()
-        @book = Book.new
-        @book.save
-        @person = Person.new
-        @person.save
-      end
-      it "should have many books once it has been saved" do
-        @library.books << @book
+        it "saving the parent should save the relationships on the children" do
+          @library.save
+          @library.books = [@book, @book2]
+          @library.save
+          @library = Library.find(@library.pid)
+          @library.books.should == [@book, @book2]
+        end
 
-        @book.library.pid.should == @library.pid
-        @library.books.reload
-        @library.books.should == [@book]
 
-        @library2 = Library.find(@library.pid)
-        @library2.books.should == [@book]
-      end
+        it "should let you lookup an array of objects with solr" do
+          @library.save
+          @book.library = @library
+          @book2.library = @library
+          @book.save
+          @book2.save
 
-      it "should have a count once it has been saved" do
-        @library.books << @book << Book.create 
-        @library.save
+          @library = Library.find(@library.pid)
+          @library.books.should == [@book, @book2]
+        
+          solr_resp =  @library.books(:response_format=>:solr)
+          solr_resp.size.should == 2
+          solr_resp[0]['id'].should == @book.pid 
+          solr_resp[1]['id'].should == @book2.pid 
+        
+        end
 
-        # @book.library.pid.should == @library.pid
-        # @library.books.reload
-        # @library.books.should == [@book]
 
-        @library2 = Library.find(@library.pid)
-        @library2.books.size.should == 2
-      end
 
-      it "should respect the :class_name parameter" do
-        @book.author = @person
-        @book.save
-        Book.find(@book.id).author_id.should == @person.pid
-        Book.find(@book.id).author.send(:find_target).should be_kind_of Person
+        after do
+          @book.delete
+          @book2.delete
+        end
       end
 
-      describe "when changing the belonger" do
+      describe "of belongs to" do
         before do
-          @book.library = @library
+          @library = Library.new()
+          @library.save
+          @book = Book.new
           @book.save
-          @library2 = Library.create
         end
-        it "should replace an existing instance" do
-          @book.library_id.should == @library.id
-          @book.library = @library2
-          @book.save
-          Book.find(@book.id).library_id.should == @library2.id
+        it "shouldn't do anything if you set a nil id" do
+          @book.library_id = nil
+        end
+        it "should be settable from the book side" do
+          @book.library_id = @library.pid
+          @book.library.should == @library
+          @book.library.pid.should == @library.pid
+          @book.attributes= {:library_id => ""}
+          @book.library_id.should be_nil
         end
         after do
-          @library2.delete
+          @library.delete
+          @book.delete
         end
       end
 
-      after do
-        @library.delete
-        @book.delete
-      end
-    end
-    describe "of has_many_and_belongs_to" do
-      before do
-        @book = Book.create
-      end
-      after do
-        @book.delete
-      end
-      describe "when invese is specified" do
+      describe "of has_many_and_belongs_to" do
         before do
           @topic1 = Topic.create
           @topic2 = Topic.create
+          @book = Book.create
         end
-        it "should set relationships bidirectionally" do
+        it "habtm should set and remove relationships bidirectionally" do
           @book.topics << @topic1
           @book.topics.should == [@topic1]
-          @book.relationships(:has_topic).should == [@topic1.internal_uri]
-          @topic1.relationships(:has_topic).should == []
-          @topic1.relationships(:is_topic_of).should == [@book.internal_uri]
-          Topic.find(@topic1.pid).books.should == [@book] #Can't have saved it because @book isn't saved yet.
-        end
-        it "should save new child objects" do
-          @book.topics << Topic.new
-          @book.topics.first.pid.should_not be_nil
-        end
-        it "should clear out the old associtions" do
-          @book.topics = [@topic1]
-          @book.topics = [@topic2]
-          @book.topic_ids.should == [@topic2.pid]
+          @topic1.books.should == [@book]
+          @topic1.reload.books.should == [@book]
+
+          @book.topics.delete(@topic1)
+          #@topic1.books.delete(@book)
+          @book.topics.should == []
+          @topic1.books.should == []
         end
         after do
           @topic1.delete
           @topic2.delete
         end
       end
-      describe "when invese is not specified" do
+    end
+
+    
+
+
+    describe "a saved instance" do
+      describe "of belongs_to" do
         before do
-          @c = Collection.create
-          @book.collections << @c
+          @library = Library.new()
+          @library.save()
+          @book = Book.new
           @book.save
+          @person = Person.new
+          @person.save
+        end
+        it "should have many books once it has been saved" do
+          @library.books << @book
+
+          @book.library.pid.should == @library.pid
+          @library.books.reload
+          @library.books.should == [@book]
+
+          @library2 = Library.find(@library.pid)
+          @library2.books.should == [@book]
         end
+
+        it "should have a count once it has been saved" do
+          @library.books << @book << Book.create 
+          @library.save
+
+          # @book.library.pid.should == @library.pid
+          # @library.books.reload
+          # @library.books.should == [@book]
+
+          @library2 = Library.find(@library.pid)
+          @library2.books.size.should == 2
+        end
+
+        it "should respect the :class_name parameter" do
+          @book.author = @person
+          @book.save
+          Book.find(@book.id).author_id.should == @person.pid
+          Book.find(@book.id).author.send(:find_target).should be_kind_of Person
+        end
+
+        describe "when changing the belonger" do
+          before do
+            @book.library = @library
+            @book.save
+            @library2 = Library.create
+          end
+          it "should replace an existing instance" do
+            @book.library_id.should == @library.id
+            @book.library = @library2
+            @book.save
+            Book.find(@book.id).library_id.should == @library2.id
+          end
+          after do
+            @library2.delete
+          end
+        end
+
         after do
-          @c.delete
+          @library.delete
+          @book.delete
         end
-        it "should have a collection" do
-          @book.relationships(:is_member_of_collection).should == [@c.internal_uri]
-          @book.collections.should == [@c]
+      end
+      describe "of has_many_and_belongs_to" do
+        before do
+          @book = Book.create
         end
-        it "habtm should not set foreign relationships if :inverse_of is not specified" do
-           @c.relationships(:is_member_of_collection).should == []
+        after do
+          @book.delete
         end
-        it "should load the collections" do
-          reloaded = Book.find(@book.pid)
-          reloaded.collections.should == [@c]
+        describe "when invese is specified" do
+          before do
+            @topic1 = Topic.create
+            @topic2 = Topic.create
+          end
+          it "should set relationships bidirectionally" do
+            @book.topics << @topic1
+            @book.topics.should == [@topic1]
+            @book.relationships(:has_topic).should == [@topic1.internal_uri]
+            @topic1.relationships(:has_topic).should == []
+            @topic1.relationships(:is_topic_of).should == [@book.internal_uri]
+            Topic.find(@topic1.pid).books.should == [@book] #Can't have saved it because @book isn't saved yet.
+          end
+          it "should save new child objects" do
+            @book.topics << Topic.new
+            @book.topics.first.pid.should_not be_nil
+          end
+          it "should clear out the old associtions" do
+            @book.topics = [@topic1]
+            @book.topics = [@topic2]
+            @book.topic_ids.should == [@topic2.pid]
+          end
+          after do
+            @topic1.delete
+            @topic2.delete
+          end
+        end
+        describe "when invese is not specified" do
+          before do
+            @c = Collection.create
+            @book.collections << @c
+            @book.save
+          end
+          after do
+            @c.delete
+          end
+          it "should have a collection" do
+            @book.relationships(:is_member_of_collection).should == [@c.internal_uri]
+            @book.collections.should == [@c]
+          end
+          it "habtm should not set foreign relationships if :inverse_of is not specified" do
+             @c.relationships(:is_member_of_collection).should == []
+          end
+          it "should load the collections" do
+            reloaded = Book.find(@book.pid)
+            reloaded.collections.should == [@c]
+          end
         end
       end
     end
-  end
 
-  describe "setting belongs_to" do
-    before do
-      @library = Library.new()
-      @library.save()
-      @book = Book.new
-    end
-    it "should set the association" do
-      @book.library = @library
-      @book.library.pid.should == @library.pid
-      @book.save
+    describe "setting belongs_to" do
+      before do
+        @library = Library.new()
+        @library.save()
+        @book = Book.new
+      end
+      it "should set the association" do
+        @book.library = @library
+        @book.library.pid.should == @library.pid
+        @book.save
 
 
-      Book.find(@book.pid).library.pid.should == @library.pid
-      
-    end
-    it "should clear the association" do
-      @book.library = @library
-      @book.library = nil
-      @book.save
+        Book.find(@book.pid).library.pid.should == @library.pid
+        
+      end
+      it "should clear the association" do
+        @book.library = @library
+        @book.library = nil
+        @book.save
 
-      Book.find(@book.pid).library.should be_nil 
-      
-    end
+        Book.find(@book.pid).library.should be_nil 
+        
+      end
 
-    it "should replace the association" do
-      @library2 = Library.new
-      @library2.save
-      @book.library = @library
-      @book.save
-      @book.library = @library2
-      @book.save
-      Book.find(@book.pid).library.pid.should == @library2.pid 
+      it "should replace the association" do
+        @library2 = Library.new
+        @library2.save
+        @book.library = @library
+        @book.save
+        @book.library = @library2
+        @book.save
+        Book.find(@book.pid).library.pid.should == @library2.pid 
 
-    end
+      end
 
-    it "should be able to be set by id" do
-      @book.library_id = @library.pid
-      @book.library_id.should == @library.pid
-      @book.library.pid.should == @library.pid
-      @book.save
-      Book.find(@book.pid).library_id.should == @library.pid
-    end
+      it "should be able to be set by id" do
+        @book.library_id = @library.pid
+        @book.library_id.should == @library.pid
+        @book.library.pid.should == @library.pid
+        @book.save
+        Book.find(@book.pid).library_id.should == @library.pid
+      end
 
-    after do
-      @library.delete
-      @book.delete
-      @library2.delete if @library2
+      after do
+        @library.delete
+        @book.delete
+        @library2.delete if @library2
+      end
     end
   end
 
@@ -503,7 +515,11 @@ describe ActiveFedora::Base do
       @master.media_object = @media
       @master.save
       @master.reload
+    end
 
+    after :all do
+      Object.send(:remove_const, :MasterFile)
+      Object.send(:remove_const, :MediaObject)
     end
 
     it "should also remove the relationships that point at that object" do
@@ -513,5 +529,80 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe "has_many" do
+    describe "when an object doesn't have a property, and the class_name is predictable" do
+      before (:all) do
+        class Bauble < ActiveFedora::Base
+          belongs_to :media_object, property: :is_part_of
+        end
+        class MediaObject < ActiveFedora::Base
+          has_many :baubles
+        end
+      end
+      after :all do
+        Object.send(:remove_const, :Bauble)
+        Object.send(:remove_const, :MediaObject)
+      end
+
+      it "it should find the predicate" do
+        MediaObject.new.baubles.send(:find_predicate).should == :is_part_of
+      end
+    end
+
+    describe "when an object doesn't have a property, but has a class_name" do
+      before (:all) do
+        class MasterFile < ActiveFedora::Base
+          belongs_to :media_object, property: :is_part_of
+        end
+        class MediaObject < ActiveFedora::Base
+          has_many :parts, :class_name=>'MasterFile'
+        end
+      end
+      after :all do
+        Object.send(:remove_const, :MasterFile)
+        Object.send(:remove_const, :MediaObject)
+      end
+
+      it "it should find the predicate" do
+        MediaObject.new.parts.send(:find_predicate).should == :is_part_of
+      end
+    end
+
+    describe "an object has an explicity property" do
+      before (:all) do
+        class Bauble < ActiveFedora::Base
+          belongs_to :media_object, property: :is_part_of
+        end
+        class MediaObject < ActiveFedora::Base
+          has_many :baubles, property: :has_baubles
+        end
+      end
+      after :all do
+        Object.send(:remove_const, :Bauble)
+        Object.send(:remove_const, :MediaObject)
+      end
+
+      it "it should find the predicate" do
+        MediaObject.new.baubles.send(:find_predicate).should == :has_baubles
+      end
+    end
+    describe "an object doesn't have a property" do
+      before (:all) do
+        class Bauble < ActiveFedora::Base
+          belongs_to :media_object, property: :is_part_of
+        end
+        class MediaObject < ActiveFedora::Base
+          has_many :shoes
+        end
+      end
+      after :all do
+        Object.send(:remove_const, :Bauble)
+        Object.send(:remove_const, :MediaObject)
+      end
 
+      it "it should find the predicate" do
+        expect { MediaObject.new.shoes.send(:find_predicate) }.to raise_error RuntimeError, "No :property attribute was set or could be inferred for has_many :shoes on MediaObject"
+      end
+    end
+  end
 end

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -27,6 +27,19 @@ describe "Nested Rdf Objects" do
       ds = SpecDatastream.new(mock_obj)
     end
 
+    describe "#new_record?" do
+      it "should be true when its built" do
+        v = ds.parts.build(label: 'Alternator')
+        v.should be_new_record
+      end
+
+      it "should not be new when it's loaded from fedora" do
+        ds.content = '_:g70324142325120 <http://purl.org/dc/terms/title> "Alternator" .
+<info:fedora/test:124> <http://purl.org/dc/terms/hasPart> _:g70324142325120 .'
+        ds.parts.first.should_not be_new_record
+      end
+    end
+
     it "should not choke on invalid data" do
       # set a string in the graph where model expects a node
       ds.parts = ["foo"]

data/spec/integration/has_many_associations_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe "When two or more relationships share the same property" do 
   before do
     class Book < ActiveFedora::Base 
-      has_many :collections, :property=>:is_part_of, :class_name=>'Collection'
-      has_many :people, :property=>:is_part_of
+      has_many :collections, :class_name=>'Collection'
+      has_many :people
     end
 
     class Person < ActiveFedora::Base

data/spec/integration/rdf_nested_attributes_spec.rb

@@ -70,18 +70,20 @@ describe "Nesting attribute behavior of RDFDatastream" do
       let(:params) do 
         { myResource: 
           {
-            topic_attributes: [
+            topic_attributes: {
+              '0' =>
               {
                 elementList_attributes: [{
                   topicElement:"Cosmology"
                   }]
               },
+              '1' =>
               {
                 elementList_attributes: [{
                   topicElement:"Quantum Behavior"
                 }]
               }
-            ],
+            },
             personalName_attributes: [
               { 
                 elementList_attributes: [{
@@ -153,6 +155,11 @@ describe "Nesting attribute behavior of RDFDatastream" do
         subject.parts.map{|p| p.label.first}.should == ['Alternator', 'Universal Joint', 'Transmission', 'Oil Pump']
 
       end
+      it "should raise an error when the object isn't found" do
+       expect {
+          subject.parts_attributes= [{id: '_:g70192865051320', label: "Universal Joint"}]
+       }.to raise_error ActiveFedora::RecordNotFound
+      end
     end    
   end
 end

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -45,7 +45,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
 
   it "should create the right number of fields" do
-    ActiveFedora::QualifiedDublinCoreDatastream::DCTERMS.size.should == 53
+    ActiveFedora::QualifiedDublinCoreDatastream::DCTERMS.size.should == 54
   end
 
   it "should have unmodifiable constants" do
@@ -114,6 +114,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     end
 
   end
+
   describe 'custom fields' do
     it 'should grab the term' do
       sample_xml = "<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'><dcterms:cust>custom</dcterms:cust></dc>"
@@ -123,4 +124,12 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     end
   end
 
+  describe "#field should accept :path option" do
+    it "should be able to map :dc_type to the path 'type'" do
+      test_ds = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(@sample_xml)
+      test_ds.field :dc_type, :string, path: "type", multiple: true
+      test_ds.dc_type.should == ['sound']
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.4.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -384,6 +384,8 @@ files:
 - lib/generators/active_fedora/config/solr/templates/solr_conf/solr.xml
 - lib/generators/active_fedora/model/USAGE
 - lib/generators/active_fedora/model/model_generator.rb
+- lib/generators/active_fedora/model/templates/datastream.rb.erb
+- lib/generators/active_fedora/model/templates/datastream_spec.rb.erb
 - lib/generators/active_fedora/model/templates/model.rb.erb
 - lib/generators/active_fedora/model/templates/model_spec.rb.erb
 - lib/tasks/active_fedora.rake