fix: require necessary ActiveSupport parts in proper order

* fix: require necessary ActiveSupport parts in proper order * fix: make gem compatible with older ActiveSupport versions
graphiti-api · Jun 11, 2024 · bb2a488 · bb2a488
1 parent 1479411
commit bb2a488
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/graphiti.rb b/lib/graphiti.rb
@@ -1,13 +1,16 @@
 require "json"
 require "forwardable"
 require "uri"
+
+require "active_support/version"
+require "active_support/deprecation"
+require "active_support/deprecator" if ::ActiveSupport.version >= Gem::Version.new("7.1")
 require "active_support/core_ext/string"
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/hash/conversions" # to_xml
 require "active_support/concern"
 require "active_support/time"
-require "active_support/deprecation"
 
 require "dry-types"
 require "graphiti_errors"

diff --git a/lib/graphiti/scope.rb b/lib/graphiti/scope.rb
@@ -102,7 +102,7 @@ def updated_at
         Graphiti.log(e)
       end
 
-      return updated_time || Time.now
+      updated_time || Time.now
     end
     alias_method :last_modified_at, :updated_at