active-fedora 8.7.0 → 9.0.0.beta1

data/lib/generators/active_fedora/config/config_generator.rb

@@ -4,7 +4,6 @@ module ActiveFedora
   class ConfigGenerator < Rails::Generators::Base
     def generate_configs
       generate('active_fedora:config:solr')
-      generate('active_fedora:config:fedora')
     end
   end
 end

data/lib/generators/active_fedora/config/solr/solr_generator.rb

@@ -2,7 +2,7 @@ require 'rails/generators'
 
 module ActiveFedora
   class Config::SolrGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root ::File.expand_path('../templates', __FILE__)
 
     def generate
       # Overwrite the configuration files that Blacklight has installed

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

@@ -2,7 +2,7 @@ require 'rails/generators'
 
 module ActiveFedora
   class ModelGenerator < Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
+    source_root ::File.expand_path('../templates', __FILE__)
     check_class_collision
 
     class_option :directory, :type => :string, :default => 'models', :desc => "Which directory to generate? (i.e. app/DIRECTORY)"
@@ -11,10 +11,10 @@ module ActiveFedora
     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"))
+      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

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

@@ -6,7 +6,7 @@ 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']
+    expect(subject.title).to eq ['War and Peace']
   end
 
 end

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

@@ -12,12 +12,12 @@ describe <%= class_name %> do
     before { subject.save! }
     after { subject.destroy }
     it 'should exist' do
-      <%= class_name %>.exists?(subject.pid).should be_true
+      expect(<%= class_name %>.exists?(subject.id)).to be true
     end
   end
 
   it 'should have a descMetadata datastream' do
-    subject.descMetadata.should be_kind_of <%= options['descMetadata'] ? options['descMetadata'] : "#{class_name}Metadata" %>
+    expect(subject.descMetadata).to be_kind_of <%= options['descMetadata'] ? options['descMetadata'] : "#{class_name}Metadata" %>
   end
 
 end

data/lib/tasks/active_fedora_dev.rake

@@ -1,7 +1,7 @@
 APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 
 require 'jettywrapper'
-JETTY_ZIP_BASENAME = '7.x-stable'
+JETTY_ZIP_BASENAME = 'fedora-4/master'
 Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
 
 namespace :active_fedora do
@@ -13,7 +13,7 @@ namespace :active_fedora do
     doc_destination = File.join(project_root, 'doc')
 
     YARD::Rake::YardocTask.new(:doc) do |yt|
-      yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) + 
+      yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
                    [ '-', File.join(project_root, 'README.md')]
       yt.options = ['--output-dir', doc_destination, '--readme', 'README.md']
     end
@@ -26,47 +26,41 @@ namespace :active_fedora do
 
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:rspec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
-    spec.pattern += FileList['spec/*_spec.rb']
     spec.rspec_opts = ['--backtrace'] if ENV['CI']
   end
 
   RSpec::Core::RakeTask.new(:rcov) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
-    spec.pattern += FileList['spec/*_spec.rb']
     spec.rcov = true
   end
 
   desc "Copies the default SOLR config for the bundled Testing Server"
   task :configure_jetty do
-    FileList['lib/generators/active_fedora/config/solr/templates/solr_conf/conf/*'].each do |f|  
+    FileList['lib/generators/active_fedora/config/solr/templates/solr_conf/conf/*'].each do |f|
       cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
       cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
     end
   end
 
 
-desc "CI build"
-task :ci do
-  ENV['environment'] = "test"
-  Rake::Task["active_fedora:configure_jetty"].invoke
-  jetty_params = Jettywrapper.load_config
-  error = Jettywrapper.wrap(jetty_params) do
-    Rake::Task['active_fedora:coverage'].invoke
+  desc "CI build"
+  task :ci do
+    ENV['environment'] = "test"
+    Rake::Task["active_fedora:configure_jetty"].invoke
+    jetty_params = Jettywrapper.load_config
+    error = Jettywrapper.wrap(jetty_params) do
+      Rake::Task['active_fedora:coverage'].invoke
+    end
+    raise "test failures: #{error}" if error
+    # Only create documentation if the tests have passed
+    Rake::Task["active_fedora:doc"].invoke
   end
-  raise "test failures: #{error}" if error
-  # Only create documentation if the tests have passed
-  Rake::Task["active_fedora:doc"].invoke
-end
-
-desc "Execute specs with coverage"
-task :coverage do 
-  # Put spec opts in a file named .rspec in root
-  ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
-  ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
 
- # Rake::Task["active_fedora:fixtures"].invoke
-  Rake::Task["active_fedora:rspec"].invoke
-end
+  desc "Execute specs with coverage"
+  task :coverage do
+    # Put spec opts in a file named .rspec in root
+    ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+    ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
+    Rake::Task["active_fedora:rspec"].invoke
+  end
 
 end

data/spec/config_helper.rb

@@ -19,7 +19,7 @@ end
 def unstub_rails
   Object.send(:remove_const,:Rails) if defined?(Rails)
 end
-    
+
 def setup_pretest_env
   ENV['RAILS_ENV']='test'
   ENV['environment']='test'

data/spec/fixtures/mixed_rdf_descMetadata.nt

@@ -1,7 +1,7 @@
-<info:fedora/test:1> <http://purl.org/dc/terms/created> "2010-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
-<info:fedora/test:1> <http://purl.org/dc/terms/title> "Title of work" .
-<info:fedora/test:1> <http://purl.org/dc/terms/publisher> "Penn State" .
-<info:fedora/test:1> <http://xmlns.com/foaf/0.1/based_near> "New York, NY, US" .
-<info:fedora/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://google.com/> .
-<info:fedora/test:1/content> <http://purl.org/dc/terms/title> "Title of datastream" .
+<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/created> "2010-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/title> "Title of work" .
+<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/publisher> "Penn State" .
+<http://localhost:8983/fedora/rest/test/test:1> <http://xmlns.com/foaf/0.1/based_near> "New York, NY, US" .
+<http://localhost:8983/fedora/rest/test/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://google.com/> .
+<http://localhost:8983/fedora/rest/test/test:1/content> <http://purl.org/dc/terms/title> "Title of datastream" .
 

data/spec/fixtures/rails_root/config/predicate_mappings.yml

@@ -1,23 +1,7 @@
-# The default namespace maps to the default namespace for generating rels_ext from solr
-:default_namespace: info:fedora/fedora-system:def/relations-external#
+:default_namespace: http://fedora.info/definitions/v4/rels-ext#
 
-# namespace mappings--- 
-# you can add specific mappings for your institution by providing the following:
-#   namespace_uri:
-#     :relationship_symbol: relationship_identifier
-# 
-# For example, if you have the following element in your rels_ext:
-#  
-#  <oai:itemID>oai:example.edu:changeme:500</oai:itemID>
-# 
-# With the last two lines of this file uncommented, the relationships hash of your object will include:
-#   :oai_item_id => ["info:fedora/oai:example.edu:changeme:500"]
-#
-# With the last two lines of this file commented out, the relationships hash of your object will include:
-#   "oai_itemID" => ["info:fedora/oai:example.edu:changeme:500"]
-#   
 :predicate_mapping:
-  info:fedora/fedora-system:def/relations-external#: 
+  http://fedora.info/definitions/v4/rels-ext#: 
     :is_derivation_of: isDerivationOf
     :is_metadata_for: isMetadataFor
     :is_member_of_collection: isMemberOfCollection
@@ -41,7 +25,7 @@
     :has_description: hasDescription
     :has_part: hasPart
     :has_member: hasMember
-  info:fedora/fedora-system:def/model#:
+  http://fedora.info/definitions/v4/model#:
     :has_model: hasModel
 #  http://www.openarchives.org/OAI/2.0/: 
 #    :oai_item_id: itemID

data/spec/fixtures/solr_rdf_descMetadata.nt

@@ -1,7 +1,7 @@
-<info:fedora/test:1> <http://purl.org/dc/terms/created> "2009-10-10"^^<http://www.w3.org/2001/XMLSchema#date> .
-<info:fedora/test:1> <http://purl.org/dc/terms/title> "fake-title" .
-<info:fedora/test:1> <http://purl.org/dc/terms/publisher> "publisher1" .
-<info:fedora/test:1> <http://xmlns.com/foaf/0.1/based_near> "coverage1" .
-<info:fedora/test:1> <http://xmlns.com/foaf/0.1/based_near> "coverage2" .
-<info:fedora/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://example.org/> .
+<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/created> "2009-10-10"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/title> "fake-title" .
+<http://localhost:8983/fedora/rest/test/test:1> <http://purl.org/dc/terms/publisher> "publisher1" .
+<http://localhost:8983/fedora/rest/test/test:1> <http://xmlns.com/foaf/0.1/based_near> "coverage1" .
+<http://localhost:8983/fedora/rest/test/test:1> <http://xmlns.com/foaf/0.1/based_near> "coverage2" .
+<http://localhost:8983/fedora/rest/test/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://example.org/> .
 

data/spec/integration/associations_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   describe "use a URI as the property" do
     before do
-      class Book < ActiveFedora::Base 
-        belongs_to :author, :property=>RDF::DC.creator, :class_name=>'Person'
+      class Book < ActiveFedora::Base
+        belongs_to :author, predicate: ::RDF::DC.creator, class_name: 'Person'
       end
 
       class Person < ActiveFedora::Base
@@ -16,7 +16,7 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :Person)
     end
 
-    let(:person) { Person.create}
+    let(:person) { Person.create }
     let(:book) { Book.new(author: person) }
 
     it "should go" do
@@ -27,14 +27,14 @@ describe ActiveFedora::Base do
 
   describe "complex example" do
     before do
-      class Library < ActiveFedora::Base 
-        has_many :books, :property=>:has_constituent
+      class Library < ActiveFedora::Base
+        has_many :books, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
       end
 
-      class Book < ActiveFedora::Base 
-        belongs_to :library, :property=>:has_constituent
-        belongs_to :author, :property=>:has_member, :class_name=>'Person'
-        belongs_to :publisher, :property=>:has_member
+      class Book < ActiveFedora::Base
+        belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
+        belongs_to :author, predicate: ActiveFedora::RDF::RelsExt.hasMember, class_name: 'Person'
+        belongs_to :publisher, predicate: ActiveFedora::RDF::RelsExt.hasMember
       end
 
       class Person < ActiveFedora::Base
@@ -66,7 +66,7 @@ describe ActiveFedora::Base do
           expect(new_book).to be_new_record
           expect(new_book).to be_kind_of Book
           expect(new_book.library).to be_kind_of Library
-          expect(@library.books).to eq([new_book])
+          expect(@library.books).to eq [new_book]
         end
 
         it "should make a new child" do
@@ -74,7 +74,7 @@ describe ActiveFedora::Base do
           expect(new_book).to be_new_record
           expect(new_book).to be_kind_of Book
           expect(new_book.library).to be_kind_of Library
-          expect(@library.books).to eq([new_book])
+          expect(@library.books).to eq [new_book]
         end
 
         it "should not create children if the parent isn't saved" do
@@ -84,63 +84,63 @@ describe ActiveFedora::Base do
         it "should create children" do
           @library.save!
           new_book = @library.books.create({})
-          expect(new_book).not_to be_new_record
+          expect(new_book).to_not be_new_record
           expect(new_book).to be_kind_of Book
-          expect(new_book.library).to eq(@library)
+          expect(new_book.library).to eq @library
         end
 
         it "should build parent" do
           new_library = @book.build_library({})
           expect(new_library).to be_new_record
           expect(new_library).to be_kind_of Library
-          expect(@book.library).to eq(new_library)
+          expect(@book.library).to eq new_library
         end
 
         it "should create parent" do
           new_library = @book.create_library({})
-          expect(new_library).not_to be_new_record
+          expect(new_library).to_not be_new_record
           expect(new_library).to be_kind_of Library
-          expect(@book.library).to eq(new_library)
+          expect(@book.library).to eq new_library
         end
 
         it "should let you shift onto the association" do
-          expect(@library.new_record?).to be_truthy
-          expect(@library.books.size).to eq(0)
-          expect(@library.books).to eq([])
-          expect(@library.book_ids).to eq([])
+          expect(@library).to be_new_record
+          expect(@library.books.size).to eq 0
+          expect(@library.books).to eq []
+          expect(@library.book_ids).to eq []
           @library.books << @book
-          expect(@library.books).to eq([@book])
-          expect(@library.book_ids).to eq([@book.pid])
+          expect(@library.books).to eq [@book]
+          expect(@library.book_ids).to eq [@book.id]
 
         end
 
         it "should let you set an array of objects" do
           @library.books = [@book, @book2]
-          expect(@library.books).to eq([@book, @book2])
+          expect(@library.books).to eq [@book, @book2]
           @library.save
 
           @library.books = [@book]
-          expect(@library.books).to eq([@book])
-        
+          expect(@library.books).to eq [@book]
+
         end
         it "should let you set an array of object ids" do
-          @library.book_ids = [@book.pid, @book2.pid]
-          expect(@library.books).to eq([@book, @book2])
+          @library.book_ids = [@book.id, @book2.id]
+          expect(@library.books).to eq [@book, @book2]
         end
 
         it "setter should wipe out previously saved relations" do
-          @library.book_ids = [@book.pid, @book2.pid]
-          @library.book_ids = [@book2.pid]
-          expect(@library.books).to eq([@book2])
-          
+          @library.book_ids = [@book.id, @book2.id]
+          @library.book_ids = [@book2.id]
+          expect(@library.books).to eq [@book2]
+
         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)
-          expect(@library.books).to eq([@book, @book2])
+          @library = Library.find(@library.id)
+          expect(@library.books).to eq [@book, @book2]
         end
 
 
@@ -151,22 +151,16 @@ describe ActiveFedora::Base do
           @book.save
           @book2.save
 
-          @library = Library.find(@library.pid)
-          expect(@library.books).to eq([@book, @book2])
-        
-          solr_resp =  @library.books(:response_format=>:solr)
-          expect(solr_resp.size).to eq(2)
-          expect(solr_resp[0]['id']).to eq(@book.pid) 
-          expect(solr_resp[1]['id']).to eq(@book2.pid) 
-        
-        end
-
+          @library = Library.find(@library.id)
+          expect(@library.books).to eq [@book, @book2]
 
+          solr_resp =  @library.books(:response_format=>:solr)
+          expect(solr_resp.size).to eq 2
+          expect(solr_resp[0]['id']).to eq @book.id
+          expect(solr_resp[1]['id']).to eq @book2.id
 
-        after do
-          @book.delete
-          @book2.delete
         end
+
       end
 
       describe "of belongs to" do
@@ -180,16 +174,12 @@ describe ActiveFedora::Base do
           @book.library_id = nil
         end
         it "should be settable from the book side" do
-          @book.library_id = @library.pid
-          expect(@book.library).to eq(@library)
-          expect(@book.library.pid).to eq(@library.pid)
-          @book.attributes= {:library_id => ""}
+          @book.library_id = @library.id
+          expect(@book.library).to eq @library
+          expect(@book.library.id).to eq @library.id
+          @book.attributes= {:library_id => nil }
           expect(@book.library_id).to be_nil
         end
-        after do
-          @library.delete
-          @book.delete
-        end
       end
     end
 
@@ -208,39 +198,45 @@ describe ActiveFedora::Base do
         it "should have many books once it has been saved" do
           @library.books << @book
 
-          expect(@book.library.pid).to eq(@library.pid)
+          expect(@book.library.id).to eq @library.id
           @library.books.reload
-          expect(@library.books).to eq([@book])
+          expect(@library.books).to eq [@book]
 
-          @library2 = Library.find(@library.pid)
-          expect(@library2.books).to eq([@book])
+          @library2 = Library.find(@library.id)
+          expect(@library2.books).to eq [@book]
         end
 
         it "should have a count once it has been saved" do
-          @library.books << @book << Book.create 
+          @book_2 = Book.create
+          @library.books << @book << @book_2
           @library.save
 
-          @library2 = Library.find(@library.pid)
-          expect(@library2.books.size).to eq(2)
+          @library2 = Library.find(@library.id)
+          expect(@library2.books.size).to eq 2
+          @book_2.reload
+          @book_2.delete
         end
 
         it "should respect the :class_name parameter" do
           @book.author = @person
           @book.save
-          expect(Book.find(@book.id).author_id).to eq(@person.pid)
-          expect(Book.find(@book.id).author).to be_kind_of Person
+          new_book = Book.find(@book.id)
+          expect(new_book.author_id).to eq @person.id
+          expect(new_book.author).to be_kind_of Person
         end
 
         it "should respect multiple associations that share the same :property and respect associated class" do
           @book.author = @person
           @book.publisher = @publisher
           @book.save
-          
-          expect(Book.find(@book.id).publisher_id).to eq(@publisher.pid)
-          expect(Book.find(@book.id).publisher).to be_kind_of Publisher
 
-          expect(Book.find(@book.id).author_id).to eq(@person.pid)
-          expect(Book.find(@book.id).author).to be_kind_of Person
+          new_book = Book.find(@book.id)
+
+          expect(new_book.publisher_id).to eq @publisher.id
+          expect(new_book.publisher).to be_kind_of Publisher
+
+          expect(new_book.author_id).to eq @person.id
+          expect(new_book.author).to be_kind_of Person
         end
 
         describe "when changing the belonger" do
@@ -250,22 +246,11 @@ describe ActiveFedora::Base do
             @library2 = Library.create
           end
           it "should replace an existing instance" do
-            expect(@book.library_id).to eq(@library.id)
+            expect(@book.library_id).to eq @library.id
             @book.library = @library2
             @book.save
-            expect(Book.find(@book.id).library_id).to eq(@library2.id)
+            expect(Book.find(@book.id).library_id).to eq @library2.id
           end
-          after do
-            @library2.delete
-          end
-        end
-
-
-        after do
-          @library.delete
-          @book.delete
-          @person.delete
-          @publisher.delete
         end
       end
     end
@@ -282,11 +267,11 @@ describe ActiveFedora::Base do
       end
       it "should set the association" do
         @book.library = @library
-        expect(@book.library.pid).to eq(@library.pid)
+        expect(@book.library.id).to eq @library.id
         @book.save
 
 
-        expect(Book.find(@book.pid).library.pid).to eq(@library.pid)
+        expect(Book.find(@book.id).library.id).to eq@library.id
         
       end
       it "should clear the association" do
@@ -294,8 +279,7 @@ describe ActiveFedora::Base do
         @book.library = nil
         @book.save
 
-        expect(Book.find(@book.pid).library).to be_nil 
-        
+        expect(Book.find(@book.id).library).to be_nil
       end
 
       it "should replace the association" do
@@ -305,7 +289,7 @@ describe ActiveFedora::Base do
         @book.save
         @book.library = @library2
         @book.save
-        expect(Book.find(@book.pid).library.pid).to eq(@library2.pid) 
+        expect(Book.find(@book.id).library.id).to eq @library2.id
 
       end
 
@@ -315,13 +299,14 @@ describe ActiveFedora::Base do
 
         @book.publisher = @publisher
         @book.author = @author      
-        @book.save 
+        @book.save!
 
         @book.publisher = @publisher2
-        @book.save
+        @book.save!
 
-        expect(Book.find(@book.pid).publisher.pid).to eq(@publisher2.pid)
-        expect(Book.find(@book.pid).author.pid).to eq(@author.pid)
+        new_book = Book.find(@book.id)
+        expect(new_book.publisher.id).to eq @publisher2.id
+        expect(new_book.author.id).to eq @author.id
       end
 
       it "should only clear the matching class association" do
@@ -332,38 +317,30 @@ describe ActiveFedora::Base do
         @book.author = nil
         @book.save
 
-        expect(Book.find(@book.pid).author).to be_nil
-        expect(Book.find(@book.pid).publisher.pid).to eq(@publisher.pid)
+        expect(Book.find(@book.id).author).to be_nil
+        expect(Book.find(@book.id).publisher.id).to eq @publisher.id
       end
 
       it "should be able to be set by id" do
-        @book.library_id = @library.pid
-        expect(@book.library_id).to eq(@library.pid)
-        expect(@book.library.pid).to eq(@library.pid)
+        @book.library_id = @library.id
+        expect(@book.library_id).to eq @library.id
+        expect(@book.library.id).to eq @library.id
         @book.save
-        expect(Book.find(@book.pid).library_id).to eq(@library.pid)
+        expect(Book.find(@book.id).library_id).to eq @library.id
       end
 
-      after do
-        @library.delete
-        @book.delete
-        @author.delete
-        @publisher.delete
-        @library2.delete if @library2
-        @publisher2.delete if @publisher2
-      end
     end
   end
 
   describe "single direction habtm" do
     before :all do
       class Course < ActiveFedora::Base
-        has_and_belongs_to_many :textbooks, :property=>:is_part_of
+        has_and_belongs_to_many :textbooks, predicate: ActiveFedora::RDF::RelsExt.isPartOf
       end
       class Textbook < ActiveFedora::Base
-        has_many :courses, :property=>:is_part_of
+        has_many :courses, predicate: ActiveFedora::RDF::RelsExt.isPartOf
       end
-        
+
     end
     after :all do
       Object.send(:remove_const, :Course)
@@ -380,17 +357,17 @@ describe ActiveFedora::Base do
       end
 
       it "should load the association stored in the parent" do
-        @reloaded_course = Course.find(@course.pid)
-        expect(@reloaded_course.textbooks).to eq([@t1, @t2])
+        @reloaded_course = Course.find(@course.id)
+        expect(@reloaded_course.textbooks).to eq [@t1, @t2]
       end
 
       it "should allow a parent to be deleted from the has_many association" do
-        @reloaded_course = Course.find(@course.pid)
+        @reloaded_course = Course.find(@course.id)
         @t1.courses.delete(@reloaded_course)
         @reloaded_course.save
 
-        @reloaded_course = Course.find(@course.pid)
-        expect(@reloaded_course.textbooks).to eq([@t2])
+        @reloaded_course = Course.find(@course.id)
+        expect(@reloaded_course.textbooks).to eq [@t2]
       end
 
       it "should allow replacing the children" do
@@ -399,17 +376,17 @@ describe ActiveFedora::Base do
         @course.textbooks = [@t3, @t4]
         @course.save
 
-        expect(@course.reload.textbooks).to eq([@t3, @t4])
+        expect(@course.reload.textbooks).to eq [@t3, @t4]
       end
 
       it "should allow a child to be deleted from the has_and_belongs_to_many association" do
-        @reloaded_course = Course.find(@course.pid)
+        @reloaded_course = Course.find(@course.id)
         @reloaded_course.textbooks.delete(@t1)
         @reloaded_course.save
         @t1.save
 
-        @reloaded_course = Course.find(@course.pid)
-        expect(@reloaded_course.textbooks).to eq([@t2])
+        @reloaded_course = Course.find(@course.id)
+        expect(@reloaded_course.textbooks).to eq [@t2]
       end
     end
   end
@@ -418,24 +395,27 @@ describe ActiveFedora::Base do
     describe "for habtm" do
       before :all do
         class LibraryBook < ActiveFedora::Base
-          has_and_belongs_to_many :pages, :property=>:is_part_of, after_remove: :after_hook, before_remove: :before_hook
+          has_and_belongs_to_many :pages, predicate: ActiveFedora::RDF::RelsExt.isPartOf, after_remove: :after_hook, before_remove: :before_hook
 
           def before_hook(m)
             say_hi(m)
-            m.reload.library_books.count.should == 1
+            before_count(m.reload.library_books.count)
           end
 
           def after_hook(m)
             say_hi(m)
-            m.reload.library_books.count.should == 0
+            after_count(m.reload.library_books.count)
+          end
+
+          def say_hi(var)
           end
 
 
         end
         class Page < ActiveFedora::Base
-          has_many :library_books, :property=>:is_part_of
+          has_many :library_books, predicate: ActiveFedora::RDF::RelsExt.isPartOf
         end
-          
+
       end
       after :all do
         Object.send(:remove_const, :LibraryBook)
@@ -451,6 +431,8 @@ describe ActiveFedora::Base do
           subject.save!
         end
         it "should save between the before and after hooks" do
+          expect(subject).to receive(:before_count).with(1)
+          expect(subject).to receive(:after_count).with(0)
           expect(subject).to receive(:say_hi).with(@p2).twice
           subject.pages.delete(@p2)
         end
@@ -459,14 +441,14 @@ describe ActiveFedora::Base do
     describe "for has_many" do
       before :all do
         class LibraryBook < ActiveFedora::Base
-          has_many :pages, :property=>:is_part_of, after_remove: :say_hi
+          has_many :pages, predicate: ActiveFedora::RDF::RelsExt.isPartOf, after_remove: :say_hi
 
         end
         class Page < ActiveFedora::Base
-          belongs_to :library_book, :property=>:is_part_of
+          belongs_to :library_book, predicate: ActiveFedora::RDF::RelsExt.isPartOf
         end
-          
       end
+
       after :all do
         Object.send(:remove_const, :LibraryBook)
         Object.send(:remove_const, :Page)
@@ -490,7 +472,7 @@ describe ActiveFedora::Base 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
+          belongs_to :media_object, predicate: ActiveFedora::RDF::RelsExt.isPartOf
         end
         class MediaObject < ActiveFedora::Base
           has_many :baubles
@@ -502,63 +484,68 @@ describe ActiveFedora::Base do
       end
 
       it "it should find the predicate" do
-        expect(MediaObject.new.association(:baubles).send(:find_predicate)).to eq(:is_part_of)
+        expect(MediaObject.new.association(:baubles).send(:find_predicate)).to eq 'http://fedora.info/definitions/v4/rels-ext#isPartOf'
       end
     end
 
     describe "when an object doesn't have a property, but has a class_name" do
-      before (:all) do
+      before :all do
         class MasterFile < ActiveFedora::Base
-          belongs_to :media_object, property: :is_part_of
+          belongs_to :media_object, predicate: ActiveFedora::RDF::RelsExt.isPartOf
         end
         class MediaObject < ActiveFedora::Base
-          has_many :parts, :class_name=>'MasterFile'
+          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
-        expect(MediaObject.new.association(:parts).send(:find_predicate)).to eq(:is_part_of)
+        expect(MediaObject.new.association(:parts).send(:find_predicate)).to eq 'http://fedora.info/definitions/v4/rels-ext#isPartOf'
       end
     end
 
     describe "an object has an explicity property" do
-      before (:all) do
+      before :all do
         class Bauble < ActiveFedora::Base
-          belongs_to :media_object, property: :is_part_of
+          belongs_to :media_object, predicate: ActiveFedora::RDF::RelsExt.isPartOf
         end
         class MediaObject < ActiveFedora::Base
-          has_many :baubles, property: :has_baubles
+          has_many :baubles, predicate: ActiveFedora::RDF::RelsExt.hasEquivalent
         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.association(:baubles).send(:find_predicate)).to eq(:has_baubles)
+        expect(MediaObject.new.association(:baubles).send(:find_predicate)).to eq 'http://fedora.info/definitions/v4/rels-ext#hasEquivalent'
       end
     end
+
     describe "an object doesn't have a property" do
-      before (:all) do
+      before :all do
         class Bauble < ActiveFedora::Base
-          belongs_to :media_object, property: :is_part_of
+          belongs_to :media_object, predicate: ActiveFedora::RDF::RelsExt.isPartOf
         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"
+        expect { MediaObject.new.shoes.send(:find_predicate) }.to raise_error RuntimeError, "No :predicate attribute was set or could be inferred for has_many :shoes on MediaObject"
       end
     end
   end
@@ -567,19 +554,19 @@ describe ActiveFedora::Base do
     describe "for habtm" do
       before :all do
         class Novel < ActiveFedora::Base
-          has_and_belongs_to_many :contents, property: :is_part_of, class_name: 'ActiveFedora::Base'
+          has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
         class TextBook < ActiveFedora::Base
-          has_and_belongs_to_many :contents, property: :is_part_of, class_name: 'ActiveFedora::Base'
+          has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
         class Text < ActiveFedora::Base
-          has_many :books, property: :is_part_of, class_name: 'ActiveFedora::Base'
+          has_many :books, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
         class Image < ActiveFedora::Base
-          has_many :books, property: :is_part_of, class_name: 'ActiveFedora::Base'
+          has_many :books, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
-          
       end
+
       after :all do
         Object.send(:remove_const, :Novel)
         Object.send(:remove_const, :TextBook)
@@ -602,19 +589,12 @@ describe ActiveFedora::Base do
           book2.save!
 
           expect(book1.reload.contents).to include(text1, image1)
-          expect(text1.reload.books).to eq([book1])
-          expect(image1.reload.books).to eq([book1])
+          expect(text1.reload.books).to eq [book1]
+          expect(image1.reload.books).to eq [book1]
 
           expect(book2.reload.contents).to include(text2, image2)
-          expect(text2.reload.books).to eq([book2])
-          expect(image2.reload.books).to eq([book2])
-        end
-
-        it "should work when added via the has_many" do
-          text2.books << book2
-          book2.save
-          expect(book2.reload.contents).to eq([text2])
-          expect(text2.reload.books).to eq([book2])
+          expect(text2.reload.books).to eq [book2]
+          expect(image2.reload.books).to eq [book2]
         end
       end
     end