From ff1e08b46c84785bfeb34a5b559ea93323937200 Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Tue, 7 Aug 2018 17:26:29 -0400 Subject: [PATCH] Update Gemfile and get server starting --- .ruby-version | 2 +- .tool-versions | 1 + Gemfile | 62 +--- Gemfile.lock | 341 ++++++++++-------- app/controllers/sessions_controller.rb | 2 +- db/migrate/20140323140443_create_images.rb | 2 +- db/migrate/20140324161505_create_users.rb | 2 +- .../20140324170840_add_avatar_to_user.rb | 2 +- db/schema.rb | 33 +- 9 files changed, 228 insertions(+), 219 deletions(-) create mode 100644 .tool-versions diff --git a/.ruby-version b/.ruby-version index 3e3c2f1..73462a5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.1 +2.5.1 diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..0d37153 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +ruby 2.5.1 diff --git a/Gemfile b/Gemfile index 57b9681..a8c60a0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,57 +1,27 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.4' +gem "rails", "5.2.0" -# Use sqlite3 as the database for Active Record -gem 'sqlite3' - -# Use SCSS for stylesheets -gem 'sass-rails', '~> 4.0.2' - -# Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' - -# 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' +gem "dragonfly" +gem "jquery-rails" +gem "omniauth-twitter" +gem "puma" +gem "sass-rails" +gem "simple_form" +gem "sqlite3" +gem "uglifier" 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 'pry' - gem 'better_errors' - gem 'binding_of_caller' + gem "better_errors" + gem "binding_of_caller" + gem "pry" + 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] diff --git a/Gemfile.lock b/Gemfile.lock index 70c3160..0b306a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,163 +1,201 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.4) - actionpack (= 4.0.4) - mail (~> 2.5.4) - actionpack (4.0.4) - activesupport (= 4.0.4) - builder (~> 3.1.0) - erubis (~> 2.7.0) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - activemodel (4.0.4) - activesupport (= 4.0.4) - builder (~> 3.1.0) - activerecord (4.0.4) - activemodel (= 4.0.4) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.4) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.4) - i18n (~> 0.6, >= 0.6.9) - minitest (~> 4.2) - multi_json (~> 1.3) - thread_safe (~> 0.1) - tzinfo (~> 0.3.37) - arel (4.0.2) - atomic (1.1.16) - better_errors (1.1.0) + actioncable (5.2.0) + actionpack (= 5.2.0) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.2.0) + actionview (= 5.2.0) + activesupport (= 5.2.0) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.2.0) + activesupport (= 5.2.0) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.0) + activesupport (= 5.2.0) + globalid (>= 0.3.6) + 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) - binding_of_caller (0.7.2) + erubi (>= 1.0.0) + rack (>= 0.9.0) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - builder (3.1.4) - capybara (2.2.1) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - coderay (1.1.0) - coffee-rails (4.0.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) - coffee-script-source - execjs - coffee-script-source (1.7.0) - debug_inspector (0.0.2) - diff-lcs (1.2.5) - dragonfly (1.0.3) + builder (3.2.3) + capybara (3.5.1) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) + coderay (1.1.2) + concurrent-ruby (1.0.5) + crass (1.0.4) + debug_inspector (0.0.3) + diff-lcs (1.3) + dragonfly (1.1.5) + addressable (~> 2.3) multi_json (~> 1.0) - rack - erubis (2.7.0) - execjs (2.0.2) - hashie (2.0.5) - hike (1.2.3) - i18n (0.6.9) - jbuilder (1.5.3) - activesupport (>= 3.0.0) - multi_json (>= 1.2.0) - jquery-rails (3.1.0) - railties (>= 3.0, < 5.0) + rack (>= 1.3) + erubi (1.7.1) + execjs (2.7.0) + ffi (1.9.25) + globalid (0.4.1) + activesupport (>= 4.2.0) + hashie (3.5.7) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.1) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - method_source (0.8.2) - mime-types (1.25.1) - mini_portile (0.5.2) - minitest (4.7.5) - multi_json (1.9.2) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - oauth (0.4.7) - omniauth (1.2.1) - hashie (>= 1.2, < 3) - rack (~> 1.0) - omniauth-oauth (1.0.1) + loofah (2.2.2) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.2) + mimemagic (~> 0.3.2) + method_source (0.9.0) + mimemagic (0.3.2) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + multi_json (1.13.1) + nio4r (2.3.1) + nokogiri (1.8.4) + 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) - multi_json (~> 1.3) - omniauth-oauth (~> 1.0) - polyglot (0.3.4) - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - puma (2.8.1) - rack (>= 1.1, < 2.0) - rack (1.5.2) - rack-test (0.6.2) - rack (>= 1.0) - rails (4.0.4) - actionmailer (= 4.0.4) - actionpack (= 4.0.4) - activerecord (= 4.0.4) - activesupport (= 4.0.4) - bundler (>= 1.3.0, < 2.0) - railties (= 4.0.4) - sprockets-rails (~> 2.0.0) - railties (4.0.4) - actionpack (= 4.0.4) - activesupport (= 4.0.4) + omniauth-twitter (1.4.0) + omniauth-oauth (~> 1.1) + rack + pry (0.11.3) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (3.0.2) + puma (3.12.0) + rack (2.0.5) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.0) + actioncable (= 5.2.0) + actionmailer (= 5.2.0) + actionpack (= 5.2.0) + actionview (= 5.2.0) + activejob (= 5.2.0) + activemodel (= 5.2.0) + activerecord (= 5.2.0) + activestorage (= 5.2.0) + activesupport (= 5.2.0) + bundler (>= 1.3.0) + railties (= 5.2.0) + 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) - rdoc (4.1.1) - json (~> 1.4) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - rspec-rails (2.14.1) + rake (12.3.1) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + rdoc (6.0.4) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + 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-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - sass (3.2.18) - sass-rails (4.0.2) - railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) - sprockets-rails (~> 2.0.0) - sdoc (0.4.0) - json (~> 1.8) - rdoc (~> 4.0, < 5.0) - simple_form (3.0.1) - actionpack (>= 4.0.0, < 4.1) - activemodel (>= 4.0.0, < 4.1) - slop (3.4.7) - sprockets (2.11.0) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.0.1) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.9) - thor (0.19.0) - thread_safe (0.3.1) - atomic (>= 1.1.7, < 2) - tilt (1.4.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - tzinfo (0.3.39) - uglifier (2.5.0) - execjs (>= 0.3.0) - json (>= 1.8.0) - xpath (2.0.0) - nokogiri (~> 1.3) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + sass (3.5.7) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) + sdoc (1.0.0) + rdoc (>= 5.0) + simple_form (4.0.1) + actionpack (>= 5.0) + activemodel (>= 5.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.13) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + tzinfo (1.2.5) + thread_safe (~> 0.1) + uglifier (4.1.17) + execjs (>= 0.3.0, < 3) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + 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 diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index b175b1a..bd1625c 100644 --- a/app/controllers/sessions_controller.rb +++ b/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 diff --git a/db/migrate/20140323140443_create_images.rb b/db/migrate/20140323140443_create_images.rb index 947372d..0183e16 100644 --- a/db/migrate/20140323140443_create_images.rb +++ b/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 diff --git a/db/migrate/20140324161505_create_users.rb b/db/migrate/20140324161505_create_users.rb index 51668c8..363102d 100644 --- a/db/migrate/20140324161505_create_users.rb +++ b/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 diff --git a/db/migrate/20140324170840_add_avatar_to_user.rb b/db/migrate/20140324170840_add_avatar_to_user.rb index 397c6f9..e58211a 100644 --- a/db/migrate/20140324170840_add_avatar_to_user.rb +++ b/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 diff --git a/db/schema.rb b/db/schema.rb index 8c1843a..1e4ca7e 100644 --- a/db/schema.rb +++ b/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| - t.integer "user_id" - t.string "image_uid" - t.string "image_name" - t.datetime "created_at" - t.datetime "updated_at" + create_table "images", force: :cascade do |t| + t.integer "user_id" + t.string "image_uid" + t.string "image_name" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - create_table "users", force: true do |t| - t.string "email" - t.string "username" - t.string "name" - t.string "provider" - t.string "uid" - t.datetime "created_at" - t.datetime "updated_at" - t.string "avatar_uid" + create_table "users", force: :cascade do |t| + t.string "email" + t.string "username" + t.string "name" + t.string "provider" + t.string "uid" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "avatar_uid" end end