From 5ffa8447a977454cec2b19f0af3ff31d1e7447a9 Mon Sep 17 00:00:00 2001 From: Alex Reisner <alex@alexreisner.com> Date: Wed, 16 Mar 2011 10:14:48 -0400 Subject: [PATCH] Only load Railtie if Rails exists. --- lib/geocoder.rb | 7 +++++-- test/test_helper.rb | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/geocoder.rb b/lib/geocoder.rb index 268e7b72..df59e222 100644 --- a/lib/geocoder.rb +++ b/lib/geocoder.rb @@ -1,7 +1,6 @@ require "geocoder/configuration" require "geocoder/calculations" require "geocoder/cache" -require "geocoder/railtie" require "geocoder/request" module Geocoder @@ -118,4 +117,8 @@ module Geocoder end end -Geocoder::Railtie.insert +# load Railtie if Rails exists +if defined?(Rails) + require "geocoder/railtie" + Geocoder::Railtie.insert +end diff --git a/test/test_helper.rb b/test/test_helper.rb index 92c0681b..b852c32d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -38,6 +38,10 @@ module ActiveRecord end end +# simulate Rails module so Railtie gets loaded +module Rails +end + # Require Geocoder after ActiveRecord simulator. require 'geocoder' require "geocoder/lookups/base" -- GitLab