Update Gemfile and get server starting

.ruby-version

@@ -1 +1 @@
-2.1.1
+2.5.1

.tool-versions

@@ -0,0 +1 @@
+ruby 2.5.1

Gemfile

@@ -1,57 +1,27 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem "rails", "5.2.0"
-gem 'rails', '4.0.4'
 
-# Use sqlite3 as the database for Active Record
+gem "dragonfly"
-gem 'sqlite3'
+gem "jquery-rails"
-
+gem "omniauth-twitter"
-# Use SCSS for stylesheets
+gem "puma"
-gem 'sass-rails', '~> 4.0.2'
+gem "sass-rails"
-
+gem "simple_form"
-# Use Uglifier as compressor for JavaScript assets
+gem "sqlite3"
-gem 'uglifier', '>= 1.3.0'
+gem "uglifier"
-
-# Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
-
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use jquery as the JavaScript library
-gem 'jquery-rails'
-
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
 
 group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
+  gem "sdoc", require: false
-  gem 'sdoc', require: false
 end
 
 group :development, :test do
-  gem 'rspec-rails'
+  gem "better_errors"
-  gem 'pry'
+  gem "binding_of_caller"
-  gem 'better_errors'
+  gem "pry"
-  gem 'binding_of_caller'
+  gem "rspec-rails"
 end
 
 group :test do
-  gem 'capybara'
+  gem "capybara"
 end
-
-gem 'simple_form'
-gem 'omniauth-twitter'
-gem 'dragonfly'
-
-# Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use puma as the app server
-gem 'puma'
-
-# Use Capistrano for deployment
-# gem 'capistrano', group: :development
-
-# Use debugger
-# gem 'debugger', group: [:development, :test]

Gemfile.lock

@@ -1,163 +1,201 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.4)
+    actioncable (5.2.0)
-      actionpack (= 4.0.4)
+      actionpack (= 5.2.0)
-      mail (~> 2.5.4)
+      nio4r (~> 2.0)
-    actionpack (4.0.4)
+      websocket-driver (>= 0.6.1)
-      activesupport (= 4.0.4)
+    actionmailer (5.2.0)
-      builder (~> 3.1.0)
+      actionpack (= 5.2.0)
-      erubis (~> 2.7.0)
+      actionview (= 5.2.0)
-      rack (~> 1.5.2)
+      activejob (= 5.2.0)
-      rack-test (~> 0.6.2)
+      mail (~> 2.5, >= 2.5.4)
-    activemodel (4.0.4)
+      rails-dom-testing (~> 2.0)
-      activesupport (= 4.0.4)
+    actionpack (5.2.0)
-      builder (~> 3.1.0)
+      actionview (= 5.2.0)
-    activerecord (4.0.4)
+      activesupport (= 5.2.0)
-      activemodel (= 4.0.4)
+      rack (~> 2.0)
-      activerecord-deprecated_finders (~> 1.0.2)
+      rack-test (>= 0.6.3)
-      activesupport (= 4.0.4)
+      rails-dom-testing (~> 2.0)
-      arel (~> 4.0.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activerecord-deprecated_finders (1.0.3)
+    actionview (5.2.0)
-    activesupport (4.0.4)
+      activesupport (= 5.2.0)
-      i18n (~> 0.6, >= 0.6.9)
+      builder (~> 3.1)
-      minitest (~> 4.2)
+      erubi (~> 1.4)
-      multi_json (~> 1.3)
+      rails-dom-testing (~> 2.0)
-      thread_safe (~> 0.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-      tzinfo (~> 0.3.37)
+    activejob (5.2.0)
-    arel (4.0.2)
+      activesupport (= 5.2.0)
-    atomic (1.1.16)
+      globalid (>= 0.3.6)
-    better_errors (1.1.0)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (9.0.0)
+    better_errors (2.4.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
-    binding_of_caller (0.7.2)
+      rack (>= 0.9.0)
+    binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    builder (3.1.4)
+    builder (3.2.3)
-    capybara (2.2.1)
+    capybara (3.5.1)
-      mime-types (>= 1.16)
+      addressable
-      nokogiri (>= 1.3.3)
+      mini_mime (>= 0.1.3)
-      rack (>= 1.0.0)
+      nokogiri (~> 1.8)
-      rack-test (>= 0.5.4)
+      rack (>= 1.6.0)
-      xpath (~> 2.0)
+      rack-test (>= 0.6.3)
-    coderay (1.1.0)
+      xpath (~> 3.1)
-    coffee-rails (4.0.1)
+    coderay (1.1.2)
-      coffee-script (>= 2.2.0)
+    concurrent-ruby (1.0.5)
-      railties (>= 4.0.0, < 5.0)
+    crass (1.0.4)
-    coffee-script (2.2.0)
+    debug_inspector (0.0.3)
-      coffee-script-source
+    diff-lcs (1.3)
-      execjs
+    dragonfly (1.1.5)
-    coffee-script-source (1.7.0)
+      addressable (~> 2.3)
-    debug_inspector (0.0.2)
-    diff-lcs (1.2.5)
-    dragonfly (1.0.3)
       multi_json (~> 1.0)
-      rack
+      rack (>= 1.3)
-    erubis (2.7.0)
+    erubi (1.7.1)
-    execjs (2.0.2)
+    execjs (2.7.0)
-    hashie (2.0.5)
+    ffi (1.9.25)
-    hike (1.2.3)
+    globalid (0.4.1)
-    i18n (0.6.9)
+      activesupport (>= 4.2.0)
-    jbuilder (1.5.3)
+    hashie (3.5.7)
-      activesupport (>= 3.0.0)
+    i18n (1.0.1)
-      multi_json (>= 1.2.0)
+      concurrent-ruby (~> 1.0)
-    jquery-rails (3.1.0)
+    jquery-rails (4.3.3)
-      railties (>= 3.0, < 5.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    loofah (2.2.2)
-    mail (2.5.4)
+      crass (~> 1.0.2)
-      mime-types (~> 1.16)
+      nokogiri (>= 1.5.9)
-      treetop (~> 1.4.8)
+    mail (2.7.0)
-    method_source (0.8.2)
+      mini_mime (>= 0.1.1)
-    mime-types (1.25.1)
+    marcel (0.3.2)
-    mini_portile (0.5.2)
+      mimemagic (~> 0.3.2)
-    minitest (4.7.5)
+    method_source (0.9.0)
-    multi_json (1.9.2)
+    mimemagic (0.3.2)
-    nokogiri (1.6.1)
+    mini_mime (1.0.0)
-      mini_portile (~> 0.5.0)
+    mini_portile2 (2.3.0)
-    oauth (0.4.7)
+    minitest (5.11.3)
-    omniauth (1.2.1)
+    multi_json (1.13.1)
-      hashie (>= 1.2, < 3)
+    nio4r (2.3.1)
-      rack (~> 1.0)
+    nokogiri (1.8.4)
-    omniauth-oauth (1.0.1)
+      mini_portile2 (~> 2.3.0)
+    oauth (0.5.4)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-twitter (1.0.1)
+    omniauth-twitter (1.4.0)
-      multi_json (~> 1.3)
+      omniauth-oauth (~> 1.1)
-      omniauth-oauth (~> 1.0)
+      rack
-    polyglot (0.3.4)
+    pry (0.11.3)
-    pry (0.9.12.6)
+      coderay (~> 1.1.0)
-      coderay (~> 1.0)
+      method_source (~> 0.9.0)
-      method_source (~> 0.8)
+    public_suffix (3.0.2)
-      slop (~> 3.4)
+    puma (3.12.0)
-    puma (2.8.1)
+    rack (2.0.5)
-      rack (>= 1.1, < 2.0)
+    rack-test (1.1.0)
-    rack (1.5.2)
+      rack (>= 1.0, < 3)
-    rack-test (0.6.2)
+    rails (5.2.0)
-      rack (>= 1.0)
+      actioncable (= 5.2.0)
-    rails (4.0.4)
+      actionmailer (= 5.2.0)
-      actionmailer (= 4.0.4)
+      actionpack (= 5.2.0)
-      actionpack (= 4.0.4)
+      actionview (= 5.2.0)
-      activerecord (= 4.0.4)
+      activejob (= 5.2.0)
-      activesupport (= 4.0.4)
+      activemodel (= 5.2.0)
-      bundler (>= 1.3.0, < 2.0)
+      activerecord (= 5.2.0)
-      railties (= 4.0.4)
+      activestorage (= 5.2.0)
-      sprockets-rails (~> 2.0.0)
+      activesupport (= 5.2.0)
-    railties (4.0.4)
+      bundler (>= 1.3.0)
-      actionpack (= 4.0.4)
+      railties (= 5.2.0)
-      activesupport (= 4.0.4)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (12.3.1)
-    rdoc (4.1.1)
+    rb-fsevent (0.10.3)
-      json (~> 1.4)
+    rb-inotify (0.9.10)
-    rspec-core (2.14.8)
+      ffi (>= 0.5.0, < 2)
-    rspec-expectations (2.14.5)
+    rdoc (6.0.4)
-      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-core (3.8.0)
-    rspec-mocks (2.14.6)
+      rspec-support (~> 3.8.0)
-    rspec-rails (2.14.1)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.0)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
+      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 2.14.0)
+      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-mocks (~> 3.8.0)
-    sass (3.2.18)
+      rspec-support (~> 3.8.0)
-    sass-rails (4.0.2)
+    rspec-support (3.8.0)
-      railties (>= 4.0.0, < 5.0)
+    sass (3.5.7)
-      sass (~> 3.2.0)
+      sass-listen (~> 4.0.0)
-      sprockets (~> 2.8, <= 2.11.0)
+    sass-listen (4.0.0)
-      sprockets-rails (~> 2.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
-    sdoc (0.4.0)
+      rb-inotify (~> 0.9, >= 0.9.7)
-      json (~> 1.8)
+    sass-rails (5.0.7)
-      rdoc (~> 4.0, < 5.0)
+      railties (>= 4.0.0, < 6)
-    simple_form (3.0.1)
+      sass (~> 3.1)
-      actionpack (>= 4.0.0, < 4.1)
+      sprockets (>= 2.8, < 4.0)
-      activemodel (>= 4.0.0, < 4.1)
+      sprockets-rails (>= 2.0, < 4.0)
-    slop (3.4.7)
+      tilt (>= 1.1, < 3)
-    sprockets (2.11.0)
+    sdoc (1.0.0)
-      hike (~> 1.2)
+      rdoc (>= 5.0)
-      multi_json (~> 1.0)
+    simple_form (4.0.1)
-      rack (~> 1.0)
+      actionpack (>= 5.0)
-      tilt (~> 1.1, != 1.3.0)
+      activemodel (>= 5.0)
-    sprockets-rails (2.0.1)
+    sprockets (3.7.2)
-      actionpack (>= 3.0)
+      concurrent-ruby (~> 1.0)
-      activesupport (>= 3.0)
+      rack (> 1, < 3)
-      sprockets (~> 2.8)
+    sprockets-rails (3.2.1)
-    sqlite3 (1.3.9)
+      actionpack (>= 4.0)
-    thor (0.19.0)
+      activesupport (>= 4.0)
-    thread_safe (0.3.1)
+      sprockets (>= 3.0.0)
-      atomic (>= 1.1.7, < 2)
+    sqlite3 (1.3.13)
-    tilt (1.4.1)
+    thor (0.20.0)
-    treetop (1.4.15)
+    thread_safe (0.3.6)
-      polyglot
+    tilt (2.0.8)
-      polyglot (>= 0.3.1)
+    tzinfo (1.2.5)
-    tzinfo (0.3.39)
+      thread_safe (~> 0.1)
-    uglifier (2.5.0)
+    uglifier (4.1.17)
-      execjs (>= 0.3.0)
+      execjs (>= 0.3.0, < 3)
-      json (>= 1.8.0)
+    websocket-driver (0.7.0)
-    xpath (2.0.0)
+      websocket-extensions (>= 0.1.0)
-      nokogiri (~> 1.3)
+    websocket-extensions (0.1.3)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -166,17 +204,18 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   capybara
-  coffee-rails (~> 4.0.0)
   dragonfly
-  jbuilder (~> 1.2)
   jquery-rails
   omniauth-twitter
   pry
   puma
-  rails (= 4.0.4)
+  rails (= 5.2.0)
   rspec-rails
-  sass-rails (~> 4.0.2)
+  sass-rails
   sdoc
   simple_form
   sqlite3
-  uglifier (>= 1.3.0)
+  uglifier
+
+BUNDLED WITH
+   1.16.3

app/controllers/sessions_controller.rb

@@ -14,6 +14,6 @@ class SessionsController < ApplicationController
   private
 
   def auth
-    request.env['omniauth.auth']
+    request.env["omniauth.auth"]
   end
 end

db/migrate/20140323140443_create_images.rb

@@ -1,4 +1,4 @@
-class CreateImages < ActiveRecord::Migration
+class CreateImages < ActiveRecord::Migration[5.2]
   def change
     create_table :images do |t|
       t.integer :user_id

db/migrate/20140324161505_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[5.2]
   def change
     create_table :users do |t|
       t.string :email

db/migrate/20140324170840_add_avatar_to_user.rb

@@ -1,4 +1,4 @@
-class AddAvatarToUser < ActiveRecord::Migration
+class AddAvatarToUser < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :avatar_uid, :string
   end

db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,25 +10,25 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140324170840) do
+ActiveRecord::Schema.define(version: 2014_03_24_170840) do
 
-  create_table "images", force: true do |t|
+  create_table "images", force: :cascade do |t|
-    t.integer  "user_id"
+    t.integer "user_id"
-    t.string   "image_uid"
+    t.string "image_uid"
-    t.string   "image_name"
+    t.string "image_name"
-    t.datetime "created_at"
+    t.datetime "created_at", null: false
-    t.datetime "updated_at"
+    t.datetime "updated_at", null: false
   end
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
-    t.string   "email"
+    t.string "email"
-    t.string   "username"
+    t.string "username"
-    t.string   "name"
+    t.string "name"
-    t.string   "provider"
+    t.string "provider"
-    t.string   "uid"
+    t.string "uid"
-    t.datetime "created_at"
+    t.datetime "created_at", null: false
-    t.datetime "updated_at"
+    t.datetime "updated_at", null: false
-    t.string   "avatar_uid"
+    t.string "avatar_uid"
   end
 
 end