From 43cb64d77e5bea7361a5cd053e3658ee4ded3408 Mon Sep 17 00:00:00 2001
From: Chris Eppstein <chris@eppsteins.net>
Date: Mon, 6 Jul 2009 11:47:02 -0700
Subject: [PATCH] [Rails] Fixed bug introduced in 0.8.3.

---
 CHANGELOG.markdown                                          | 5 +++++
 lib/compass/app_integration/rails.rb                        | 2 +-
 lib/compass/app_integration/rails/{image_url.rb => urls.rb} | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename lib/compass/app_integration/rails/{image_url.rb => urls.rb} (87%)

diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 75eef36c..1298a7c4 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,6 +1,11 @@
 COMPASS CHANGELOG
 =================
 
+0.8.4 (July 06, 2009)
+---------------------
+
+Fixed a bug in rails integration introduced in 0.8.3.
+
 0.8.3 (July 06, 2009)
 ---------------------
 
diff --git a/lib/compass/app_integration/rails.rb b/lib/compass/app_integration/rails.rb
index c29cbb24..904be241 100644
--- a/lib/compass/app_integration/rails.rb
+++ b/lib/compass/app_integration/rails.rb
@@ -2,7 +2,7 @@ unless defined?(Compass::RAILS_LOADED)
   Compass::RAILS_LOADED = true
   require File.join(File.dirname(__FILE__), 'rails', 'action_controller')
   require File.join(File.dirname(__FILE__), 'rails', 'sass_plugin')
-  require File.join(File.dirname(__FILE__), 'rails', 'image_url')
+  require File.join(File.dirname(__FILE__), 'rails', 'urls')
   # Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
   class Sass::Script::Functions::EvaluationContext
     include Sass::Script::Functions
diff --git a/lib/compass/app_integration/rails/image_url.rb b/lib/compass/app_integration/rails/urls.rb
similarity index 87%
rename from lib/compass/app_integration/rails/image_url.rb
rename to lib/compass/app_integration/rails/urls.rb
index f59f8056..87f39508 100644
--- a/lib/compass/app_integration/rails/image_url.rb
+++ b/lib/compass/app_integration/rails/urls.rb
@@ -1,4 +1,4 @@
-module Compass::SassExtensions::Functions::ImageUrl
+module Compass::SassExtensions::Functions::Urls
   def image_url_with_rails_integration(path)
     if @controller = Sass::Plugin.rails_controller
       begin