active-fedora 11.1.6 → 11.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4288e97d72b9829adfa9892a3013ddc587624bc
-  data.tar.gz: 78a3834e826d71206fae523c8c70c48538bc3f0c
+  metadata.gz: b5718b93144050d065de0a17b2a483d64227f43b
+  data.tar.gz: 69c0d340816d9fe60d9eab9304464c020879ad07
 SHA512:
-  metadata.gz: 2b0fbfc067535245ae40b410fcc8641b4a042c84c2d07ae248225cb2998ed2dc4728d2dcfef81f8cb5540771c2afd7578bdb5c8584e9e438ee4725bb9289c610
-  data.tar.gz: 3111010745fb585c75009fd10e7d221e6339c588fa907374966186641135d5f21114b10680cccd0844a7de1b89f57ca3da35ef0ed605a8bb81e924afbe6f42b1
+  metadata.gz: 96f4efe5a38cbb1e4a1e577defd7373fa9ca2b85e5f08d5b0a4bfb1376915e2c98d5b2b1b95d211a51316d1acff74676aee9cae932716687c4f4a0f2f2242c20
+  data.tar.gz: 05abe1815355410f735cc17f2c283d1961a567e0b565deac21f59124c7f5974b5ab2d78639d44c782f9658fee9dc81f68c8fda27dea367d0b9afff5355628c29

data/.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
 cache: bundler
 sudo: false
-rvm: 2.4.0
+rvm: 2.4.1
 matrix:
   include:
-    - rvm: 2.3.3
-      env: "RAILS_VERSION=4.2.7.1"
-    - env: "RSOLR_VERSION=2.0.0.pre1"
+    - rvm: 2.3.4
+      env: "RAILS_VERSION=4.2.8"
+    - env: "RSOLR_VERSION=2.0.1"
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 before_install:

data/active-fedora.gemspec

@@ -21,12 +21,13 @@ Gem::Specification.new do |s|
   s.add_dependency "active-triples", '~> 0.11.0'
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.6.0'
+  s.add_dependency "ruby-progressbar", '~> 1.0'
 
   s.add_development_dependency "rails"
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
   s.add_development_dependency "rake"
-  s.add_development_dependency "solr_wrapper", "~> 0.15"
+  s.add_development_dependency "solr_wrapper", "~> 1.0"
   s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rspec-its"

data/lib/active_fedora/file.rb

@@ -40,7 +40,7 @@ module ActiveFedora
           id = ActiveFedora::Associations::IDComposite.new([identifier], translate_uri_to_id).first
           @ldp_source = build_ldp_resource id
         else
-          raise "The first argument to #{self} must be a Hash, String or RDF::URI. You provided a #{uri.class}"
+          raise "The first argument to #{self} must be a Hash, String or RDF::URI. You provided a #{identifier.class}"
         end
 
         @attributes = {}.with_indifferent_access

data/lib/active_fedora/file_configurator.rb

@@ -108,7 +108,7 @@ module ActiveFedora
       end
 
       begin
-        fedora_yml = YAML.safe_load(config_erb)
+        fedora_yml = YAML.safe_load(config_erb, [], [], true) # allow YAML aliases
       rescue Psych::SyntaxError => e
         raise "fedora.yml was found, but could not be parsed. " \
               "Error #{e.message}"
@@ -132,7 +132,7 @@ module ActiveFedora
       end
 
       begin
-        solr_yml = YAML.safe_load(config_erb)
+        solr_yml = YAML.safe_load(config_erb, [], [], true) # allow YAML aliases
       rescue StandardError
         raise("solr.yml was found, but could not be parsed.\n")
       end

data/lib/active_fedora/fixity_service.rb

@@ -2,26 +2,57 @@ module ActiveFedora
   class FixityService
     extend ActiveSupport::Concern
 
-    attr_accessor :target, :response
+    attr_accessor :target
 
-    # @param [String, RDF::URI] target url for a Fedora resource
+    # @param [String, RDF::URI] target url for a Fedora resource.
     def initialize(target)
       raise ArgumentError, 'You must provide a uri' unless target
       @target = target.to_s
     end
 
-    # Executes a fixity check on Fedora and saves the Faraday::Response.
+    def response
+      @response ||= fixity_response_from_fedora
+    end
+
+    # For backwards compat, check always insists on doing a new request.
+    # you might want verified? instead which uses a cached request.
     # @return true or false
     def check
-      @response = fixity_response_from_fedora
+      @response = nil
+      verified?
+    end
+
+    # Executes a fixity check on Fedora
+    # @return true or false
+    def verified?
       status.include?(success)
     end
 
+    # An array of 1 or more literals reported by Fedora.
+    # See 'success' for which one indicates fixity check is good.
     def status
       fixity_graph.query(predicate: premis_status_predicate).map(&:object) +
         fixity_graph.query(predicate: fedora_status_predicate).map(&:object)
     end
 
+    # the currently calculated checksum, as a string URI, like
+    # "urn:sha1:09a848b79f86f3a4f3f301b8baafde455d6f8e0e"
+    def expected_message_digest
+      fixity_graph.query(predicate: ::RDF::Vocab::PREMIS.hasMessageDigest).first.try(:object).try(:to_s)
+    end
+
+    # integer, as reported by fedora. bytes maybe?
+    def expected_size
+      fixity_graph.query(predicate: ::RDF::Vocab::PREMIS.hasSize).first.try(:object).try(:to_s).try(:to_i)
+    end
+
+    # Fedora response as an ::RDF::Graph object. Public API, so consumers
+    # can do with it what they will, especially if future fedora versions
+    # add more things to it.
+    def response_graph
+      fixity_graph
+    end
+
     private
 
       def premis_status_predicate
@@ -46,7 +77,7 @@ module ActiveFedora
       end
 
       def fixity_graph
-        ::RDF::Graph.new << ::RDF::Reader.for(:ttl).new(response.body)
+        @fixity_graph ||= ::RDF::Graph.new << ::RDF::Reader.for(:ttl).new(response.body)
       end
 
       # See https://jira.duraspace.org/browse/FCREPO-1247

data/lib/active_fedora/indexing.rb

@@ -13,6 +13,7 @@ module ActiveFedora
 
     eager_autoload do
       autoload :Map
+      autoload :DescendantFetcher
     end
 
     included do
@@ -82,26 +83,44 @@ module ActiveFedora
                             end
         end
 
-        def reindex_everything
-          descendants = descendant_uris(ActiveFedora.fedora.base_uri)
-          descendants.shift # Discard the root uri
+        # @param [Integer] batch_size - The number of Fedora objects to process for each SolrService.add call. Default 50.
+        # @param [Boolean] softCommit - Do we perform a softCommit when we add the to_solr objects to SolrService. Default true.
+        # @param [Boolean] progress_bar - If true output progress bar information. Default false.
+        # @param [Boolean] final_commit - If true perform a hard commit to the Solr service at the completion of the batch of updates. Default false.
+        def reindex_everything(batch_size: 50, softCommit: true, progress_bar: false, final_commit: false)
+          # skip root url
+          descendants = descendant_uris(ActiveFedora.fedora.base_uri, exclude_uri: true)
+
+          batch = []
+
+          progress_bar_controller = ProgressBar.create(total: descendants.count, format: "%t: |%B| %p%% %e") if progress_bar
+
           descendants.each do |uri|
             logger.debug "Re-index everything ... #{uri}"
-            ActiveFedora::Base.find(ActiveFedora::Base.uri_to_id(uri)).update_index
+
+            batch << ActiveFedora::Base.find(ActiveFedora::Base.uri_to_id(uri)).to_solr
+
+            if (batch.count % batch_size).zero?
+              SolrService.add(batch, softCommit: softCommit)
+              batch.clear
+            end
+
+            progress_bar_controller.increment if progress_bar_controller
+          end
+
+          if batch.present?
+            SolrService.add(batch, softCommit: softCommit)
+            batch.clear
           end
-        end
 
-        def descendant_uris(uri)
-          resource = Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, uri)
-          # GET could be slow if it's a big resource, we're using HEAD to avoid this problem,
-          # but this causes more requests to Fedora.
-          return [] unless resource.head.rdf_source?
-          immediate_descendant_uris = resource.graph.query(predicate: ::RDF::Vocab::LDP.contains).map { |descendant| descendant.object.to_s }
-          all_descendants_uris = [uri]
-          immediate_descendant_uris.each do |descendant_uri|
-            all_descendants_uris += descendant_uris(descendant_uri)
+          if final_commit
+            logger.debug "Solr hard commit..."
+            SolrService.commit
           end
-          all_descendants_uris
+        end
+
+        def descendant_uris(uri, exclude_uri: false)
+          DescendantFetcher.new(uri, exclude_self: exclude_uri).descendant_and_self_uris
         end
       end
   end

data/lib/active_fedora/indexing/descendant_fetcher.rb

@@ -0,0 +1,101 @@
+module ActiveFedora
+  module Indexing
+    # Finds all descendent URIs of a given repo URI (usually the base URI).
+    #
+    # This is a slow and non-performant thing to do, we need to fetch every single
+    # object from the repo.
+    #
+    # The DescendantFetcher is also capable of partitioning the URIs into "priority" URIs
+    # that will be first in the returned list. These prioritized URIs belong to objects
+    # with certain hasModel models. This feature is used in some hydra apps that need to
+    # index 'permissions' objects before other objects to have the solr indexing work right.
+    # And so by default, the prioritized class names are the ones form Hydra::AccessControls,
+    # but you can alter the prioritized model name list, or set it to the empty array.
+    #
+    #     DescendantFetcher.new(ActiveFedora.fedora.base_uri).descendent_and_self_uris
+    #     #=> array including self uri and descendent uris with "prioritized" (by default)
+    #         Hydra::AccessControls permissions) objects FIRST.
+    #
+    # Change the default prioritized hasModel names:
+    #
+    #     ActiveFedora::Indexing::DescendantFetcher.default_priority_models = []
+    class DescendantFetcher
+      HAS_MODEL_PREDICATE = ActiveFedora::RDF::Fcrepo::Model.hasModel
+
+      class_attribute :default_priority_models, instance_accessor: false
+      self.default_priority_models = %w(Hydra::AccessControl Hydra::AccessControl::Permissions).freeze
+
+      attr_reader :uri, :priority_models
+
+      def initialize(uri,
+                     priority_models: self.class.default_priority_models, exclude_self: false)
+        @uri = uri
+        @priority_models = priority_models
+        @exclude_self = exclude_self
+      end
+
+      def descendant_and_self_uris
+        partitioned = descendant_and_self_uris_partitioned
+        partitioned[:priority] + partitioned[:other]
+      end
+
+      # returns a hash where key :priority is an array of all prioritized
+      # type objects, key :other is an array of the rest.
+      def descendant_and_self_uris_partitioned
+        resource = Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, uri)
+        # GET could be slow if it's a big resource, we're using HEAD to avoid this problem,
+        # but this causes more requests to Fedora.
+        return partitioned_uris unless resource.head.rdf_source?
+
+        add_self_to_partitioned_uris unless @exclude_self
+
+        immediate_descendant_uris = rdf_graph.query(predicate: ::RDF::Vocab::LDP.contains).map { |descendant| descendant.object.to_s }
+        immediate_descendant_uris.each do |descendant_uri|
+          self.class.new(
+            descendant_uri,
+            priority_models: priority_models
+          ).descendant_and_self_uris_partitioned.tap do |descendant_partitioned|
+            partitioned_uris[:priority].concat descendant_partitioned[:priority]
+            partitioned_uris[:other].concat descendant_partitioned[:other]
+          end
+        end
+        partitioned_uris
+      end
+
+      protected
+
+        def rdf_resource
+          @rdf_resource ||= Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, uri)
+        end
+
+        def rdf_graph
+          @rdf_graph ||= rdf_resource.graph
+        end
+
+        def partitioned_uris
+          @partitioned_uris ||= {
+            priority: [],
+            other: []
+          }
+        end
+
+        def rdf_graph_models
+          rdf_graph.query(predicate: HAS_MODEL_PREDICATE).collect(&:object).collect do |rdf_object|
+            rdf_object.to_s if rdf_object.literal?
+          end.compact
+        end
+
+        def prioritized_object?
+          priority_models.present? && (rdf_graph_models & priority_models).count > 0
+        end
+
+        def add_self_to_partitioned_uris
+          if prioritized_object?
+            partitioned_uris[:priority] << rdf_resource.subject
+          else
+            partitioned_uris[:other] << rdf_resource.subject
+          end
+        end
+    end
+  end
+end

data/lib/active_fedora/indexing/map.rb

@@ -11,7 +11,15 @@ module ActiveFedora::Indexing
     end
 
     def dup
-      self.class.new(@hash.deep_dup)
+      self.class.new(to_hash)
+    end
+
+    def merge(new_hash)
+      self.class.new(to_hash.merge(new_hash))
+    end
+
+    def to_hash
+      @hash.deep_dup
     end
 
     # this enables a cleaner API for solr integration
@@ -19,8 +27,8 @@ module ActiveFedora::Indexing
       attr_accessor :data_type, :behaviors, :term
       attr_reader :key
 
-      def initialize(name, &_block)
-        @behaviors = []
+      def initialize(name, behaviors: [], &_block)
+        @behaviors = behaviors
         @data_type = :string
         @key = name
         yield self if block_given?

data/lib/active_fedora/indexing_service.rb

@@ -61,7 +61,12 @@ module ActiveFedora
       # Serialize the resource's RDF relationships to solr
       # @param [Hash] solr_doc @deafult an empty Hash
       def solrize_rdf_assertions(solr_doc = {})
-        solr_doc.merge rdf_service.new(object).generate_solr_document
+        solr_doc.merge rdf_indexer.generate_solr_document
+      end
+
+      # @return IndexingService
+      def rdf_indexer
+        rdf_service.new(object, object.class.index_config)
       end
   end
 end

data/lib/active_fedora/rdf/field_map.rb

@@ -15,8 +15,8 @@ module ActiveFedora::RDF
 
     # Inserts each solr field map configuration into the FieldMap class
     # @param [Symbol] name the name of the property on the object that we're indexing
-    # @param [Object] index_field_config an instance of ActiveFedora::Indexing::Map::IndexObject
-    # @param [Object] object the instance of ActiveFedora::Base which is being indexed into Solr
+    # @param [ActiveFedora::Indexing::Map::IndexObject] index_field_config describes how the object should be indexed
+    # @param [ActiveFedora::Base] object the object to be indexed into Solr
     def insert(name, index_field_config, object)
       self[index_field_config.key.to_s] ||= FieldMapEntry.new
       PolymorphicBuilder.new(self[index_field_config.key.to_s], index_field_config, object, name).build

data/lib/active_fedora/rdf/field_map_entry.rb

@@ -3,9 +3,10 @@ module ActiveFedora::RDF
   # It might be possible for two properties to share a single field map entry if they use the same solr key.
   # @attribute [Symbol] type the data type hint for Solrizer
   # @attribute [Array] behaviors the indexing hints such as :stored_searchable or :symbol
-  # @attribute [Array] values the actual values that get sent to solr
+  # @!attribute [w] values the raw values
   class FieldMapEntry
-    attr_accessor :type, :behaviors, :values
+    attr_accessor :type, :behaviors
+    attr_writer :values
 
     def initialize
       @behaviors = []
@@ -15,14 +16,15 @@ module ActiveFedora::RDF
     # Merges any existing values for solr fields with new, incoming values and ensures that resulting values are unique.
     # @param [Symbol] type the data type for the field such as :string, :date, :integer
     # @param [Array] behaviors Solrizer's behaviors for indexing such as :stored_searhable, :symbol
-    # @param [Array] values existing values for the solr field
-    def merge!(type, behaviors, values)
+    # @param [Array] new_values values to append into the existing solr field
+    def merge!(type, behaviors, new_values)
       self.type ||= type
       self.behaviors += behaviors
       self.behaviors.uniq!
-      self.values += values
+      self.values += new_values
     end
 
+    # @return [Array] the actual values that get sent to solr
     def values
       @values.map do |value|
         ValueCaster.new(value).value

data/lib/active_fedora/rdf/indexing_service.rb

@@ -6,11 +6,17 @@ module ActiveFedora::RDF
   # @see ActiveFedora::IndexingService
   class IndexingService
     include Solrizer::Common
-    attr_reader :object
+    attr_reader :object, :index_config
 
-    # @param [#resource, #rdf_subject] obj the object to build an solr document for. Its class must respond to 'properties' and 'index_config'
-    def initialize(obj)
+    # @param [#resource, #rdf_subject] obj the object to build an solr document for. Its class must respond to 'properties'
+    # @param [ActiveFedora::Indexing::Map] index_config the configuration to use to map object values to index document values
+    def initialize(obj, index_config = nil)
+      unless index_config
+        Deprecation.warn(self, "initializing ActiveFedora::RDF::IndexingService without an index_config is deprecated and will be removed in ActiveFedora 13.0")
+        index_config = obj.class.index_config
+      end
       @object = obj
+      @index_config = index_config
     end
 
     # Creates a solr document hash for the rdf assertions of the {#object}
@@ -69,10 +75,6 @@ module ActiveFedora::RDF
         object.resource
       end
 
-      def index_config
-        object.class.index_config
-      end
-
       # returns the field map instance
       def fields
         field_map_class.new do |field_map|

data/lib/active_fedora/solr_service.rb

@@ -2,6 +2,7 @@ require 'rsolr'
 
 module ActiveFedora
   class SolrService
+    attr_reader :options
     attr_writer :conn
 
     MAX_ROWS = 10_000
@@ -64,7 +65,7 @@ module ActiveFedora
         SolrService.get(query, args)['response']['numFound'].to_i
       end
 
-      # @param [Hash] doc the document to index
+      # @param [Hash] doc the document to index, or an array of docs
       # @param [Hash] params
       #   :commit => commits immediately
       #   :softCommit => commit to memory, but don't flush to disk

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.1.6".freeze
+  VERSION = "11.2.0".freeze
 end

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -36,6 +36,7 @@ module ActiveFedora
       end
 
       def ldp_source
+        @ldp_source ||= LdpResource.new(ldp_connection, nil) if file.new_record?
         @ldp_source ||= LdpResource.new(ldp_connection, metadata_uri)
       end
 
@@ -47,6 +48,7 @@ module ActiveFedora
         raise "Save the file first" if file.new_record?
         SparqlInsert.new(changes_for_update, file.uri).execute(metadata_uri)
         @ldp_source = nil
+        @metadata_uri = nil
         true
       end
 

data/spec/integration/associations_spec.rb

@@ -582,7 +582,7 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :MediaObject)
       end
 
-      it "it should find the reflection that bears the predicate" do
+      it "finds the reflection that bears the predicate" do
         expect(MediaObject.new.association(:baubles).send(:find_reflection)).to eq Bauble._reflect_on_association(:media_object)
       end
     end
@@ -602,7 +602,7 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :MediaObject)
       end
 
-      it "it should find the reflection that bears the predicate" do
+      it "finds the reflection that bears the predicate" do
         expect(MediaObject.new.association(:parts).send(:find_reflection)).to eq MasterFile._reflect_on_association(:media_object)
       end
     end
@@ -622,7 +622,7 @@ describe ActiveFedora::Base do
         Object.send(:remove_const, :MediaObject)
       end
 
-      it "it should find the reflection that bears the predicate" do
+      it "finds the reflection that bears the predicate" do
         expect(MediaObject.new.association(:baubles).send(:find_reflection)).to eq MediaObject._reflect_on_association(:baubles)
       end
     end

data/spec/integration/indexing_spec.rb

@@ -43,13 +43,33 @@ describe ActiveFedora::Base do
       end
     end
 
+    describe "when some of the descendants are prioritized models" do
+      around do |example|
+        class PriorityModel < ActiveFedora::Base
+        end
+        original_defaults = ActiveFedora::Indexing::DescendantFetcher.default_priority_models
+        ActiveFedora::Indexing::DescendantFetcher.default_priority_models = ["PriorityModel"]
+
+        example.run
+
+        ActiveFedora::Indexing::DescendantFetcher.default_priority_models = original_defaults
+        Object.send(:remove_const, :PriorityModel)
+      end
+      let(:ids) { ['foo', 'bar'] }
+      let!(:priority_models) { [PriorityModel.create, PriorityModel.create] }
+
+      it "puts prioritized model ids first" do
+        expect(described_class.descendant_uris(ActiveFedora.fedora.base_uri).slice(0..(priority_models.count - 1))).to contain_exactly(*priority_models.collect(&:uri).collect(&:to_s))
+      end
+    end
+
     describe "reindex_everything" do
       let(:ids) { ['foo', 'bar'] }
       let(:solr) { ActiveFedora::SolrService.instance.conn }
       before do
         solr.delete_by_query('*:*', params: { 'softCommit' => true })
       end
-      it "calls update_index on every object represented in the sitemap" do
+      it "adds object to solr" do
         expect {
           described_class.reindex_everything
         }.to change { ActiveFedora::SolrService.query('id:foo').size }.from(0).to(1)

data/spec/unit/file_spec.rb

@@ -451,7 +451,7 @@ describe ActiveFedora::File do
 
     context "when Array passed to new" do
       it "raises an expection" do
-        expect { described_class.new([]) }.to raise_error
+        expect { described_class.new([]) }.to raise_error(RuntimeError)
       end
     end
   end

data/spec/unit/fixity_service_spec.rb

@@ -4,6 +4,32 @@ describe ActiveFedora::FixityService do
   let(:service) { described_class.new(uri) }
   let(:uri) { RDF::URI("http://path/to/resource") }
 
+  let(:passing_fedora44_response_body) {
+    <<-EOF
+@prefix premis: <http://www.loc.gov/premis/rdf/v1#> .
+
+<http://127.0.0.1:8080/rest/dev/0k/22/5b/04/0k225b04p/files/9f296a1f-10e7-44a3-83eb-4811d611edc6/fcr:versions/version1> premis:hasFixity <http://127.0.0.1:8080/rest/dev/0k/22/5b/04/0k225b04p/files/9f296a1f-10e7-44a3-83eb-4811d611edc6/fcr:versions/version1#fixity/1493843767961> .
+
+<http://127.0.0.1:8080/rest/dev/0k/22/5b/04/0k225b04p/files/9f296a1f-10e7-44a3-83eb-4811d611edc6/fcr:versions/version1#fixity/1493843767961> a premis:Fixity , premis:EventOutcomeDetail ;
+  premis:hasEventOutcome "SUCCESS"^^<http://www.w3.org/2001/XMLSchema#string> ;
+  premis:hasMessageDigest <urn:sha1:b995eef5262dd1c74f0ed9c96be1f404394d45dc> ;
+  premis:hasSize "103945"^^<http://www.w3.org/2001/XMLSchema#long> .
+  EOF
+  }
+
+  let(:failing_fedora44_response_body) {
+    <<-EOF
+@prefix premis: <http://www.loc.gov/premis/rdf/v1#> .
+
+<http://127.0.0.1:8080/rest/dev/ks/65/hc/20/ks65hc20t/files/e316b4b5-4627-44f8-9fdb-d2016e0e7380/fcr:versions/version3> premis:hasFixity <http://127.0.0.1:8080/rest/dev/ks/65/hc/20/ks65hc20t/files/e316b4b5-4627-44f8-9fdb-d2016e0e7380/fcr:versions/version3#fixity/1493844791463> .
+
+<http://127.0.0.1:8080/rest/dev/ks/65/hc/20/ks65hc20t/files/e316b4b5-4627-44f8-9fdb-d2016e0e7380/fcr:versions/version3#fixity/1493844791463> a premis:Fixity , premis:EventOutcomeDetail ;
+  premis:hasEventOutcome "BAD_CHECKSUM"^^<http://www.w3.org/2001/XMLSchema#string> , "BAD_SIZE"^^<http://www.w3.org/2001/XMLSchema#string> ;
+  premis:hasMessageDigest <urn:sha1:1a89571e25dd372563a10740a883e93f8af2d146> ;
+  premis:hasSize "1878582"^^<http://www.w3.org/2001/XMLSchema#long> .
+EOF
+  }
+
   describe "the instance" do
     subject { described_class.new(uri) }
     it { is_expected.to respond_to(:response) }
@@ -22,21 +48,21 @@ describe ActiveFedora::FixityService do
     end
   end
 
-  describe "#check" do
+  describe "#verified?" do
     before { allow(service).to receive(:fixity_response_from_fedora).and_return(response) }
-    subject { service.check }
+    subject { service.verified? }
 
     context "with Fedora version >= 4.4.0" do
       context "with a passing result" do
         let(:response) do
-          instance_double("Response", body: '<subject> <http://www.loc.gov/premis/rdf/v1#hasEventOutcome> "SUCCESS"^^<http://www.w3.org/2001/XMLSchema#string> .')
+          instance_double("Response", body: passing_fedora44_response_body)
         end
         it { is_expected.to be true }
       end
 
       context "with a failing result" do
         let(:response) do
-          instance_double("Response", body: '<subject> <http://www.loc.gov/premis/rdf/v1#hasEventOutcome> "BAD_CHECKSUM"^^<http://www.w3.org/2001/XMLSchema#string> .')
+          instance_double("Response", body: failing_fedora44_response_body)
         end
         it { is_expected.to be false }
       end
@@ -65,4 +91,38 @@ describe ActiveFedora::FixityService do
       it { is_expected.to be false }
     end
   end
+
+  describe "expected_message_digest" do
+    before { allow(service).to receive(:fixity_response_from_fedora).and_return(response) }
+    subject { service.expected_message_digest }
+    context "with success response" do
+      let(:response) do
+        instance_double("Response", body: passing_fedora44_response_body)
+      end
+      it { is_expected.to match(/urn:sha1:[a-f0-9]+/) }
+    end
+    context "with failure response" do
+      let(:response) do
+        instance_double("Response", body: failing_fedora44_response_body)
+      end
+      it { is_expected.to match(/urn:sha1:[a-f0-9]+/) }
+    end
+  end
+
+  describe "expected_size" do
+    before { allow(service).to receive(:fixity_response_from_fedora).and_return(response) }
+    subject { service.expected_size }
+    context "with success response" do
+      let(:response) do
+        instance_double("Response", body: passing_fedora44_response_body)
+      end
+      it { is_expected.to be_kind_of Numeric }
+    end
+    context "with failure response" do
+      let(:response) do
+        instance_double("Response", body: failing_fedora44_response_body)
+      end
+      it { is_expected.to be_kind_of Numeric }
+    end
+  end
 end

data/spec/unit/indexing/map/index_object_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Indexing::Map::IndexObject do
+  describe "with a block" do
+    subject(:instance) do
+      described_class.new(:name) do |index|
+        index.as :stored_searchable, :facetable
+      end
+    end
+
+    it "can set behaviors" do
+      expect(instance.behaviors).to eq [:stored_searchable, :facetable]
+    end
+  end
+
+  describe "with an initializer parameters" do
+    subject(:instance) do
+      described_class.new(:name, behaviors: [:stored_searchable, :facetable])
+    end
+
+    it "can set behaviors" do
+      expect(instance.behaviors).to eq [:stored_searchable, :facetable]
+    end
+  end
+end

data/spec/unit/indexing/map_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Indexing::Map do
+  describe ".merge" do
+    subject(:merged) { first_map.merge(extra) }
+    let(:index_object1) { instance_double(described_class::IndexObject) }
+    let(:index_object2) { instance_double(described_class::IndexObject) }
+    let(:index_object3) { instance_double(described_class::IndexObject) }
+    let(:first_map) { described_class.new(one: index_object1, two: index_object2) }
+
+    context "with a hash" do
+      let(:extra) { { three: index_object3 } }
+      it "merges with a hash" do
+        expect(merged).to be_instance_of described_class
+        expect(merged.keys).to match_array [:one, :two, :three]
+      end
+    end
+
+    context "with another Indexing::Map" do
+      let(:extra) { described_class.new(three: index_object3) }
+      it "merges with the other map" do
+        expect(merged).to be_instance_of described_class
+        expect(merged.keys).to match_array [:one, :two, :three]
+      end
+    end
+  end
+end

data/spec/unit/rdf/indexing_service_spec.rb

@@ -50,11 +50,25 @@ describe ActiveFedora::RDF::IndexingService do
     end
   end
 
-  before do
-    allow(MyObj).to receive(:index_config).and_return(index_config)
+  describe "#index_config" do
+    subject { indexer.index_config }
+    context "without passing one in" do
+      before do
+        expect(Deprecation).to receive(:warn)
+        allow(MyObj).to receive(:index_config).and_return(index_config)
+      end
+
+      let(:indexer) { described_class.new(f2) }
+      it { is_expected.to eq(index_config) }
+    end
+
+    context "when passing one in" do
+      let(:indexer) { described_class.new(f2, index_config) }
+      it { is_expected.to eq(index_config) }
+    end
   end
 
-  let(:indexer) { described_class.new(f2) }
+  let(:indexer) { described_class.new(f2, index_config) }
 
   describe "#generate_solr_document" do
     let(:solr_obj) { indexer.generate_solr_document(lambda { |key| "solr_rdf__#{key}" }) }

data/spec/unit/solr_service_spec.rb

@@ -11,6 +11,12 @@ describe ActiveFedora::SolrService do
 
   let(:mock_conn) { instance_double(RSolr::Client) }
 
+  describe '#options' do
+    it 'is readable' do
+      expect(described_class.instance.options).to include :read_timeout, :open_timeout, :url
+    end
+  end
+
   describe '#conn' do
     it "takes a n-arg constructor and configure for localhost" do
       expect(RSolr).to receive(:connect).with(read_timeout: 120, open_timeout: 120, url: 'http://localhost:8080/solr')

data/spec/unit/with_metadata/metadata_node_spec.rb

@@ -41,4 +41,29 @@ describe ActiveFedora::WithMetadata::MetadataNode do
       end
     end
   end
+
+  describe ".new" do
+    it "does not make a request when parent file is new" do
+      expect(file.ldp_source.client).not_to receive(:head)
+      described_class.new(file)
+    end
+  end
+
+  describe ".save" do
+    it "resets metadata_uri" do
+      expect(node.metadata_uri).to eq ::RDF::URI.new(nil)
+      file.content = "test"
+      file.save!
+      node.save
+      expect(node.metadata_uri).not_to eq ::RDF::URI.new(nil)
+    end
+
+    it "resets ldp_source" do
+      expect(node.ldp_source.new?).to be_truthy
+      file.content = "test"
+      file.save!
+      node.save
+      expect(node.ldp_source.new?).to be_falsey
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.1.6
+  version: 11.2.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -134,6 +134,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -196,14 +210,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -429,6 +443,7 @@ files:
 - lib/active_fedora/indexers/global_indexer.rb
 - lib/active_fedora/indexers/null_indexer.rb
 - lib/active_fedora/indexing.rb
+- lib/active_fedora/indexing/descendant_fetcher.rb
 - lib/active_fedora/indexing/map.rb
 - lib/active_fedora/indexing_service.rb
 - lib/active_fedora/inheritable_accessors.rb
@@ -628,6 +643,8 @@ files:
 - spec/unit/has_and_belongs_to_many_association_spec.rb
 - spec/unit/has_many_association_spec.rb
 - spec/unit/indexers/global_indexer_spec.rb
+- spec/unit/indexing/map/index_object_spec.rb
+- spec/unit/indexing/map_spec.rb
 - spec/unit/indexing_service_spec.rb
 - spec/unit/indexing_spec.rb
 - spec/unit/inheritance_spec.rb
@@ -684,7 +701,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.