active-fedora 13.3.0 → 14.0.0

data/lib/active_fedora/associations/collection_association.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Associations
-    class CollectionAssociation < Association #:nodoc:
+    class CollectionAssociation < Association # :nodoc:
       attr_reader :proxy
 
       # Implements the reader method, e.g. foo.items for Foo.has_many :items
@@ -336,11 +336,8 @@ module ActiveFedora
 
         def find_reflection
           return reflection if @reflection.options[:predicate]
-          if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base' && @reflection.macro != :has_and_belongs_to_many
-            @reflection.inverse_of || raise("No :inverse_of or :predicate attribute was set or could be inferred for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class}")
-          else
-            raise "Couldn't find reflection"
-          end
+          raise "Couldn't find reflection" unless @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base' && @reflection.macro != :has_and_belongs_to_many
+          @reflection.inverse_of || raise("No :inverse_of or :predicate attribute was set or could be inferred for #{@reflection.macro} #{@reflection.name.inspect} on #{@owner.class}")
         end
 
         def _create_record(attributes, raise = false)

data/lib/active_fedora/associations/container_proxy.rb

@@ -1,9 +1,11 @@
 module ActiveFedora
   module Associations
     class ContainerProxy < CollectionProxy
+      # rubocop:disable Lint/MissingSuper
       def initialize(association)
         @association = association
       end
+      # rubocop:enable Lint/MissingSuper
     end
   end
 end

data/lib/active_fedora/associations/contains_association.rb

@@ -1,7 +1,7 @@
 # This is the parent class of BasicContainsAssociation, DirectlyContainsAssociation and IndirectlyContainsAssociation
 module ActiveFedora
   module Associations
-    class ContainsAssociation < CollectionAssociation #:nodoc:
+    class ContainsAssociation < CollectionAssociation # :nodoc:
       def insert_record(record, force = true, validate = true)
         if force
           record.save!
@@ -18,7 +18,7 @@ module ActiveFedora
         if loaded?
           target.include?(other)
         elsif container_predicate = options[:has_member_relation]
-          owner.resource.query(predicate: container_predicate, object: ::RDF::URI(other.uri)).present?
+          owner.resource.query({ predicate: container_predicate, object: ::RDF::URI(other.uri) }).present?
         else # is_member_of_relation
           # This will force a load, so it's slowest and the least preferable option
           target.include?(other)

data/lib/active_fedora/associations/directly_contains_association.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Associations
-    class DirectlyContainsAssociation < ContainsAssociation #:nodoc:
+    class DirectlyContainsAssociation < ContainsAssociation # :nodoc:
       def insert_record(record, force = true, validate = true)
         container.save!
         super
@@ -14,24 +14,22 @@ module ActiveFedora
                        container
                      end
 
-        uris = query_node.resource.query(predicate: container_predicate).map { |r| r.object.to_s }
+        uris = query_node.resource.query({ predicate: container_predicate }).map { |r| r.object.to_s }
 
         uris.map { |object_uri| klass.find(klass.uri_to_id(object_uri)) }
       end
 
       def container
-        @container ||= begin
-          DirectContainer.find_or_initialize(ActiveFedora::Base.uri_to_id(uri)).tap do |container|
-            container.parent = @owner
-            container.has_member_relation = Array(options[:has_member_relation])
-            container.is_member_of_relation = Array(options[:is_member_of_relation])
-          end
+        @container ||= DirectContainer.find_or_initialize(ActiveFedora::Base.uri_to_id(uri)).tap do |container|
+          container.parent = @owner
+          container.has_member_relation = Array(options[:has_member_relation])
+          container.is_member_of_relation = Array(options[:is_member_of_relation])
         end
       end
 
       protected
 
-        def initialize_attributes(record) #:nodoc:
+        def initialize_attributes(record) # :nodoc:
           record.uri = ActiveFedora::Base.id_to_uri(container.mint_id)
           set_inverse_instance(record)
         end

data/lib/active_fedora/associations/directly_contains_one_association.rb

@@ -1,7 +1,7 @@
 module ActiveFedora
   module Associations
     # Filters a DirectContainer relationship, returning the first item that matches the given :type
-    class DirectlyContainsOneAssociation < SingularAssociation #:nodoc:
+    class DirectlyContainsOneAssociation < SingularAssociation # :nodoc:
       # Finds objects contained by the container predicate (either the configured has_member_relation or ldp:contains)
       # TODO: Refactor this to use solr (for efficiency) instead of parsing the RDF graph.  Requires indexing ActiveFedora::File objects into solr, including their RDF.type and, if possible, the id of their container
       # See https://github.com/samvera/active_fedora/issues/1335
@@ -14,7 +14,7 @@ module ActiveFedora
                        container_association.container # Use the :through association's container
                      end
 
-        contained_uris = query_node.resource.query(predicate: container_predicate).map { |r| r.object.to_s }
+        contained_uris = query_node.resource.query({ predicate: container_predicate }).map { |r| r.object.to_s }
         contained_uris.each do |object_uri|
           contained_object = klass.find(klass.uri_to_id(object_uri))
           return contained_object if get_type_from_record(contained_object).include?(options[:type])

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -1,7 +1,7 @@
 module ActiveFedora
   # = Active Fedora Has And Belongs To Many Association
   module Associations
-    class HasAndBelongsToManyAssociation < CollectionAssociation #:nodoc:
+    class HasAndBelongsToManyAssociation < CollectionAssociation # :nodoc:
       def initialize(owner, reflection)
         super
       end

data/lib/active_fedora/associations/has_many_association.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Associations
-    class HasManyAssociation < CollectionAssociation #:nodoc:
+    class HasManyAssociation < CollectionAssociation # :nodoc:
       def initialize(owner, reflection)
         super
       end
@@ -35,7 +35,7 @@ module ActiveFedora
           end
         elsif owner.persisted?
           inverse = reflection.inverse_of
-          if inverse && inverse.collection?
+          if inverse&.collection?
             record[inverse.foreign_key] ||= []
             record[inverse.foreign_key] += [owner.id]
           elsif inverse && inverse.klass == ActiveFedora::Base
@@ -88,6 +88,7 @@ module ActiveFedora
 
         # Deletes the records according to the <tt>:dependent</tt> option.
         def delete_records(records, method)
+          # rubocop:disable Style/GuardClause
           return records.each(&:destroy) if method == :destroy
           # Find all the records that point to this and nullify them
           # keys  = records.map { |r| r[reflection.association_primary_key] }
@@ -115,6 +116,7 @@ module ActiveFedora
           end
 
           # update_counter(-scope.update_all(reflection.foreign_key => nil))
+          # rubocop:enable Style/GuardClause
         end
     end
   end

data/lib/active_fedora/associations/has_subresource_association.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Associations
-    class HasSubresourceAssociation < SingularAssociation #:nodoc:
+    class HasSubresourceAssociation < SingularAssociation # :nodoc:
       # Implements the reader method, e.g. foo.bar for Foo.has_one :bar
       def reader(force_reload = false)
         super || build
@@ -50,9 +50,7 @@ module ActiveFedora
 
         def configure_datastream(record)
           # If you called has_metadata with a block, pass the block into the File class
-          if reflection.options[:block].class == Proc
-            reflection.options[:block].call(record)
-          end
+          reflection.options[:block].call(record) if reflection.options[:block].class == Proc
           return unless record.new_record? && reflection.options[:autocreate]
           record.datastream_will_change!
         end

data/lib/active_fedora/associations/indirectly_contains_association.rb

@@ -3,7 +3,7 @@ module ActiveFedora
     # TODO: we may want to split this into two subclasses, one for has_member_relation
     # and the other for is_member_of_relation
     # See https://github.com/samvera/active_fedora/issues/1332
-    class IndirectlyContainsAssociation < ContainsAssociation #:nodoc:
+    class IndirectlyContainsAssociation < ContainsAssociation # :nodoc:
       # Add +records+ to this association.  Returns +self+ so method calls may be chained.
       # Since << flattens its argument list and inserts each record, +push+ and +concat+ behave identically.
       def concat(*records)
@@ -30,38 +30,36 @@ module ActiveFedora
         if loaded?
           target.map(&:id)
         else
-          owner.resource.query(predicate: predicate)
+          owner.resource.query({ predicate: predicate })
                .map { |s| ActiveFedora::Base.uri_to_id(s.object) } | target.map(&:id)
         end
       end
 
       def find_target
         if container_predicate = options[:has_member_relation]
-          uris = owner.resource.query(predicate: container_predicate).map { |r| r.object.to_s }
+          uris = owner.resource.query({ predicate: container_predicate }).map { |r| r.object.to_s }
           uris.map { |object_uri| klass.find(klass.uri_to_id(object_uri)) }
         else # is_member_of_relation
           # TODO this is a lot of reads. Avoid this path
           # See https://github.com/samvera/active_fedora/issues/1345
           container_predicate = ::RDF::Vocab::LDP.contains
-          proxy_uris = container.resource.query(predicate: container_predicate).map { |r| r.object.to_s }
+          proxy_uris = container.resource.query({ predicate: container_predicate }).map { |r| r.object.to_s }
           proxy_uris.map { |uri| proxy_class.find(proxy_class.uri_to_id(uri))[options[:foreign_key]] }
         end
       end
 
       def container
-        @container ||= begin
-          IndirectContainer.find_or_initialize(ActiveFedora::Base.uri_to_id(uri)).tap do |container|
-            container.parent = @owner
-            container.has_member_relation = Array(options[:has_member_relation])
-            container.is_member_of_relation = Array(options[:is_member_of_relation])
-            container.inserted_content_relation = Array(options[:inserted_content_relation])
-          end
+        @container ||= IndirectContainer.find_or_initialize(ActiveFedora::Base.uri_to_id(uri)).tap do |container|
+          container.parent = @owner
+          container.has_member_relation = Array(options[:has_member_relation])
+          container.is_member_of_relation = Array(options[:is_member_of_relation])
+          container.inserted_content_relation = Array(options[:inserted_content_relation])
         end
       end
 
       protected
 
-        def initialize_attributes(_record) #:nodoc:
+        def initialize_attributes(_record) # :nodoc:
           # record.uri = ActiveFedora::Base.id_to_uri(container.mint_id)
           # set_inverse_instance(record)
         end

data/lib/active_fedora/associations/orders_association.rb

@@ -52,9 +52,7 @@ module ActiveFedora::Associations
     # Append a target node to the end of the order.
     # @param [ActiveFedora::Base] record Record to append
     def append_target(record, _skip_callbacks = false)
-      unless unordered_association.target.include?(record)
-        unordered_association.concat(record)
-      end
+      unordered_association.concat(record) unless unordered_association.target.include?(record)
       target.append_target(record, proxy_in: owner)
     end
 
@@ -62,9 +60,7 @@ module ActiveFedora::Associations
     # @param [Integer] loc Position to insert record.
     # @param [ActiveFedora::Base] record Record to insert
     def insert_target_at(loc, record)
-      unless unordered_association.target.include?(record)
-        unordered_association.concat(record)
-      end
+      unordered_association.concat(record) unless unordered_association.target.include?(record)
       target.insert_at(loc, record, proxy_in: owner)
     end
 
@@ -73,9 +69,7 @@ module ActiveFedora::Associations
     # @param [String] id ID of record to insert.
     def insert_target_id_at(loc, id)
       raise ArgumentError, "ID can not be nil" if id.nil?
-      unless unordered_association.ids_reader.include?(id)
-        raise ArgumentError, "#{id} is not a part of #{unordered_association.reflection.name}"
-      end
+      raise ArgumentError, "#{id} is not a part of #{unordered_association.reflection.name}" unless unordered_association.ids_reader.include?(id)
       target.insert_proxy_for_at(loc, ActiveFedora::Base.id_to_uri(id), proxy_in: owner)
     end
 
@@ -106,11 +100,10 @@ module ActiveFedora::Associations
       list_container.save
       # NOTE: This turns out to be pretty cheap, but should we be doing it
       # elsewhere?
-      unless list_container.changed?
-        owner.head = [list_container.head_id.first]
-        owner.tail = [list_container.tail_id.first]
-        owner.save
-      end
+      return if list_container.changed?
+      owner.head = [list_container.head_id.first]
+      owner.tail = [list_container.tail_id.first]
+      owner.save
     end
 
     def scope(*_args)

data/lib/active_fedora/associations/rdf.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Associations
-    class RDF < SingularAssociation #:nodoc:
+    class RDF < SingularAssociation # :nodoc:
       def replace(values)
         ids = Array(values).reject(&:blank?)
         raise "can't modify frozen #{owner.class}" if owner.frozen?
@@ -54,7 +54,7 @@ module ActiveFedora
 
         # @return [Array<RDF::Statement>]
         def rdf_query
-          owner.resource.query(subject: owner.rdf_subject, predicate: reflection.predicate).enum_statement
+          owner.resource.query({ subject: owner.rdf_subject, predicate: reflection.predicate }).enum_statement
         end
 
         # @return [Array<RDF::URI>]

data/lib/active_fedora/associations/record_composite.rb

@@ -18,6 +18,7 @@ module ActiveFedora::Associations
     def delete
       each(&:delete)
     end
+
     ##
     # A Repository which returns a composite from #find instead of a single
     # record. Delegates find to a base repository.

data/lib/active_fedora/associations/singular_association.rb

@@ -1,7 +1,8 @@
 module ActiveFedora
   module Associations
-    class SingularAssociation < Association #:nodoc:
+    class SingularAssociation < Association # :nodoc:
       # Implements the reader method, e.g. foo.bar for Foo.has_one :bar
+      # rubocop:disable Style/GuardClause
       def reader(force_reload = false)
         if force_reload
           raise NotImplementedError, "Need to define the uncached method" # TODO
@@ -11,6 +12,7 @@ module ActiveFedora
         end
         target
       end
+      # rubocop:enable Style/GuardClause
 
       # Implements the writer method, e.g. foo.items= for Foo.has_many :items
       def writer(record)

data/lib/active_fedora/associations/singular_rdf.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Associations
-    class SingularRDF < RDF #:nodoc:
+    class SingularRDF < RDF # :nodoc:
       def replace(value)
         super(Array(value))
       end

data/lib/active_fedora/associations.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 
 module ActiveFedora
-  class InverseOfAssociationNotFoundError < RuntimeError #:nodoc:
+  class InverseOfAssociationNotFoundError < RuntimeError # :nodoc:
     def initialize(reflection, associated_class = nil)
       super("Could not find the inverse association for #{reflection.name} (#{reflection.options[:inverse_of].inspect} in #{associated_class.nil? ? reflection.class_name : associated_class.name})")
     end
@@ -65,7 +65,7 @@ module ActiveFedora
     end
 
     # Clears out the association cache.
-    def clear_association_cache #:nodoc:
+    def clear_association_cache # :nodoc:
       @association_cache.clear if persisted?
     end
 
@@ -73,7 +73,7 @@ module ActiveFedora
     attr_reader :association_cache
 
     # Returns the association instance for the given name, instantiating it if it doesn't already exist
-    def association(name) #:nodoc:
+    def association(name) # :nodoc:
       association = association_instance_get(name)
 
       if association.nil?

data/lib/active_fedora/attached_files.rb

@@ -8,9 +8,11 @@ module ActiveFedora
 
     # Returns only the attached_files that are declared with 'contains'
     def declared_attached_files
-      attached_files.reflections.keys.each_with_object({}) do |k, h|
-        h[k] = attached_files[k]
+      result = {}
+      attached_files.reflections.keys.each do |k|
+        result[k] = attached_files[k]
       end
+      result
     end
 
     #
@@ -30,7 +32,7 @@ module ActiveFedora
     end
 
     def contains_assertions
-      resource.query(subject: resource, predicate: ::RDF::Vocab::LDP.contains).objects.map(&:to_s)
+      resource.query({ subject: resource, predicate: ::RDF::Vocab::LDP.contains }).objects.map(&:to_s)
     end
 
     # Load any undeclared relationships or has_subresource relationships.  These are non-idiomatic LDP

data/lib/active_fedora/attribute_assignment.rb

@@ -29,10 +29,8 @@ module ActiveFedora
     #   cat.name # => 'Gorby'
     #   cat.status => 'sleeping'
     def assign_attributes(new_attributes)
-      unless new_attributes.respond_to?(:stringify_keys)
-        raise ArgumentError, "When assigning attributes, you must pass a hash as an argument."
-      end
-      return if new_attributes.nil? || new_attributes.empty?
+      raise ArgumentError, "When assigning attributes, you must pass a hash as an argument." unless new_attributes.respond_to?(:stringify_keys)
+      return if new_attributes.blank?
 
       attributes = new_attributes.stringify_keys
       _assign_attributes(sanitize_for_mass_assignment(attributes))

data/lib/active_fedora/attribute_methods/read.rb

@@ -4,7 +4,7 @@ module ActiveFedora
       module ClassMethods
         protected
 
-          def define_method_attribute(name, owner: nil)
+          def define_method_attribute(name, owner: nil) # rubocop:disable Lint/UnusedMethodArgument
             name = name.to_s
             safe_name = name.unpack('h*'.freeze).first
             temp_method = "__temp__#{safe_name}"

data/lib/active_fedora/attribute_methods/write.rb

@@ -4,7 +4,7 @@ module ActiveFedora
       module ClassMethods
         protected
 
-          def define_method_attribute=(name, owner: nil)
+          def define_method_attribute=(name, owner: nil) # rubocop:disable Lint/UnusedMethodArgument
             name = name.to_s
             safe_name = name.unpack('h*'.freeze).first
             ActiveFedora::AttributeMethods::AttrNames.set_name_cache safe_name, name
@@ -27,11 +27,9 @@ module ActiveFedora
       end
 
       def write_attribute(attribute_name, value)
-        if self.class.properties.key?(attribute_name)
-          attributes[attribute_name] = value
-        else
-          raise ActiveModel::MissingAttributeError, "can't write unknown attribute `#{attribute_name}'"
-        end
+        raise ActiveModel::MissingAttributeError, "can't write unknown attribute `#{attribute_name}'" unless self.class.properties.key?(attribute_name)
+
+        attributes[attribute_name] = value
       end
 
       private

data/lib/active_fedora/attribute_methods.rb

@@ -13,12 +13,12 @@ module ActiveFedora
       end
     end
 
-    BLACKLISTED_CLASS_METHODS = %w(private public protected allocate new name parent superclass).freeze
+    BLACKLISTED_CLASS_METHODS = %w[private public protected allocate new name parent superclass].freeze
 
     class GeneratedAttributeMethods < Module; end # :nodoc:
 
     module ClassMethods
-      def inherited(child_class) #:nodoc:
+      def inherited(child_class) # :nodoc:
         child_class.initialize_generated_modules
         super
       end
@@ -46,9 +46,7 @@ module ActiveFedora
       #   Person.instance_method_already_implemented?(:name)
       #   # => false
       def instance_method_already_implemented?(method_name)
-        if dangerous_attribute_method?(method_name)
-          raise DangerousAttributeError, "#{method_name} is defined by Active Fedora. Check to make sure that you don't have an attribute or method with the same name."
-        end
+        raise DangerousAttributeError, "#{method_name} is defined by Active Fedora. Check to make sure that you don't have an attribute or method with the same name." if dangerous_attribute_method?(method_name)
 
         if superclass == Base
           super
@@ -148,9 +146,11 @@ module ActiveFedora
     #   person.attributes
     #   # => {"id"=>3, "created_at"=>Sun, 21 Oct 2012 04:53:04, "updated_at"=>Sun, 21 Oct 2012 04:53:04, "name"=>"Francesco", "age"=>22}
     def attributes
-      attribute_names.each_with_object({}) do |name, attrs|
-        attrs[name] = read_attribute(name)
+      result = {}
+      attribute_names.each do |name|
+        result[name] = read_attribute(name)
       end
+      result
     end
 
     # Returns an <tt>#inspect</tt>-like string for the value of the

data/lib/active_fedora/attributes/property_builder.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Attributes
-  class PropertyBuilder < ActiveTriples::PropertyBuilder #:nodoc:
+  class PropertyBuilder < ActiveTriples::PropertyBuilder # :nodoc:
     def self.define_accessors(model, reflection, options = {})
       if reflection.multiple?
         super

data/lib/active_fedora/attributes.rb

@@ -77,7 +77,7 @@ module ActiveFedora
       # override activemodel so it doesn't trigger a load of all the attributes.
       # the callback methods seem to trigger this, which means just initing an object (after_init)
       # causes a load of all the datastreams.
-      def attribute_method?(attr_name) #:nodoc:
+      def attribute_method?(attr_name) # :nodoc:
         respond_to_without_attributes?(:attributes) && self.class.delegated_attributes.include?(attr_name)
       end
 

data/lib/active_fedora/autosave_association.rb

@@ -77,7 +77,7 @@ module ActiveFedora
 
     ASSOCIATION_TYPES = [:has_many, :belongs_to, :has_and_belongs_to_many, :directly_contains, :indirectly_contains, :is_a_container].freeze
 
-    module AssociationBuilderExtension #:nodoc:
+    module AssociationBuilderExtension # :nodoc:
       def self.valid_options
         [:autosave]
       end
@@ -199,7 +199,7 @@ module ActiveFedora
       # unless the parent is/was a new record itself.
       def associated_records_to_validate_or_save(association, new_record, autosave)
         if new_record
-          association && association.target
+          association&.target
         elsif autosave
           association.target.find_all(&:changed_for_autosave?)
         else
@@ -220,7 +220,7 @@ module ActiveFedora
       # turned on for the association.
       def validate_single_association(reflection)
         association = association_instance_get(reflection.name)
-        record      = association && association.target
+        record      = association&.target
         association_valid?(reflection, record) if record
       end
 
@@ -306,7 +306,7 @@ module ActiveFedora
       # In addition, it will destroy the association if it was marked for destruction.
       def save_belongs_to_association(reflection)
         association = association_instance_get(reflection.name)
-        record      = association && association.load_target
+        record      = association&.load_target
         if record && !record.destroyed?
           autosave = reflection.options[:autosave]
 

data/lib/active_fedora/callbacks.rb

@@ -227,7 +227,7 @@ module ActiveFedora
       define_model_callbacks :save, :create, :update, :destroy, :update_index
     end
 
-    def destroy(*) #:nodoc:
+    def destroy(*) # :nodoc:
       _run_destroy_callbacks { super }
     end
 
@@ -241,11 +241,11 @@ module ActiveFedora
         _run_save_callbacks { super }
       end
 
-      def _create_record(*) #:nodoc:
+      def _create_record(*) # :nodoc:
         _run_create_callbacks { super }
       end
 
-      def _update_record(*) #:nodoc:
+      def _update_record(*) # :nodoc:
         _run_update_callbacks { super }
       end
   end

data/lib/active_fedora/change_set.rb

@@ -20,10 +20,10 @@ module ActiveFedora
         if object.association(key.to_sym).present?
           # This is always an ActiveFedora::Reflection::RDFPropertyReflection
           predicate = object.association(key.to_sym).reflection.predicate
-          result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
+          result[predicate] = graph.query({ subject: object.rdf_subject, predicate: predicate })
         elsif object.class.properties.keys.include?(key)
           predicate = graph.reflections.reflect_on_property(key).predicate
-          results = graph.query(subject: object.rdf_subject, predicate: predicate)
+          results = graph.query({ subject: object.rdf_subject, predicate: predicate })
           new_graph = child_graphs(results.map(&:object))
           results.each do |res|
             new_graph << res
@@ -32,7 +32,7 @@ module ActiveFedora
         elsif key == 'type'.freeze
           # working around https://github.com/ActiveTriples/ActiveTriples/issues/122
           predicate = ::RDF.type
-          result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
+          result[predicate] = graph.query({ subject: object.rdf_subject, predicate: predicate })
         elsif object.local_attributes.include?(key)
           raise "Unable to find a graph predicate corresponding to the attribute: \"#{key}\""
         end
@@ -46,11 +46,9 @@ module ActiveFedora
       def child_graphs(objects)
         child_graphs = ::RDF::Graph.new
         objects.each do |object|
-          graph.query(subject: object).each do |statement|
+          graph.query({ subject: object }).each do |statement|
             # Have to filter out Fedora triples.
-            unless FedoraStatement.new(statement).internal?
-              child_graphs << statement
-            end
+            child_graphs << statement unless FedoraStatement.new(statement).internal?
           end
         end
         child_graphs

data/lib/active_fedora/cleaner.rb

@@ -35,7 +35,7 @@ module ActiveFedora
     end
 
     def self.solr_connection
-      ActiveFedora::SolrService.instance && ActiveFedora::SolrService.instance.conn
+      ActiveFedora::SolrService.instance&.conn
     end
 
     def self.cleanout_solr

data/lib/active_fedora/core/fedora_id_translator.rb

@@ -4,9 +4,7 @@ module ActiveFedora::Core
     def self.call(id)
       id = URI::DEFAULT_PARSER.escape(id, '[]'.freeze)
       id = "/#{id}" unless id.start_with? SLASH
-      unless ActiveFedora.fedora.base_path == SLASH || id.start_with?("#{ActiveFedora.fedora.base_path}/")
-        id = ActiveFedora.fedora.base_path + id
-      end
+      id = ActiveFedora.fedora.base_path + id unless ActiveFedora.fedora.base_path == SLASH || id.start_with?("#{ActiveFedora.fedora.base_path}/")
       ActiveFedora.fedora.host + id
     end
   end