Add appraisal for Rails 6 and fix failing Resolver (#248)

* Adds appraisal for Rails 6 and fixes Resolver

* Add comments and fix old guard clause

Appraisals

@@ -1,3 +1,7 @@
 appraise "rails-5" do
   gem "rails", "~> 5.0"
 end
+
+appraise "rails-6" do
+  gem "rails", "~> 6.0"
+end

gemfiles/rails_5.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "admin", :path => "../test/dummy/admin", :group => [:test, :development]
+gem "admin", path: "../test/dummy/admin", group: [:test, :development]
 gem "rails", "~> 5.0"
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/rails_6.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "admin", path: "../test/dummy/admin", group: [:test, :development]
+gem "rails", "~> 6.0"
+
+gemspec path: "../"

godmin.gemspec

@@ -20,21 +20,24 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "bcrypt", [">= 3.0", "< 4.0"]
-  gem.add_dependency "bootstrap_form", "~> 2.4"
   gem.add_dependency "bootstrap-sass", "~> 3.3"
+  gem.add_dependency "bootstrap_form", "~> 2.4"
   gem.add_dependency "csv_builder", "~> 2.1"
   gem.add_dependency "jquery-rails", [">= 4.0", "< 5.0"]
   gem.add_dependency "momentjs-rails", "~> 2.8"
   gem.add_dependency "pundit", [">= 1.1", "< 2.0"]
-  gem.add_dependency "rails", [">= 5.0", "< 6.0"]
+  gem.add_dependency "rails", [">= 5.0", "< 7.0"]
   gem.add_dependency "sass-rails", [">= 5.0", "< 6.0"]
   gem.add_dependency "selectize-rails", "~> 0.12"
 
   gem.add_development_dependency "appraisal"
+  gem.add_development_dependency "bootsnap"
+  gem.add_development_dependency "byebug"
   gem.add_development_dependency "capybara"
-  gem.add_development_dependency "minitest-reporters"
   gem.add_development_dependency "minitest"
+  gem.add_development_dependency "minitest-reporters"
   gem.add_development_dependency "poltergeist"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency "puma"
   gem.add_development_dependency "sqlite3"
 end

lib/godmin/resolver.rb

@@ -16,15 +16,30 @@ def initialize(path, controller_path, engine_wrapper)
       @engine_wrapper = engine_wrapper
     end
 
+    # This function is for Rails 6 and up since the `find_templates` function
+    # is deprecated. It does the same thing, just a little differently. It's
+    # not being run by versions previous to Rails 6.
+    def _find_all(name, prefix, partial, details, key, locals)
+      templates = []
+
+      template_paths(prefix).each do |p|
+        break if templates.present?
+
+        path = Path.build(name, "#{@path}/#{p}", partial)
+        templates = query(path, details, details[:formats], locals, cache: !!key)
+      end
+
+      templates
+    end
+
+    # This is how we find templates in Rails 5 and below.
     def find_templates(name, prefix, *args)
       templates = []
 
       template_paths(prefix).each do |path|
-        if templates.present?
-          break
-        else
-          templates = super(name, path, *args)
-        end
+        break if templates.present?
+
+        templates = super(name, path, *args)
       end
 
       templates