Upgrading to Rails 4.0.13

Author: MohamedZainFayed

.rspec

@@ -1,2 +1,2 @@
 --color
---profile
+--require spec_helper

Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.0.12'
+gem 'rails', '~> 4.0.13'
 gem 'rails-i18n'
+gem 'rake', '< 11.0'
 
 gem 'mysql2', '~> 0.3.21'
 gem 'daemons-rails'
@@ -70,7 +71,7 @@ gem 'simple_captcha2', require: 'simple_captcha'
 gem 'rest-client', '~> 1.6.8'
 
 group :development, :test do
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails'
   gem 'faker', '~> 1.4.3'
   gem 'mina'
   gem 'mina-slack', github: 'InfraexDev/mina-slack'
@@ -87,13 +88,13 @@ group :development, :test do
 end
 
 group :test do
-  gem 'database_cleaner'
-  gem 'mocha', :require => false
-  gem 'shoulda-matchers'
   gem 'capybara'
+  gem 'database_cleaner'
   gem 'launchy'
-  gem 'selenium-webdriver'
+  gem 'mocha', :require => false
   gem 'poltergeist'
+  gem 'selenium-webdriver'
+  gem 'shoulda-matchers'
 
   # rspec-rails rely on test-unit if rails version less then 4.1.0
   # but test-unit has been removed from ruby core since 2.2.0

Gemfile.lock

@@ -17,27 +17,27 @@ GEM
   remote: https://rubygems.org/
   specs:
     aasm (3.4.0)
-    actionmailer (4.0.12)
-      actionpack (= 4.0.12)
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.12)
-      activesupport (= 4.0.12)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     active_hash (1.3.0)
       activesupport (>= 2.2.2)
-    activemodel (4.0.12)
-      activesupport (= 4.0.12)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
-    activerecord (4.0.12)
-      activemodel (= 4.0.12)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.12)
+      activesupport (= 4.0.13)
       arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.12)
+    activerecord-deprecated_finders (1.0.4)
+    activesupport (4.0.13)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -52,7 +52,7 @@ GEM
       eventmachine
     angularjs-rails (1.3.15)
     arel (4.0.2)
-    atomic (1.1.99)
+    atomic (1.1.101)
     awesome_print (1.2.0)
     axiom-types (0.1.0)
       descendants_tracker (~> 0.0.3)
@@ -106,6 +106,7 @@ GEM
       execjs
     coffee-script-source (1.7.0)
     columnize (0.3.6)
+    concurrent-ruby (1.0.5)
     countries (0.9.3)
       currencies (~> 0.4.2)
     country_select (2.1.0)
@@ -145,10 +146,10 @@ GEM
     erubis (2.7.0)
     eventmachine (1.0.4)
     execjs (2.2.1)
-    factory_girl (4.3.0)
+    factory_bot (4.10.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.3.0)
-      factory_girl (~> 4.3.0)
+    factory_bot_rails (4.10.0)
+      factory_bot (~> 4.10.0)
       railties (>= 3.0.0)
     faker (1.4.3)
       i18n (~> 0.5)
@@ -188,7 +189,8 @@ GEM
     http_accept_language (2.0.1)
     http_parser.rb (0.6.0)
     httpclient (2.3.4.1)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.0)
     jbuilder (2.0.2)
       activesupport (>= 3.0.0)
@@ -208,8 +210,8 @@ GEM
       addressable (~> 2.3)
     liability-proof (0.0.9)
       awesome_print
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     mails_viewer (0.1.2)
       jquery-datatables-rails
       jquery-rails (>= 2.0.1)
@@ -224,13 +226,14 @@ GEM
     mina (0.3.0)
       open4
       rake
+    mini_mime (1.0.0)
     mini_portile (0.6.2)
     minitest (4.7.5)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
-    multi_json (1.10.1)
+    multi_json (1.13.1)
     multi_xml (0.5.5)
     mysql2 (0.3.21)
     nokogiri (1.6.5)
@@ -260,13 +263,14 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
+    puma (3.11.4)
     pusher (0.12.0)
       httpclient (~> 2.3.0)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
-    rack (1.5.2)
+    rack (1.5.5)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (3.0.0)
@@ -277,25 +281,25 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.12)
-      actionmailer (= 4.0.12)
-      actionpack (= 4.0.12)
-      activerecord (= 4.0.12)
-      activesupport (= 4.0.12)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.12)
+      railties (= 4.0.13)
       sprockets-rails (~> 2.0)
     rails-i18n (4.0.1)
       i18n (~> 0.6)
       rails (~> 4.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.0.12)
-      actionpack (= 4.0.12)
-      activesupport (= 4.0.12)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     rbtree (0.4.2)
     rdoc (4.1.1)
       json (~> 1.4)
@@ -370,15 +374,15 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     structured_warnings (0.1.4)
     temple (0.6.7)
     test-unit (3.0.8)
       power_assert
-    thor (0.19.1)
+    thor (0.20.0)
     thread_safe (0.1.3)
       atomic
     tilt (1.4.1)
@@ -387,7 +391,7 @@ GEM
       builder (>= 2.1.2)
       jwt (>= 0.1.2)
       multi_json (>= 1.3.0)
-    tzinfo (0.3.42)
+    tzinfo (0.3.54)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -439,7 +443,7 @@ DEPENDENCIES
   em-websocket (~> 0.5.1)
   enumerize
   eventmachine (~> 1.0.4)
-  factory_girl_rails
+  factory_bot_rails
   faker (~> 1.4.3)
   figaro
   font-awesome-sass
@@ -470,12 +474,14 @@ DEPENDENCIES
   phonelib (~> 0.3.5)
   poltergeist
   pry-rails
+  puma
   pusher
   quiet_assets
   rack-attack (~> 3.0.0)
-  rails (~> 4.0.12)
+  rails (~> 4.0.13)
   rails-i18n
   rails-observers
+  rake (< 11.0)
   rbtree
   redis-rails
   rest-client (~> 1.6.8)
@@ -495,4 +501,4 @@ DEPENDENCIES
   whenever (~> 0.9.2)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

config/boot.rb

@@ -3,4 +3,4 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

config/database.yml

@@ -7,3 +7,12 @@ production:
   pool: 10
   reconnect: true
   host: <%= ENV["MYSQL_HOST"] %>
+
+development: &defaults
+  adapter: mysql2
+  encoding: utf8
+  database: peatio_v2_development
+  username: root
+  password: 12345
+  pool: 10
+  reconnect: true

config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
+# Initialize the Rails application.
 Peatio::Application.initialize!

config/initializers/secret_token.rb

@@ -1 +1,12 @@
-Peatio::Application.config.secret_key_base = '4adeecaaba6c4a5474d9c8d7893dd1f4243abdcd58187d8e628d3cf0be1855b5f0b780f63de790e8eb3fde4ba032b4d183ce623ed321c296382d7946826fcc5e'
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+Peatio::Application.config.secret_key_base = 'f712e69206796ba8932125cb932c5ea147f6ce6eb86e0e22659d61a8a4217b9b1c63ff35533e64324c239fb0cb4d7ebe9d78cb4e50d8ab5d51801079d5e63933'

config/initializers/session_store.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Peatio::Application.config.session_store :cookie_store, key: '_peatio_session'

config/locales/en.yml

@@ -0,0 +1,23 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+en:
+  hello: "Hello world"