Load soap4r so IP geolocation works

diff --git a/Gemfile b/Gemfile
index b8b1430e9f49d8a13e195d4ff4753d7206b3bc12..312f6d60402eb140d6f3ec5dde0b3e18746aa717 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -68,8 +68,9 @@ gem 'htmlentities'
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 

-# Load httpclient for SOAP support for Quova GeoIP queries
+# Load httpclient and soap4r for SOAP support for Quova GeoIP queries

 gem 'httpclient'
 gem 'httpclient'

+gem 'soap4r-ruby1.9'

 
 # Load memcache client in case we are using it
 gem 'dalli'
 
 # Load memcache client in case we are using it
 gem 'dalli'

diff --git a/Gemfile.lock b/Gemfile.lock
index cc73ba00c83f6066cfc3dff440b979a4c94f3670..676595a47463830f8b37f1c228e09675cbaf7846 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,17 +45,16 @@ GEM
     coffee-script-source (1.6.3)
     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)
     coffee-script-source (1.6.3)
     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)

-    dalli (2.6.4)
+    dalli (2.7.0)

     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.0.2)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (2.0.2)

-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)

     hike (1.2.3)
     htmlentities (4.3.1)
     http_accept_language (2.0.0)
     hike (1.2.3)
     htmlentities (4.3.1)
     http_accept_language (2.0.0)

-    httpauth (0.2.0)

     httpclient (2.3.4.1)
     i18n (0.6.9)
     iconv (0.1)
     httpclient (2.3.4.1)
     i18n (0.6.9)
     iconv (0.1)


@@ -68,7 +67,7 @@ GEM
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)
     jsonify-rails (0.3.2)
       actionpack
       jsonify (< 0.4.0)

-    jwt (0.1.8)
+    jwt (0.1.10)

       multi_json (>= 1.5)
     kgio (2.8.1)
     libxml-ruby (2.7.0)
       multi_json (>= 1.5)
     kgio (2.8.1)
     libxml-ruby (2.7.0)


@@ -78,9 +77,9 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.5.2)
     minitest (4.7.5)
     mime-types (1.25.1)
     mini_portile (0.5.2)
     minitest (4.7.5)

-    multi_json (1.8.2)
+    multi_json (1.8.4)

     multi_xml (0.5.5)
     multi_xml (0.5.5)

-    multipart-post (1.2.0)
+    multipart-post (2.0.0)

     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)


@@ -89,11 +88,10 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)

       multi_xml (~> 0.5)
       rack (~> 1.2)
     open_id_authentication (1.2.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     open_id_authentication (1.2.0)


@@ -136,13 +134,14 @@ GEM
     redcarpet (3.0.0)
     rinku (1.7.3)
     ruby-openid (2.3.0)
     redcarpet (3.0.0)
     rinku (1.7.3)
     ruby-openid (2.3.0)

-    sanitize (2.0.6)
+    sanitize (2.1.0)

       nokogiri (>= 1.4.4)
     sass (3.2.13)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
       nokogiri (>= 1.4.4)
     sass (3.2.13)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)

+    soap4r-ruby1.9 (2.0.5)

     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)


@@ -156,7 +155,7 @@ GEM
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)

-    timecop (0.7.0)
+    timecop (0.7.1)

     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)


@@ -204,6 +203,7 @@ DEPENDENCIES
   ruby-openid (>= 2.2.0)
   sanitize
   sass-rails (~> 4.0.0)
   ruby-openid (>= 2.2.0)
   sanitize
   sass-rails (~> 4.0.0)

+  soap4r-ruby1.9

   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)
   timecop
   uglifier (>= 1.3.0)
   validates_email_format_of (>= 1.5.1)