active-fedora 6.0.0.rc6 → 6.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9409f2deb359a4478e64508db0a9e1efeddd3ede
-  data.tar.gz: 24abcbc60267a4dc7d119ea21e02bdf792f12b39
+  metadata.gz: 443c8f93ef41704da2c34752bb28a811ac9684ac
+  data.tar.gz: 925b1f309a57f0584e0fae33cb7a2785dde7166f
 SHA512:
-  metadata.gz: c3447788f7c5fbe82a19d97bee6f6c4b8fbef4811738e3555f9c853d18e0e77f8b3acc1114d342f27177d9b65ecfde8e45818568337d82cd4856bb145b42f029
-  data.tar.gz: 0e0471d596cd79f882e9face2f5f70c6a93ff72ce19e6759e081c79d7db2575354f1b74aa044ea7f807857c8af6455b1a05fa2c4f204ea8af9b76a30236fac5e
+  metadata.gz: 573ea265ed95d54c703227de1622f6e037e5a42aa95bbedf253f703cdc927dca0efe888000c951c5aaf714dea9985e0adcaabc6477d3adb61bc0998ec5c03969
+  data.tar.gz: cd0df254f2b44148e9d9bf5656fb9e941c7c5d142b3f00ebcdd9f42ad3629af980907d83ccde2b7a9a6ccfb8e4942b805f860cd7d7713c097fc73222cfdc5f54

data/active-fedora.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.4')
+  s.add_dependency("rubydora", '~>1.5')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>1.0.0')
   s.add_dependency("deprecation")

data/lib/active_fedora.rb

@@ -67,6 +67,7 @@ module ActiveFedora #:nodoc:
     autoload :DatastreamCollections
     autoload :Predicates
     autoload :Validations
+    autoload :SolrInstanceLoader
   end
   
   

data/lib/active_fedora/digital_object.rb

@@ -32,13 +32,10 @@ module ActiveFedora
 
     def self.find(original_class, pid)
       conn = original_class.connection_for_pid(pid)
-      obj = Deprecation.silence(Rubydora::DigitalObject) do
-        begin
-          super(pid, conn)
-        rescue Rubydora::FedoraInvalidRequest => e
-          # PID is nil
-          raise ActiveFedora::ObjectNotFoundError, "Unable to find '#{pid}' in fedora. See logger for details."
-        end
+      obj = begin
+        super(pid, conn)
+      rescue Rubydora::RecordNotFound
+        raise ActiveFedora::ObjectNotFoundError, "Unable to find '#{pid}' in fedora. See logger for details."
       end
       obj.original_class = original_class
       # PID is not found, but was "well-formed" for its Fedora request. So

data/lib/active_fedora/indexing.rb

@@ -4,8 +4,8 @@ module ActiveFedora
 
     # Return a Hash representation of this object where keys in the hash are appropriate Solr field names.
     # @param [Hash] solr_doc (optional) Hash to insert the fields into
-    # @param [Hash] opts (optional) 
-    # If opts[:model_only] == true, the base object metadata and the RELS-EXT datastream will be omitted.  This is mainly to support shelver, which calls .to_solr for each model an object subscribes to. 
+    # @param [Hash] opts (optional)
+    # If opts[:model_only] == true, the base object metadata and the RELS-EXT datastream will be omitted.  This is mainly to support shelver, which calls .to_solr for each model an object subscribes to.
     def to_solr(solr_doc = Hash.new, opts={})
       unless opts[:model_only]
         c_time = create_date
@@ -43,7 +43,7 @@ module ActiveFedora
       self.datastreams.each_pair { |dsid,ds| profile_hash['datastreams'][dsid] = ds.solrize_profile }
       solr_doc[self.class.profile_solr_name] = profile_hash.to_json
     end
-    
+
     # Serialize the datastream's RDF relationships to solr
     # @param [Hash] solr_doc @deafult an empty Hash
     def solrize_relationships(solr_doc = Hash.new)
@@ -58,7 +58,7 @@ module ActiveFedora
 
     # Updates Solr index with self.
     def update_index
-      if defined?( Solrizer::Fedora::Solrizer ) 
+      if defined?( Solrizer::Fedora::Solrizer )
         #logger.info("Trying to solrize pid: #{pid}")
         solrizer = Solrizer::Fedora::Solrizer.new
         solrizer.solrize( self )
@@ -70,63 +70,32 @@ module ActiveFedora
 
 
     module ClassMethods
-      # This method can be used instead of ActiveFedora::Model::ClassMethods.find.  
+      # This method can be used instead of ActiveFedora::Model::ClassMethods.find.
       # It works similarly except it populates an object from Solr instead of Fedora.
       # It is most useful for objects used in read-only displays in order to speed up loading time.  If only
       # a pid is passed in it will query solr for a corresponding solr document and then use it
       # to populate this object.
-      # 
+      #
       # If a value is passed in for optional parameter solr_doc it will not query solr again and just use the
       # one passed to populate the object.
       #
       # It will anything stored within solr such as metadata and relationships.  Non-metadata datastreams will not
       # be loaded and if needed you should use find instead.
       def load_instance_from_solr(pid,solr_doc=nil)
-        if solr_doc.nil?
-          result = find_with_conditions(:id=>pid)
-          raise ActiveFedora::ObjectNotFoundError, "Object #{pid} not found in solr" if result.empty?
-          solr_doc = result.first
-          #double check pid and id in record match
-          raise ActiveFedora::ObjectNotFoundError, "Object #{pid} not found in Solr" unless !result.nil? && !solr_doc.nil? && pid == solr_doc[SOLR_DOCUMENT_ID]
-        else
-          raise "Solr document record id and pid do not match" unless pid == solr_doc[SOLR_DOCUMENT_ID]
-        end
-        klass = if class_str = solr_doc[ActiveFedora::SolrService.solr_name('has_model', :symbol)]
-          ActiveFedora::SolrService.class_from_solr_document(solr_doc)
-        else
-          ActiveFedora::Base
-        end
-
-        profile_json = Array(solr_doc[ActiveFedora::Base.profile_solr_name]).first
-        unless profile_json.present?
-          raise ActiveFedora::ObjectNotFoundError, "Object #{pid} does not contain a solrized profile"
-        end
-        profile_hash = ActiveSupport::JSON.decode(profile_json)
-        obj = klass.allocate.init_with(SolrDigitalObject.new(solr_doc, profile_hash, klass))
-        #set by default to load any dependent relationship objects from solr as well
-        #need to call rels_ext once so it exists when iterating over datastreams
-        obj.rels_ext
-        obj.datastreams.each_value do |ds|
-          if ds.respond_to?(:profile_from_hash) and (ds_prof = profile_hash['datastreams'][ds.dsid])
-            ds.profile_from_hash(ds_prof)
-          end
-          ds.from_solr(solr_doc) if ds.respond_to?(:from_solr)
-        end
-        obj.inner_object.freeze
-        obj
+        SolrInstanceLoader.new(self, pid, solr_doc).object
       end
-      
-      # Using the fedora search (not solr), get every object and reindex it. 
+
+      # Using the fedora search (not solr), get every object and reindex it.
       def reindex_everything
         connections.each do |conn|
           conn.search(nil) do |object|
             ActiveFedora::Base.find(object.pid, :cast=>true).update_index
           end
         end
-      end 
+      end
 
       private
-      
+
       def connections
         if ActiveFedora.config.sharded?
           return ActiveFedora.config.credentials.map { |cred| ActiveFedora::RubydoraConnection.new(cred).connection}

data/lib/active_fedora/solr_instance_loader.rb

@@ -0,0 +1,93 @@
+module ActiveFedora
+  class FedoraSolrMismatchError < ActiveFedora::ObjectNotFoundError
+    def initialize(pid, solr_document_id)
+      super("Solr record id and pid do not match; Solr ID=#{solr_document_id}, PID=#{pid}")
+    end
+  end
+
+  # Responsible for loading an ActiveFedora::Base proxy from a Solr document.
+  class SolrInstanceLoader
+    attr_reader :context, :pid
+    private :context, :pid
+    def initialize(context, pid, solr_doc = nil)
+      @context = context
+      @pid = pid
+      @solr_doc = solr_doc
+      validate_solr_doc_and_pid!(@solr_doc)
+    end
+
+    def object
+      return @object if @object
+      @object = allocate_object
+      @object.rels_ext
+      load_object_datastreams(@object)
+      @object.inner_object.freeze
+      @object
+    end
+
+    private
+
+    def allocate_object
+      active_fedora_class.allocate.init_with(solr_digital_object)
+    end
+
+    def solr_digital_object
+      SolrDigitalObject.new(solr_doc, profile_hash, active_fedora_class)
+    end
+
+
+    def load_object_datastreams(obj)
+      obj.datastreams.each_value do |ds|
+        if ds.respond_to?(:profile_from_hash) and (ds_prof = profile_hash['datastreams'][ds.dsid])
+          ds.profile_from_hash(ds_prof)
+        end
+        ds.from_solr(solr_doc) if ds.respond_to?(:from_solr)
+      end
+    end
+
+    def solr_doc
+      @solr_doc ||= begin
+        result = context.find_with_conditions(:id=>pid)
+        if result.empty?
+          raise ActiveFedora::ObjectNotFoundError, "Object #{pid} not found in solr"
+        end
+        @solr_doc = result.first
+        validate_solr_doc_and_pid!(@solr_doc)
+        @solr_doc
+      end
+    end
+
+    def validate_solr_doc_and_pid!(document)
+      return true if document.nil?
+      solr_id = document[SOLR_DOCUMENT_ID]
+      if pid != solr_id
+        raise ActiveFedora::FedoraSolrMismatchError.new(pid, solr_id)
+      end
+    end
+
+    def active_fedora_class
+      @active_fedora_class ||= begin
+        if solr_doc[ActiveFedora::SolrService.solr_name('has_model', :symbol)]
+          ActiveFedora::SolrService.class_from_solr_document(solr_doc)
+        else
+          ActiveFedora::Base
+        end
+      end
+    end
+
+    def profile_json
+      @profile_json ||= begin
+        profile_json = Array(solr_doc[ActiveFedora::Base.profile_solr_name]).first
+        unless profile_json.present?
+          raise ActiveFedora::ObjectNotFoundError, "Object #{pid} does not contain a solrized profile"
+        end
+        profile_json
+      end
+    end
+
+    def profile_hash
+      @profile_hash ||= ActiveSupport::JSON.decode(profile_json)
+    end
+
+  end
+end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0.rc6"
+  VERSION = "6.0.0.rc7"
 end

data/spec/integration/rels_ext_datastream_spec.rb

@@ -74,7 +74,9 @@ describe ActiveFedora::RelsExtDatastream do
     # make sure that _something_ was actually added to the object's relationships hash
     @test_object.ids_for_outbound(:is_member_of).size.should == 1
     new_rels = ActiveFedora::Base.find(@test_object.pid).relationships
-    new_rels.should == @test_object.relationships
+    # This stopped working, need to push an issue into the rdf library. (when dumping ntriples, the order of assertions changed)
+    #new_rels.should == @test_object.relationships
+    new_rels.dump(:rdfxml).should == @test_object.relationships.dump(:rdfxml)
   end
 
 end

data/spec/integration/solr_instance_loader_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+require 'active_fedora'
+
+describe ActiveFedora::SolrInstanceLoader do
+  let(:context) { ActiveFedora::Base }
+  let(:pid) { nil }
+  let(:solr_doc) { nil }
+  let(:active_fedora_object) { ActiveFedora::Base.find(pid, :cast => true) }
+  subject { ActiveFedora::SolrInstanceLoader.new(context, pid, solr_doc) }
+
+  describe 'existing pid' do
+    let(:pid) { 'hydrangea:fixture_mods_article1' }
+    describe 'without a solr document' do
+      it 'it finds the SOLR document and casts into an AF::Base object' do
+        expect(subject.object).to eq(active_fedora_object)
+      end
+    end
+    describe 'with matching solr document' do
+      let(:solr_doc) { ActiveFedora::Base.find_with_conditions(:id=>pid).first }
+      it 'it casts the SOLR document and casts into an AF::Base object' do
+        expect(subject.object).to eq(active_fedora_object)
+      end
+    end
+    describe 'with a mismatching solr document' do
+      let(:mismatching_pid) { 'hydrangea:fixture_mods_article2' }
+      let(:solr_doc) { ActiveFedora::Base.find_with_conditions(:id=>mismatching_pid).first }
+      it 'it raise ObjectNotFoundError' do
+        expect {
+          subject
+        }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      end
+    end
+  end
+  describe 'missing pid' do
+    let(:pid) { 'hydrangea:fixture_mods_article8675309' }
+    describe 'without a solr document' do
+      it 'it raise ObjectNotFoundError' do
+        expect {
+          subject.object
+        }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      end
+    end
+    describe 'with matching solr document' do
+      let(:solr_doc) { ActiveFedora::Base.find_with_conditions(:id=>pid).first }
+      it 'it raise ObjectNotFoundError' do
+        expect {
+          subject.object
+        }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      end
+    end
+    describe 'with a mismatching solr document' do
+      let(:mismatching_pid) { 'hydrangea:fixture_mods_article2' }
+      let(:solr_doc) { ActiveFedora::Base.find_with_conditions(:id=>mismatching_pid).first }
+      it 'it raise ObjectNotFoundError' do
+        expect {
+          subject
+        }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc6
+  version: 6.0.0.rc7
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -130,14 +130,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -392,6 +392,7 @@ files:
 - lib/active_fedora/service_definitions.rb
 - lib/active_fedora/simple_datastream.rb
 - lib/active_fedora/solr_digital_object.rb
+- lib/active_fedora/solr_instance_loader.rb
 - lib/active_fedora/solr_service.rb
 - lib/active_fedora/test_support.rb
 - lib/active_fedora/unsaved_digital_object.rb
@@ -459,6 +460,7 @@ files:
 - spec/integration/persistence_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/scoped_query_spec.rb
+- spec/integration/solr_instance_loader_spec.rb
 - spec/integration/solr_service_spec.rb
 - spec/rails3_test_app/.gitignore
 - spec/rails3_test_app/.rspec
@@ -619,6 +621,7 @@ test_files:
 - spec/integration/persistence_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/scoped_query_spec.rb
+- spec/integration/solr_instance_loader_spec.rb
 - spec/integration/solr_service_spec.rb
 - spec/rails3_test_app/.gitignore
 - spec/rails3_test_app/.rspec