Load railtie only if Rails::Railtie is defined

thiagopradi · Dec 15, 2015 · 7bb1783 · 7bb1783
1 parent ecb8767
commit 7bb1783
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/lib/octopus.rb b/lib/octopus.rb
@@ -145,7 +145,7 @@ def self.fully_replicated(&_block)
 require 'octopus/abstract_adapter'
 require 'octopus/singular_association'
 
-require 'octopus/railtie' if defined?(::Rails)
+require 'octopus/railtie' if defined?(::Rails::Railtie)
 
 require 'octopus/proxy'
 require 'octopus/collection_proxy'

diff --git a/lib/octopus/railtie.rb b/lib/octopus/railtie.rb
@@ -1,6 +1,4 @@
 begin
-  require 'rails/railtie'
-
   module Octopus
     class Railtie < Rails::Railtie
       rake_tasks do