Fixes #44 update Rails to 4.2.5

Notice: mongoid config changed, you must update mongoid.yml at deploy server before deploy it.

Gemfile

@@ -1,14 +1,13 @@
 if ENV['RUBYTAOBAO']
-  source 'http://ruby.taobao.org'
+  source 'https://ruby.taobao.org'
 else
   source 'https://rubygems.org'
 end
 
-gem 'rails', '4.1.9'
+gem 'rails', '4.2.5'
-#gem 'sprockets', '2.12.1'
 gem 'sass-rails'
 gem 'coffee-rails', '~> 4.1.0'
-gem 'uglifier', '>= 1.3.0'
+gem 'uglifier', '>= 2.7.2'
 gem 'jquery-rails'
 gem 'foundation-rails', '~> 5.5.1'
 gem 'foundation-icons-sass-rails'
@@ -32,6 +31,7 @@ gem 'figaro'
 gem 'rqrcode-with-patches', require: 'rqrcode'
 gem 'chunky_png'
 gem 'sidekiq'
+gem 'redis-namespace'
 gem 'rest-client'
 gem 'unicorn'
 gem 'newrelic_rpm'

Gemfile.lock

@@ -1,37 +1,48 @@
 GEM
-  remote: http://ruby.taobao.org/
+  remote: https://ruby.taobao.org/
   specs:
-    actionmailer (4.1.9)
+    actionmailer (4.2.5)
-      actionpack (= 4.1.9)
+      actionpack (= 4.2.5)
-      actionview (= 4.1.9)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.9)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      actionview (= 4.1.9)
+    actionpack (4.2.5)
-      activesupport (= 4.1.9)
+      actionview (= 4.2.5)
-      rack (~> 1.5.2)
+      activesupport (= 4.2.5)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.9)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      activesupport (= 4.1.9)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.9)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      activesupport (= 4.1.9)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.1.9)
+    activerecord (4.2.5)
-      activemodel (= 4.1.9)
+      activemodel (= 4.2.5)
-      activesupport (= 4.1.9)
+      activesupport (= 4.2.5)
-      arel (~> 5.0.0)
+      arel (~> 6.0)
-    activesupport (4.1.9)
+    activesupport (4.2.5)
-      i18n (~> 0.6, >= 0.6.9)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    angularjs-rails (1.3.14)
+    addressable (2.4.0)
-    arel (5.0.1.20140414130214)
+    angularjs-rails (1.5.0)
-    bson (2.3.0)
+    arel (6.0.3)
+    bson (4.0.3)
     builder (3.2.2)
-    capybara (2.4.4)
+    capybara (2.6.2)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -42,49 +53,52 @@ GEM
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
-    carrierwave-mongoid (0.7.1)
+    carrierwave-mongoid (0.8.1)
       carrierwave (>= 0.8.0, < 0.11.0)
-      mongoid (>= 3.0, < 5.0)
+      mongoid (>= 3.0, < 6.0)
       mongoid-grid_fs (>= 1.3, < 3.0)
-    celluloid (0.16.0)
+    chunky_png (1.3.5)
-      timers (~> 4.0.0)
+    codeclimate-test-reporter (0.5.0)
-    chunky_png (1.3.4)
-    codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
-    coffee-rails (4.1.0)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
+      railties (>= 4.0.0, < 5.1.x)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.10.0)
-    connection_pool (2.1.1)
+    concurrent-ruby (1.0.1)
-    database_cleaner (1.4.0)
+    connection_pool (2.2.0)
+    database_cleaner (1.5.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    domain_name (0.5.20160216)
+      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    execjs (2.3.0)
+    execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.5.0)
+    factory_girl_rails (4.6.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffi (1.9.6)
+    ffi (1.9.10)
-    figaro (1.1.0)
+    figaro (1.1.1)
       thor (~> 0.14)
-    font-awesome-sass (4.3.1)
+    font-awesome-sass (4.5.0)
-      sass (~> 3.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 (5.5.1.0)
+    foundation-rails (5.5.3.2)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
-    guard (2.12.4)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    guard (2.13.0)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -96,170 +110,176 @@ GEM
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
-    guard-rails (0.7.1)
+    guard-rails (0.7.2)
       guard (~> 2.11)
       guard-compat (~> 1.0)
-    guard-rspec (4.5.0)
+    guard-rspec (4.6.4)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hike (1.2.3)
+    html_truncator (0.4.1)
-    hitimes (1.2.2)
-    html_truncator (0.4.0)
       nokogiri (~> 1.5)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     i18n (0.7.0)
-    jbuilder (2.2.8)
+    jbuilder (2.4.1)
-      activesupport (>= 3.0.0, < 5)
+      activesupport (>= 3.0.0, < 5.1)
       multi_json (~> 1.2)
-    jquery-rails (3.1.2)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.2)
+    json (1.8.3)
-    kgio (2.9.3)
+    kgio (2.10.0)
-    listen (2.8.5)
+    listen (3.0.6)
-      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
+      rb-inotify (>= 0.9.7)
-    lumberjack (1.0.9)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    lumberjack (1.0.10)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.4.3)
+    mime-types (2.99.1)
-    mina (0.3.3)
+    mina (0.3.8)
       open4 (~> 1.3.4)
       rake
-    mina-multistage (0.1.1)
+    mina-multistage (1.0.2)
       mina (>= 0.2.1)
     mina-sidekiq (0.3.1)
       mina
-    mina-unicorn (0.0.4)
+    mina-unicorn (0.4.0)
-    mini_magick (4.1.0)
+    mini_magick (4.4.0)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
-    minitest (5.5.1)
+    minitest (5.8.4)
-    mongoid (4.0.2)
+    mongo (2.2.4)
+      bson (~> 4.0)
+    mongoid (5.1.1)
       activemodel (~> 4.0)
-      moped (~> 2.0.0)
+      mongo (~> 2.1)
-      origin (~> 2.1)
+      origin (~> 2.2)
       tzinfo (>= 0.3.37)
-    mongoid-grid_fs (2.1.0)
+    mongoid-grid_fs (2.2.1)
       mime-types (>= 1.0, < 3.0)
-      mongoid (>= 3.0, < 5.0)
+      mongoid (>= 3.0, < 6.0)
     mongoid-pagination (0.2.0)
       activesupport
       mongoid
-    mongoid-rspec (2.1.0)
+    mongoid-rspec (3.0.0)
-      mongoid (~> 4.0.0)
+      mongoid (~> 5.0)
       rake
-      rspec (~> 3.1)
+      rspec (~> 3.3)
-    mongoid-tree (2.0.0)
+    mongoid-tree (2.0.1)
-      mongoid (>= 4.0, <= 5.0)
+      mongoid (>= 4.0, < 6.0)
-    moped (2.0.4)
+    multi_json (1.11.2)
-      bson (~> 2.2)
+    nenv (0.3.0)
-      connection_pool (~> 2.0)
+    netrc (0.11.0)
-      optionable (~> 0.2.0)
+    newrelic_rpm (3.15.0.314)
-    multi_json (1.10.1)
+    nokogiri (1.6.7.2)
-    nenv (0.2.0)
+      mini_portile2 (~> 2.0.0.rc2)
-    netrc (0.10.3)
+    notiffany (0.0.8)
-    newrelic_rpm (3.10.0.279)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    notiffany (0.0.6)
       nenv (~> 0.1)
       shellany (~> 0.0)
     open4 (1.3.4)
-    optionable (0.2.0)
+    origin (2.2.0)
-    origin (2.1.1)
+    pry (0.10.3)
-    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
-    pry-rails (0.3.3)
+    pry-rails (0.3.4)
       pry (>= 0.9.10)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.5.2)
+    rack (1.6.4)
-    rack-cors (0.3.1)
+    rack-cors (0.4.0)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.9)
+    rails (4.2.5)
-      actionmailer (= 4.1.9)
+      actionmailer (= 4.2.5)
-      actionpack (= 4.1.9)
+      actionpack (= 4.2.5)
-      actionview (= 4.1.9)
+      actionview (= 4.2.5)
-      activemodel (= 4.1.9)
+      activejob (= 4.2.5)
-      activerecord (= 4.1.9)
+      activemodel (= 4.2.5)
-      activesupport (= 4.1.9)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.9)
+      railties (= 4.2.5)
-      sprockets-rails (~> 2.0)
+      sprockets-rails
-    railties (4.1.9)
+    rails-deprecated_sanitizer (1.0.3)
-      actionpack (= 4.1.9)
+      activesupport (>= 4.2.0.alpha)
-      activesupport (= 4.1.9)
+    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.3)
+      loofah (~> 2.0)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.13.0)
+    raindrops (0.16.0)
-    rake (10.4.2)
+    rake (10.5.0)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    redcarpet (3.2.2)
+    redcarpet (3.3.4)
-    redis (3.2.1)
+    redis (3.2.2)
-    redis-namespace (1.5.1)
+    redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
-    rest-client (1.7.3)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rouge (1.8.0)
+    rouge (1.10.1)
-    rqrcode-with-patches (0.5.4)
+    rqrcode-with-patches (0.6.0)
       chunky_png
-    rspec (3.2.0)
+    rspec (3.4.0)
-      rspec-core (~> 3.2.0)
+      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.2.0)
+      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.2.0)
+      rspec-mocks (~> 3.4.0)
-    rspec-core (3.2.1)
+    rspec-core (3.4.3)
-      rspec-support (~> 3.2.0)
+      rspec-support (~> 3.4.0)
-    rspec-expectations (3.2.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
+      rspec-support (~> 3.4.0)
-    rspec-mocks (3.2.1)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
+      rspec-support (~> 3.4.0)
-    rspec-rails (3.2.1)
+    rspec-rails (3.4.2)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.2.0)
+      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.2.0)
+      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.2.0)
+      rspec-mocks (~> 3.4.0)
-      rspec-support (~> 3.2.0)
+      rspec-support (~> 3.4.0)
-    rspec-sidekiq (2.0.0)
+    rspec-sidekiq (2.2.0)
       rspec (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.2.2)
+    rspec-support (3.4.1)
-    sass (3.4.13)
+    sass (3.4.21)
-    sass-rails (5.0.1)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
+      tilt (>= 1.1, < 3)
     shellany (0.0.1)
-    sidekiq (3.3.2)
+    sidekiq (4.1.0)
-      celluloid (>= 0.16.0)
+      concurrent-ruby (~> 1.0)
-      connection_pool (>= 2.1.1)
+      connection_pool (~> 2.2, >= 2.2.0)
-      json
+      redis (~> 3.2, >= 3.2.1)
-      redis (>= 3.0.6)
+    simple_form (3.2.1)
-      redis-namespace (>= 1.3.1)
+      actionpack (> 4, < 5.1)
-    simple_form (3.1.0)
+      activemodel (> 4, < 5.1)
-      actionpack (~> 4.0)
+    simplecov (0.11.2)
-      activemodel (~> 4.0)
-    simplecov (0.9.2)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
+      json (~> 1.8)
-      simplecov-html (~> 0.9.0)
+      simplecov-html (~> 0.10.0)
-    simplecov-html (0.9.0)
+    simplecov-html (0.10.0)
-    slim (3.0.2)
+    slim (3.0.6)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slim-rails (3.0.1)
@@ -269,28 +289,27 @@ GEM
       railties (>= 3.1, < 5.0)
       slim (~> 3.0)
     slop (3.6.0)
-    spring (1.3.3)
+    spring (1.6.4)
-    sprockets (2.12.3)
+    sprockets (3.5.2)
-      hike (~> 1.2)
+      concurrent-ruby (~> 1.0)
-      multi_json (~> 1.0)
+      rack (> 1, < 3)
-      rack (~> 1.0)
+    sprockets-rails (3.0.3)
-      tilt (~> 1.1, != 1.3.0)
+      actionpack (>= 4.0)
-    sprockets-rails (2.2.4)
+      activesupport (>= 4.0)
-      actionpack (>= 3.0)
+      sprockets (>= 3.0.0)
-      activesupport (>= 3.0)
+    temple (0.7.6)
-      sprockets (>= 2.8, < 4.0)
-    temple (0.7.5)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.2)
-    timers (4.0.1)
-      hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicorn (4.8.3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.2)
+    unicorn (5.0.1)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -335,8 +354,9 @@ DEPENDENCIES
   pry-rails
   quiet_assets
   rack-cors
-  rails (= 4.1.9)
+  rails (= 4.2.5)
   redcarpet
+  redis-namespace
   rest-client
   rouge
   rqrcode-with-patches
@@ -347,5 +367,5 @@ DEPENDENCIES
   simple_form
   slim-rails
   spring
-  uglifier (>= 1.3.0)
+  uglifier (>= 2.7.2)
   unicorn

app/assets/javascripts/angularjs/admin_sessions.js.coffee

@@ -10,7 +10,7 @@
         password: $scope.password
     .success (res)->
       if res.success
-        urlback = $cookies.urlback || 'admin'
+        urlback = $cookies.urlback || '/admin'
         window.location = urlback
       else
         $scope.password = ''

config/mongoid.yml.example

@@ -1,5 +1,5 @@
 development:
-  sessions:
+  clients:
     default:
       database: w_blog_development
       hosts:
@@ -7,7 +7,7 @@ development:
   options:
 
 production:
-  sessions:
+  clients:
     default:
       database: w_blog_production
       hosts:
@@ -15,7 +15,7 @@ production:
   options:
 
 test:
-  sessions:
+  clients:
     default:
       database: w_blog_test
       hosts:

spec/spec_helper.rb

@@ -20,7 +20,11 @@ RSpec.configure do |config|
   config.after :each do
     DatabaseCleaner.clean
   end
-  
+
   config.mock_with :rspec
   config.infer_base_class_for_anonymous_controllers = false
 end
+
+RSpec::Sidekiq.configure do |config|
+  config.warn_when_jobs_not_processed_by_sidekiq = false
+end