diff --git a/.travis.yml b/.travis.yml index 4c4bbd6..45382b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ services: - postgresql rvm: - - 2.2.3 + - 2.3.1 diff --git a/Gemfile b/Gemfile index 543f897..6dade48 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -ruby '2.2.3' +ruby '2.3.1' -gem 'rails', '>= 5.0.0.beta3', '< 5.1' +gem 'rails', '>= 5.0.0', '< 5.1' gem 'sass-rails', '~> 5.0' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '>= 2.7.2' @@ -16,7 +16,7 @@ gem 'kaminari', github: 'amatsuda/kaminari' gem 'turbolinks', '~> 5.x' gem 'js_cookie_rails' -gem 'rails-i18n', '~> 5.0.0.beta3' +gem 'rails-i18n', '~> 5.0.0' gem 'jbuilder' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 112de03..43012f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/amatsuda/kaminari.git - revision: 0e21d52feca1f79a9aca83613cf053eb5273827e + revision: be3a2c9a2182fae145e7ff88223feb4d55ed539d specs: kaminari (1.0.0.alpha) actionpack (>= 3.0.0) @@ -9,64 +9,65 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (5.0.0.rc1) - actionpack (= 5.0.0.rc1) + actioncable (5.0.0) + actionpack (= 5.0.0) nio4r (~> 1.2) websocket-driver (~> 0.6.1) - actionmailer (5.0.0.rc1) - actionpack (= 5.0.0.rc1) - actionview (= 5.0.0.rc1) - activejob (= 5.0.0.rc1) + actionmailer (5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (5.0.0.rc1) - actionview (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) - rack (~> 2.x) + rails-dom-testing (~> 2.0) + actionpack (5.0.0) + actionview (= 5.0.0) + activesupport (= 5.0.0) + rack (~> 2.0) rack-test (~> 0.6.3) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.0.rc1) - activesupport (= 5.0.0.rc1) + actionview (5.0.0) + activesupport (= 5.0.0) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (5.0.0.rc1) - activesupport (= 5.0.0.rc1) + activejob (5.0.0) + activesupport (= 5.0.0) globalid (>= 0.3.6) - activemodel (5.0.0.rc1) - activesupport (= 5.0.0.rc1) - activerecord (5.0.0.rc1) - activemodel (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) + activemodel (5.0.0) + activesupport (= 5.0.0) + activerecord (5.0.0) + activemodel (= 5.0.0) + activesupport (= 5.0.0) arel (~> 7.0) - activesupport (5.0.0.rc1) + activesupport (5.0.0) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.4.0) - arel (7.0.0) + arel (7.1.1) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) execjs (~> 2.0) builder (3.2.2) - byebug (8.2.4) - capybara (2.7.0) + byebug (9.0.5) + capybara (2.7.1) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - carrierwave (0.11.0) + carrierwave (0.11.2) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) - codeclimate-test-reporter (0.5.0) + mimemagic (>= 0.3.0) + codeclimate-test-reporter (0.6.0) simplecov (>= 0.7.1, < 1.0.0) coderay (1.1.1) coffee-rails (4.1.1) @@ -81,33 +82,33 @@ GEM database_cleaner (1.5.3) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160310) + domain_name (0.5.20160615) unf (>= 0.0.5, < 1.0.0) erubis (2.7.0) - execjs (2.6.0) + execjs (2.7.0) factory_girl (4.7.0) activesupport (>= 3.0.0) factory_girl_rails (4.7.0) factory_girl (~> 4.7.0) railties (>= 3.0.0) - ffi (1.9.10) + ffi (1.9.14) figaro (1.1.1) thor (~> 0.14) - font-awesome-sass (4.5.0) + font-awesome-sass (4.6.2) sass (>= 3.2) formatador (0.2.5) foundation-icons-sass-rails (3.0.0) railties (>= 3.1.1) sass-rails (>= 3.1.1) - foundation-rails (6.2.1.0) + foundation-rails (6.2.3.0) railties (>= 3.1.0) sass (>= 3.3.0, < 3.5) sprockets-es6 (>= 0.9.0) - globalid (0.3.6) + globalid (0.3.7) activesupport (>= 4.1.0) - guard (2.13.0) + guard (2.14.0) formatador (>= 0.2.4) - listen (>= 2.7, <= 4.0) + listen (>= 2.7, < 4.0) lumberjack (~> 1.0) nenv (~> 0.1) notiffany (~> 0.0) @@ -119,10 +120,10 @@ GEM guard (~> 2.2) guard-compat (~> 1.1) guard-compat (1.2.1) - guard-rails (0.7.2) + guard-rails (0.8.0) guard (~> 2.11) guard-compat (~> 1.0) - guard-rspec (4.6.5) + guard-rspec (4.7.2) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) @@ -131,184 +132,186 @@ GEM http-cookie (1.0.2) domain_name (~> 0.5) i18n (0.7.0) - jbuilder (2.4.1) + jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js_cookie_rails (1.0.1) + js_cookie_rails (2.1.2) railties (>= 3.1) - json (1.8.3) - listen (3.1.1) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) + json (2.0.2) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.10) mail (2.6.4) mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (2.99.1) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mimemagic (0.3.1) mina (0.3.8) open4 (~> 1.3.4) rake - mina-logs (0.0.9) + mina-logs (0.1.0) mina mina-multistage (1.0.2) mina (>= 0.2.1) - mina-puma (0.3.0) + mina-puma (0.3.1) mina puma (>= 2.13) - mina-sidekiq (0.3.1) + mina-sidekiq (0.4.1) mina mini_magick (4.5.1) - mini_portile2 (2.0.0) - minitest (5.8.4) - multi_json (1.11.2) + mini_portile2 (2.1.0) + minitest (5.9.0) + multi_json (1.12.1) nenv (0.3.0) netrc (0.11.0) - newrelic_rpm (3.15.1.316) + newrelic_rpm (3.16.0.318) nio4r (1.2.1) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - notiffany (0.0.8) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + notiffany (0.1.0) nenv (~> 0.1) shellany (~> 0.0) open4 (1.3.4) pg (0.18.4) - pry (0.10.3) + pkg-config (1.1.7) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - puma (3.4.0) - rack (2.0.0.rc1) - json + puma (3.6.0) + rack (2.0.1) rack-cors (0.4.0) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.0.rc1) - actioncable (= 5.0.0.rc1) - actionmailer (= 5.0.0.rc1) - actionpack (= 5.0.0.rc1) - actionview (= 5.0.0.rc1) - activejob (= 5.0.0.rc1) - activemodel (= 5.0.0.rc1) - activerecord (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) + rails (5.0.0) + actioncable (= 5.0.0) + actionmailer (= 5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) + activemodel (= 5.0.0) + activerecord (= 5.0.0) + activesupport (= 5.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 5.0.0.rc1) + railties (= 5.0.0) sprockets-rails (>= 2.0.0) rails-controller-testing (0.1.1) actionpack (~> 5.x) actionview (~> 5.x) activesupport (~> 5.x) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) + rails-dom-testing (2.0.1) + activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-i18n (5.0.0.beta3) + rails-i18n (5.0.0) i18n (~> 0.7) - railties (~> 5.0.0.beta1) - railties (5.0.0.rc1) - actionpack (= 5.0.0.rc1) - activesupport (= 5.0.0.rc1) + railties (~> 5.0) + railties (5.0.0) + actionpack (= 5.0.0) + activesupport (= 5.0.0) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.1.2) + rake (11.2.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) redcarpet (3.3.4) - redis (3.3.0) + redis (3.3.1) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - rest-client (1.8.0) + rest-client (2.0.0) http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rouge (1.10.1) - rspec (3.1.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + rouge (2.0.5) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) rspec-sidekiq (2.2.0) rspec (~> 3.0, >= 3.0.0) sidekiq (>= 2.4.0) - rspec-support (3.1.2) + rspec-support (3.5.0) + ruby_dep (1.3.1) sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) shellany (0.0.1) - sidekiq (4.1.1) + sidekiq (4.1.2) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) simple_form (3.2.1) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) - simplecov (0.11.2) + simplecov (0.12.0) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - slim (3.0.6) - temple (~> 0.7.3) + slim (3.0.7) + temple (~> 0.7.6) tilt (>= 1.3.3, < 2.1) - slim-rails (3.0.1) - actionmailer (>= 3.1, < 5.0) - actionpack (>= 3.1, < 5.0) - activesupport (>= 3.1, < 5.0) - railties (>= 3.1, < 5.0) + slim-rails (3.1.0) + actionpack (>= 3.1) + railties (>= 3.1) slim (~> 3.0) slop (3.6.0) - spring (1.7.1) + spring (1.7.2) spring-watcher-listen (2.0.0) listen (>= 2.7, < 4.0) spring (~> 1.2) - sprockets (3.6.0) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-es6 (0.9.0) babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.0.4) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - temple (0.7.6) + temple (0.7.7) thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.2) - turbolinks (5.0.0.beta2) - turbolinks-source - turbolinks-source (5.0.0.beta4) + tilt (2.0.5) + turbolinks (5.0.0) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (3.0.0) @@ -316,7 +319,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - websocket-driver (0.6.3) + websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) xpath (2.0.0) @@ -358,9 +361,9 @@ DEPENDENCIES pg puma rack-cors - rails (>= 5.0.0.beta3, < 5.1) + rails (>= 5.0.0, < 5.1) rails-controller-testing - rails-i18n (~> 5.0.0.beta3) + rails-i18n (~> 5.0.0) redcarpet redis-namespace rest-client diff --git a/app/views/layouts/_footer.html.slim b/app/views/layouts/_footer.html.slim index 62fa378..0f206ba 100644 --- a/app/views/layouts/_footer.html.slim +++ b/app/views/layouts/_footer.html.slim @@ -2,12 +2,12 @@ .small-12.columns .footer div - span.link yafeilee.me - span.time © 2012 - 2016 + span.link = ENV['SITE_ADDRESS'] + span.time = ENV['SITE_YEAR'] .license | Designed by span - = link_to 'WinDy', about_path, target: '_blank' + = link_to 'WinDy', 'http://yafeilee.me/about', target: '_blank' .license | Built with span diff --git a/config/application.yml.example b/config/application.yml.example index 1c96733..2f41ea9 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -20,6 +20,11 @@ REDIS_NAMESPACE: 'wblog' # META description for SEO INTRODUCE: '这是李亚飞的博客, 李亚飞是暂住在深圳的一名 Ruby 程序员, 这里是关于技术, 创业, 生活的思考' +#Website Address for footer display without http +SITE_ADDRESS: 'yafeilee.me' +#Website Year for footer display +SITE_YEAR: '© 2012 - 2016' + # optional # google analytics, blank it if you don't need GOOGLE: ''