From 4c3bb1cb7ce3fb9bc9fedcfa369a69aad58b1794 Mon Sep 17 00:00:00 2001
From: Marcello Barnaba <vjt@openssl.it>
Date: Tue, 11 Jan 2011 17:20:51 +0100
Subject: [PATCH 1/4] Init: added a Railtie for Rails3

---
 lib/more.rb         |  2 ++
 lib/more/railtie.rb | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 lib/more.rb
 create mode 100644 lib/more/railtie.rb

diff --git a/lib/more.rb b/lib/more.rb
new file mode 100644
index 0000000..a46a63c
--- /dev/null
+++ b/lib/more.rb
@@ -0,0 +1,2 @@
+require 'less/more'
+require 'more/railtie'
diff --git a/lib/more/railtie.rb b/lib/more/railtie.rb
new file mode 100644
index 0000000..5db1297
--- /dev/null
+++ b/lib/more/railtie.rb
@@ -0,0 +1,21 @@
+class Less::More # :nodoc:
+  if defined? Rails::Railtie
+    class Railtie < ::Rails::Railtie
+      initializer 'more.insert_into_action_controller' do
+        ActiveSupport.on_load(:action_controller) do
+          Less::More::Railtie.insert
+        end
+      end
+
+      rake_tasks do
+        load 'tasks/more_tasks.rake'
+      end
+    end
+  end
+
+  class Railtie
+    def self.insert
+      require 'less/controller_extension' if Rails.env.development?
+    end
+  end
+end

From 94d7004dddbaec9d2e71bd793cf72bf69db1f034 Mon Sep 17 00:00:00 2001
From: Marcello Barnaba <vjt@openssl.it>
Date: Tue, 11 Jan 2011 17:21:27 +0100
Subject: [PATCH 2/4] Init: Rails2 AND 3 compatible initialization

---
 init.rb       | 2 +-
 rails/init.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/init.rb b/init.rb
index 6dbfa4c..6da0ced 100644
--- a/init.rb
+++ b/init.rb
@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), 'rails', 'init')
+require File.join(File.dirname(__FILE__), 'lib', 'more')
diff --git a/rails/init.rb b/rails/init.rb
index 17ff689..8366457 100644
--- a/rails/init.rb
+++ b/rails/init.rb
@@ -1 +1,2 @@
-require File.join(File.dirname(__FILE__), '..', 'lib', 'less', 'controller_extension') if RAILS_ENV == 'development'
\ No newline at end of file
+require 'more/railtie'
+Less::More::Railtie.insert

From 38ff99ab48f0f02518a54390ca09bbee6d44e4ab Mon Sep 17 00:00:00 2001
From: Marcello Barnaba <vjt@openssl.it>
Date: Tue, 11 Jan 2011 17:23:55 +0100
Subject: [PATCH 3/4] Cleanup: move controller_extension into more/

---
 lib/{less => more}/controller_extension.rb | 0
 lib/more/railtie.rb                        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename lib/{less => more}/controller_extension.rb (100%)

diff --git a/lib/less/controller_extension.rb b/lib/more/controller_extension.rb
similarity index 100%
rename from lib/less/controller_extension.rb
rename to lib/more/controller_extension.rb
diff --git a/lib/more/railtie.rb b/lib/more/railtie.rb
index 5db1297..ca4c693 100644
--- a/lib/more/railtie.rb
+++ b/lib/more/railtie.rb
@@ -15,7 +15,7 @@ class Railtie < ::Rails::Railtie
 
   class Railtie
     def self.insert
-      require 'less/controller_extension' if Rails.env.development?
+      require 'more/controller_extension' if Rails.env.development?
     end
   end
 end

From 30bc701b5043c8d19446008671c08a0fbff62b1a Mon Sep 17 00:00:00 2001
From: Marcello Barnaba <vjt@openssl.it>
Date: Tue, 11 Jan 2011 17:25:49 +0100
Subject: [PATCH 4/4] Gem: regenerate gemspec

---
 more.gemspec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/more.gemspec b/more.gemspec
index a64f9c3..a00053d 100644
--- a/more.gemspec
+++ b/more.gemspec
@@ -18,8 +18,10 @@ Gem::Specification.new do |s|
   s.files = [
     "Rakefile",
     "init.rb",
-    "lib/less/controller_extension.rb",
     "lib/less/more.rb",
+    "lib/more.rb",
+    "lib/more/controller_extension.rb",
+    "lib/more/railtie.rb",
     "lib/tasks/more_tasks.rake",
     "rails/init.rb",
     "test/controller_test.rb",