From 141cbce259c7286cd8c0ba0bb5f7f0af41e084a7 Mon Sep 17 00:00:00 2001 From: Junv Zhao Date: Sun, 3 Jun 2018 21:03:00 +1000 Subject: [PATCH] make the server running --- .ruby-version | 2 +- Gemfile | 28 +- Gemfile.lock | 625 +++++++++--------- app/assets/javascripts/active_admin.js.coffee | 1 - .../javascripts/api/v1/bookmarks.coffee | 3 - app/assets/javascripts/api/v1/comments.coffee | 3 - .../javascripts/api/v1/dashboard.coffee | 3 - .../javascripts/api/v1/data_analysis.coffee | 3 - .../javascripts/api/v1/em_sources.coffee | 3 - app/assets/javascripts/api/v1/follow.coffee | 3 - app/assets/javascripts/api/v1/likes.coffee | 3 - app/assets/javascripts/api/v1/posts.coffee | 3 - app/assets/javascripts/api/v1/search.coffee | 3 - app/assets/javascripts/api/v1/timeline.coffee | 3 - app/assets/javascripts/api/v1/users.coffee | 3 - app/assets/javascripts/dashboard.coffee | 3 - app/assets/javascripts/explore.coffee | 3 - app/assets/javascripts/explore_menus.coffee | 3 - app/assets/javascripts/published_post.coffee | 3 - .../javascripts/published_posts/post.coffee | 12 - app/models/application_record.rb | 3 + config/application.rb | 7 +- config/initializers/sentry.rb | 5 - 23 files changed, 341 insertions(+), 387 deletions(-) delete mode 100644 app/assets/javascripts/active_admin.js.coffee delete mode 100644 app/assets/javascripts/api/v1/bookmarks.coffee delete mode 100644 app/assets/javascripts/api/v1/comments.coffee delete mode 100644 app/assets/javascripts/api/v1/dashboard.coffee delete mode 100644 app/assets/javascripts/api/v1/data_analysis.coffee delete mode 100644 app/assets/javascripts/api/v1/em_sources.coffee delete mode 100644 app/assets/javascripts/api/v1/follow.coffee delete mode 100644 app/assets/javascripts/api/v1/likes.coffee delete mode 100644 app/assets/javascripts/api/v1/posts.coffee delete mode 100644 app/assets/javascripts/api/v1/search.coffee delete mode 100644 app/assets/javascripts/api/v1/timeline.coffee delete mode 100644 app/assets/javascripts/api/v1/users.coffee delete mode 100644 app/assets/javascripts/dashboard.coffee delete mode 100644 app/assets/javascripts/explore.coffee delete mode 100644 app/assets/javascripts/explore_menus.coffee delete mode 100644 app/assets/javascripts/published_post.coffee delete mode 100644 app/assets/javascripts/published_posts/post.coffee create mode 100644 app/models/application_record.rb delete mode 100644 config/initializers/sentry.rb diff --git a/.ruby-version b/.ruby-version index b1b25a5..95e3ba8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.2 +2.5 diff --git a/Gemfile b/Gemfile index 5daa72f..4678336 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.3' +gem 'rails', '5.2.0' # Use postgresql as the database for Active Record gem 'pg' # Use SCSS for stylesheets @@ -10,7 +10,7 @@ gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .coffee assets and views -gem 'coffee-rails', '~> 4.1.0' +# gem 'coffee-rails', '~> 4.1.0' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby @@ -19,9 +19,9 @@ gem 'jquery-rails' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.0' +gem 'jbuilder' # bundle exec rake doc:rails generates the API under doc/api. -gem 'sdoc', '~> 0.4.0', group: :doc +# gem 'sdoc', '~> 0.4.0', group: :doc # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' @@ -32,25 +32,25 @@ gem 'sdoc', '~> 0.4.0', group: :doc # Use Capistrano for deployment # gem 'capistrano-rails', group: :development -gem 'activeadmin', '~> 1.0.0.pre2' +gem 'activeadmin' gem 'devise' gem 'omniauth' gem 'omniauth-weibo-oauth2' -gem 'weibo_2' +# gem 'weibo_2' gem 'jwt' gem 'active_model_serializers', '~>0.10.0.rc2' gem 'versionist' gem 'houston' -gem 'kaminari', '~> 0.16.3' -gem 'rack-cors', :require => 'rack/cors' -gem 'redis', '~> 3.2.1' -gem 'sidekiq', '~> 4.0', '>= 4.0.1' -gem 'sidekiq-limit_fetch', '~> 3.0', '>= 3.0.1' +gem 'kaminari' +gem 'redis' +gem 'sidekiq' +gem 'sidekiq-limit_fetch' gem 'sidekiq_mailer' -gem 'sidekiq-failures', '~> 0.4.5' +gem 'sidekiq-failures' gem 'sinatra', :require => nil +gem 'rack-cors', require: 'rack/cors' gem 'devise-bootstrap-views' @@ -61,14 +61,13 @@ gem 'puma' gem 'metainspector' #file storage -gem 'paperclip', '~> 4.0' +gem 'paperclip' gem 'paperclip-meta' gem 'paperclip-qiniu', :github => 'lidaobing/paperclip-qiniu' gem 'rest-client' gem 'htmlentities' -gem 'newrelic_rpm' #group data by day, week, month gem 'groupdate' @@ -80,7 +79,6 @@ gem 'font-awesome-rails', '~> 4.4' #gem 'sprockets', '>= 3.0.0' #gem 'sprockets-es6' -gem "sentry-raven" #, :github => "getsentry/raven-ruby" gem "paranoia", "~> 2.0" gem 'faraday' gem 'rmagick' diff --git a/Gemfile.lock b/Gemfile.lock index 152daf6..78f714c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/lidaobing/paperclip-qiniu.git - revision: e5b1258359ba9440758250ce3c99f55e1fd1062c + revision: d9b9258bfde4329fc23215689c95205c8deeb252 specs: paperclip-qiniu (0.2.0) paperclip @@ -9,406 +9,428 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.3) - actionpack (= 4.2.3) - actionview (= 4.2.3) - activejob (= 4.2.3) + 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 (~> 1.0, >= 1.0.5) - actionpack (4.2.3) - actionview (= 4.2.3) - activesupport (= 4.2.3) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + 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 (4.2.3) - activesupport (= 4.2.3) + actionview (5.2.0) + activesupport (= 5.2.0) builder (~> 3.1) - erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - active_model_serializers (0.10.0.rc3) - actionpack (>= 4.0) - activemodel (>= 4.0) - railties (>= 4.0) - activeadmin (1.0.0.pre2) - arbre (~> 1.0, >= 1.0.2) - bourbon + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + active_model_serializers (0.10.7) + actionpack (>= 4.1, < 6) + activemodel (>= 4.1, < 6) + case_transform (>= 0.2) + jsonapi-renderer (>= 0.1.1.beta1, < 0.3) + activeadmin (1.3.0) + arbre (>= 1.1.1) coffee-rails formtastic (~> 3.1) formtastic_i18n - inherited_resources (~> 1.6) - jquery-rails - jquery-ui-rails - kaminari (~> 0.15) - rails (>= 3.2, < 5.0) + inherited_resources (>= 1.7.0) + jquery-rails (>= 4.2.0) + kaminari (>= 0.15) + railties (>= 4.2, < 5.3) ransack (~> 1.3) - sass-rails - activejob (4.2.3) - activesupport (= 4.2.3) - globalid (>= 0.3.0) - activemodel (4.2.3) - activesupport (= 4.2.3) - builder (~> 3.1) - activerecord (4.2.3) - activemodel (= 4.2.3) - activesupport (= 4.2.3) - arel (~> 6.0) - activesupport (4.2.3) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) + sass (~> 3.1) + sprockets (< 4.1) + 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) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.3.8) - arbre (1.0.3) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + airbrussh (1.3.0) + sshkit (>= 1.6.1, != 1.7.0) + arbre (1.1.1) activesupport (>= 3.0.0) - arel (6.0.3) - autoprefixer-rails (6.0.3) + arel (9.0.0) + autoprefixer-rails (8.6.0) execjs - json awesome_print (1.6.1) - bcrypt (3.1.10) - better_errors (2.1.1) + bcrypt (3.1.12) + better_errors (2.4.0) coderay (>= 1.0.0) - erubis (>= 2.6.6) + erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.5.1) - autoprefixer-rails (>= 5.0.0.1) - sass (>= 3.3.0) - bourbon (4.2.6) - sass (~> 3.4) - thor (~> 0.19) - builder (3.2.2) - byebug (6.0.2) - capistrano (3.4.0) + bootstrap-sass (3.3.7) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) + builder (3.2.3) + byebug (10.0.2) + capistrano (3.11.0) + airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) - sshkit (~> 1.3) - capistrano-bundler (1.1.4) + sshkit (>= 1.9.0) + capistrano-bundler (1.3.0) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-rails (1.1.5) + capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano-sidekiq (0.5.4) - capistrano + capistrano-sidekiq (1.0.2) + capistrano (>= 3.9.0) sidekiq (>= 3.4) - capistrano3-puma (1.2.1) - capistrano (~> 3.0) - puma (>= 2.6) - climate_control (0.0.3) - activesupport (>= 3.0) - cocaine (0.5.7) - climate_control (>= 0.0.3, < 1.0) - coderay (1.1.0) - coffee-rails (4.1.0) + capistrano3-puma (3.1.1) + capistrano (~> 3.7) + capistrano-bundler + puma (~> 3.4) + case_transform (0.2) + activesupport + climate_control (0.2.0) + coderay (1.1.2) + coffee-rails (4.2.2) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - colorize (0.7.7) - commander (4.3.5) + coffee-script-source (1.12.2) + commander (4.4.5) highline (~> 1.7.2) - concurrent-ruby (1.0.0) - connection_pool (2.2.0) - debug_inspector (0.0.2) - devise (3.5.2) + concurrent-ruby (1.0.5) + connection_pool (2.2.2) + crass (1.0.4) + debug_inspector (0.0.3) + devise (4.4.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 6.0) responders - thread_safe (~> 0.1) warden (~> 1.2.3) - devise-bootstrap-views (0.0.6) - diff-lcs (1.2.5) - domain_name (0.5.25) + devise-bootstrap-views (0.0.11) + diff-lcs (1.3) + domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - erubis (2.7.0) - execjs (2.6.0) - faraday (0.9.2) + erubi (1.7.1) + execjs (2.7.0) + faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - faraday-http-cache (1.2.2) + faraday-encoding (0.0.4) + faraday + faraday-http-cache (2.0.0) faraday (~> 0.8) - faraday_middleware (0.10.0) - faraday (>= 0.7.4, < 0.10) - fastimage (1.7.0) - addressable (~> 2.3, >= 2.3.5) - font-awesome-rails (4.4.0.0) - railties (>= 3.2, < 5.0) - formtastic (3.1.3) + faraday_middleware (0.12.2) + faraday (>= 0.7.4, < 1.0) + fastimage (2.1.3) + ffi (1.9.24) + font-awesome-rails (4.7.0.4) + railties (>= 3.2, < 6.0) + formtastic (3.1.5) actionpack (>= 3.2.13) - formtastic_i18n (0.4.1) - globalid (0.3.6) - activesupport (>= 4.1.0) - groupdate (2.5.0) - activesupport (>= 3) - has_scope (0.6.0) - actionpack (>= 3.2, < 5) - activesupport (>= 3.2, < 5) - hashie (2.0.5) - highline (1.7.8) - houston (2.2.3) - commander (~> 4.1) + formtastic_i18n (0.6.0) + globalid (0.4.1) + activesupport (>= 4.2.0) + groupdate (4.0.1) + activesupport (>= 4.2) + has_scope (0.7.2) + actionpack (>= 4.1) + activesupport (>= 4.1) + hashie (3.5.7) + highline (1.7.10) + houston (2.2.4) + commander (~> 4.4) json htmlentities (4.3.4) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.7.0) - inherited_resources (1.6.0) - actionpack (>= 3.2, < 5) - has_scope (~> 0.6.0.rc) - railties (>= 3.2, < 5) + i18n (1.0.1) + concurrent-ruby (~> 1.0) + inherited_resources (1.8.0) + actionpack (>= 4.2, <= 5.2) + has_scope (~> 0.6) + railties (>= 4.2, <= 5.2) responders - jbuilder (2.3.2) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) - jquery-rails (4.0.5) - rails-dom-testing (~> 1.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) - railties (>= 3.2.16) - json (1.8.3) - jwt (1.5.1) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - loofah (2.0.3) + json (1.8.6) + jsonapi-renderer (0.2.0) + jwt (1.5.6) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - metainspector (4.7.2) - addressable (~> 2.3.5) - faraday (~> 0.9.0) - faraday-cookie_jar (~> 0.0.6) - faraday-http-cache (~> 1.2.2) - faraday_middleware (~> 0.10) - fastimage - nokogiri (~> 1.6) - method_source (0.8.2) + mail (2.7.0) + mini_mime (>= 0.1.1) + marcel (0.3.2) + mimemagic (~> 0.3.2) + metainspector (5.5.0) + addressable (~> 2.5) + faraday (~> 0.11) + faraday-cookie_jar (~> 0.0) + faraday-encoding (~> 0.0) + faraday-http-cache (~> 2.0) + faraday_middleware (~> 0.11) + fastimage (~> 2.1) + nesty (~> 1.0) + nokogiri (~> 1.7) + method_source (0.9.0) mime-types (2.4.3) - mimemagic (0.3.0) - mini_portile (0.6.2) - minitest (5.8.1) - multi_json (1.11.2) - multi_xml (0.5.5) + mimemagic (0.3.2) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.11.3) + multi_json (1.13.1) + multi_xml (0.6.0) multipart-post (2.0.0) + mustermann (1.0.2) + nesty (1.0.2) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (3.0.1) - netrc (0.10.3) - newrelic_rpm (3.14.0.305) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - oauth2 (0.9.4) - faraday (>= 0.8, < 0.10) + net-ssh (5.0.1) + netrc (0.11.0) + nio4r (2.3.1) + nokogiri (1.8.2) + mini_portile2 (~> 2.3.0) + oauth2 (1.4.0) + faraday (>= 0.8, < 0.13) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (~> 1.2) - omniauth (1.2.2) - hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-oauth2 (1.1.2) - faraday (>= 0.8, < 0.10) - multi_json (~> 1.3) - oauth2 (~> 0.9.3) + rack (>= 1.2, < 3) + omniauth (1.8.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) - omniauth-weibo-oauth2 (0.4.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) + omniauth-weibo-oauth2 (0.5.2) + omniauth (~> 1.5) + omniauth-oauth2 (>= 1.4.0) orm_adapter (0.5.0) - paperclip (4.3.1) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - cocaine (~> 0.5.5) + paperclip (6.0.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) mime-types - mimemagic (= 0.3.0) - paperclip-meta (1.2.0) - paperclip (>= 3.0.2, < 5.0) - paranoia (2.1.4) - activerecord (~> 4.0) - pg (0.18.3) - polyamorous (1.2.0) + mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) + paperclip-meta (3.1.0) + paperclip (>= 5.0) + paranoia (2.4.1) + activerecord (>= 4.0, < 5.3) + pg (1.0.0) + polyamorous (1.3.3) activerecord (>= 3.0) - pry (0.10.3) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - puma (2.14.0) - qiniu (6.4.2) - json (~> 1.8) + method_source (~> 0.9.0) + public_suffix (3.0.2) + puma (3.11.4) + qiniu (6.4.1) + json (~> 1.7) mime-types (~> 2.4.3) - rest-client (~> 1.7.3) + rest-client (~> 1.6) ruby-hmac (~> 0.4) - rack (1.6.4) - rack-cors (0.4.0) - rack-protection (1.5.3) + rack (2.0.5) + rack-cors (1.0.2) + rack-protection (2.0.1) rack - rack-test (0.6.3) - rack (>= 1.0) - rails (4.2.3) - actionmailer (= 4.2.3) - actionpack (= 4.2.3) - actionview (= 4.2.3) - activejob (= 4.2.3) - activemodel (= 4.2.3) - activerecord (= 4.2.3) - activesupport (= 4.2.3) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.3) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) - loofah (~> 2.0) + rack-test (1.0.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) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_serve_static_assets (0.0.4) - rails_stdout_logging (0.0.4) - railties (4.2.3) - actionpack (= 4.2.3) - activesupport (= 4.2.3) + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) + 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.4.2) - ransack (1.7.0) + rake (12.3.1) + ransack (1.8.8) actionpack (>= 3.0) activerecord (>= 3.0) activesupport (>= 3.0) i18n - polyamorous (~> 1.2) - rdoc (4.2.0) - redis (3.2.2) - responders (2.1.0) - railties (>= 4.2.0, < 5) - rest-client (1.7.3) + polyamorous (~> 1.3.2) + rb-fsevent (0.10.3) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + redis (4.0.1) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rmagick (2.15.4) - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + rmagick (2.16.0) + rspec-core (3.7.1) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-mocks (3.3.2) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.3) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-sidekiq (2.1.0) - rspec (~> 3.0, >= 3.0.0) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-sidekiq (3.0.3) + rspec-core (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) - rspec-support (3.3.0) + rspec-support (3.7.1) ruby-hmac (0.4.0) rvm1-capistrano3 (1.4.0) capistrano (~> 3.0) sshkit (>= 1.2) - sass (3.4.19) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass (3.5.6) + 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 (0.4.1) - json (~> 1.7, >= 1.7.7) - rdoc (~> 4.0) - sentry-raven (0.15.2) - faraday (>= 0.7.6) - sidekiq (4.0.1) + sidekiq (5.1.3) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) - json (~> 1.0) - redis (~> 3.2, >= 3.2.1) - sidekiq-failures (0.4.5) - sidekiq (>= 2.16.0) - sidekiq-limit_fetch (3.0.1) + rack-protection (>= 1.5.0) + redis (>= 3.3.5, < 5) + sidekiq-failures (1.0.0) + sidekiq (>= 4.0.0) + sidekiq-limit_fetch (3.4.0) sidekiq (>= 4) sidekiq_mailer (0.0.8) actionmailer (>= 3.0) activesupport (>= 3.0) sidekiq (>= 2.3) - sinatra (1.4.6) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - slop (3.6.0) - spring (1.4.0) - sprockets (3.4.0) + sinatra (2.0.1) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.1) + tilt (~> 2.0) + spring (2.0.2) + activesupport (>= 4.2) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sshkit (1.7.1) - colorize (>= 0.7.0) + sprockets-rails (3.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sshkit (1.16.1) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.1) - turbolinks (2.5.3) - coffee-rails - tzinfo (1.2.2) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) + thor (0.20.0) + thread_safe (0.3.6) + tilt (2.0.8) + turbolinks (5.1.1) + turbolinks-source (~> 5.1) + turbolinks-source (5.1.0) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (4.1.11) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.1) - versionist (1.4.1) + unf_ext (0.0.7.5) + versionist (1.7.0) activesupport (>= 3) railties (>= 3) - yard (~> 0.7) - warden (1.2.3) + yard (~> 0.9.11) + warden (1.2.7) rack (>= 1.0) - web-console (2.2.1) + web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - weibo_2 (0.1.7) - hashie (~> 2.0.4) - multi_json (~> 1) - oauth2 (~> 0.9.1) - rest-client (~> 1.7.3) - yard (0.8.7.6) + websocket-driver (0.7.0) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) + yard (0.9.14) PLATFORMS ruby DEPENDENCIES active_model_serializers (~> 0.10.0.rc2) - activeadmin (~> 1.0.0.pre2) + activeadmin awesome_print (~> 1.6.1) better_errors bootstrap-sass (~> 3.3.5) @@ -419,7 +441,6 @@ DEPENDENCIES capistrano-rvm capistrano-sidekiq capistrano3-puma - coffee-rails (~> 4.1.0) devise devise-bootstrap-views faraday @@ -427,15 +448,14 @@ DEPENDENCIES groupdate houston htmlentities - jbuilder (~> 2.0) + jbuilder jquery-rails jwt - kaminari (~> 0.16.3) + kaminari metainspector - newrelic_rpm omniauth omniauth-weibo-oauth2 - paperclip (~> 4.0) + paperclip paperclip-meta paperclip-qiniu! paranoia (~> 2.0) @@ -443,20 +463,18 @@ DEPENDENCIES pry puma rack-cors - rails (= 4.2.3) + rails (= 5.2.0) rails_12factor - redis (~> 3.2.1) + redis rest-client rmagick rspec-rails (~> 3.0) rspec-sidekiq rvm1-capistrano3 sass-rails (~> 5.0) - sdoc (~> 0.4.0) - sentry-raven - sidekiq (~> 4.0, >= 4.0.1) - sidekiq-failures (~> 0.4.5) - sidekiq-limit_fetch (~> 3.0, >= 3.0.1) + sidekiq + sidekiq-failures + sidekiq-limit_fetch sidekiq_mailer sinatra spring @@ -464,7 +482,6 @@ DEPENDENCIES uglifier (>= 1.3.0) versionist web-console (~> 2.0) - weibo_2 BUNDLED WITH - 1.10.6 + 1.16.2 diff --git a/app/assets/javascripts/active_admin.js.coffee b/app/assets/javascripts/active_admin.js.coffee deleted file mode 100644 index 3752dce..0000000 --- a/app/assets/javascripts/active_admin.js.coffee +++ /dev/null @@ -1 +0,0 @@ -#= require active_admin/base diff --git a/app/assets/javascripts/api/v1/bookmarks.coffee b/app/assets/javascripts/api/v1/bookmarks.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/bookmarks.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/comments.coffee b/app/assets/javascripts/api/v1/comments.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/comments.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/dashboard.coffee b/app/assets/javascripts/api/v1/dashboard.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/dashboard.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/data_analysis.coffee b/app/assets/javascripts/api/v1/data_analysis.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/data_analysis.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/em_sources.coffee b/app/assets/javascripts/api/v1/em_sources.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/em_sources.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/follow.coffee b/app/assets/javascripts/api/v1/follow.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/follow.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/likes.coffee b/app/assets/javascripts/api/v1/likes.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/likes.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/posts.coffee b/app/assets/javascripts/api/v1/posts.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/posts.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/search.coffee b/app/assets/javascripts/api/v1/search.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/search.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/timeline.coffee b/app/assets/javascripts/api/v1/timeline.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/timeline.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/api/v1/users.coffee b/app/assets/javascripts/api/v1/users.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/api/v1/users.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/dashboard.coffee b/app/assets/javascripts/dashboard.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/dashboard.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/explore.coffee b/app/assets/javascripts/explore.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/explore.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/explore_menus.coffee b/app/assets/javascripts/explore_menus.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/explore_menus.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/published_post.coffee b/app/assets/javascripts/published_post.coffee deleted file mode 100644 index 24f83d1..0000000 --- a/app/assets/javascripts/published_post.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/published_posts/post.coffee b/app/assets/javascripts/published_posts/post.coffee deleted file mode 100644 index c20eed7..0000000 --- a/app/assets/javascripts/published_posts/post.coffee +++ /dev/null @@ -1,12 +0,0 @@ -#= require jquery -#= require jquery_ujs -#= require turbolinks -#= require bootstrap-sprockets -#= require_tree . - - -$ -> -# hljs.initHighlightingOnLoad(); - - $('pre').each (i, block)-> - hljs.highlightBlock(block) diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 0000000..10a4cba --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/config/application.rb b/config/application.rb index 7f6eb1f..611a683 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,13 +22,12 @@ module LibrX config.i18n.default_locale = 'zh-CN' # Do not swallow errors in after_commit/after_rollback callbacks. - config.active_record.raise_in_transactional_callbacks = true + # config.active_record.raise_in_transactional_callbacks = true - config.middleware.insert_before 0, "Rack::Cors" do + config.middleware.insert_before 0, Rack::Cors do allow do origins '*' - resource '/api/v1/*', headers: :any, - methods: [:get, :post, :options, :delete, :put, :patch, :head] + resource '*', headers: :any, methods: [:get, :post, :options] end end end diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb deleted file mode 100644 index 914ecfe..0000000 --- a/config/initializers/sentry.rb +++ /dev/null @@ -1,5 +0,0 @@ -Raven.configure do |config| - config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s) - config.dsn = 'https://0b765acccb4c4285ae7a6f31d255a1e5:acc40fe583ed4cada414cf054b5c9eb1@app.getsentry.com/59314' - config.environments = ['staging', 'production'] -end