Merge pull request #29 from clio/rails-6

Modify the code structure to make clear how the patches are applied to different versions of Rails:

1. Rename preloader/association.rb to preloader/ar5_association.rb
2. Bump the version to 0.3.0 as the gem now supports Rails 6

Author: Arthur Chui

.gitignore

@@ -43,7 +43,7 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 

Gemfile.lock

@@ -8,18 +8,17 @@
 require 'jit_preloader/active_record/relation'
 require 'jit_preloader/active_record/associations/collection_association'
 require 'jit_preloader/active_record/associations/singular_association'
-if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5.2.2")
-  require 'jit_preloader/active_record/associations/preloader/collection_association'
-  require 'jit_preloader/active_record/associations/preloader/singular_association'
-elsif Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.0.0")
+if Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("6.0.0")
   require 'jit_preloader/active_record/associations/preloader/ar6_association'
+elsif Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new("5.2.2")
+  require 'jit_preloader/active_record/associations/preloader/ar5_association'
 else
-  require 'jit_preloader/active_record/associations/preloader/association'
+  require 'jit_preloader/active_record/associations/preloader/collection_association'
+  require 'jit_preloader/active_record/associations/preloader/singular_association'
 end
 require 'jit_preloader/preloader'
 
 module JitPreloader
-
   def self.globally_enabled=(value)
     @enabled = value
   end

lib/jit_preloader.rb

@@ -1,3 +1,3 @@
 module JitPreloader
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end