From 86a042ddd9dba8f62e7328c7258a798aef73d57f Mon Sep 17 00:00:00 2001
From: Jacek Becela <jacek.becela@gmail.com>
Date: Wed, 28 May 2008 21:30:44 +0200
Subject: Make plugins initialize also from rails/init.rb to ensure consistency
 with gems used as plugins

[#272 state:resolved]
---
 railties/lib/rails/plugin.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails/plugin.rb')

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 256f4b0132..a54ab85dbe 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -74,10 +74,18 @@ module Rails
         File.join(directory, 'lib')
       end
 
-      def init_path
+      def classic_init_path
         File.join(directory, 'init.rb')
       end
 
+      def gem_init_path
+        File.join(directory, 'rails', 'init.rb')
+      end
+
+      def init_path
+        File.file?(gem_init_path) ? gem_init_path : classic_init_path
+      end
+
       def has_lib_directory?
         File.directory?(lib_path)
       end
-- 
cgit v1.2.3


From faad1e32a8ab81890018ba89d191607778830cf0 Mon Sep 17 00:00:00 2001
From: rick <technoweenie@gmail.com>
Date: Sun, 8 Jun 2008 14:04:04 -0400
Subject: Fix discrepancies with loading rails/init.rb from gems. [#324
 state:resolved]

---
 railties/lib/rails/plugin.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'railties/lib/rails/plugin.rb')

diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index a54ab85dbe..b8b2b57038 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -95,14 +95,14 @@ module Rails
       end
 
       def evaluate_init_rb(initializer)
-         if has_init_file?
-           silence_warnings do
-             # Allow plugins to reference the current configuration object
-             config = initializer.configuration
-             
-             eval(IO.read(init_path), binding, init_path)
-           end
-         end
+        if has_init_file?
+          silence_warnings do
+            # Allow plugins to reference the current configuration object
+            config = initializer.configuration
+            
+            eval(IO.read(init_path), binding, init_path)
+          end
+        end
       end               
   end
 
@@ -111,8 +111,9 @@ module Rails
   # to Dependencies.load_paths.
   class GemPlugin < Plugin
     # Initialize this plugin from a Gem::Specification.
-    def initialize(spec)
-      super(File.join(spec.full_gem_path))
+    def initialize(spec, gem)
+      directory = (gem.frozen? && gem.unpacked_paths.first) || File.join(spec.full_gem_path)
+      super(directory)
       @name = spec.name
     end
 
-- 
cgit v1.2.3