diff --git a/.ruby-version b/.ruby-version index 8274681..25c81fe 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.2.3 +ruby-2.5.1 \ No newline at end of file diff --git a/Gemfile b/Gemfile index c14df54..d8238ba 100644 --- a/Gemfile +++ b/Gemfile @@ -24,8 +24,9 @@ gem 'nokogiri', '~>1.8.2' gem 'mysql2', '~> 0.3.20' gem 'whenever', require: false + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 4.2.7.1' +gem 'rails', '~> 4.2' # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.3' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index aabcda3..c85d513 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,37 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.7.1) - actionview (= 4.2.7.1) - activesupport (= 4.2.7.1) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.7.1) - activesupport (= 4.2.7.1) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.7.1) - activesupport (= 4.2.7.1) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.7.1) - activesupport (= 4.2.7.1) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.7.1) - activemodel (= 4.2.7.1) - activesupport (= 4.2.7.1) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.7.1) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) @@ -160,16 +159,16 @@ GEM rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.7.1) - actionmailer (= 4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) - activemodel (= 4.2.7.1) - activerecord (= 4.2.7.1) - activesupport (= 4.2.7.1) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7.1) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -192,9 +191,9 @@ GEM rails (>= 4.0, < 6) remotipart (~> 1.3) sass-rails (>= 4.0, < 6) - railties (4.2.7.1) - actionpack (= 4.2.7.1) - activesupport (= 4.2.7.1) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.19.0) @@ -286,7 +285,7 @@ DEPENDENCIES mysql2 (~> 0.3.20) newrelic_rpm nokogiri (~> 1.8.2) - rails (~> 4.2.7.1) + rails (~> 4.2) rails_admin (~> 1.3.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) diff --git a/README.md b/README.md index df56ab8..ae52ca2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ A dashboard rails app to visualise activities in Slack ## Dependencies -- rvm +- rbenv - unicorn - capistrano3 - chartkick.js diff --git a/db/schema.rb b/db/schema.rb index fa5e35e..0ff02bc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -13,80 +13,62 @@ ActiveRecord::Schema.define(version: 20160108221227) do - create_table "channels", force: true do |t| - t.string "ch_id" - t.string "name" - t.integer "created" - t.string "creator" + create_table "channels", force: :cascade do |t| + t.string "ch_id", limit: 255 + t.string "name", limit: 255 + t.integer "created", limit: 4 + t.string "creator", limit: 255 t.boolean "is_archived" - t.integer "num_members" - t.string "topic_value" - t.string "topic_creator" - t.integer "topic_last_set" - t.string "purpose_value" - t.string "purpose_creator" - t.integer "purpose_last_set" + t.integer "num_members", limit: 4 + t.string "topic_value", limit: 255 + t.string "topic_creator", limit: 255 + t.integer "topic_last_set", limit: 4 + t.string "purpose_value", limit: 255 + t.string "purpose_creator", limit: 255 + t.integer "purpose_last_set", limit: 4 t.datetime "created_at" t.datetime "updated_at" end - create_table "loginusers", force: true do |t| - t.string "email", default: "", null: false - t.string "encrypted_password", default: "", null: false - t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.integer "sign_in_count", default: 0, null: false - t.datetime "current_sign_in_at" - t.datetime "last_sign_in_at" - t.string "current_sign_in_ip" - t.string "last_sign_in_ip" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "loginusers", ["email"], name: "index_loginusers_on_email", unique: true, using: :btree - add_index "loginusers", ["reset_password_token"], name: "index_loginusers_on_reset_password_token", unique: true, using: :btree - - create_table "posts", force: true do |t| - t.string "post_type" - t.string "user" - t.text "text" - t.string "ts" + create_table "posts", force: :cascade do |t| + t.string "post_type", limit: 255 + t.string "user", limit: 255 + t.text "text", limit: 65535 + t.string "ts", limit: 255 t.datetime "created_at" t.datetime "updated_at" t.datetime "ts_date" - t.string "ch_id" + t.string "ch_id", limit: 255 end - create_table "stars", force: true do |t| - t.string "post_type" - t.string "ts" - t.string "user" - t.text "text" + create_table "stars", force: :cascade do |t| + t.string "post_type", limit: 255 + t.string "ts", limit: 255 + t.string "user", limit: 255 + t.text "text", limit: 65535 t.datetime "created_at" t.datetime "updated_at" - t.string "starred_by" + t.string "starred_by", limit: 255 t.datetime "ts_date" - t.string "ch_id" + t.string "ch_id", limit: 255 end - create_table "users", force: true do |t| - t.string "user_id" - t.string "name" + create_table "users", force: :cascade do |t| + t.string "user_id", limit: 255 + t.string "name", limit: 255 t.boolean "deleted" - t.string "color" - t.string "profile_first_name" - t.string "profile_last_name" - t.string "profile_real_name" - t.string "profile_email" - t.string "profile_skype" - t.string "profile_phone" - t.string "profile_image_24" - t.string "profile_image_32" - t.string "profile_image_48" - t.string "profile_image_72" - t.string "profile_image_192" + t.string "color", limit: 255 + t.string "profile_first_name", limit: 255 + t.string "profile_last_name", limit: 255 + t.string "profile_real_name", limit: 255 + t.string "profile_email", limit: 255 + t.string "profile_skype", limit: 255 + t.string "profile_phone", limit: 255 + t.string "profile_image_24", limit: 255 + t.string "profile_image_32", limit: 255 + t.string "profile_image_48", limit: 255 + t.string "profile_image_72", limit: 255 + t.string "profile_image_192", limit: 255 t.boolean "is_admin" t.boolean "is_owner" t.boolean "has_files" @@ -94,26 +76,11 @@ t.datetime "updated_at" end - create_table "word_counts", force: true do |t| - t.string "word" - t.integer "count" - t.boolean "ignore_flag" - t.integer "last_post_id" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "word_ignores", force: true do |t| - t.string "word" - t.datetime "created_at" - t.datetime "updated_at" - end - - create_table "words", force: true do |t| - t.string "word" - t.integer "count" + create_table "words", force: :cascade do |t| + t.string "word", limit: 255 + t.integer "count", limit: 4 t.boolean "ignore_flag" - t.integer "last_post_id" + t.integer "last_post_id", limit: 4 t.datetime "created_at" t.datetime "updated_at" end