Override Rails 2.3's BlueCloth dependency with RDiscount. [#24]

marnen · May 29, 2009 · bdbc45e · bdbc45e
1 parent 9fb1f8d
commit bdbc45e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -10,6 +10,8 @@ class ApplicationController < ActionController::Base
   before_filter :login_from_cookie
   before_filter :set_current_user 
 
+  ActionView::Helpers::TextHelper::BlueCloth = RDiscount
+
   helper :all # include all helpers, all the time
 
   # Check to see if the current user is an admin of at least one calendar.

diff --git a/config/environment.rb b/config/environment.rb
@@ -74,6 +74,8 @@
 
   config.gem 'grosser-fast_gettext', :lib => 'fast_gettext', :source => 'http://gems.github.com'
 
+  config.gem 'rdiscount', :version => '>= 1.2.11'
+
   # Set app to Eastern time for now -- we'll have configurable time zones soon enough
   config.time_zone = 'Eastern Time (US & Canada)'
 end
diff --git a/config/geminstaller.yml b/config/geminstaller.yml
@@ -42,8 +42,6 @@ gems:
   version: 0.8.1
 - name: rcov # testing
   version: 0.8.1.2.0
-- name: rdiscount
-  version: 1.2.11
 - name: rspec # testing
   version: 1.1.9
 - name: rspec-rails # testing

diff --git a/spec/controllers/events_controller_spec.rb b/spec/controllers/events_controller_spec.rb
@@ -132,7 +132,7 @@
   it "should contain an entry for every event, with <title>, <description> (with address and description), <link>, <guid>, and <pubDate> elements" do
     @events.each do |e|
       response.should have_tag('item title',ERB::Util::html_escape(e.name)) # actually, this is XML escape, but close enough
-      response.should have_tag('item description', /#{ERB::Util::html_escape(e.date.to_s(:rfc822))}.*#{ERB::Util::html_escape(e.address.to_s(:geo))}.*#{ERB::Util::html_escape(BlueCloth::new(ERB::Util::html_escape(e.description)).to_html)}/m) # kinky but accurate
+      response.should have_tag('item description', /#{ERB::Util::html_escape(e.date.to_s(:rfc822))}.*#{ERB::Util::html_escape(e.address.to_s(:geo))}.*#{ERB::Util::html_escape(RDiscount.new(ERB::Util::html_escape(e.description)).to_html)}/m) # kinky but accurate
       response.should have_tag('item link', event_url(e))
       response.should have_tag('item guid', event_url(e))
       response.should have_tag('item pubDate', e.created_at.to_s(:rfc822))