change version comparison from string to

Gem::Version

Author: gregmolnar

lib/ransack/constants.rb

@@ -48,7 +48,7 @@ module Constants
     RAILS_5_1           = '5.1'.freeze
     RAILS_5_2           = '5.2'.freeze
     RAILS_5_2_0         = '5.2.0'.freeze
-    RAILS_6_0           = '6.0.0.rc1'.freeze
+    RAILS_6_0           = '6.0.0'.freeze
 
     RANSACK_SLASH_SEARCHES = 'ransack/searches'.freeze
     RANSACK_SLASH_SEARCHES_SLASH_SEARCH = 'ransack/searches/search'.freeze

polyamorous/lib/polyamorous.rb

@@ -12,9 +12,8 @@ module Polyamorous
   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::STRING < "6.0"
-  ar_version = "5.2.1" if ::ActiveRecord::VERSION::STRING >= "5.2.1" && ::ActiveRecord::VERSION::STRING < "6.0"
-
+  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|
     require "polyamorous/activerecord_#{ar_version}_ruby_2/#{file}"
   end

ransack.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'
-  s.add_development_dependency 'sqlite3', ENV['RAILS'] == '6-0-stable' ? '~> 1.4.1' : '~> 1.3.3'
+  s.add_development_dependency 'sqlite3', ::Gem::Version.new(ENV['RAILS'].gsub(/^v/, '')) >= ::Gem::Version.new('6-0-stable') ? '~> 1.4.1' : '~> 1.3.3'
   s.add_development_dependency 'pg', '~> 0.21'
   s.add_development_dependency 'mysql2', '0.3.20'
   s.add_development_dependency 'pry', '0.10'

spec/helpers/polyamorous_helper.rb

@@ -3,15 +3,15 @@ def new_join_association(reflection, children, klass)
     Polyamorous::JoinAssociation.new reflection, children, klass
   end
 
-  if ActiveRecord::VERSION::STRING >= "6.0.0.rc1"
+  if ActiveRecord.version >= ::Gem::Version.new("6.0.0.rc1")
     def new_join_dependency(klass, associations = {})
       Polyamorous::JoinDependency.new klass, klass.arel_table, associations, Polyamorous::InnerJoin
     end
-  elsif ActiveRecord::VERSION::STRING > "5.2.0"
+  elsif ActiveRecord.version > ::Gem::Version.new("5.2.0")
     def new_join_dependency(klass, associations = {})
       Polyamorous::JoinDependency.new klass, klass.arel_table, associations
     end
-  elsif ActiveRecord::VERSION::STRING == "5.2.0"
+  elsif ActiveRecord.version == ::Gem::Version.new("5.2.0")
     def new_join_dependency(klass, associations = {})
       alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(klass.connection, klass.table_name, [])
       Polyamorous::JoinDependency.new klass, klass.arel_table, associations, alias_tracker