From ef73e712baaf64482afad9fa967cf915283a8b2b Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Fri, 23 Aug 2013 17:00:19 +0100
Subject: [PATCH] Remove nominatum.rb's dependence on Rails

The user_agent and user_agent_email are now set as class instance
variables in config/initializers/nominatim.rb.
---
 config/initializers/nominatim.rb |  3 +++
 lib/nominatim.rb                 | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/config/initializers/nominatim.rb b/config/initializers/nominatim.rb
index e2833d6b2..2c4c954a4 100644
--- a/config/initializers/nominatim.rb
+++ b/config/initializers/nominatim.rb
@@ -1 +1,4 @@
 require 'nominatim'
+
+Nominatim.user_agent = Growstuff::Application.config.user_agent
+Nominatim.user_agent_email = Growstuff::Application.config.user_agent_email
diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index c54c705b3..4f969eb5d 100644
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -1,4 +1,3 @@
-require 'rails'
 require 'open-uri'
 require 'json'
 
@@ -6,7 +5,11 @@ class Nominatim
 
   # class-level instance variable, see
   # http://www.railstips.org/blog/archives/2006/11/18/class-and-instance-variables-in-ruby/
-  class << self; attr_accessor :in_testing end
+  class << self
+    attr_accessor :in_testing
+    attr_accessor :user_agent
+    attr_accessor :user_agent_email
+  end
   @in_testing = false
 
   def self.geocode(place)
@@ -15,8 +18,8 @@ class Nominatim
     end
     json = open(
       URI.escape("http://nominatim.openstreetmap.org/search/#{place}?format=json&limit=1"),
-      "User-Agent" => Growstuff::Application.config.user_agent,
-      "From" => Growstuff::Application.config.user_agent_email
+      "User-Agent" => user_agent,
+      "From" => user_agent_email
     ).read()
     location = JSON.parse(json)
     if location && location[0]