lib/polyamorous.rb in polyamorous-2.3.0 vs lib/polyamorous.rb in polyamorous-2.3.1

- old
+ new

@@ -10,19 +10,14 @@ require 'polyamorous/tree_node' require 'polyamorous/join' require 'polyamorous/swapping_reflection_class' ar_version = ::ActiveRecord::VERSION::STRING[0,3] - ar_version = ::ActiveRecord::VERSION::STRING[0,5] if ar_version >= "5.2" && ::ActiveRecord.version < ::Gem::Version.new("6.0") - ar_version = "5.2.1" if ::ActiveRecord::VERSION::STRING >= "5.2.1" && ::ActiveRecord.version < ::Gem::Version.new("6.0") - %w(join_association join_dependency).each do |file| + %w(join_association join_dependency reflection).each do |file| require "polyamorous/activerecord_#{ar_version}_ruby_2/#{file}" end - if ar_version >= "5.2.0" - require "polyamorous/activerecord_#{ar_version}_ruby_2/reflection.rb" - ::ActiveRecord::Reflection::AbstractReflection.send(:prepend, Polyamorous::ReflectionExtensions) - end + ActiveRecord::Reflection::AbstractReflection.send(:prepend, Polyamorous::ReflectionExtensions) Polyamorous::JoinDependency.send(:prepend, Polyamorous::JoinDependencyExtensions) Polyamorous::JoinDependency.singleton_class.send(:prepend, Polyamorous::JoinDependencyExtensions::ClassMethods) Polyamorous::JoinAssociation.send(:prepend, Polyamorous::JoinAssociationExtensions) end