active-fedora 6.4.3 → 6.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9395c7f327612946bfc5d90b4f8cdcf93af0a49
-  data.tar.gz: 13f08cd89e3b35e3b3b437cc13d5db8df934b022
+  metadata.gz: 9682552f64d1274de9b4de8f26e12dc1ab04cab5
+  data.tar.gz: 0267bbbfcd15b12ab6593620aebab8e2e6322274
 SHA512:
-  metadata.gz: 036af5cc43ab70dcca4ca55da21f1961bb6e1047a96f48256019102adac6b43e35dacc6ed5b0776a44ff949c15c4c1144d1c54e6d8979dcbb6b51482cd0b66e7
-  data.tar.gz: 025ae1503457b5427a05d9bd408e84594d137fbb94bd2e7b8d98f433f505ee3988ccab442de9a5e67b421c30981a137024e18b3b513d2a30d0da54825b31982d
+  metadata.gz: 8fdd12fb3660f58afca86fa8f488d3da34db1e36ceb55b76d3cda5f33f6a87a2b668bbcc6841d07a7d62f14d32fb77e61811fad3a29cd1a268175b30dd536587
+  data.tar.gz: 96459b1261137d65d9f64e2dab39587aac41466f958b943da81a19799ec7d7f6a343b353332984d43de296d161172861fdea152854811056f04d2d1a64b60e85

data/CONTRIBUTING.md

@@ -0,0 +1,111 @@
+# How to Contribute
+
+We want your help to make Project Hydra great.
+There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+## Hydra Project Intellectual Property Licensing and Ownership
+
+All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
+If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+
+https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+
+You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
+
+## Contribution Tasks
+
+* Reporting Issues
+* Making Changes
+* Submitting Changes
+* Merging Changes
+
+### Reporting Issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a [Github issue](./issues) by:
+  * Clearly describing the issue
+    * Provide a descriptive summary
+    * Explain the expected behavior
+    * Explain the actual behavior
+    * Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
+  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
+  * Please avoid working directly on the `master` branch.
+  * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make commits of logical units.
+  * Your commit should include a high level description of your work in HISTORY.textile 
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_with Post.limit(10)
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
+### Submitting Changes
+
+* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Make sure your branch is up to date with its parent branch (i.e. master)
+  * `git checkout master`
+  * `git pull --rebase`
+  * `git checkout <your-branch>`
+  * `git rebase master`
+  * It is likely a good idea to run your tests again.
+* Squash the commits for your branch into one commit
+  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request from your fork to the project.
+
+### Merging Changes
+
+* It is considered "poor from" to merge your own request.
+* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
+  * Does the commit message explain what is going on?
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+  * Did the Travis tests complete successfully?
+* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
+* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/lib/active_fedora/associations/belongs_to_association.rb

@@ -12,11 +12,11 @@ module ActiveFedora
 
       def replace(record)
         if record.nil?
-          @owner.clear_relationship(@reflection.options[:property])
+          remove_matching_property_relationship
         else
           raise_on_type_mismatch(record)
 
-          @owner.clear_relationship(@reflection.options[:property])
+          remove_matching_property_relationship
 
           @target = (AssociationProxy === record ? record.target : record)
           @owner.add_relationship(@reflection.options[:property], record) unless record.new_record?
@@ -29,13 +29,38 @@ module ActiveFedora
 
       private
         def find_target
-          pid = @owner.ids_for_outbound(@reflection.options[:property]).first
-          return if pid.nil?
-          query = ActiveFedora::SolrService.construct_query_for_pids([pid])
+          pid = @owner.ids_for_outbound(@reflection.options[:property])
+          return if pid.empty?          
+          class_name = @reflection.options[:class_name] ? @reflection.options[:class_name] : @reflection.class_name
+          query = construct_query(pid, class_name)    
           solr_result = SolrService.query(query) 
           return ActiveFedora::SolrService.reify_solr_results(solr_result).first
         end
 
+        def construct_query pid, class_name
+          if class_name && class_name != "ActiveFedora::Base"
+            clauses = {}  
+            clauses[:has_model] = class_name.constantize.to_class_uri
+            query = ActiveFedora::SolrService.construct_query_for_rel(clauses) + " AND (" + ActiveFedora::SolrService.construct_query_for_pids(pid) + ")"
+          else
+            query = ActiveFedora::SolrService.construct_query_for_pids(pid)
+          end
+        end
+
+        def remove_matching_property_relationship
+          class_name = @reflection.options[:class_name] ? @reflection.options[:class_name] : @reflection.class_name
+          ids = @owner.ids_for_outbound(@reflection.options[:property])
+          return if ids.empty? 
+          ids.each do |id|
+            result = SolrService.query(ActiveFedora::SolrService.construct_query_for_pids([id]))
+            hit = ActiveFedora::SolrService.reify_solr_results(result).first
+            # We remove_relationship on subjects that match the same class, or if the subject is nil 
+            if hit.class.to_s == class_name || hit.nil?
+              @owner.remove_relationship(@reflection.options[:property], hit)
+            end
+          end
+        end
+
         def foreign_key_present
           !@owner.send(@reflection.primary_key_name).nil?
         end

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -10,7 +10,7 @@ module ActiveFedora
           pids = @owner.ids_for_outbound(@reflection.options[:property])
           return [] if pids.empty?
           query = ActiveFedora::SolrService.construct_query_for_pids(pids)
-          solr_result = SolrService.query(query)
+          solr_result = SolrService.query(query, rows: 1000)
           return ActiveFedora::SolrService.reify_solr_results(solr_result)
       end
 

data/lib/active_fedora/file_configurator.rb

@@ -48,7 +48,7 @@ module ActiveFedora
     #
 
     attr_accessor :config_env
-    attr_reader :config_options, :fedora_config_path, :solr_config_path
+    attr_reader :config_options, :fedora_config_path, :solr_config_path, :predicate_mappings_config_path
 
     # The configuration hash that gets used by RSolr.connect
     def initialize
@@ -208,22 +208,18 @@ module ActiveFedora
     end
 
     def predicate_config
-      @predicate_config_path ||= build_predicate_config_path(File.dirname(self.path))
+      @predicate_config_path ||= build_predicate_config_path
       YAMLAdaptor.load(File.open(@predicate_config_path)) if File.exist?(@predicate_config_path)
     end
 
     protected
 
-    def build_predicate_config_path(config_path=nil)
-      pred_config_paths = [File.join(ActiveFedora.root,"config")]
-      pred_config_paths.unshift config_path if config_path
-      pred_config_paths.each do |path|
-        testfile = File.expand_path(File.join(path,"predicate_mappings.yml"))
-        if File.exist?(testfile) && valid_predicate_mapping?(testfile)
-          return testfile
-        end
+    def build_predicate_config_path
+      testfile = File.expand_path(get_config_path(:predicate_mappings))
+      if File.exist?(testfile) && valid_predicate_mapping?(testfile)
+        return testfile
       end
-      raise PredicateMappingsNotFoundError #"Could not find predicate_mappings.yml in these locations: #{pred_config_paths.join("; ")}." unless @predicate_config_path
+      raise PredicateMappingsNotFoundError
     end
 
     def valid_predicate_mapping?(testfile)

data/lib/active_fedora/indexing.rb

@@ -87,9 +87,12 @@ module ActiveFedora
       end
 
       # Using the fedora search (not solr), get every object and reindex it.
-      def reindex_everything
+      # @param [String] a query string that conforms to the query param format
+      #   of the underlying search's API
+      def reindex_everything(query = nil)
         connections.each do |conn|
-          conn.search(nil) do |object|
+          conn.search(query) do |object|
+            next if object.pid.start_with?('fedora-system:')
             ActiveFedora::Base.find(object.pid, :cast=>true).update_index
           end
         end

data/lib/active_fedora/test_support.rb

@@ -1,3 +1,4 @@
+require File.expand_path('../../../spec/support/an_active_model', __FILE__)
 module ActiveFedora
   module TestSupport
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.4.3"
+  VERSION = "6.4.4"
 end

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

@@ -4,16 +4,16 @@ require 'spec_helper'
 require 'active_fedora/test_support'
 
 describe <%= class_name %> do
+  it_behaves_like 'An ActiveModel'
   include ActiveFedora::TestSupport
   subject { <%= class_name %>.new }
 
-  it 'should persist to Fedora' do
-    subject.save!
-    expect {
-      subject.reload
-    }.to_not raise_error(ActiveFedora::ObjectNotFoundError)
-
-    subject.destroy
+  describe "when persisted to fedora" do
+    before { subject.save! }
+    after { subject.destroy }
+    it 'should exist' do
+      <%= class_name %>.exists?(subject.pid).should be_true
+    end
   end
 
   it 'should have a descMetadata datastream' do

data/spec/integration/associations_spec.rb

@@ -10,6 +10,7 @@ describe ActiveFedora::Base do
       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
         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
@@ -17,6 +18,9 @@ describe ActiveFedora::Base do
       class Person < ActiveFedora::Base
       end
 
+      class Publisher < ActiveFedora::Base
+      end
+
       class Collection < ActiveFedora::Base
       end
 
@@ -186,6 +190,17 @@ describe ActiveFedora::Base do
           @book.topics.should == []
           @topic1.books.should == []
         end
+        it "Should allow for more than 10 items" do
+
+          (0..11).each do
+            @book.topics << Topic.create
+          end
+          @book.save
+          @book.topics.count.should == 12
+          book2 = Book.find(@book.pid)
+          book2.topics.count.should == 12
+        end
+
         after do
           @topic1.delete
           @topic2.delete
@@ -205,6 +220,8 @@ describe ActiveFedora::Base do
           @book.save
           @person = Person.new
           @person.save
+          @publisher = Publisher.new
+          @publisher.save
         end
         it "should have many books once it has been saved" do
           @library.books << @book
@@ -236,6 +253,18 @@ describe ActiveFedora::Base do
           Book.find(@book.id).author.send(:find_target).should 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
+          
+          Book.find(@book.id).publisher_id.should == @publisher.pid
+          Book.find(@book.id).publisher.send(:find_target).should be_kind_of Publisher
+
+          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
@@ -256,6 +285,8 @@ describe ActiveFedora::Base do
         after do
           @library.delete
           @book.delete
+          @person.delete
+          @publisher.delete
         end
       end
       describe "of has_many_and_belongs_to" do
@@ -321,6 +352,10 @@ describe ActiveFedora::Base do
         @library = Library.new()
         @library.save()
         @book = Book.new
+        @author = Person.new
+        @author.save
+        @publisher = Publisher.new
+        @publisher.save
       end
       it "should set the association" do
         @book.library = @library
@@ -351,6 +386,33 @@ describe ActiveFedora::Base do
 
       end
 
+      it "should only replace the matching class association" do
+        @publisher2 = Publisher.new
+        @publisher2.save
+
+        @book.publisher = @publisher
+        @book.author = @author      
+        @book.save 
+
+        @book.publisher = @publisher2
+        @book.save
+
+        Book.find(@book.pid).publisher.pid.should == @publisher2.pid
+        Book.find(@book.pid).author.pid.should == @author.pid
+      end
+
+      it "should only clear the matching class association" do
+        @book.publisher = @publisher
+        @book.author = @author
+        @book.save
+
+        @book.author = nil
+        @book.save
+
+        Book.find(@book.pid).author.should be_nil
+        Book.find(@book.pid).publisher.pid.should == @publisher.pid
+      end
+
       it "should be able to be set by id" do
         @book.library_id = @library.pid
         @book.library_id.should == @library.pid
@@ -362,7 +424,10 @@ describe ActiveFedora::Base do
       after do
         @library.delete
         @book.delete
+        @author.delete
+        @publisher.delete
         @library2.delete if @library2
+        @publisher2.delete if @publisher2
       end
     end
   end
@@ -605,4 +670,61 @@ describe ActiveFedora::Base do
       end
     end
   end
-end
+
+  describe "casting when the class name is 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'
+        end
+        class TextBook < ActiveFedora::Base
+          has_and_belongs_to_many :contents, property: :is_part_of, class_name: 'ActiveFedora::Base'
+        end
+        class Text < ActiveFedora::Base
+          has_many :books, property: :is_part_of, class_name: 'ActiveFedora::Base'
+        end
+        class Image < ActiveFedora::Base
+          has_many :books, property: :is_part_of, class_name: 'ActiveFedora::Base'
+        end
+          
+      end
+      after :all do
+        Object.send(:remove_const, :Novel)
+        Object.send(:remove_const, :TextBook)
+        Object.send(:remove_const, :Text)
+        Object.send(:remove_const, :Image)
+      end
+
+      describe "saving between the before and after hooks" do
+        let(:text1) { Text.create}
+        let(:image1) { Image.create}
+        let(:text2) { Text.create}
+        let(:image2) { Image.create}
+        let(:book1) { TextBook.create}
+        let(:book2) { Novel.create}
+
+        it "should work when added via the has_and_belongs_to_many" do
+          book1.contents = [text1, image1]
+          book1.save!
+          book2.contents = [text2, image2]
+          book2.save!
+
+          book1.reload.contents.should include(text1, image1)
+          text1.reload.books.should == [book1]
+          image1.reload.books.should == [book1]
+
+          book2.reload.contents.should include(text2, image2)
+          text2.reload.books.should == [book2]
+          image2.reload.books.should == [book2]
+        end
+
+        it "should work when added via the has_many" do
+          text2.books << book2
+          book2.save
+          book2.reload.contents.should == [text2]
+          text2.reload.books.should == [book2]
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ require 'active-fedora'
 require 'rspec'
 require 'equivalent-xml/rspec_matchers'
 
-require 'support/mock_fedora'
+Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f }
 require 'samples/samples'
 
 

data/spec/support/an_active_model.rb

@@ -0,0 +1,28 @@
+shared_examples_for "An ActiveModel" do
+  begin
+    require 'minitest/unit'
+    include Minitest::Assertions
+  rescue NameError
+    puts "Unable to load minitest, here's hoping these methods are adequate"
+
+    def assert(test, *args)
+      expect(test).to eq(true)
+    end
+
+    def assert_kind_of(klass, inspected_object)
+      expect(inspected_object).to be_kind_of(klass)
+    end
+  end
+  include ActiveModel::Lint::Tests
+
+  ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
+    example m.gsub('_',' ') do
+      send m
+    end
+  end
+
+  def model
+    subject
+  end
+
+end

data/spec/unit/base_active_model_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-
   describe "active model methods" do 
     class BarStream < ActiveFedora::OmDatastream 
       set_terminology do |t|

data/spec/unit/base_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 @@last_pid = 0  
 
 describe ActiveFedora::Base do
+  it_behaves_like "An ActiveModel"
+
   describe 'descendants' do
     it "should record the decendants" do
       ActiveFedora::Base.descendants.should include(ModsArticle, SpecialThing)
@@ -82,9 +84,13 @@ describe ActiveFedora::Base do
   end
 
   describe "reindex_everything" do
-    it "should call update_index on every object" do
+    it "should call update_index on every object except for the fedora-system objects" do
        Rubydora::Repository.any_instance.should_receive(:search).
-            and_yield(double(pid:'XXX')).and_yield(double(pid:'YYY')).and_yield(double(pid:'ZZZ'))
+            and_yield(double(pid:'XXX')).and_yield(double(pid:'YYY')).and_yield(double(pid:'ZZZ')).
+            and_yield(double(pid:'fedora-system:ServiceDeployment-3.0')).
+            and_yield(double(pid:'fedora-system:ServiceDefinition-3.0')).
+            and_yield(double(pid:'fedora-system:FedoraObject-3.0'))
+
        mock_update = double(:mock_obj)
        mock_update.should_receive(:update_index).exactly(3).times
        ActiveFedora::Base.should_receive(:find).with('XXX', :cast=>true).and_return(mock_update)
@@ -92,6 +98,18 @@ describe ActiveFedora::Base do
        ActiveFedora::Base.should_receive(:find).with('ZZZ', :cast=>true).and_return(mock_update)
        ActiveFedora::Base.reindex_everything
     end
+
+    it "should accept a query param for the search" do
+       query_string = "pid~*"
+       Rubydora::Repository.any_instance.should_receive(:search).with(query_string).
+            and_yield(double(pid:'XXX')).and_yield(double(pid:'YYY')).and_yield(double(pid:'ZZZ'))
+       mock_update = double(:mock_obj)
+       mock_update.should_receive(:update_index).exactly(3).times
+       ActiveFedora::Base.should_receive(:find).with('XXX', :cast=>true).and_return(mock_update)
+       ActiveFedora::Base.should_receive(:find).with('YYY', :cast=>true).and_return(mock_update)
+       ActiveFedora::Base.should_receive(:find).with('ZZZ', :cast=>true).and_return(mock_update)
+       ActiveFedora::Base.reindex_everything(query_string)
+    end
   end
 
   describe "With a test class" do

data/spec/unit/file_configurator_spec.rb

@@ -93,6 +93,38 @@ describe ActiveFedora::FileConfigurator do
       end
     end
 
+    describe "get_config_path(:predicate_mappings)" do
+      it "should use the config_options[:config_path] if it exists" do
+        subject.should_receive(:config_options).and_return({:predicate_mappings_config_path => "/path/to/predicate_mappings.yml"})
+        File.should_receive(:file?).with("/path/to/predicate_mappings.yml").and_return(true)
+        subject.get_config_path(:predicate_mappings).should eql("/path/to/predicate_mappings.yml")
+      end
+
+      it "should look in Rails.root/config/predicate_mappings.yml if it exists and no predicate_mappings_config_path passed in" do
+        subject.should_receive(:config_options).and_return({})
+        stub_rails(:root => "/rails/root")
+        File.should_receive(:file?).with("/rails/root/config/predicate_mappings.yml").and_return(true)
+        subject.get_config_path(:predicate_mappings).should eql("/rails/root/config/predicate_mappings.yml")
+        unstub_rails
+      end
+
+      it "should look in ./config/predicate_mappings.yml if neither rails.root nor :predicate_mappings_config_path are set" do
+        subject.should_receive(:config_options).and_return({})
+        Dir.stub(:getwd => "/current/working/directory")
+        File.should_receive(:file?).with("/current/working/directory/config/predicate_mappings.yml").and_return(true)
+        subject.get_config_path(:predicate_mappings).should eql("/current/working/directory/config/predicate_mappings.yml")
+      end
+
+      it "should return default predicate_mappings.yml that ships with active-fedora if none of the above" do
+        subject.should_receive(:config_options).and_return({})
+        Dir.should_receive(:getwd).and_return("/current/working/directory")
+        File.should_receive(:file?).with("/current/working/directory/config/predicate_mappings.yml").and_return(false)
+        File.should_receive(:file?).with(File.expand_path(File.join(File.dirname("__FILE__"),'config','predicate_mappings.yml'))).and_return(true)
+        logger.should_receive(:warn).with("Using the default predicate_mappings.yml that comes with active-fedora.  If you want to override this, pass the path to predicate_mappings.yml to ActiveFedora - ie. ActiveFedora.init(:predicate_mappings_config_path => '/path/to/predicate_mappings.yml') - or set Rails.root and put predicate_mappings.yml into \#{Rails.root}/config.")
+        subject.get_config_path(:predicate_mappings).should eql(File.expand_path(File.join(File.dirname("__FILE__"),'config','predicate_mappings.yml')))
+      end
+    end
+
     describe "get_config_path(:solr)" do
       it "should return the solr_config_path if set in config_options hash" do
         subject.stub(:config_options => {:solr_config_path => "/path/to/solr.yml"})
@@ -302,20 +334,8 @@ describe ActiveFedora::FileConfigurator do
   
   describe ".build_predicate_config_path" do
     it "should return the path to the default config/predicate_mappings.yml if no valid path is given" do
-      subject.send(:build_predicate_config_path, nil).should == default_predicate_mapping_file
+      subject.send(:build_predicate_config_path).should == default_predicate_mapping_file
     end
-
-    it "should return the path to the default config/predicate_mappings.yml if specified config file not found" do
-      File.should_receive(:exist?).with("/path/to/predicate_mappings.yml").and_return(false)
-      File.should_receive(:exist?).with(default_predicate_mapping_file).and_return(true)
-      subject.send(:build_predicate_config_path,"/path/to").should == default_predicate_mapping_file
-    end
-
-    it "should return the path to the specified config_path if it exists" do
-      File.should_receive(:exist?).with("/path/to/predicate_mappings.yml").and_return(true)
-      subject.should_receive(:valid_predicate_mapping?).and_return(true)
-      subject.send(:build_predicate_config_path,"/path/to").should == "/path/to/predicate_mappings.yml"
-    end    
   end
 
   describe ".predicate_config" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.4.3
+  version: 6.4.4
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -285,6 +285,7 @@ files:
 - .mailmap
 - .travis.yml
 - CONSOLE_GETTING_STARTED.textile
+- CONTRIBUTING.md
 - CONTRIBUTORS.md
 - Gemfile
 - History.txt
@@ -477,6 +478,7 @@ files:
 - spec/samples/special_thing.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/an_active_model.rb
 - spec/support/mock_fedora.rb
 - spec/unit/active_fedora_spec.rb
 - spec/unit/association_proxy_spec.rb
@@ -637,6 +639,7 @@ test_files:
 - spec/samples/special_thing.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/an_active_model.rb
 - spec/support/mock_fedora.rb
 - spec/unit/active_fedora_spec.rb
 - spec/unit/association_proxy_spec.rb