lib/gmaps4rails.rb in gmaps4rails-1.4.1 vs lib/gmaps4rails.rb in gmaps4rails-1.4.2

@@ -15,14 +15,16 @@
          else
            app.middleware.use ::ActionDispatch::Static, "#{root}/public"
          end
        end
        
-       initializer "include acts_as_gmappable within ActiveRecord" do
-         if defined? ::ActiveRecord 
-           ActiveRecord::Base.send :include, Gmaps4rails::ActsAsGmappable
-         elsif defined? ::Mongoid
-           Mongoid::Document.send :include, Gmaps4rails::ActsAsGmappable
+       initializer "include acts_as_gmappable within ORM" do
+         ActiveSupport.on_load(:active_record) do
+           ActiveRecord::Base.send(:include, Gmaps4rails::ActsAsGmappable)
+         end
+         
+         ActiveSupport.on_load(:mongoid) do
+           Mongoid::Document.send(:include, Gmaps4rails::ActsAsGmappable)
          end
        end
        
     end
   end
\ No newline at end of file