Merge branch 'V2_1_0' of github.com:afimb/chouette2 into V2_1_0

2 files changed, 42 insertions, 20 deletions

diff --git a/Gemfile b/Gemfile
index 451b51eac..a07288cf9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,13 @@ gem 'devise_invitable'
 
 # Map, Geolocalization
 gem "map_layers", "0.0.4"
+gem "georuby-ext", :git => 'https://github.com/dryade/georuby-ext.git' , :ref => '69e3460141d831f0ad76780ee2b3f0a925a744f8'
+gem "geokit","1.6.5"
+gem "dbf","2.0.5"
+gem "json_pure","1.7.7"
+gem "multi_json","1.7.7"
+
+#gem "georuby-ext", "0.0.2"
 
 # User interface
 gem 'user_interface', "0.0.4"
@@ -45,7 +52,8 @@ gem 'inherited_resources'
 gem 'will_paginate', '~> 3.0'
 gem 'ransack'
 gem 'squeel'
-gem 'ninoxe', '0.1.5'
+#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git'
+gem 'ninoxe', '0.1.3'
 gem 'acts_as_list', '0.1.6'
 gem "acts_as_tree-1.8", '1.1.0', :require => "acts_as_tree"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index bb1f94e0d..5de7519a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,19 @@
+GIT
+  remote: https://github.com/dryade/georuby-ext.git
+  revision: 69e3460141d831f0ad76780ee2b3f0a925a744f8
+  ref: 69e3460141d831f0ad76780ee2b3f0a925a744f8
+  specs:
+    georuby-ext (0.0.2)
+      activesupport
+      dbf
+      dr-ffi-proj4 (= 0.0.1)
+      ffi-geos (= 0.1.1)
+      geokit
+      georuby (= 1.9.8)
+      json_pure
+      nokogiri (= 1.5.10)
+      rgeo (= 0.3.20)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -75,7 +91,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    dbf (2.0.6)
+    dbf (2.0.5)
       fastercsv (~> 1.5.4)
     delayed_job (3.0.3)
       activesupport (~> 3.0)
@@ -93,7 +109,7 @@ GEM
       railties (~> 3.0)
     diff-lcs (1.2.1)
     dr-apartment (0.14.1)
-    dr-ffi-proj4 (0.0.3)
+    dr-ffi-proj4 (0.0.1)
       ffi (>= 1.0.0)
     erubis (2.7.0)
     execjs (1.4.0)
@@ -106,23 +122,15 @@ GEM
     fastercsv (1.5.5)
     ffi (1.0.11)
     ffi (1.0.11-java)
-    ffi-geos (0.3.0)
+    ffi-geos (0.1.1)
       ffi (>= 1.0.0)
     foreigner (1.4.0)
       activerecord (>= 3.0.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    geokit (1.6.7)
-      multi_json (>= 1.3.2)
-    georuby (2.2.1)
-    georuby-ext (0.0.5)
-      activesupport (>= 3.2.6)
-      dbf
-      dr-ffi-proj4 (>= 0.0.3)
-      ffi-geos (>= 0.1.1)
-      geokit (= 1.6.7)
-      georuby (>= 1.9.8)
-      rgeo (>= 0.3.20)
+    geokit (1.6.5)
+      multi_json
+    georuby (1.9.8)
     gravatar_image_tag (1.1.3)
     guard (1.3.2)
       listen (>= 0.4.2)
@@ -132,7 +140,7 @@ GEM
     has_scope (0.5.1)
     highline (1.6.15)
     hike (1.2.2)
-    i18n (0.6.4)
+    i18n (0.6.5)
     inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
       responders (~> 0.6)
@@ -150,6 +158,7 @@ GEM
       jruby-rack (>= 1.1.1)
     json (1.7.7)
     json (1.7.7-java)
+    json_pure (1.7.7)
     launchy (2.1.0)
       addressable (~> 2.2.6)
     launchy (2.1.0-java)
@@ -178,11 +187,11 @@ GEM
     net-ssh (2.6.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    ninoxe (0.1.5)
-      activerecord (>= 3.1.3, < 3.2.14)
+    ninoxe (0.1.3)
+      activerecord (~> 3.1)
       acts_as_list (~> 0.1.6)
       foreigner (= 1.4.0)
-      georuby-ext (= 0.0.5)
+      georuby-ext (= 0.0.2)
     nokogiri (1.5.10)
     nokogiri (1.5.10-java)
     open4 (1.3.0)
@@ -329,12 +338,15 @@ DEPENDENCIES
   cocoon (= 1.1.2)
   coffee-rails (~> 3.2.1)
   coffee-script-source
+  dbf (= 2.0.5)
   delayed_job_active_record
   devise (= 2.1.3)
   devise_invitable
   dr-apartment
   factory_girl_rails (= 1.7)
   formtastic
+  geokit (= 1.6.5)
+  georuby-ext!
   gravatar_image_tag
   guard
   guard-rspec
@@ -343,10 +355,12 @@ DEPENDENCIES
   jruby-openssl
   jruby-rack-worker
   json
+  json_pure (= 1.7.7)
   launchy
   map_layers (= 0.0.4)
   modernizr-rails (~> 2.0.6)
-  ninoxe (= 0.1.5)
+  multi_json (= 1.7.7)
+  ninoxe (= 0.1.3)
   pg (~> 0.11.0)
   rabl
   rails (= 3.2.6)