Permalink
Browse files

update

  • Loading branch information...
2 parents 9d6bed6 + 5821f29 commit fbf2c8a0eae29f50aa37f03bd0eb84821b2a0c51 @xdite committed Feb 2, 2012
Showing with 286 additions and 289 deletions.
  1. +15 −17 Gemfile
  2. +85 −84 Gemfile.lock
  3. +5 −0 README.markdown
  4. BIN app/assets/images/sprites/icons.png
  5. BIN app/assets/images/sprites/icons/rss.png
  6. +1 −0 app/assets/javascripts/application.js
  7. +6 −0 app/assets/javascripts/topics.coffee
  8. +11 −4 app/assets/stylesheets/front.scss
  9. +31 −3 app/assets/stylesheets/mobile.scss
  10. +16 −0 app/assets/stylesheets/sprites/icons.scss
  11. +11 −0 app/assets/stylesheets/topics.scss
  12. +27 −6 app/cells/topics/reply_help_block.zh-CN.html.erb
  13. +28 −7 app/cells/topics/reply_help_block.zh-TW.html.erb
  14. +2 −1 app/cells/topics_cell.rb
  15. +6 −0 app/controllers/cpanel/topics_controller.rb
  16. +2 −4 app/controllers/search_controller.rb
  17. +1 −0 app/models/page.rb
  18. +0 −1 app/models/post.rb
  19. +0 −5 app/models/topic.rb
  20. +1 −1 app/views/common/_feeds.html.erb
  21. +1 −1 app/views/cpanel/page_versions/index.html.erb
  22. +7 −1 app/views/cpanel/topics/index.html.erb
  23. +1 −0 app/views/layouts/application.html.erb
  24. +0 −2 app/views/topics/_editor_toolbar.html.erb
  25. +0 −5 config/application.rb
  26. +1 −16 config/environments/development.rb
  27. +1 −1 config/environments/production.rb
  28. +0 −12 config/initializers/redis.rb
  29. +2 −1 config/initializers/social_share_button.rb
  30. +1 −0 config/locales/menu.en.yml
  31. +1 −0 config/locales/menu.zh-CN.yml
  32. +1 −0 config/locales/menu.zh-TW.yml
  33. +1 −0 config/routes.rb
  34. +1 −1 config/sunspot.yml
  35. +0 −25 lib/README.md
  36. +0 −74 lib/daemon.rb
  37. +0 −17 lib/segment.rb
  38. +17 −0 spec/models/page_spec.rb
  39. +3 −0 spec/spec_helper.rb
View
32 Gemfile
@@ -1,6 +1,6 @@
-source 'http://ruby.taobao.org'
+source "http://rubygems.org"
-gem "rails", "3.1.3"
+gem "rails", "3.2.1"
gem "bson_ext", "1.5.2"
gem "mongoid", "2.3.4"
@@ -21,19 +21,15 @@ gem 'will_paginate', '3.0.2'
gem 'bootstrap-will_paginate', '0.0.3'
# 三方平台 OAuth 验证登陆
-gem "omniauth"
-gem 'omniauth-openid'
-gem "omniauth-github"
-gem "omniauth-twitter"
+gem "omniauth", "~> 1.0.1"
+gem 'omniauth-openid', "~> 1.0.1"
+gem "omniauth-github", "~> 1.0.0"
+gem "omniauth-twitter", "~> 0.0.7"
gem "omniauth-douban", :git => "git://github.com/ballantyne/omniauth-douban.git"
# permission
-gem "cancan"
+gem "cancan", "~> 1.6.7"
-# 搜索相关的组件
-gem 'chinese_pinyin', '0.4.1'
-gem "rmmseg-cpp-huacnlee", "0.2.8"
-gem 'redis-search', '0.6.3'
# Rails I18n
gem "rails-i18n","0.1.8"
# Redis 命名空间
@@ -51,7 +47,7 @@ gem "jquery-rails", "1.0.16"
gem "rails_autolink", ">= 1.0.4"
# YAML 配置信息
gem "settingslogic", "~> 2.0.6"
-gem "cells", "3.6.7"
+gem "cells", "3.7.1"
gem "resque", "~> 1.19.0", :require => "resque/server"
gem "resque_mailer", '2.0.2'
gem "aws-ses", "~> 0.4.3"
@@ -61,7 +57,7 @@ gem "unicorn"
# 用于组合小图片
gem "sprite-factory", "1.4.1"
# 分享功能
-gem "social-share-button", "~> 0.0.1"
+gem "social-share-button", "~> 0.0.3"
# Simple form last commit: 2011-12-03
gem 'simple_form', :git => "git://github.com/plataformatec/simple_form.git"
@@ -71,9 +67,9 @@ gem 'sunspot_rails', "~> 1.3.0"
gem 'sunspot_solr'
group :assets do
- gem 'sass-rails', " ~> 3.1.4"
- gem 'coffee-rails', "~> 3.1.1"
- gem 'uglifier'
+ gem 'sass-rails', " ~> 3.2.3"
+ gem 'coffee-rails', "~> 3.2.1"
+ gem 'uglifier', '>= 1.0.3'
end
group :development do
@@ -83,7 +79,9 @@ group :development do
end
group :development, :test do
- gem 'rspec-rails', '~> 2.7.0'
+ gem 'rspec-rails', '~> 2.8.1'
+ gem 'progress_bar'
+ gem 'quiet_assets', :git => 'git://github.com/AgilionApps/quiet_assets.git'
end
group :test do
View
@@ -5,6 +5,12 @@ GIT
mail_view (1.0.1)
GIT
+ remote: git://github.com/AgilionApps/quiet_assets.git
+ revision: b699ee6c8aac59dc2e1405e98aef82802e8b8098
+ specs:
+ quiet_assets (0.0.1)
+
+GIT
remote: git://github.com/anjlab/bootstrap-rails.git
revision: 41bcbfdb36a2c18af9bbe77c4f3eec9310e405b8
specs:
@@ -39,38 +45,37 @@ GIT
thor (~> 0.14)
GEM
- remote: http://ruby.taobao.org/
+ remote: http://rubygems.org/
specs:
- actionmailer (3.1.3)
- actionpack (= 3.1.3)
- mail (~> 2.3.0)
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ actionmailer (3.2.1)
+ actionpack (= 3.2.1)
+ mail (~> 2.4.0)
+ actionpack (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.5)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.1)
+ activesupport (= 3.2.1)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activeresource (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
+ activeresource (3.2.1)
+ activemodel (= 3.2.1)
+ activesupport (= 3.2.1)
+ activesupport (3.2.1)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.6)
- arel (2.2.1)
+ arel (3.0.0)
aws-ses (0.4.4)
builder
mail (> 2.2.5)
@@ -96,18 +101,17 @@ GEM
carrierwave-mongoid (0.1.2)
carrierwave (>= 0.5.6)
mongoid (~> 2.1)
- cells (3.6.7)
+ cells (3.7.1)
actionpack (~> 3.0)
railties (~> 3.0)
- chinese_pinyin (0.4.1)
chunky_png (1.2.5)
- coffee-rails (3.1.1)
+ coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
- railties (~> 3.1.0)
+ railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.3)
+ coffee-script-source (1.2.0)
daemon-spawn (0.4.2)
dalli (1.1.1)
devise (1.5.2)
@@ -128,18 +132,20 @@ GEM
addressable (~> 2.2.6)
multipart-post (~> 1.1.3)
rack (>= 1.1.0, < 2)
+ fattr (2.2.1)
ffi (1.0.11)
hashie (1.2.0)
highline (1.6.8)
hike (1.2.1)
hpricot (0.8.5)
i18n (0.6.0)
+ journey (1.0.1)
jquery-rails (1.0.16)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.4)
+ json (1.6.5)
kgio (2.6.0)
- mail (2.3.0)
+ mail (2.4.1)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -187,16 +193,19 @@ GEM
rack-openid (~> 1.3.1)
omniauth-twitter (0.0.7)
omniauth-oauth (~> 1.0)
+ options (2.3.0)
+ fattr
orm_adapter (0.0.5)
polyglot (0.3.3)
pr_geohash (1.0.0)
+ progress_bar (0.4.0)
+ highline (~> 1.6.1)
+ options (~> 2.3.0)
pygments.rb (0.2.4)
rubypython (~> 0.5.3)
- rack (1.3.6)
+ rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
@@ -206,21 +215,21 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.3)
- actionmailer (= 3.1.3)
- actionpack (= 3.1.3)
- activerecord (= 3.1.3)
- activeresource (= 3.1.3)
- activesupport (= 3.1.3)
+ rails (3.2.1)
+ actionmailer (= 3.2.1)
+ actionpack (= 3.2.1)
+ activerecord (= 3.2.1)
+ activeresource (= 3.2.1)
+ activesupport (= 3.2.1)
bundler (~> 1.0)
- railties (= 3.1.3)
+ railties (= 3.2.1)
rails-i18n (0.1.8)
i18n (~> 0.5)
rails_autolink (1.0.4)
rails (>= 3.1.0)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ railties (3.2.1)
+ actionpack (= 3.2.1)
+ activesupport (= 3.2.1)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -235,11 +244,6 @@ GEM
redis (< 3.0.0)
redis-objects (0.5.2)
redis (>= 2.1.1)
- redis-search (0.6.3)
- chinese_pinyin (>= 0.3.0)
- redis (>= 2.1.1)
- redis-namespace (~> 1.0.2)
- rmmseg-cpp-huacnlee (>= 0.2.8)
resque (1.19.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0.2)
@@ -248,40 +252,38 @@ GEM
resque_mailer (2.0.2)
actionmailer (>= 3.0.0)
resque (>= 1.2.3)
- rmmseg-cpp-huacnlee (0.2.8)
rsolr (1.0.6)
builder (>= 2.1.2)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
ruby-openid (2.1.8)
rubypython (0.5.3)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
- sass (3.1.11)
- sass-rails (3.1.5)
- actionpack (~> 3.1.0)
- railties (~> 3.1.0)
- sass (~> 3.1.10)
- tilt (~> 1.3.2)
+ sass (3.1.12)
+ sass-rails (3.2.4)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
settingslogic (2.0.6)
sinatra (1.3.1)
rack (~> 1.3, >= 1.3.4)
rack-protection (~> 1.1, >= 1.1.2)
tilt (~> 1.3, >= 1.3.3)
- social-share-button (0.0.1)
+ social-share-button (0.0.3)
sprite-factory (1.4.1)
- sprockets (2.0.3)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -324,14 +326,13 @@ DEPENDENCIES
bootstrap-will_paginate (= 0.0.3)
bootstrap_helper!
bson_ext (= 1.5.2)
- cancan
+ cancan (~> 1.6.7)
capistrano (= 2.9.0)
carrierwave (= 0.5.6)
carrierwave-mongoid (= 0.1.2)
- cells (= 3.6.7)
- chinese_pinyin (= 0.4.1)
+ cells (= 3.7.1)
chunky_png (= 1.2.5)
- coffee-rails (~> 3.1.1)
+ coffee-rails (~> 3.2.1)
daemon-spawn (~> 0.4.2)
dalli (= 1.1.1)
devise (= 1.5.2)
@@ -345,30 +346,30 @@ DEPENDENCIES
mongoid (= 2.3.4)
mongoid_auto_increment_id (= 0.3.1)
nokogiri (= 1.5.0)
- omniauth
+ omniauth (~> 1.0.1)
omniauth-douban!
- omniauth-github
- omniauth-openid
- omniauth-twitter
+ omniauth-github (~> 1.0.0)
+ omniauth-openid (~> 1.0.1)
+ omniauth-twitter (~> 0.0.7)
+ progress_bar
pygments.rb
- rails (= 3.1.3)
+ quiet_assets!
+ rails (= 3.2.1)
rails-i18n (= 0.1.8)
rails_autolink (>= 1.0.4)
redcarpet (~> 2.0.0)
redis-namespace (~> 1.0.2)
redis-objects (= 0.5.2)
- redis-search (= 0.6.3)
resque (~> 1.19.0)
resque_mailer (= 2.0.2)
- rmmseg-cpp-huacnlee (= 0.2.8)
- rspec-rails (~> 2.7.0)
- sass-rails (~> 3.1.4)
+ rspec-rails (~> 2.8.1)
+ sass-rails (~> 3.2.3)
settingslogic (~> 2.0.6)
simple_form!
- social-share-button (~> 0.0.1)
+ social-share-button (~> 0.0.3)
sprite-factory (= 1.4.1)
sunspot_rails (~> 1.3.0)
sunspot_solr
- uglifier
+ uglifier (>= 1.0.3)
unicorn
will_paginate (= 3.0.2)
View
@@ -14,9 +14,14 @@ This is source code of [Ruby China Group](http://ruby-china.org)
rake assets:precompile
thin start -O -C config/thin.yml
./script/resque start
+ bundle exec rake sunspot:solr:start
easy_install pygments # 或者 pip install pygments
```
+## Test
+
+* before running RSpec, start sunspot:solr : ```RAILS_ENV=test bundle exec rake sunspot:solr:run```
+
## Deploy
$ cap deploy
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit fbf2c8a

Please sign in to comment.