Make compatible with rails 6+

avalonmediasystem · Feb 15, 2022 · 0b8f5a8 · 0b8f5a8
1 parent 75a69a8
commit 0b8f5a8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -44,6 +44,18 @@ jobs:
 workflows:
   ci:
     jobs:
+      - bundle_lint_test:
+          name: ruby2-7_rails7-0
+          ruby_version: 2.7.5
+          rails_version: 7.0.2.2
+      - bundle_lint_test:
+          name: ruby2-7_rails6-1
+          ruby_version: 2.7.5
+          rails_version: 6.1.4.6
+      - bundle_lint_test:
+          name: ruby2-7_rails6-0
+          ruby_version: 2.7.5
+          rails_version: 6.0.4.6
       - bundle_lint_test:
           name: ruby2-7_rails5-2
           ruby_version: 2.7.5

diff --git a/active_annotations.gemspec b/active_annotations.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '~> 5.2'
+  spec.add_dependency 'rails', '>= 5.2', '< 7.1'
   spec.add_dependency "json-ld"
   spec.add_dependency "rdf-vocab", ">= 2.1.0"
   spec.add_development_dependency "bundler"

diff --git a/lib/active_annotations/engine.rb b/lib/active_annotations/engine.rb
@@ -1,9 +1,5 @@
-if defined?(Rails)
-  module ActiveAnnotations  
-    class Engine < Rails::Engine
-      config.autoload_paths += Dir["#{config.root}/app/models/**/"]
-
-      engine_name 'active_annotations'
-    end
+module ActiveAnnotations
+  class Engine < Rails::Engine
+    engine_name 'active_annotations'
   end
 end