From f92e93d91e792e2e8eed1c902d6a77c1a7cdf593 Mon Sep 17 00:00:00 2001
From: Olivier El Mekki <oelmekki@gmail.com>
Date: Sun, 4 Sep 2011 18:55:07 +0200
Subject: [PATCH] ADD Rails-3.1 assets pipeline compatibility

---
 lib/lucy.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/lucy.rb b/lib/lucy.rb
index 63e148f..5aaa2bb 100644
--- a/lib/lucy.rb
+++ b/lib/lucy.rb
@@ -4,7 +4,12 @@ module Lucy
   DEFAULT_GLOBAL = "window"
 
   def self.javascript_dir
-    @js_dir ||= File.join(Rails.root, "public", "javascripts")
+    assets_dir = File.join( Rails.root, 'app', 'assets', 'javascripts' )
+    if Dir.exists?( assets_dir )
+      @js_dir ||= assets_dir
+    else
+      @js_dir ||= File.join(Rails.root, "public", "javascripts")
+    end
   end
 
   def self.generate(key, content=nil, path=nil)