active-fedora 13.3.0 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5833c4a96e372ae86f5727ec33d965f054ba21567c177c0b4340ecc2d6e7bb84
-  data.tar.gz: 86204eff86f88f343876d0974ac446b60d087945bb856a7ec4854d0f91f3adfa
+  metadata.gz: c5ea2bfd359fe8ac2103cc2f22d4bfacb564a5a6fe0964d6586120dbba785035
+  data.tar.gz: 64b28f342a53d4b2176ae4fbcdf502a7acd6e2f533bb68b71d2664e8fd95cf35
 SHA512:
-  metadata.gz: 70c86acbc2effa48e03911fc3a985918e5ce7004b7e02898ea841e95172db330a5c44a6cd3438513b76312d98b2dbe5b2116b4fdecfd978d15bf5715dbced3e4
-  data.tar.gz: e473abc4f550bae98d519fd6e1617d6336e1427926702bc4d904e59cd9f49638b820b982350c174bd2f7f6f778ef3d53a196d46667e5c4bd1b3f285c99e7eaba
+  metadata.gz: 0dd1090c7c74aa2926172c858c32bc223120ffb29b75fa1b099f8a2f881e3cf4ca772c520b54241b6f72f5997aecb5149ce4a218339e8ce0d00ad4f3c42beec9
+  data.tar.gz: bb97c2be3c9b48fc185a1ce528234e1b7d96a497fa957810fd7c4546f087d4b6a4df7c6626e1340f74d2e5bd856a777d759ce98ddbb2a6c59e666c2bb31d398e

data/.circleci/config.yml

@@ -47,41 +47,71 @@ jobs:
 workflows:
   ci:
     jobs:
+      # Ruby 3.2 releases
+      - bundle_lint_test:
+          name: ruby3-2_rails7-0
+          ruby_version: 3.2.0
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: ruby3-2_rails6-1
+          ruby_version: 3.2.0
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: ruby3-2_rails6-0
+          ruby_version: 3.2.0
+          rails_version: 6.0.6.1
+      # Ruby 3.1 releases
+      - bundle_lint_test:
+          name: ruby3-1_rails7-0
+          ruby_version: 3.1.3
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: ruby3-1_rails6-1
+          ruby_version: 3.1.3
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: ruby3-1_rails6-0
+          ruby_version: 3.1.3
+          rails_version: 6.0.6.1
+      # Ruby 3.0 releases
+      - bundle_lint_test:
+          name: ruby3-0_rails7-0
+          ruby_version: 3.0.5
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: ruby3-0_rails6-1
+          ruby_version: 3.0.5
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: ruby3-0_rails6-0
+          ruby_version: 3.0.5
+          rails_version: 6.0.6.1
       # Ruby 2.7 releases
+      - bundle_lint_test:
+          name: ruby2-7_rails7-0
+          ruby_version: 2.7.7
+          rails_version: 7.0.4.1
       - bundle_lint_test:
           name: ruby2-7_rails6-1
-          ruby_version: 2.7.5
-          rails_version: 6.1.6.1
+          ruby_version: 2.7.7
+          rails_version: 6.1.7.1
       - bundle_lint_test:
           name: ruby2-7_rails6-0
-          ruby_version: 2.7.5
-          rails_version: 6.0.4.7
+          ruby_version: 2.7.7
+          rails_version: 6.0.6.1
       - bundle_lint_test:
           name: ruby2-7_rails5-2
-          ruby_version: 2.7.5
-          rails_version: 5.2.4
+          ruby_version: 2.7.7
+          rails_version: 5.2.8.1
       # Ruby 2.6 releases
-      - bundle_lint_test:
-          name: ruby2-6_rails6-1
-          ruby_version: 2.6.9
-          rails_version: 6.1.6.1
       - bundle_lint_test:
           name: ruby2-6_rails6-0
-          ruby_version: 2.6.9
-          rails_version: 6.0.4.7
+          ruby_version: 2.6.10
+          rails_version: 6.0.6.1
       - bundle_lint_test:
           name: ruby2-6_rails5-2
-          ruby_version: 2.6.9
-          rails_version: 5.2.4
-      # Ruby 2.5 releases
-      - bundle_lint_test:
-          name: ruby2-5_rails6.0
-          ruby_version: 2.5.9
-          rails_version: 6.0.4.7
-      - bundle_lint_test:
-          name: ruby2-5_rails5-2
-          ruby_version: 2.5.9
-          rails_version: 5.2.4
+          ruby_version: 2.6.10
+          rails_version: 5.2.8.1
 
   nightly:
     triggers:
@@ -92,38 +122,68 @@ workflows:
               only:
                 - main
     jobs:
+      # Ruby 3.2 releases
+      - bundle_lint_test:
+          name: ruby3-2_rails7-0
+          ruby_version: 3.2.0
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: ruby3-2_rails6-1
+          ruby_version: 3.2.0
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: ruby3-2_rails6-0
+          ruby_version: 3.2.0
+          rails_version: 6.0.6.1
+      # Ruby 3.1 releases
+      - bundle_lint_test:
+          name: ruby3-1_rails7-0
+          ruby_version: 3.1.3
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: ruby3-1_rails6-1
+          ruby_version: 3.1.3
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: ruby3-1_rails6-0
+          ruby_version: 3.1.3
+          rails_version: 6.0.6.1
+      # Ruby 3.0 releases
+      - bundle_lint_test:
+          name: ruby3-0_rails7-0
+          ruby_version: 3.0.5
+          rails_version: 7.0.4.1
+      - bundle_lint_test:
+          name: ruby3-0_rails6-1
+          ruby_version: 3.0.5
+          rails_version: 6.1.7.1
+      - bundle_lint_test:
+          name: ruby3-0_rails6-0
+          ruby_version: 3.0.5
+          rails_version: 6.0.6.1
       # Ruby 2.7 releases
+      - bundle_lint_test:
+          name: ruby2-7_rails7-0
+          ruby_version: 2.7.7
+          rails_version: 7.0.4.1
       - bundle_lint_test:
           name: ruby2-7_rails6-1
-          ruby_version: 2.7.5
-          rails_version: 6.1.6.1
+          ruby_version: 2.7.7
+          rails_version: 6.1.7.1
       - bundle_lint_test:
           name: ruby2-7_rails6-0
-          ruby_version: 2.7.5
-          rails_version: 6.0.4.7
+          ruby_version: 2.7.7
+          rails_version: 6.0.6.1
       - bundle_lint_test:
           name: ruby2-7_rails5-2
-          ruby_version: 2.7.5
-          rails_version: 5.2.4
+          ruby_version: 2.7.7
+          rails_version: 5.2.8.1
       # Ruby 2.6 releases
-      - bundle_lint_test:
-          name: ruby2-6_rails6-1
-          ruby_version: 2.6.9
-          rails_version: 6.1.6.1
       - bundle_lint_test:
           name: ruby2-6_rails6-0
-          ruby_version: 2.6.9
-          rails_version: 6.0.4.7
+          ruby_version: 2.6.10
+          rails_version: 6.0.6.1
       - bundle_lint_test:
           name: ruby2-6_rails5-2
-          ruby_version: 2.6.9
-          rails_version: 5.2.4
-      # Ruby 2.5 releases
-      - bundle_lint_test:
-          name: ruby2-5_rails6.0
-          ruby_version: 2.5.9
-          rails_version: 6.0.4.7
-      - bundle_lint_test:
-          name: ruby2-5_rails5-2
-          ruby_version: 2.5.9
-          rails_version: 5.2.4
+          ruby_version: 2.6.10
+          rails_version: 5.2.8.1

data/.rubocop.yml

@@ -1,18 +1,13 @@
-require: rubocop-rspec
+inherit_gem:
+  bixby: bixby_default.yml
 
 inherit_from:
 - .rubocop_todo.yml
 
-AllCops:
-  TargetRubyVersion: 2.2
-  DisplayCopNames: true
-  Include:
-    - '**/Rakefile'
-  Exclude:
-    - 'script/**/*'
-    - 'vendor/**/*'
+Style/FrozenStringLiteralComment:
+  Enabled: false
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
     - 'spec/unit/**/*'
     - 'spec/integration/**/*'
@@ -22,12 +17,19 @@ Lint/HandleExceptions:
 Lint/AssignmentInCondition:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Exclude:
+    - 'lib/active_fedora.rb'
+    - 'lib/active_fedora/nested_attributes.rb'
+    - 'lib/active_fedora/rspec_matchers/**/*'
+    - 'lib/tasks/**/*'
+
 Metrics/BlockNesting:
   Exclude:
     - 'lib/active_fedora/autosave_association.rb'
@@ -173,7 +175,7 @@ Style/Lambda:
     - 'spec/**/*'
 
 Layout/IndentationConsistency:
-  EnforcedStyle: rails
+  EnforcedStyle: indented_internal_methods
 
 Style/CollectionMethods:
   PreferredMethods:
@@ -240,6 +242,15 @@ Rails/Date:
 Rails/TimeZone:
   Enabled: false
 
+Rails/FilePath:
+  Enabled: false
+
+Rails/ActiveRecordAliases:
+  Enabled: false
+
+Rails/SkipsModelValidations:
+  Enabled: false
+
 RSpec/AnyInstance:
   Enabled: false
 
@@ -271,3 +282,6 @@ RSpec/NotToNot:
 
 RSpec/MessageSpies:
   Enabled: false
+
+Security/MarshalLoad:
+  Enabled: false

data/.rubocop_todo.yml

@@ -16,5 +16,5 @@ Style/PercentLiteralDelimiters:
 # Offense count: 1
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 82

data/Gemfile

@@ -11,14 +11,14 @@ if ENV['RAILS_VERSION']
   gem 'activemodel', ENV['RAILS_VERSION']
   gem 'rails', ENV['RAILS_VERSION']
 else
-  gem 'activemodel', '~> 6.0.4', '< 7'
-  gem 'rails', '~> 6.0.4', '< 7'
+  gem 'activemodel', '>= 6.0', '< 8'
+  gem 'rails', '>= 6.0', '< 8'
 end
 
 group :test do
-  gem 'simplecov', require: false
   gem 'coveralls', require: false
   gem 'rspec_junit_formatter'
+  gem 'simplecov', require: false
 end
 
 gem 'jruby-openssl', platform: :jruby

data/active-fedora.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "active_fedora/version"
 
 Gem::Specification.new do |s|
@@ -8,39 +9,38 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Matt Zumwalt", "McClain Looney", "Justin Coyne"]
   s.email       = ["samvera-tech@googlegroups.com"]
-  s.homepage    = %q{https://github.com/samvera/active_fedora}
-  s.summary     = %q{A convenience libary for manipulating documents in the Fedora Repository.}
-  s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
+  s.homepage    = 'https://github.com/samvera/active_fedora'
+  s.summary     = 'A convenience libary for manipulating documents in the Fedora Repository.'
+  s.description = 'ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.'
   s.license = "Apache-2.0"
-  s.required_ruby_version = '~> 2.4'
+  s.metadata = { "rubygems_mfa_required" => "true" }
+  s.required_ruby_version = '>= 2.6'
 
   s.add_dependency "activemodel", '>= 5.1'
   s.add_dependency "activesupport", '>= 5.1'
   s.add_dependency "active-triples", '>= 0.11.0', '< 2.0.0'
   s.add_dependency "deprecation"
-  s.add_dependency 'faraday', '~> 0.12'
+  s.add_dependency 'faraday', '~> 1.0'
   s.add_dependency 'faraday-encoding', '>= 0.0.5'
   s.add_dependency "ldp", '>= 0.7.0', '< 2'
   s.add_dependency 'rsolr', '>= 1.1.2', '< 3'
   s.add_dependency "ruby-progressbar", '~> 1.0'
 
+  s.add_development_dependency "bixby"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   s.add_development_dependency "github_changelog_generator"
   s.add_development_dependency "rdoc"
-  s.add_development_dependency "psych", "< 4" # Restricted because 4.0+ do not work with rubocop 0.56.x
   s.add_development_dependency "rails"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.5"
   s.add_development_dependency "rspec-its"
-  s.add_development_dependency "rubocop", '~> 0.56.0'
-  s.add_development_dependency "rubocop-rspec", '~> 1.12.0'
   s.add_development_dependency "simplecov", '~> 0.8'
-  s.add_development_dependency "solr_wrapper", "~> 2.0"
+  s.add_development_dependency "solr_wrapper", "~> 4.0"
   s.add_development_dependency "yard"
 
   s.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR).select { |f| File.dirname(f) !~ %r{\A"?spec\/?} }
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"

data/lib/active_fedora/association_hash.rb

@@ -11,11 +11,11 @@ module ActiveFedora
     end
 
     def [](name)
-      association(name).reader if association(name)
+      association(name)&.reader
     end
 
     def []=(name, object)
-      association(name).writer(object) if association(name)
+      association(name)&.writer(object)
     end
 
     def association(name)
@@ -84,6 +84,7 @@ module ActiveFedora
       super
     end
   end
+
   ##
   # Represents the result of merging two association hashes.
   # @note As the keys can come from multiple models, the attributes become
@@ -91,11 +92,13 @@ module ActiveFedora
   class Merged < AssociationHash
     attr_reader :first, :second
 
+    # rubocop:disable Lint/MissingSuper
     def initialize(first, second)
       @first = first
       @base = first.base
       @second = second
     end
+    # rubocop:enable Lint/MissingSuper
 
     def [](name)
       first[name] || second[name]

data/lib/active_fedora/associations/association.rb

@@ -119,7 +119,7 @@ module ActiveFedora
         reset
       end
 
-      def initialize_attributes(record, except_from_scope_attributes = nil) #:nodoc:
+      def initialize_attributes(record, except_from_scope_attributes = nil) # :nodoc:
         except_from_scope_attributes ||= {}
         skip_assign = [reflection.foreign_key].compact
         assigned_keys = record.changed
@@ -141,9 +141,7 @@ module ActiveFedora
           if (reflection.has_one? || reflection.collection?) && !options[:through]
             attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
 
-            if reflection.options[:as]
-              attributes[reflection.type] = owner.class.base_class.name
-            end
+            attributes[reflection.type] = owner.class.base_class.name if reflection.options[:as]
           end
 
           attributes

data/lib/active_fedora/associations/association_scope.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Associations
-    class AssociationScope #:nodoc:
+    class AssociationScope # :nodoc:
       def self.scope(association)
         new(association).scope
       end

data/lib/active_fedora/associations/basic_contains_association.rb

@@ -1,8 +1,8 @@
 module ActiveFedora
   module Associations
-    class BasicContainsAssociation < ContainsAssociation #:nodoc:
+    class BasicContainsAssociation < ContainsAssociation # :nodoc:
       def find_target
-        uris = owner.resource.query(predicate: options[:predicate])
+        uris = owner.resource.query({ predicate: options[:predicate] })
                     .map { |r| r.object.to_s }
 
         uris.map { |object_uri| klass.find(klass.uri_to_id(object_uri)) }

data/lib/active_fedora/associations/belongs_to_association.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   module Associations
-    class BelongsToAssociation < SingularAssociation #:nodoc:
+    class BelongsToAssociation < SingularAssociation # :nodoc:
       def handle_dependency
         target.send(options[:dependent]) if load_target
       end

data/lib/active_fedora/associations/builder/association.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class Association #:nodoc:
+  class Association # :nodoc:
     class << self
       attr_accessor :extensions
     end
@@ -36,7 +36,7 @@ module ActiveFedora::Associations::Builder
     def self.build_scope(scope, extension)
       new_scope = scope
 
-      new_scope = proc { instance_exec(&scope) } if scope && scope.arity.zero?
+      new_scope = proc { instance_exec(&scope) } if scope&.arity&.zero?
 
       new_scope = wrap_scope new_scope, extension if extension
 
@@ -114,9 +114,7 @@ module ActiveFedora::Associations::Builder
     end
 
     def self.check_dependent_options(dependent)
-      unless valid_dependent_options.include? dependent
-        raise ArgumentError, "The :dependent option must be one of #{valid_dependent_options}, but is :#{dependent}"
-      end
+      raise ArgumentError, "The :dependent option must be one of #{valid_dependent_options}, but is :#{dependent}" unless valid_dependent_options.include? dependent
     end
 
     def self.add_destroy_callbacks(model, reflection)

data/lib/active_fedora/associations/builder/basic_contains.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class BasicContains < CollectionAssociation #:nodoc:
+  class BasicContains < CollectionAssociation # :nodoc:
     def self.macro
       :is_a_container
     end

data/lib/active_fedora/associations/builder/belongs_to.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class BelongsTo < SingularAssociation #:nodoc:
+  class BelongsTo < SingularAssociation # :nodoc:
     def self.macro
       :belongs_to
     end
@@ -19,9 +19,7 @@ module ActiveFedora::Associations::Builder
     end
 
     def self.define_validations(model, reflection)
-      if reflection.options.key?(:required)
-        reflection.options[:optional] = !reflection.options.delete(:required)
-      end
+      reflection.options[:optional] = !reflection.options.delete(:required) if reflection.options.key?(:required)
 
       required = if reflection.options[:optional].nil?
                    model.belongs_to_required_by_default
@@ -31,9 +29,7 @@ module ActiveFedora::Associations::Builder
 
       super
 
-      if required
-        model.validates_presence_of reflection.name, message: :required
-      end
+      model.validates_presence_of reflection.name, message: :required if required
     end
   end
 end

data/lib/active_fedora/associations/builder/collection_association.rb

@@ -1,6 +1,6 @@
 require 'active_fedora/associations'
 module ActiveFedora::Associations::Builder
-  class CollectionAssociation < Association #:nodoc:
+  class CollectionAssociation < Association # :nodoc:
     CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove].freeze
 
     def self.valid_options(options)
@@ -15,11 +15,11 @@ module ActiveFedora::Associations::Builder
     end
 
     def self.define_extensions(model, name)
-      if block_given?
-        extension_module_name = "#{model.name.demodulize}#{name.to_s.camelize}AssociationExtension"
-        extension = Module.new(&Proc.new)
-        model.parent.const_set(extension_module_name, extension)
-      end
+      return unless block_given?
+
+      extension_module_name = "#{model.name.demodulize}#{name.to_s.camelize}AssociationExtension"
+      extension = Module.new(&Proc.new)
+      model.parent.const_set(extension_module_name, extension)
     end
 
     def self.define_callback(model, callback_name, name, options)
@@ -44,7 +44,7 @@ module ActiveFedora::Associations::Builder
 
     def self.wrap_scope(scope, mod)
       if scope
-        if scope.arity > 0
+        if scope.arity.positive?
           proc { |owner| instance_exec(owner, &scope).extending(mod) }
         else
           proc { instance_exec(&scope).extending(mod) }

data/lib/active_fedora/associations/builder/directly_contains.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class DirectlyContains < CollectionAssociation #:nodoc:
+  class DirectlyContains < CollectionAssociation # :nodoc:
     def self.macro
       :directly_contains
     end
@@ -10,11 +10,9 @@ module ActiveFedora::Associations::Builder
 
     def self.validate_options(options)
       super
-      if !options[:has_member_relation] && !options[:is_member_of_relation]
-        raise ArgumentError, "You must specify a :has_member_relation or :is_member_of_relation predicate for #{name}"
-      elsif !options[:has_member_relation].is_a?(RDF::URI) && !options[:is_member_of_relation].is_a?(RDF::URI)
-        raise ArgumentError, "Predicate must be a kind of RDF::URI"
-      end
+
+      raise ArgumentError, "You must specify a :has_member_relation or :is_member_of_relation predicate for #{name}" if !options[:has_member_relation] && !options[:is_member_of_relation]
+      raise ArgumentError, "Predicate must be a kind of RDF::URI" if !options[:has_member_relation].is_a?(RDF::URI) && !options[:is_member_of_relation].is_a?(RDF::URI)
     end
   end
 end

data/lib/active_fedora/associations/builder/directly_contains_one.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class DirectlyContainsOne < SingularAssociation #:nodoc:
+  class DirectlyContainsOne < SingularAssociation # :nodoc:
     def self.macro
       :directly_contains_one
     end
@@ -9,15 +9,13 @@ module ActiveFedora::Associations::Builder
     end
 
     def self.create_reflection(model, name, scope, options, extension = nil)
-      if options[:through]
-        inherit_options_from_association(model, options, options[:through])
-      else
-        raise ArgumentError, "you must specify a :through option on #{name}.  #{name} will use the container from that directly_contains association."
-      end
+      raise ArgumentError, "you must specify a :through option on #{name}.  #{name} will use the container from that directly_contains association." unless options[:through]
+      inherit_options_from_association(model, options, options[:through])
 
       super
     end
 
+    # rubocop:disable Style/GuardClause
     def self.validate_options(options)
       super
       if options[:class_name] == "ActiveFedora::File"
@@ -31,6 +29,7 @@ module ActiveFedora::Associations::Builder
       return if options[:type].is_a?(RDF::URI)
       raise ArgumentError, "You must specify a Type and it must be a kind of RDF::URI"
     end
+    # rubocop:enable Style/GuardClause
 
     # Inherits :has_member_relation from the association corresponding to association_name
     # @param [Symbol] association_name of the association to inherit from

data/lib/active_fedora/associations/builder/has_and_belongs_to_many.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class HasAndBelongsToMany < CollectionAssociation #:nodoc:
+  class HasAndBelongsToMany < CollectionAssociation # :nodoc:
     def self.macro
       :has_and_belongs_to_many
     end

data/lib/active_fedora/associations/builder/has_many.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class HasMany < CollectionAssociation #:nodoc:
+  class HasMany < CollectionAssociation # :nodoc:
     def self.macro
       :has_many
     end

data/lib/active_fedora/associations/builder/has_subresource.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class HasSubresource < SingularAssociation #:nodoc:
+  class HasSubresource < SingularAssociation # :nodoc:
     def self.macro
       :has_subresource
     end

data/lib/active_fedora/associations/builder/indirectly_contains.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class IndirectlyContains < CollectionAssociation #:nodoc:
+  class IndirectlyContains < CollectionAssociation # :nodoc:
     def self.macro
       :indirectly_contains
     end
@@ -18,12 +18,9 @@ module ActiveFedora::Associations::Builder
 
     def self.validate_options(options)
       super
-      if !options[:has_member_relation] && !options[:is_member_of_relation]
-        raise ArgumentError, "You must specify a predicate for #{name}"
-      elsif !options[:has_member_relation].is_a?(RDF::URI) && !options[:is_member_of_relation].is_a?(RDF::URI)
-        raise ArgumentError, "Predicate must be a kind of RDF::URI"
-      end
 
+      raise ArgumentError, "You must specify a predicate for #{name}" if !options[:has_member_relation] && !options[:is_member_of_relation]
+      raise ArgumentError, "Predicate must be a kind of RDF::URI" if !options[:has_member_relation].is_a?(RDF::URI) && !options[:is_member_of_relation].is_a?(RDF::URI)
       raise ArgumentError, "Missing :through option" unless options[:through]
       raise ArgumentError, "Missing :foreign_key option" unless options[:foreign_key]
     end

data/lib/active_fedora/associations/builder/singular_association.rb

@@ -1,5 +1,5 @@
 module ActiveFedora::Associations::Builder
-  class SingularAssociation < Association #:nodoc:
+  class SingularAssociation < Association # :nodoc:
     def self.valid_options(options)
       super + [:dependent, :inverse_of, :required]
     end