升级 Rouge.

Author: huacnlee

.travis.yml

@@ -10,8 +10,8 @@ matrix:
     - rvm: ruby-head
 
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.0
 
 before_script:
   - mongo ruby_china_test --eval 'db.addUser("travis", "test");'

Gemfile

@@ -52,7 +52,7 @@ gem "redis-objects", "0.5.2"
 
 # Markdown 格式 & 文本处理
 gem "redcarpet", "~> 2.2.2"
-gem "rouge", "~> 0.3.10"
+gem "rouge", "~> 1.0.0"
 gem 'nokogiri', "~> 1.5.6"
 gem 'auto-space', '0.0.2'
 

Gemfile.lock

@@ -297,8 +297,7 @@ GEM
     remotipart (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rouge (0.3.10)
-      thor
+    rouge (1.0.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -437,7 +436,7 @@ DEPENDENCIES
   redcarpet (~> 2.2.2)
   redis-namespace (~> 1.2.1)
   redis-objects (= 0.5.2)
-  rouge (~> 0.3.10)
+  rouge (~> 1.0.0)
   rspec-cells (= 0.1.7)
   rspec-rails (~> 2.13.2)
   rvm-capistrano

spec/helpers/topics_helper_spec.rb

@@ -107,30 +107,30 @@
 
     it "should highlight code block" do
       helper.format_topic_body("```ruby\nclass Hello\n\nend\n```").should ==
-        %(<pre class=\"highlight ruby\"><span class=\"k\">class </span><span class=\"nc\">Hello</span>\n\n<span class=\"k\">end</span>\n</pre>)
+        %(<pre class=\"highlight ruby\"><span class=\"k\">class</span> <span class=\"nc\">Hello</span>\n\n<span class=\"k\">end</span>\n</pre>)
     end
 
     it "should be able to identigy Ruby or RUBY as ruby language" do
       ['Ruby', 'RUBY'].each do |lang|
         helper.format_topic_body("```#{lang}\nclass Hello\nend\n```").should ==
-          %(<pre class=\"highlight ruby\"><span class=\"k\">class </span><span class=\"nc\">Hello</span>\n<span class=\"k\">end</span>\n</pre>)
+          %(<pre class=\"highlight ruby\"><span class=\"k\">class</span> <span class=\"nc\">Hello</span>\n<span class=\"k\">end</span>\n</pre>)
       end
     end
 
     it "should highlight code block after the content" do
       helper.format_topic_body("this code:\n```\ngem install rails\n```\n").should ==
-        %(<p>this code:</p>\n<pre class=\"highlight text\">gem install rails\n</pre>)
+        %(<p>this code:</p>\n<pre class=\"highlight plaintext\">gem install rails\n</pre>)
     end
 
     it "should highlight code block without language" do
       helper.format_topic_body("```\ngem install ruby\n```").gsub("\n",'').should ==
-        %(<pre class=\"highlight text\">gem install ruby</pre>)
+        %(<pre class=\"highlight plaintext\">gem install ruby</pre>)
     end
 
     it "should not filter underscore" do
       helper.format_topic_body("ruby_china_image `ruby_china_image`").should == "<p>ruby_china_image <code>ruby_china_image</code></p>"
       helper.format_topic_body("```\nruby_china_image\n```").should ==
-        %(<pre class=\"highlight text\">ruby_china_image\n</pre>)
+        %(<pre class=\"highlight plaintext\">ruby_china_image\n</pre>)
     end
   end