diff options
| -rw-r--r-- | Gemfile | 5 | ||||
| -rw-r--r-- | Gemfile.lock | 45 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
3 files changed, 20 insertions, 31 deletions
@@ -23,8 +23,6 @@ gem 'devise_invitable' # Map, Geolocalization gem "map_layers", "0.0.4" -gem "georuby-ext", :git => 'git://github.com/dryade/georuby-ext.git' -#gem "georuby-ext", "0.0.2" # User interface gem 'user_interface', "0.0.4" @@ -47,8 +45,7 @@ gem 'inherited_resources' gem 'will_paginate', '~> 3.0' gem 'ransack' gem 'squeel' -#gem 'ninoxe', :git => 'git://github.com/dryade/ninoxe.git' -gem 'ninoxe', '0.1.3' +gem 'ninoxe', '0.1.5' 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 889847519..bb1f94e0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,3 @@ -GIT - remote: git://github.com/dryade/georuby-ext.git - revision: 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: @@ -90,7 +75,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) - dbf (2.0.5) + dbf (2.0.6) fastercsv (~> 1.5.4) delayed_job (3.0.3) activesupport (~> 3.0) @@ -108,7 +93,7 @@ GEM railties (~> 3.0) diff-lcs (1.2.1) dr-apartment (0.14.1) - dr-ffi-proj4 (0.0.1) + dr-ffi-proj4 (0.0.3) ffi (>= 1.0.0) erubis (2.7.0) execjs (1.4.0) @@ -121,15 +106,23 @@ GEM fastercsv (1.5.5) ffi (1.0.11) ffi (1.0.11-java) - ffi-geos (0.1.1) + ffi-geos (0.3.0) ffi (>= 1.0.0) foreigner (1.4.0) activerecord (>= 3.0.0) formtastic (2.2.1) actionpack (>= 3.0) - geokit (1.6.5) - multi_json - georuby (1.9.8) + 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) gravatar_image_tag (1.1.3) guard (1.3.2) listen (>= 0.4.2) @@ -157,7 +150,6 @@ GEM jruby-rack (>= 1.1.1) json (1.7.7) json (1.7.7-java) - json_pure (1.8.0) launchy (2.1.0) addressable (~> 2.2.6) launchy (2.1.0-java) @@ -186,11 +178,11 @@ GEM net-ssh (2.6.2) net-ssh-gateway (1.1.0) net-ssh (>= 1.99.1) - ninoxe (0.1.3) - activerecord (~> 3.1) + ninoxe (0.1.5) + activerecord (>= 3.1.3, < 3.2.14) acts_as_list (~> 0.1.6) foreigner (= 1.4.0) - georuby-ext (= 0.0.2) + georuby-ext (= 0.0.5) nokogiri (1.5.10) nokogiri (1.5.10-java) open4 (1.3.0) @@ -343,7 +335,6 @@ DEPENDENCIES dr-apartment factory_girl_rails (= 1.7) formtastic - georuby-ext! gravatar_image_tag guard guard-rspec @@ -355,7 +346,7 @@ DEPENDENCIES launchy map_layers (= 0.0.4) modernizr-rails (~> 2.0.6) - ninoxe (= 0.1.3) + ninoxe (= 0.1.5) pg (~> 0.11.0) rabl rails (= 3.2.6) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d18359ce0..97b0e4ed8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -14,6 +14,7 @@ unless defined?(FactoryGirl) require 'spec/factories.rb' end require 'chouette_factories' +require 'georuby-ext' # Requires supporting ruby files with custom matchers and macros, etc, # in spec/support/ and its subdirectories. |