Merge branch 'master' of github.com:ruby-china/ruby-china

.gitignore

@@ -28,3 +28,4 @@ solr/data/
 solr/pids/
 bin/
 tags
+chromedriver.log

.travis.yml

@@ -1,20 +1,41 @@
+language: ruby
 bundler_args: --without development
 
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - jruby
-  - rbx
-  - ree
+before_install:
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
+  - "export DISPLAY=:99.0"
+  - "export JASMINE_BROWSER=firefox"
+
+services:
+  - mongodb
+  - redis-server
 
 matrix:
+  include:
+    - rvm: 1.9.3
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+      jdk: openjdk7
+      env: JRUBY_OPTS="-Xmx512m -Xcompile.invokedynamic=false"
+    - rvm: jruby-head
+      jdk: openjdk7
+      env: JRUBY_OPTS="-Xcompile.invokedynamic=false"
   allow_failures:
-    - rvm: jruby
-    - rvm: rbx
-    - rvm: ree
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+      jdk: openjdk7
+      env: JRUBY_OPTS="-Xmx512m -Xcompile.invokedynamic=false"
+    - rvm: jruby-head
+      jdk: openjdk7
+      env: JRUBY_OPTS="-Xcompile.invokedynamic=false"
 
 before_script:
   - mongo ruby_china_test --eval 'db.addUser("travis", "test");'
   - cp config/config.yml.default config/config.yml
   - cp config/mongoid.yml.default config/mongoid.yml
-  - cp config/redis.yml.default config/redis.yml
+  - cp config/redis.yml.default config/redis.yml
+  - sed -i "s/SETUP_DEVELOPMENT_HOST/127.0.0.1:27017/g" config/mongoid.yml
+  - sed -i "s/SETUP_REDIS_HOST/127.0.0.1/g" config/redis.yml
+  - sed -i "s/SETUP_REDIS_PORT/6379/g" config/redis.yml
+
+script: bundle exec rake spec jasmine:ci

Gemfile

@@ -1,6 +1,7 @@
-source 'http://ruby.taobao.org'
+# coding: utf-8
+source 'https://rubygems.org'
 
-gem "rails", "3.2.7"
+gem "rails", "3.2.9"
 gem "rails-i18n","0.1.8"
 gem "jquery-rails", "2.0.1"
 gem "rails_autolink", ">= 1.0.4"
@@ -46,7 +47,7 @@ gem "omniauth-github", "~> 1.0.0"
 gem "cancan", "~> 1.6.7"
 
 # Redis 命名空间
-gem 'redis-namespace','~> 1.0.2'
+gem 'redis-namespace','~> 1.2.1'
 
 # 将一些数据存放入 Redis
 gem "redis-objects", "0.5.2"
@@ -61,10 +62,11 @@ gem "settingslogic", "~> 2.0.6"
 gem "cells", "3.7.1"
 
 # 队列
-gem "sidekiq", "1.1.0"
-gem "devise-async", "0.1.1"
+gem "sidekiq", "2.5.3"
 
-gem 'faye-rails'
+gem 'faye-rails','1.0.0'
+
+gem 'newrelic_rpm'
 
 # 分享功能
 gem "social-share-button", "~> 0.0.5"
@@ -82,6 +84,9 @@ gem 'quiet_assets', "1.0.1"
 # API
 gem 'grape', :github => 'intridea/grape', :branch => 'frontier'
 
+# Mailer
+gem 'postmark-rails', '0.4.1'
+
 # Google Analytics performance 
 gem 'garelic', '0.0.2'
 
@@ -97,6 +102,8 @@ group :development, :test do
   gem 'api_taster'
   gem "letter_opener"
   gem 'thin'
+
+  gem 'jasmine', '1.2.1'
 end
 
 group :production do