active-fedora 9.9.1 → 9.10.0.pre1

data/lib/active_fedora/validations.rb

@@ -53,7 +53,7 @@ module ActiveFedora
     # Attempts to save the record just like Base#save but will raise a +RecordInvalid+ exception instead of returning false
     # if the record is not valid.
     def save!(options = {})
-      perform_validations(options) ? super : raise(RecordInvalid, self)
+      perform_validations(options) ? super : raise_validation_error
     end
 
     # Runs all the validations within the specified context. Returns true if no errors are found,
@@ -65,11 +65,13 @@ module ActiveFedora
     # Validations with no <tt>:on</tt> option will run no matter the context. Validations with
     # some <tt>:on</tt> option will only run in the specified context.
     def valid?(context = nil)
-      context ||= (new_record? ? :create : :update)
+      context ||= default_validation_context
       output = super(context)
       errors.empty? && output
     end
 
+    alias validate valid?
+
     # Test to see if the given field is required
     # @param [Symbol] key a field
     # @return [Boolean] is it required or not
@@ -79,9 +81,16 @@ module ActiveFedora
 
     protected
 
-      def perform_validations(options = {})
-        perform_validation = options[:validate] != false
-        perform_validation ? valid?(options[:context]) : true
+      def default_validation_context
+        new_record? ? :create : :update
+      end
+
+      def raise_validation_error
+        raise RecordInvalid, self
+      end
+
+      def perform_validations(options = {}) # :nodoc:
+        options[:validate] == false || valid?(options[:context])
       end
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.9.1".freeze
+  VERSION = "9.10.0.pre1".freeze
 end

data/lib/active_fedora/versionable.rb

@@ -25,10 +25,14 @@ module ActiveFedora
     # Returns an array of ActiveFedora::VersionsGraph::ResourceVersion objects.
     # Excludes auto-snapshot versions from Fedora.
     def versions(reload = false)
+      response = versions_request
+
+      return ActiveFedora::VersionsGraph.new unless response
+
       if reload
-        @versions = ActiveFedora::VersionsGraph.new << ::RDF::Reader.for(:ttl).new(versions_request)
+        @versions = ActiveFedora::VersionsGraph.new << versions_request.reader
       else
-        @versions ||= ActiveFedora::VersionsGraph.new << ::RDF::Reader.for(:ttl).new(versions_request)
+        @versions ||= ActiveFedora::VersionsGraph.new << versions_request.reader
       end
     end
 
@@ -57,11 +61,8 @@ module ActiveFedora
     private
 
       def versions_request
-        return '' unless has_versions?
-        resp = ActiveFedora.fedora.connection.get(versions_uri)
-        raise ActiveFedoraError, status_message(resp) unless resp.success?
-        raise ActiveFedoraError, bad_headers(resp) unless resp.headers['content-type'] == 'text/turtle'
-        resp.body
+        return false unless has_versions?
+        ActiveFedora.fedora.connection.get(versions_uri)
       end
 
       def versions_uri

data/spec/config_helper.rb

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

data/spec/integration/associations_spec.rb

@@ -234,8 +234,8 @@ describe ActiveFedora::Base do
 
           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
+          expect(solr_resp[0].id).to eq @book.id
+          expect(solr_resp[1].id).to eq @book2.id
         end
       end
 
@@ -584,7 +584,7 @@ describe ActiveFedora::Base do
       end
 
       it "it should find the reflection that bears the predicate" do
-        expect(MediaObject.new.association(:baubles).send(:find_reflection)).to eq Bauble.reflect_on_association(:media_object)
+        expect(MediaObject.new.association(:baubles).send(:find_reflection)).to eq Bauble._reflect_on_association(:media_object)
       end
     end
 
@@ -604,7 +604,7 @@ describe ActiveFedora::Base do
       end
 
       it "it should find the reflection that bears the predicate" do
-        expect(MediaObject.new.association(:parts).send(:find_reflection)).to eq MasterFile.reflect_on_association(:media_object)
+        expect(MediaObject.new.association(:parts).send(:find_reflection)).to eq MasterFile._reflect_on_association(:media_object)
       end
     end
 
@@ -624,7 +624,7 @@ describe ActiveFedora::Base do
       end
 
       it "it should find the reflection that bears the predicate" do
-        expect(MediaObject.new.association(:baubles).send(:find_reflection)).to eq MediaObject.reflect_on_association(:baubles)
+        expect(MediaObject.new.association(:baubles).send(:find_reflection)).to eq MediaObject._reflect_on_association(:baubles)
       end
     end
   end

data/spec/integration/base_spec.rb

@@ -22,8 +22,8 @@ describe ActiveFedora::Base do
         obj = described_class.find(@obj.id)
         expect(obj.foo).to_not be_new_record
         expect(obj.foo.person).to eq ['bob']
-        person_field = ActiveFedora::SolrQueryBuilder.solr_name('foo__person', type: :string)
-        solr_result = ActiveFedora::SolrService.query("{!raw f=id}#{@obj.id}", fl: "id #{person_field}").first
+        person_field = ActiveFedora.index_field_mapper.solr_name('foo__person', type: :string)
+        solr_result = ActiveFedora::SolrService.query("{!field f=id}#{@obj.id}", fl: "id #{person_field}").first
         expect(solr_result).to eq("id" => @obj.id, person_field => ['bob'])
       end
     end
@@ -41,7 +41,7 @@ describe ActiveFedora::Base do
         end
         it "saves the datastream." do
           expect(MockAFBaseRelationship.find(@release.id).foo.person).to eq ['frank']
-          person_field = ActiveFedora::SolrQueryBuilder.solr_name('foo__person', type: :string)
+          person_field = ActiveFedora.index_field_mapper.solr_name('foo__person', type: :string)
           expect(ActiveFedora::SolrService.query("id:\"#{@release.id}\"", fl: "id #{person_field}").first).to eq("id" => @release.id, person_field => ['frank'])
         end
       end
@@ -164,7 +164,7 @@ describe ActiveFedora::Base do
     let(:obj) { ExampleBase.new }
     it "configures properties and solrize them" do
       obj.title = ["Test"]
-      expect(obj.to_solr[ActiveFedora::SolrQueryBuilder.solr_name("title", :symbol)]).to eq ["Test"]
+      expect(obj.to_solr[ActiveFedora.index_field_mapper.solr_name("title", :symbol)]).to eq ["Test"]
     end
   end
 

data/spec/integration/bug_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 require 'active_fedora'
 require 'active_fedora/model'
 require "rexml/document"
-include ActiveFedora::Model
 
 describe 'bugs' do
   before do

data/spec/integration/full_featured_model_spec.rb

@@ -131,11 +131,11 @@ describe ActiveFedora::Base do
 
     @test_history.save
 
-    @solr_result = OralHistory.find_with_conditions(id: @test_history.id)[0]
+    @solr_result = OralHistory.search_with_conditions(id: @test_history.id)[0]
     @properties_sample_values.each_pair do |field, value|
       next if field == :hard_copy_availability # FIXME: HYDRA-824
       next if field == :location # FIXME HYDRA-825
-      expect((@solr_result[ActiveFedora::SolrQueryBuilder.solr_name(field, type: :string)] || @solr_result[ActiveFedora::SolrQueryBuilder.solr_name(field, type: :date)])).to eq [::Solrizer::Extractor.format_node_value(value)]
+      expect((@solr_result[ActiveFedora.index_field_mapper.solr_name(field, type: :string)] || @solr_result[ActiveFedora.index_field_mapper.solr_name(field, type: :date)])).to eq [::Solrizer::Extractor.format_node_value(value)]
     end
 
     @dublin_core_sample_values.each_pair do |field, value|
@@ -153,8 +153,8 @@ describe ActiveFedora::Base do
     expect(dc_xml.root.elements["dcterms:subject"].text).to eq "My Subject Heading"
   end
 
-  it "supports #find_with_conditions" do
-    solr_result = OralHistory.find_with_conditions({})
+  it "supports #search_with_conditions" do
+    solr_result = OralHistory.search_with_conditions({})
     expect(solr_result).to_not be_nil
   end
 end

data/spec/integration/has_and_belongs_to_many_associations_spec.rb

@@ -395,7 +395,7 @@ describe ActiveFedora::Base do
       end
 
       context "when the has_and_belongs_to_many provides an inverse_of" do
-        let(:reflection) { Component.reflect_on_association(:items) }
+        let(:reflection) { Component._reflect_on_association(:items) }
         before do
           reflection.options[:inverse_of] = :components
         end

data/spec/integration/has_many_associations_spec.rb

@@ -27,6 +27,35 @@ describe ActiveFedora::Associations::HasManyAssociation do
         end
       end
 
+      context "when the owner is not saved, and potential targets (Books) exist" do
+        let!(:book) { Book.create }
+        let(:library) { Library.new }
+        subject { library.books.count }
+        it "it excludes the books that aren't associated" do
+          expect(subject).to eq 0
+        end
+      end
+
+      context "when the owner is saved with associations" do
+        let(:book) { Book.create }
+        let!(:library) { Library.create(books: [book]) }
+        subject { library.reload; library.books.count }
+        it "it excludes the books that are associated" do
+          expect(subject).to eq 1
+        end
+      end
+
+      context "when the owner is not saved after checking the count" do
+        let!(:book) { Book.create }
+        let(:library) { Library.new }
+        it "refreshes the cache" do
+          expect(library.books.count).to eq 0
+          library.books << book
+          library.save!
+          expect(library.books.count).to eq 1
+        end
+      end
+
       context "loading the association prior to a save that affects the association" do
         let(:library) { Library.new }
         before do
@@ -61,7 +90,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
         expect(library.books).to be_loaded
       end
       it "loads from solr" do
-        expect(library.books.load_from_solr.map { |r| r["id"] }).to eq([book.id])
+        expect(library.books.load_from_solr.map(&:id)).to eq([book.id])
       end
       it "loads from solr with options" do
         expect(library.books.load_from_solr(rows: 0).size).to eq(0)

data/spec/integration/indirect_container_spec.rb

@@ -98,7 +98,7 @@ describe "Indirect containers" do
     context "when the class is implied" do
       before do
         class FooHistory < ActiveFedora::Base
-          # TODO: inserted_content_relation can look up the predicate at options[:through].constantize.reflect_on_association(options[:foreign_key]).predicate
+          # TODO: inserted_content_relation can look up the predicate at options[:through].constantize._reflect_on_association(options[:foreign_key]).predicate
           indirectly_contains :related_objects,
                               has_member_relation: ::RDF::URI.new('http://www.openarchives.org/ore/terms/aggregates'),
                               inserted_content_relation: ::RDF::URI.new('http://www.openarchives.org/ore/terms/proxyFor'),

data/spec/integration/nested_attribute_spec.rb

@@ -102,6 +102,12 @@ describe "NestedAttribute behavior" do
         it "creates a new record" do
           expect {
             car.update bars_attributes: [{ uno: "bar1 uno", _destroy: "1" }]
+          }.to change { car.bars(true).count }.by(1)
+        end
+
+        it "does not create a new record if reject_if conditions are triggered" do
+          expect {
+            car.update bars_attributes: [{ uno: "", _destroy: "1" }]
           }.not_to change { car.bars(true).count }
         end
       end

data/spec/integration/ntriples_datastream_spec.rb

@@ -92,21 +92,21 @@ EOF
       subject.date_uploaded = [Date.parse('2012-11-02')]
       expect(subject.date_uploaded.first).to be_kind_of Date
       solr_document = subject.to_solr
-      expect(solr_document[ActiveFedora::SolrQueryBuilder.solr_name('rdf__date_uploaded', type: :date)]).to eq ['2012-11-02T00:00:00Z']
+      expect(solr_document[ActiveFedora.index_field_mapper.solr_name('rdf__date_uploaded', type: :date)]).to eq ['2012-11-02T00:00:00Z']
     end
     it "handles integers" do
       subject.filesize = 12_345
       expect(subject.filesize).to be_kind_of Fixnum
       solr_document = subject.to_solr
-      expect(solr_document[ActiveFedora::SolrQueryBuilder.solr_name('rdf__filesize', :stored_sortable, type: :integer)]).to eq '12345'
+      expect(solr_document[ActiveFedora.index_field_mapper.solr_name('rdf__filesize', :stored_sortable, type: :integer)]).to eq '12345'
     end
   end
 
   it "produces a solr document" do
     @subject = RdfTest.new(title: "War and Peace")
     solr_document = @subject.to_solr
-    expect(solr_document[ActiveFedora::SolrQueryBuilder.solr_name('rdf__title', :facetable)]).to eq ["War and Peace"]
-    expect(solr_document[ActiveFedora::SolrQueryBuilder.solr_name('rdf__title', type: :string)]).to eq ["War and Peace"]
+    expect(solr_document[ActiveFedora.index_field_mapper.solr_name('rdf__title', :facetable)]).to eq ["War and Peace"]
+    expect(solr_document[ActiveFedora.index_field_mapper.solr_name('rdf__title', type: :string)]).to eq ["War and Peace"]
   end
 
   it "sets and recall values" do

data/spec/integration/om_datastream_spec.rb

@@ -72,7 +72,7 @@ describe ActiveFedora::OmDatastream do
       obj.reload
     end
     it "solrizes terms with :type=>'date' to *_dt solr terms" do
-      expect(obj.to_solr[ActiveFedora::SolrQueryBuilder.solr_name('desc_metadata__journal_issue_publication_date', type: :date)]).to eq ['2012-11-02T00:00:00Z']
+      expect(obj.to_solr[ActiveFedora.index_field_mapper.solr_name('desc_metadata__journal_issue_publication_date', type: :date)]).to eq ['2012-11-02T00:00:00Z']
     end
   end
 end

data/spec/integration/relation_delegation_spec.rb

@@ -16,7 +16,7 @@ describe ActiveFedora::Model do
 
         def to_solr(doc = {})
           doc = super
-          doc[ActiveFedora::SolrQueryBuilder.solr_name('foo', :sortable)] = doc[ActiveFedora::SolrQueryBuilder.solr_name('foo', type: :string)]
+          doc[ActiveFedora.index_field_mapper.solr_name('foo', :sortable)] = doc[ActiveFedora.index_field_mapper.solr_name('foo', type: :string)]
           doc
         end
       end

data/spec/integration/scoped_query_spec.rb

@@ -16,7 +16,7 @@ describe ActiveFedora::Querying do
 
         def to_solr(doc = {})
           doc = super
-          doc[ActiveFedora::SolrQueryBuilder.solr_name('foo', :sortable)] = doc[ActiveFedora::SolrQueryBuilder.solr_name('foo', type: :string)]
+          doc[ActiveFedora.index_field_mapper.solr_name('foo', :sortable)] = doc[ActiveFedora.index_field_mapper.solr_name('foo', type: :string)]
           doc
         end
       end
@@ -64,12 +64,12 @@ describe ActiveFedora::Querying do
       end
 
       it "queries" do
-        field = ActiveFedora::SolrQueryBuilder.solr_name('foo', type: :string)
+        field = ActiveFedora.index_field_mapper.solr_name('foo', type: :string)
         expect(ModelIntegrationSpec::Basic.where(field => 'Beta')).to eq [test_instance1]
         expect(ModelIntegrationSpec::Basic.where('foo' => 'Beta')).to eq [test_instance1]
       end
       it "orders" do
-        expect(ModelIntegrationSpec::Basic.order(ActiveFedora::SolrQueryBuilder.solr_name('foo', :sortable) + ' asc')).to eq [test_instance2, test_instance1, test_instance3]
+        expect(ModelIntegrationSpec::Basic.order(ActiveFedora.index_field_mapper.solr_name('foo', :sortable) + ' asc')).to eq [test_instance2, test_instance1, test_instance3]
       end
       it "limits" do
         expect(ModelIntegrationSpec::Basic.limit(1)).to eq [test_instance1]
@@ -79,7 +79,7 @@ describe ActiveFedora::Querying do
       end
 
       it "chains queries" do
-        expect(ModelIntegrationSpec::Basic.where(ActiveFedora::SolrQueryBuilder.solr_name('bar', type: :string) => 'Peanuts').order(ActiveFedora::SolrQueryBuilder.solr_name('foo', :sortable) + ' asc').limit(1)).to eq [test_instance2]
+        expect(ModelIntegrationSpec::Basic.where(ActiveFedora.index_field_mapper.solr_name('bar', type: :string) => 'Peanuts').order(ActiveFedora.index_field_mapper.solr_name('foo', :sortable) + ' asc').limit(1)).to eq [test_instance2]
       end
 
       it "wraps string conditions with parentheses" do
@@ -87,31 +87,31 @@ describe ActiveFedora::Querying do
       end
 
       it "chains where queries" do
-        first_condition = { ActiveFedora::SolrQueryBuilder.solr_name('bar', type: :string) => 'Peanuts' }
+        first_condition = { ActiveFedora.index_field_mapper.solr_name('bar', type: :string) => 'Peanuts' }
         second_condition = "foo_tesim:bar"
         where_values = ModelIntegrationSpec::Basic.where(first_condition)
                                                   .where(second_condition).where_values
-        expect(where_values).to eq ["bar_tesim:Peanuts",
+        expect(where_values).to eq ["_query_:\"{!field f=bar_tesim}Peanuts\"",
                                     "(foo_tesim:bar)"]
       end
 
       it "chains count" do
-        expect(ModelIntegrationSpec::Basic.where(ActiveFedora::SolrQueryBuilder.solr_name('bar', type: :string) => 'Peanuts').count).to eq 2
+        expect(ModelIntegrationSpec::Basic.where(ActiveFedora.index_field_mapper.solr_name('bar', type: :string) => 'Peanuts').count).to eq 2
       end
 
       it "calling first should not affect the relation's ability to get all results later" do
-        relation = ModelIntegrationSpec::Basic.where(ActiveFedora::SolrQueryBuilder.solr_name('bar', type: :string) => 'Peanuts')
+        relation = ModelIntegrationSpec::Basic.where(ActiveFedora.index_field_mapper.solr_name('bar', type: :string) => 'Peanuts')
         expect { relation.first }.not_to change { relation.to_a.size }
       end
 
       it "calling where should not affect the relation's ability to get all results later" do
-        relation = ModelIntegrationSpec::Basic.where(ActiveFedora::SolrQueryBuilder.solr_name('bar', type: :string) => 'Peanuts')
-        expect { relation.where(ActiveFedora::SolrQueryBuilder.solr_name('foo', type: :string) => 'bar') }.not_to change { relation.to_a.size }
+        relation = ModelIntegrationSpec::Basic.where(ActiveFedora.index_field_mapper.solr_name('bar', type: :string) => 'Peanuts')
+        expect { relation.where(ActiveFedora.index_field_mapper.solr_name('foo', type: :string) => 'bar') }.not_to change { relation.to_a.size }
       end
 
       it "calling order should not affect the original order of the relation later" do
-        relation = ModelIntegrationSpec::Basic.order(ActiveFedora::SolrQueryBuilder.solr_name('foo', :sortable) + ' asc')
-        expect { relation.order(ActiveFedora::SolrQueryBuilder.solr_name('foo', :sortable) + ' desc') }.not_to change { relation.to_a }
+        relation = ModelIntegrationSpec::Basic.order(ActiveFedora.index_field_mapper.solr_name('foo', :sortable) + ' asc')
+        expect { relation.order(ActiveFedora.index_field_mapper.solr_name('foo', :sortable) + ' desc') }.not_to change { relation.to_a }
       end
     end
 

data/spec/integration/solr_hit_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe ActiveFedora::SolrHit do
+  before do
+    class Foo < ActiveFedora::Base
+      has_metadata 'descMetadata', type: ActiveFedora::SimpleDatastream do |m|
+        m.field "foo", :text
+        m.field "bar", :text
+      end
+      Deprecation.silence(ActiveFedora::Attributes) do
+        has_attributes :foo, datastream: 'descMetadata', multiple: true
+        has_attributes :bar, datastream: 'descMetadata', multiple: false
+      end
+      property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
+    end
+  end
+
+  let(:another) { Foo.create }
+
+  let!(:obj) { Foo.create!(
+    id: 'test-123',
+    foo: ["baz"],
+    bar: 'quix',
+    title: 'My Title'
+  ) }
+
+  let(:profile) { { "foo" => ["baz"], "bar" => "quix", "title" => "My Title" }.to_json }
+  let(:doc) { { 'id' => 'test-123', 'has_model_ssim' => ['Foo'], 'object_profile_ssm' => profile } }
+  let(:solr_hit) { described_class.new(doc) }
+
+  after do
+    Object.send(:remove_const, :Foo)
+  end
+
+  describe "#reify" do
+    subject { solr_hit.reify }
+
+    it "finds the document in solr" do
+      expect(subject).to be_instance_of Foo
+      expect(subject.title).to eq 'My Title'
+    end
+  end
+
+  describe "#instantiate_with_json" do
+    subject { solr_hit.instantiate_with_json }
+
+    it "finds the document in solr" do
+      expect(subject).to be_instance_of Foo
+      expect(subject.title).to eq 'My Title'
+    end
+  end
+end

data/spec/samples/hydra-mods_article_datastream.rb

@@ -508,8 +508,8 @@ module Hydra
     def to_solr(solr_doc = {}, opts = {})
       solr_doc = super
 
-      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, Solrizer.default_field_mapper.solr_name('object_type', :facetable), "Article")
-      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, Solrizer.default_field_mapper.solr_name('mods_journal_title_info', :facetable), "Unknown") if solr_doc["mods_journal_title_info_facet"].nil?
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, ActiveFedora.index_field_mapper.solr_name('object_type', :facetable), "Article")
+      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, ActiveFedora.index_field_mapper.solr_name('mods_journal_title_info', :facetable), "Unknown") if solr_doc["mods_journal_title_info_facet"].nil?
 
       solr_doc
     end