Clean Gemfile

4 files changed, 75 insertions, 78 deletions

diff --git a/Gemfile b/Gemfile
index cac64c5db..2cd6548f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.1.10'
+gem 'rails', '~> 4.1.10'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.3'
@@ -36,13 +36,13 @@ gem 'spring', group: :development
 # gem 'debugger', group: [:development, :test]
 
 # API Rest
-gem 'sawyer', "~> 0.6.0"
+gem 'sawyer', '~> 0.6.0'
 gem 'faraday_middleware', '~> 0.9.1'
 
 platforms :jruby do
   gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.3'
   gem 'jruby-openssl'
-  gem "jruby-rack-worker"
+  gem 'jruby-rack-worker'
   gem 'warbler'
   gem 'therubyrhino'
 end
@@ -63,41 +63,22 @@ gem 'devise-encryptable'
 gem 'devise_invitable'
 
 # Map, Geolocalization
-gem "map_layers", "0.0.4"
-gem "georuby-ext", "0.0.5"
-gem "georuby", "2.3.0" # Fix version for georuby-ext because api has changed
+gem 'map_layers', '0.0.4'
+gem 'georuby-ext', '0.0.5'
+gem 'georuby', '2.3.0' # Fix version for georuby-ext because api has changed
 
 gem 'mimemagic'
 
 # User interface
 gem 'language_engine', '0.0.6'
-gem 'calendar_helper', "0.2.5"
+gem 'calendar_helper', '0.2.5'
 gem 'cocoon'
-gem 'formtastic', "2.3.1"
+gem 'formtastic', '2.3.1'
 gem 'RedCloth'
 gem 'simple_form', '~> 3.1.0'
 gem 'font-awesome-sass', '~> 4.2.0'
 gem 'will_paginate-bootstrap', '~> 1.0.1'
-gem "breadcrumbs_on_rails"
-
-# TODO : Move these resources to rails assets
-gem "modernizr-rails", "~> 2.0.6"
-
-# Javascript
-source 'https://rails-assets.org' do
-  gem 'rails-assets-morrisjs',   '~> 0.5.1'
-  gem 'rails-assets-raphael',    '~> 2.1.3'
-  gem 'rails-assets-footable',   '~> 2.0.3'
-
-  # Use twitter bootstrap resources
-  gem 'rails-assets-bootstrap-sass-official', '~> 3.3.0'
-  gem 'rails-assets-tagmanager', '~> 3.0.1.0'
-  gem 'rails-assets-typeahead.js', '~> 0.10.5'
-  gem 'rails-assets-typeahead.js-bootstrap3.less'
-  gem 'rails-assets-respond'
-  gem 'rails-assets-eonasdan-bootstrap-datetimepicker', '~> 3.1.3'
-  gem 'rails-assets-jquery-tokeninput', '~> 1.7.0'
-end
+gem 'breadcrumbs_on_rails'
 
 # Format Output
 gem 'json'
@@ -115,20 +96,17 @@ gem 'squeel'
 
 gem 'enumerize', '~> 0.10.0'
 
-gem 'ninoxe', :git => 'https://github.com/afimb/ninoxe.git'
-#gem 'ninoxe', '1.2.2'
+gem 'ninoxe', github: 'afimb/ninoxe'
 #gem 'ninoxe', path: '../ninoxe'
 
 gem 'acts_as_list', '~> 0.6.0'
-gem "acts_as_tree", '~> 2.1.0', :require => "acts_as_tree"
+gem 'acts_as_tree', '~> 2.1.0', require: 'acts_as_tree'
 
 gem 'rabl'
 
 gem 'delayed_job_active_record'
 gem 'devise-async'
-gem 'apartment', "~> 1.0.0"
-
-gem 'newrelic_rpm'
+gem 'apartment', '~> 1.0.0'
 
 group :development do
   gem 'capistrano',        '2.13.5'
@@ -148,21 +126,40 @@ end
 
 group :test, :development do
   gem 'pry-rails'
-  gem "rspec-rails", "~> 3.1.0"
-  gem "fakeweb"
-  gem 'capybara', "~> 2.4.0"
+  gem 'rspec-rails', '~> 3.1.0'
+  gem 'fakeweb'
+  gem 'capybara', '~> 2.4.0'
   gem 'poltergeist'
   gem 'launchy'
   gem 'factory_girl_rails', '~> 4.0'
   # gem 'i18n-tasks'
-  gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
-  gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
+  gem 'rb-inotify', require: RUBY_PLATFORM.include?('linux') && 'rb-inotify'
+  gem 'rb-fsevent', require: RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'
   gem 'transpec'
   gem 'database_cleaner'
   gem 'shoulda-matchers'
 end
 
 group :production do
-   gem "SyslogLogger", :require => "syslog/logger"
-   gem "daemons"
+  gem 'SyslogLogger', require: 'syslog/logger'
+  gem 'daemons'
+  gem 'newrelic_rpm'
+end
+
+# Rails Assets
+source 'https://rails-assets.org' do
+  gem 'rails-assets-morrisjs',   '~> 0.5.1'
+  gem 'rails-assets-raphael',    '~> 2.1.3'
+  gem 'rails-assets-footable',   '~> 2.0.3'
+
+  # Use twitter bootstrap resources
+  gem 'rails-assets-bootstrap-sass-official', '~> 3.3.0'
+  gem 'rails-assets-tagmanager', '~> 3.0.1.0'
+  gem 'rails-assets-typeahead.js', '~> 0.10.5'
+  gem 'rails-assets-typeahead.js-bootstrap3.less'
+  gem 'rails-assets-respond'
+  gem 'rails-assets-eonasdan-bootstrap-datetimepicker', '~> 3.1.3'
+  gem 'rails-assets-jquery-tokeninput', '~> 1.7.0'
+
+  gem 'rails-assets-modernizr', '~> 2.0.6'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c4a21fdeb..422745977 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 GIT
-  remote: https://github.com/afimb/ninoxe.git
-  revision: 766d2293bde741d34a5b9f23da21e5dc8d66bb2f
+  remote: git://github.com/afimb/ninoxe.git
+  revision: 97daab185c83e7c36f4b4b3400bb63c5d9d0f078
   specs:
-    ninoxe (1.2.1)
+    ninoxe (1.2.2)
       activerecord (~> 4.1.1)
       acts-as-taggable-on (>= 3)
       acts_as_list (>= 0.1.6)
@@ -19,32 +19,32 @@ GEM
     RedCloth (4.2.9)
     RedCloth (4.2.9-java)
     SyslogLogger (2.0)
-    actionmailer (4.1.10)
-      actionpack (= 4.1.10)
-      actionview (= 4.1.10)
+    actionmailer (4.1.13)
+      actionpack (= 4.1.13)
+      actionview (= 4.1.13)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.10)
-      actionview (= 4.1.10)
-      activesupport (= 4.1.10)
+    actionpack (4.1.13)
+      actionview (= 4.1.13)
+      activesupport (= 4.1.13)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.10)
-      activesupport (= 4.1.10)
+    actionview (4.1.13)
+      activesupport (= 4.1.13)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.10)
-      activesupport (= 4.1.10)
+    activemodel (4.1.13)
+      activesupport (= 4.1.13)
       builder (~> 3.1)
-    activerecord (4.1.10)
-      activemodel (= 4.1.10)
-      activesupport (= 4.1.10)
+    activerecord (4.1.13)
+      activemodel (= 4.1.13)
+      activesupport (= 4.1.13)
       arel (~> 5.0.0)
     activerecord-jdbc-adapter (1.3.15)
       activerecord (>= 2.2)
     activerecord-jdbcpostgresql-adapter (1.3.15)
       activerecord-jdbc-adapter (~> 1.3.15)
       jdbc-postgres (>= 9.1)
-    activesupport (4.1.10)
+    activesupport (4.1.13)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -242,11 +242,10 @@ GEM
       rack-contrib (~> 1.1)
       railties (>= 3.0.0, < 5.0.0)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.6.2)
     mimemagic (0.3.0)
     mini_portile (0.6.2)
     minitest (5.8.2)
-    modernizr-rails (2.0.6)
     multi_json (1.11.2)
     multipart-post (2.0.0)
     nenv (0.2.0)
@@ -291,20 +290,20 @@ GEM
       railties (>= 3.1, < 5.0)
     rabl (0.11.6)
       activesupport (>= 2.3.14)
-    rack (1.5.3)
+    rack (1.5.5)
     rack-contrib (1.2.0)
       rack (>= 0.9.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.10)
-      actionmailer (= 4.1.10)
-      actionpack (= 4.1.10)
-      actionview (= 4.1.10)
-      activemodel (= 4.1.10)
-      activerecord (= 4.1.10)
-      activesupport (= 4.1.10)
+    rails (4.1.13)
+      actionmailer (= 4.1.13)
+      actionpack (= 4.1.13)
+      actionview (= 4.1.13)
+      activemodel (= 4.1.13)
+      activerecord (= 4.1.13)
+      activesupport (= 4.1.13)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.10)
+      railties (= 4.1.13)
       sprockets-rails (~> 2.0)
     rails-assets-bootstrap (3.1.1)
       rails-assets-jquery (>= 1.9.0)
@@ -320,6 +319,7 @@ GEM
     rails-assets-jquery-tokeninput (1.7.0)
       rails-assets-jquery (>= 1.5)
     rails-assets-mocha (1.17.1)
+    rails-assets-modernizr (2.0.6)
     rails-assets-moment (2.10.3)
     rails-assets-morrisjs (0.5.1)
       rails-assets-jquery (>= 2.1.0)
@@ -342,9 +342,9 @@ GEM
     rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.1.10)
-      actionpack (= 4.1.10)
-      activesupport (= 4.1.10)
+    railties (4.1.13)
+      actionpack (= 4.1.13)
+      activesupport (= 4.1.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
@@ -420,12 +420,12 @@ GEM
     spreadsheet (1.0.2)
       ruby-ole (>= 1.0)
     spring (1.3.3)
-    sprockets (2.12.3)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -530,7 +530,6 @@ DEPENDENCIES
   map_layers (= 0.0.4)
   meta_request
   mimemagic
-  modernizr-rails (~> 2.0.6)
   newrelic_rpm
   ninoxe!
   pg
@@ -538,11 +537,12 @@ DEPENDENCIES
   pry-rails
   quiet_assets (~> 1.0)
   rabl
-  rails (= 4.1.10)
+  rails (~> 4.1.10)
   rails-assets-bootstrap-sass-official (~> 3.3.0)!
   rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3)!
   rails-assets-footable (~> 2.0.3)!
   rails-assets-jquery-tokeninput (~> 1.7.0)!
+  rails-assets-modernizr (~> 2.0.6)!
   rails-assets-morrisjs (~> 0.5.1)!
   rails-assets-raphael (~> 2.1.3)!
   rails-assets-respond!
diff --git a/spec/controllers/vehicle_journey_frequencies_controller_spec.rb b/spec/controllers/vehicle_journey_frequencies_controller_spec.rb
index 6316d328a..61636e334 100644
--- a/spec/controllers/vehicle_journey_frequencies_controller_spec.rb
+++ b/spec/controllers/vehicle_journey_frequencies_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe VehicleJourneyFrequenciesController, :type => :controller do
 
diff --git a/spec/helpers/vehicle_journey_frequencies_helper_spec.rb b/spec/helpers/vehicle_journey_frequencies_helper_spec.rb
index a43081e17..97a1df052 100644
--- a/spec/helpers/vehicle_journey_frequencies_helper_spec.rb
+++ b/spec/helpers/vehicle_journey_frequencies_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 # Specs in this file have access to a helper object that includes
 # the VehicleJourneyFrequenciesHelper. For example: