updating engines

.gitignore

@@ -14,6 +14,7 @@ tmp/
 *.txt
 config/database.yml
 config/newrelic.yml
+config/flare.yml
 config/environments/quandu_*.rb
 config/environments/bleak_house.rb
 doc/plugins/*

Gemfile

@@ -62,16 +62,19 @@ gem 'passiverecord',              '0.2',          github: 'ambethia/passiverecor
 gem 'restful-authentication',     '2.0.0.beta1',  github: 'raszi/restful-authentication', branch: 'rails4'
 #gem 'activerecord-postgis-adapter'
 
+gem 'rsolr'
+gem 'sunspot_rails'
+
 gem 'active_resource_extensions', '2.1.6',        github: 'thl/active_resource_extensions',  tag: 'v2.1.6' #path: '../../thl/engines/active_resource_extensions'
 gem 'acts_as_family_tree',        '1.1.3',        github: 'thl/acts_as_family_tree',         tag: 'v1.1.3' #path: '../../thl/engines/acts_as_family_tree'
 gem 'authenticated_system',       '2.3.0',        github: 'thl/authenticated_system',        tag: 'v2.3.0' #path: '../../thl/engines/authenticated_system'
 gem 'complex_dates',              '2.1.4',        github: 'thl/complex_dates',               tag: 'v2.1.4' #path: '../../thl/engines/complex_dates'
 gem 'complex_scripts',            '2.2.6',        github: 'thl/complex_scripts',             tag: 'v2.2.6' #path: '../../thl/engines/complex_scripts'
-gem 'interface_utils',            '2.2.3',        github: 'thl/interface_utils',             tag: 'v2.2.3' #path: '../../thl/engines/interface_utils'
+gem 'interface_utils',            '2.2.4',        github: 'thl/interface_utils',             tag: 'v2.2.4' #path: '../../thl/engines/interface_utils'
 gem 'mms_integration',            '2.2.6',        github: 'thl/mms_integration',             tag: 'v2.2.6' #path: '../../thl/engines/mms_integration'
-gem 'kmaps_engine',               '3.1.9',        github: 'shanti-uva/kmaps_engine',         tag: 'v3.1.9' #path: '../engines/kmaps_engine'
+gem 'kmaps_engine',               '3.2.0',        github: 'shanti-uva/kmaps_engine',         tag: 'v3.2.0' #path: '../engines/kmaps_engine'
 gem 'places_integration',         '2.1.5',        github: 'thl/places_integration',          tag: 'v2.1.5' #path: '../../thl/engines/places_integration'
-gem 'places_engine',              '4.1.1',        github: 'thl/places_engine',               tag: 'v4.1.1' #path: '../../thl/engines/places_engine'
+gem 'places_engine',              '4.1.2',        github: 'thl/places_engine',               tag: 'v4.1.2' #path: '../../thl/engines/places_engine'
 gem 'proxy_engine',               '2.1.2',        github: 'thl/proxy_engine',                tag: 'v2.1.2' #path: '../../thl/engines/proxy_engine'
 gem 'shanti_integration',         '3.1.1',        github: 'shanti-uva/shanti_integration',   tag: 'v3.1.1' #path: '../engines/shanti_integration'
 gem 'subjects_integration',       '0.1.6',        github: 'shanti-uva/subjects_integration', tag: 'v0.1.6' #path: '../engines/subjects_integration'

Gemfile.lock

@@ -13,10 +13,10 @@ GIT
 
 GIT
   remote: git://github.com/shanti-uva/kmaps_engine.git
-  revision: fab76505af8ee3905306c69ddb256d78692a8802
-  tag: v3.1.9
+  revision: 5a109cee0faed06aaee5ff4206c0d34f6369d847
+  tag: v3.2.0
   specs:
-    kmaps_engine (3.1.9)
+    kmaps_engine (3.2.0)
       rails (~> 4.1.5)
 
 GIT
@@ -79,10 +79,10 @@ GIT
 
 GIT
   remote: git://github.com/thl/interface_utils.git
-  revision: 9bf755a57b9432a53eb1676c6a11155e5b3d9a19
-  tag: v2.2.3
+  revision: 017d7c38f103359b4dbba35e5945ffbfb7f9f40c
+  tag: v2.2.4
   specs:
-    interface_utils (2.2.3)
+    interface_utils (2.2.4)
       rails (~> 4.0)
 
 GIT
@@ -95,10 +95,10 @@ GIT
 
 GIT
   remote: git://github.com/thl/places_engine.git
-  revision: 2ef07bc260ba0fe574b18283716cde6d7dd751e8
-  tag: v4.1.1
+  revision: 5a09766d3167010309d392fa807176b14c81b0e1
+  tag: v4.1.2
   specs:
-    places_engine (4.1.1)
+    places_engine (4.1.2)
       rails (~> 4.0)
 
 GIT
@@ -208,13 +208,17 @@ GEM
     makandra_resource_controller (0.8.0)
     memcache-client (1.8.5)
     mime-types (1.25.1)
+    mini_portile (0.6.2)
     minitest (5.5.1)
     multi_json (1.10.1)
     newrelic_rpm (3.9.1.236)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     open_id_authentication (1.2.0)
       rack-openid (~> 1.3)
     pg (0.17.1)
     polyglot (0.3.5)
+    pr_geohash (1.0.0)
     protected_attributes (1.0.8)
       activemodel (>= 4.0.1, < 5.0)
     rack (1.5.2)
@@ -244,6 +248,8 @@ GEM
     rdoc (4.1.1)
       json (~> 1.4)
     ref (1.0.5)
+    rsolr (1.0.12)
+      builder (>= 2.1.2)
     ruby-openid (2.5.0)
     sass (3.2.19)
     sass-rails (4.0.3)
@@ -265,6 +271,13 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
+    sunspot (2.2.0)
+      pr_geohash (~> 1.0)
+      rsolr (~> 1.0.7)
+    sunspot_rails (2.2.0)
+      nokogiri
+      rails (>= 3)
+      sunspot (= 2.2.0)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
@@ -305,32 +318,34 @@ DEPENDENCIES
   dynamic_form
   exception_notification
   hpricot
-  interface_utils (= 2.2.3)!
+  interface_utils (= 2.2.4)!
   jbuilder (~> 2.0)
   jquery-rails
   jquery-ui-rails
-  kmaps_engine (= 3.1.9)!
+  kmaps_engine (= 3.2.0)!
   makandra_resource_controller
   memcache-client
   mms_integration (= 2.2.6)!
   newrelic_rpm
   open_id_authentication
   passiverecord (= 0.2)!
   pg
-  places_engine (= 4.1.1)!
+  places_engine (= 4.1.2)!
   places_integration (= 2.1.5)!
   protected_attributes
   proxy_engine (= 2.1.2)!
   rack-openid
   rails (= 4.1.5)
   rails-observers
   restful-authentication (= 2.0.0.beta1)!
+  rsolr
   sass-rails (~> 4.0.3)
   sdoc (~> 0.4.0)
   shanti_integration (= 3.1.1)!
   spawnling
   spring
   subjects_integration (= 0.1.6)!
+  sunspot_rails
   therubyracer
   tinymce-rails
   turbolinks