Permalink
Browse files

merge

  • Loading branch information...
2 parents 64441a6 + fbf2c8a commit 05c973de09b8a9fa4402b93a3f25095eee38a519 @xdite committed Feb 2, 2012
Showing with 284 additions and 288 deletions.
  1. +16 −17 Gemfile
  2. +83 −82 Gemfile.lock
  3. +5 −1 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. +26 −5 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. +1 −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. +1 −13 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
33 Gemfile
@@ -1,6 +1,6 @@
-source 'http://rubygems.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"
@@ -23,19 +23,15 @@ gem 'will_paginate', '3.0.pre4'
# 三方平台 OAuth 验证登陆
gem "mongoid_search"
-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 命名空间
@@ -53,7 +49,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"
@@ -77,8 +73,9 @@ gem 'css3buttons', :git => "git://github.com/thetron/css3buttons_rails_helpers.g
gem "sprite-factory", "1.4.1"
-gem "social-share-button", "~> 0.0.1"
+gem "social-share-button", "~> 0.0.3"
gem "open_graph_helper"
+
# Simple form last commit: 2011-12-03
gem 'simple_form', :git => "git://github.com/plataformatec/simple_form.git"
gem 'anjlab-bootstrap-rails', :git => "git://github.com/anjlab/bootstrap-rails.git", :require => "bootstrap-rails"
@@ -88,9 +85,9 @@ gem 'newrelic_rpm'
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 :mailman do
@@ -108,7 +105,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:
@@ -64,39 +70,38 @@ GIT
GEM
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)
airbrake (3.0.5)
activesupport
builder
- arel (2.2.1)
+ arel (3.0.0)
aws-ses (0.4.4)
builder
mail (> 2.2.5)
@@ -123,18 +128,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)
@@ -155,6 +159,7 @@ GEM
multipart-post (~> 1.1.3)
rack (>= 1.1.0, < 2)
fast-stemmer (1.0.0)
+ fattr (2.2.1)
ffi (1.0.11)
fssm (0.2.7)
github-markup (0.5.3)
@@ -163,12 +168,13 @@ GEM
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)
@@ -230,16 +236,19 @@ GEM
omniauth-twitter (0.0.7)
omniauth-oauth (~> 1.0)
open_graph_helper (0.0.3)
+ options (2.3.0)
+ fattr
orm_adapter (0.0.5)
polyglot (0.3.3)
posix-spawn (0.3.6)
+ 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)
@@ -249,21 +258,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)
@@ -280,11 +289,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)
@@ -293,40 +297,38 @@ GEM
resque_mailer (2.0.2)
actionmailer (>= 3.0.0)
resque (>= 1.2.3)
- rmmseg-cpp-huacnlee (0.2.8)
- 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)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
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-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)
@@ -360,14 +362,13 @@ DEPENDENCIES
aws-ses (~> 0.4.3)
bootstrap_helper (= 1.4.1)
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)
css3buttons!
daemon-spawn (~> 0.4.2)
dalli (= 1.1.1)
@@ -387,30 +388,30 @@ DEPENDENCIES
mongoid_search
newrelic_rpm
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)
open_graph_helper
+ progress_bar
pygments.rb
- rails (= 3.1.3)
+ quiet_assets!
+ rails (= 3.2.1)
rails-i18n (= 0.1.8)
rails_autolink (>= 1.0.4)
rb-inotify
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)
- uglifier
+ uglifier (>= 1.0.3)
unicorn
will_paginate (= 3.0.pre4)
View
@@ -25,7 +25,11 @@ This is source code of [Ruby China Group](http://ruby-china.org)
mkdir doc/wiki_repo
cd doc/wiki_repo
git init
- ```
+
+
+ ## Test
+
+ * before running RSpec, start sunspot:solr : ```RAILS_ENV=test bundle exec rake sunspot:solr:run```
## 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 05c973d

Please sign in to comment.