Merge branch 'release/0.1.2'

jeffkreeftmeijer · Jul 9, 2011 · 9c9bc73 · 9c9bc73
2 parents 66b49c5 + ff12baf
commit 9c9bc73
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/gust.gemspec b/gust.gemspec
@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "gust"
-  s.version     = '0.1.1'
+  s.version     = '0.1.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jeff Kreeftmeijer"]
   s.email       = ["jeff@kreeftmeijer.nl"]

diff --git a/lib/gust.rb b/lib/gust.rb
@@ -5,7 +5,7 @@
 class Gust
 
   def self.parse(code, options = {})
-    return "<div class=\"markup\">#{code}</div>\n" unless options[:filename]
+    return "<div class=\"highlight\"><pre>#{code}</pre></div>\n" unless options[:filename]
 
     case options[:filename]
       when /.*\.png$/ then "<div class=\"image\"><img src=\"#{options[:url]}\"/></div>\n"

diff --git a/spec/gust_spec.rb b/spec/gust_spec.rb
@@ -15,7 +15,7 @@
 
       subject { Gust.parse('foo') }
 
-      it { should == "<div class=\"markup\">foo</div>\n" }
+      it { should == "<div class=\"highlight\"><pre>foo</pre></div>\n" }
 
     end