active-fedora 13.3.0 → 14.0.0

data/lib/active_fedora/orders/ordered_list.rb

@@ -35,12 +35,10 @@ module ActiveFedora
       #   empty, tail.prev is the first element.
       def tail
         @tail ||=
-          begin
-            if tail_subject
-              TailSentinel.new(self, prev_node: build_node(tail_subject))
-            else
-              head.next
-            end
+          if tail_subject
+            TailSentinel.new(self, prev_node: build_node(tail_subject))
+          else
+            head.next
           end
       end
 
@@ -113,14 +111,14 @@ module ActiveFedora
       # @param [ListNode] node Node to delete
       def delete_node(node)
         node = ordered_reader.find { |x| x == node }
-        if node
-          prev_node = node.prev
-          next_node = node.next
-          node.prev.next = next_node
-          node.next.prev = prev_node
-          @changed = true
-          node
-        end
+        return unless node
+
+        prev_node = node.prev
+        next_node = node.next
+        node.prev.next = next_node
+        node.next.prev = prev_node
+        @changed = true
+        node
       end
 
       # @param [Integer] loc Index of node to delete.
@@ -173,9 +171,7 @@ module ActiveFedora
       #   the first.
       def proxy_in
         proxies = to_a.map(&:proxy_in_id).compact.uniq
-        if proxies.length > 1
-          ActiveFedora::Base.logger.warn "WARNING: List contains nodes aggregated under different URIs. Returning only the first."
-        end
+        ActiveFedora::Base.logger.warn "WARNING: List contains nodes aggregated under different URIs. Returning only the first." if proxies.length > 1
         proxies.first
       end
 
@@ -208,9 +204,7 @@ module ActiveFedora
 
         def new_node_subject
           node = ::RDF::URI("##{::RDF::Node.new.id}")
-          while node_cache.key?(node)
-            node = ::RDF::URI("##{::RDF::Node.new.id}")
-          end
+          node = ::RDF::URI("##{::RDF::Node.new.id}") while node_cache.key?(node)
           node
         end
 
@@ -251,14 +245,14 @@ module ActiveFedora
         end
 
         class HeadSentinel < Sentinel
-          def initialize(*args)
+          def initialize(*args, **kwargs)
             super
             @next ||= TailSentinel.new(parent, prev_node: self)
           end
         end
 
         class TailSentinel < Sentinel
-          def initialize(*args)
+          def initialize(*args, **kwargs)
             super
             prev.next = self if prev && prev.next != self
           end

data/lib/active_fedora/orders/target_proxy.rb

@@ -32,7 +32,7 @@ module ActiveFedora
       # the index is out of range.
       def delete_at(loc)
         result = association.delete_at(loc)
-        result.target if result
+        result&.target
       end
 
       # Deletes all items from self that are equal to obj.

data/lib/active_fedora/querying.rb

@@ -10,7 +10,7 @@ module ActiveFedora
 
     def default_sort_params
       [ActiveFedora.index_field_mapper.solr_name('system_create', :stored_sortable, type: :date) +
-       ' asc']
+        ' asc']
     end
   end
 end

data/lib/active_fedora/rdf/fcrepo.rb

@@ -26,6 +26,7 @@ module ActiveFedora::RDF
            subClassOf: "info:fedora/fedora-system:def/model#FedoraObject".freeze,
            type: "info:fedora/fedora-system:def/model#FedoraObject".freeze
     end
+
     class Model < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/model#")
       # Class definitions
       term :FedoraObject,
@@ -176,6 +177,7 @@ module ActiveFedora::RDF
                range: "xsd:boolean".freeze,
                type: "rdf:Property".freeze
     end
+
     class RelsExt < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/relations-external#")
       # Property definitions
       property :fedoraRelationship,
@@ -293,6 +295,7 @@ module ActiveFedora::RDF
                "owl:inverseOf" => %(info:fedora/fedora-system:def/relations-external#hasSubset).freeze,
                type: "rdf:Property".freeze
     end
+
     class View < ::RDF::StrictVocabulary("info:fedora/fedora-system:def/view#")
       property :disseminates,
                comment: %(A property used to indicate that an object contains a datastream).freeze,

data/lib/active_fedora/rdf/field_map.rb

@@ -35,7 +35,6 @@ module ActiveFedora::RDF
         @index_field_config = index_field_config
         @object             = object
         @name               = name
-        self
       end
 
       def build

data/lib/active_fedora/rdf/persistence.rb

@@ -19,7 +19,7 @@ module ActiveFedora
 
       # Overrides ActiveTriples::Resource
       def persist!
-        return false unless datastream && datastream.respond_to?(:save)
+        return false unless datastream&.respond_to?(:save)
         @persisted ||= datastream.save
       end
 

data/lib/active_fedora/reflection.rb

@@ -183,11 +183,8 @@ module ActiveFedora
       end
 
       def check_validity_of_inverse!
-        unless polymorphic?
-          if has_inverse? && inverse_of.nil?
-            raise InverseOfAssociationNotFoundError, self
-          end
-        end
+        return if polymorphic?
+        raise InverseOfAssociationNotFoundError, self if has_inverse? && inverse_of.nil?
       end
 
       def alias_candidate(name)
@@ -214,6 +211,7 @@ module ActiveFedora
 
       attr_reader :active_fedora
 
+      # rubocop:disable Lint/MissingSuper
       def initialize(name, scope, options, active_fedora)
         @name = name
         @scope = scope
@@ -222,6 +220,7 @@ module ActiveFedora
         @klass         = options[:anonymous_class]
         @automatic_inverse_of = nil
       end
+      # rubocop:enable Lint/MissingSuper
 
       def autosave=(autosave)
         @options[:autosave] = autosave
@@ -262,7 +261,7 @@ module ActiveFedora
 
     # Holds all the meta-data about an association as it was specified in the
     # Active Record class.
-    class AssociationReflection < MacroReflection #:nodoc:
+    class AssociationReflection < MacroReflection # :nodoc:
       attr_accessor :parent_reflection # Reflection
 
       def initialize(name, scope, options, active_fedora)
@@ -295,9 +294,7 @@ module ActiveFedora
       end
 
       def solr_key
-        @solr_key ||= begin
-          ActiveFedora.index_field_mapper.solr_name(predicate_for_solr, :symbol)
-        end
+        @solr_key ||= ActiveFedora.index_field_mapper.solr_name(predicate_for_solr, :symbol)
       end
 
       def check_validity!
@@ -314,7 +311,7 @@ module ActiveFedora
       def collect_join_chain
         [self]
       end
-      alias chain collect_join_chain # TODO Remove alias, See https://github.com/samvera/active_fedora/issues/1347
+      alias chain collect_join_chain # TODO: Remove alias, See https://github.com/samvera/active_fedora/issues/1347
 
       def has_inverse?
         inverse_name
@@ -445,7 +442,7 @@ module ActiveFedora
             "#{name.to_s.singularize}_ids"
           elsif options[:as]
             "#{options[:as]}_id"
-          elsif inverse_of && inverse_of.collection?
+          elsif inverse_of&.collection?
             # for a has_many that is the inverse of a has_and_belongs_to_many
             "#{options[:inverse_of].to_s.singularize}_ids"
           else

data/lib/active_fedora/relation/finder_methods.rb

@@ -103,9 +103,7 @@ module ActiveFedora
     def search_by_id(id, opts = {})
       opts[:rows] = 1
       result = search_with_conditions({ id: id }, opts)
-      if result.empty?
-        raise ActiveFedora::ObjectNotFoundError, "Object '#{id}' not found in solr"
-      end
+      raise ActiveFedora::ObjectNotFoundError, "Object '#{id}' not found in solr" if result.empty?
       result.first
     end
 
@@ -118,11 +116,9 @@ module ActiveFedora
       cast = opts.delete(:cast)
       search_in_batches(conditions, opts.merge(fl: ActiveFedora.id_field)) do |group|
         group.each do |hit|
-          begin
-            yield(load_from_fedora(hit[ActiveFedora.id_field], cast))
-          rescue Ldp::Gone, ActiveFedora::ObjectNotFoundError
-            ActiveFedora::Base.logger.error "Although #{hit[ActiveFedora.id_field]} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch."
-          end
+          yield(load_from_fedora(hit[ActiveFedora.id_field], cast))
+        rescue Ldp::Gone, ActiveFedora::ObjectNotFoundError
+          ActiveFedora::Base.logger.error "Although #{hit[ActiveFedora.id_field]} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch."
         end
       end
     end
@@ -145,7 +141,7 @@ module ActiveFedora
       opts[:q] = create_query(conditions)
       opts[:qt] = @klass.solr_query_handler
       # set default sort to created date ascending
-      opts[:sort] = @klass.default_sort_params unless opts[:sort].present?
+      opts[:sort] = @klass.default_sort_params if opts[:sort].blank?
 
       batch_size = opts.delete(:batch_size) || 1000
       select_path = ActiveFedora::SolrService.select_path
@@ -194,9 +190,7 @@ module ActiveFedora
           ActiveFedora::Base
         else
           resource_class = ActiveFedora.model_mapper.classifier(resource).best_model
-          unless equivalent_class?(resource_class)
-            raise ActiveFedora::ModelMismatch, "Expected #{@klass}. Got: #{resource_class}"
-          end
+          raise ActiveFedora::ModelMismatch, "Expected #{@klass}. Got: #{resource_class}" unless equivalent_class?(resource_class)
           resource_class
         end
       end

data/lib/active_fedora/relation/spawn_methods.rb

@@ -3,7 +3,7 @@ require 'active_fedora/relation/merger'
 module ActiveFedora
   module SpawnMethods
     # This is overridden by Associations::CollectionProxy
-    def spawn #:nodoc:
+    def spawn # :nodoc:
       clone
     end
 

data/lib/active_fedora/runtime_registry.rb

@@ -1,9 +1,7 @@
-require 'active_support/per_thread_registry'
+require 'active_support/core_ext/module/attribute_accessors_per_thread'
 
 module ActiveFedora
   class RuntimeRegistry
-    extend ActiveSupport::PerThreadRegistry
-
-    attr_accessor :solr_service, :fedora_connection
+    thread_mattr_accessor :solr_service, :fedora_connection
   end
 end

data/lib/active_fedora/scoping/default.rb

@@ -46,7 +46,7 @@ module ActiveFedora
           super || default_scopes.any? || respond_to?(:default_scope)
         end
 
-        def before_remove_const #:nodoc:
+        def before_remove_const # :nodoc:
           self.current_scope = nil
         end
 
@@ -110,9 +110,7 @@ module ActiveFedora
           def build_default_scope(base_rel = nil) # :nodoc:
             return if abstract_class?
 
-            if default_scope_override.nil?
-              self.default_scope_override = !Base.is_a?(method(:default_scope).owner)
-            end
+            self.default_scope_override = !Base.is_a?(method(:default_scope).owner) if default_scope_override.nil?
 
             if default_scope_override
               # The user has defined their own default scope method, so call that

data/lib/active_fedora/scoping/named.rb

@@ -138,9 +138,7 @@ module ActiveFedora
         #   Article.published.featured.latest_article
         #   Article.featured.titles
         def scope(name, body, &block)
-          unless body.respond_to?(:call)
-            raise ArgumentError, 'The scope body needs to be callable.'
-          end
+          raise ArgumentError, 'The scope body needs to be callable.' unless body.respond_to?(:call)
 
           if dangerous_class_method?(name)
             raise ArgumentError, "You tried to define a scope named \"#{name}\" " \

data/lib/active_fedora/scoping.rb

@@ -10,11 +10,11 @@ module ActiveFedora
     end
 
     module ClassMethods
-      def current_scope #:nodoc:
+      def current_scope # :nodoc:
         ScopeRegistry.value_for(:current_scope, self)
       end
 
-      def current_scope=(scope) #:nodoc:
+      def current_scope=(scope) # :nodoc:
         ScopeRegistry.set_value_for(:current_scope, self, scope)
       end
 

data/lib/active_fedora/serialization.rb

@@ -1,4 +1,4 @@
-module ActiveFedora #:nodoc:
+module ActiveFedora # :nodoc:
   # = Active Fedora Serialization
   module Serialization
     extend ActiveSupport::Concern

data/lib/active_fedora/solr_service.rb

@@ -32,9 +32,7 @@ module ActiveFedora
       def instance
         # Register Solr
 
-        unless ActiveFedora::RuntimeRegistry.solr_service
-          register(ActiveFedora.solr_config)
-        end
+        register(ActiveFedora.solr_config) unless ActiveFedora::RuntimeRegistry.solr_service
 
         ActiveFedora::RuntimeRegistry.solr_service
       end

data/lib/active_fedora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveFedora
-  VERSION = '13.3.0'
+  VERSION = '14.0.0'
 end

data/lib/active_fedora/versionable.rb

@@ -8,9 +8,9 @@ module ActiveFedora
 
     def model_type
       if respond_to?(:metadata)
-        metadata.ldp_source.graph.query(predicate: ::RDF.type).objects
+        metadata.ldp_source.graph.query({ predicate: ::RDF.type }).objects
       else
-        resource.query(subject: resource.rdf_subject, predicate: ::RDF.type).objects
+        resource.query({ subject: resource.rdf_subject, predicate: ::RDF.type }).objects
       end
     end
 

data/lib/active_fedora/versions_graph.rb

@@ -2,9 +2,7 @@ module ActiveFedora
   class VersionsGraph < ::RDF::Graph
     def all(opts = {})
       versions = fedora_versions
-      unless opts[:include_auto_save]
-        versions.reject! { |version| version.label =~ /auto/ }
-      end
+      versions.reject! { |version| version.label =~ /auto/ } unless opts[:include_auto_save]
       versions.sort_by { |version| DateTime.parse(version.created) }
     rescue ArgumentError, NoMethodError
       raise ActiveFedora::VersionLacksCreateDate
@@ -21,7 +19,7 @@ module ActiveFedora
     end
 
     def resources
-      query(predicate: ::RDF::Vocab::Fcrepo4.hasVersion)
+      query({ predicate: ::RDF::Vocab::Fcrepo4.hasVersion })
     end
 
     private
@@ -39,11 +37,11 @@ module ActiveFedora
       end
 
       def label_query(statement)
-        query(subject: statement.object).query(predicate: ::RDF::Vocab::Fcrepo4.hasVersionLabel).first.object.to_s
+        query({ subject: statement.object }).query({ predicate: ::RDF::Vocab::Fcrepo4.hasVersionLabel }).first.object.to_s
       end
 
       def created_query(statement)
-        query(subject: statement.object).query(predicate: ::RDF::Vocab::Fcrepo4.created).first.object.to_s
+        query({ subject: statement.object }).query({ predicate: ::RDF::Vocab::Fcrepo4.created }).first.object.to_s
       end
 
       def fedora_versions

data/lib/active_fedora/with_metadata/metadata_node.rb

@@ -71,7 +71,7 @@ module ActiveFedora
         end
 
         def server_managed_properties
-          @server_managed_properties ||= properties.select { |k,v| v[:server_managed] }.keys.map(&:to_sym)
+          @server_managed_properties ||= properties.select { |_k, v| v[:server_managed] }.keys.map(&:to_sym)
         end
 
         class << self

data/lib/active_fedora/with_metadata.rb

@@ -22,7 +22,7 @@ module ActiveFedora
       return unless super && !new_record?
       # TODOs captured as https://github.com/samvera/active_fedora/issues/1331
       metadata_node.metadata_uri = described_by # TODO: only necessary if the URI was < > before
-      metadata_node.save # TODO if changed?
+      metadata_node.save # TODO: if changed?
     end
 
     module ClassMethods

data/lib/active_fedora.rb

@@ -25,7 +25,7 @@ module RDF
         @string ||= begin
           # Show nanoseconds but remove trailing zeros
           nano = @object.strftime('%N').sub(/0+\Z/, EMPTY)
-          nano = DOT + nano unless nano.blank?
+          nano = DOT + nano if nano.present?
           @object.strftime(ALTERNATIVE_FORMAT) + nano + @object.strftime(TIMEZONE_FORMAT)
         end
       end
@@ -33,7 +33,7 @@ module RDF
   end
 end
 
-module ActiveFedora #:nodoc:
+module ActiveFedora # :nodoc:
   extend ActiveSupport::Autoload
 
   eager_autoload do
@@ -156,7 +156,7 @@ module ActiveFedora #:nodoc:
   end
 
   class << self
-    attr_reader :fedora_config, :solr_config, :config_options
+    attr_reader :solr_config, :config_options
     attr_accessor :configurator
 
     def fedora_config
@@ -174,9 +174,7 @@ module ActiveFedora #:nodoc:
       options = {} if options.nil?
       # For backwards compatibility, handle cases where config_path (a String) is passed in as the argument rather than a config_options hash
       # In all other cases, set config_path to config_options[:config_path], which is ok if it's nil
-      if options.is_a? String
-        raise ArgumentError, "Calling ActiveFedora.init with a path as an argument has been removed.  Use ActiveFedora.init(:fedora_config_path=>#{options})"
-      end
+      raise ArgumentError, "Calling ActiveFedora.init with a path as an argument has been removed.  Use ActiveFedora.init(:fedora_config_path=>#{options})" if options.is_a? String
       @fedora_config = nil
       SolrService.reset!
       configurator.init(options)
@@ -199,7 +197,7 @@ module ActiveFedora #:nodoc:
     def environment
       if config_options.fetch(:environment, nil)
         config_options[:environment]
-      elsif defined?(Rails.env) && !Rails.env.nil?
+      elsif defined?(Rails.env) && !Rails.env.nil? # rubocop:disable Rails/UnknownEnv
         Rails.env.to_s
       elsif defined?(ENV['environment']) && !ENV['environment'].nil?
         ENV['environment']

data/lib/generators/active_fedora/config/solr/templates/solr/conf/solrconfig.xml

@@ -29,7 +29,9 @@
        affect both how text is indexed and queried.
   -->
   <luceneMatchVersion>5.0.0</luceneMatchVersion>
-  
+
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/modules/extraction/lib" regex=".*\.jar" />>
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
   <lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />

data/lib/tasks/active_fedora_dev.rake

@@ -14,12 +14,12 @@ namespace :active_fedora do
 
     YARD::Rake::YardocTask.new(:doc) do |yt|
       yt.files   = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
-                   [ '-', File.join(project_root, 'README.md')]
+                   ['-', File.join(project_root, 'README.md')]
       yt.options = ['--output-dir', doc_destination, '--readme', 'README.md']
     end
   rescue LoadError
     desc "Generate YARD Documentation"
-    task :doc do
+    task doc: :environment do
       abort "Please install the YARD gem to generate rdoc."
     end
   end
@@ -42,7 +42,7 @@ namespace :active_fedora do
   end
 
   desc "CI build"
-  task :ci do
+  task ci: :environment do
     Rake::Task['active_fedora:rubocop'].invoke unless ENV['NO_RUBOCOP']
     ENV['environment'] = "test"
     with_test_server do
@@ -51,7 +51,7 @@ namespace :active_fedora do
   end
 
   desc "Execute specs with coverage"
-  task :coverage do
+  task coverage: :environment do
     # Put spec opts in a file named .rspec in root
     ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
     ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
@@ -59,7 +59,7 @@ namespace :active_fedora do
   end
 
   desc "Execute specs with coverage"
-  task :spec do
+  task spec: :environment do
     with_test_server do
       Rake::Task["active_fedora:rspec"].invoke
     end