From 0f28a55056d8f8795e73c9cbfece82073bd08952 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Wed, 27 Oct 2010 08:12:21 -0700 Subject: [PATCH 1/3] Moved contents of rails/init.rb into init.rb to avoid Rails 3 deprecation warnings --- init.rb | 3 ++- rails/init.rb | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 rails/init.rb diff --git a/init.rb b/init.rb index 6dbfa4c..2a62797 100644 --- a/init.rb +++ b/init.rb @@ -1 +1,2 @@ -require File.join(File.dirname(__FILE__), 'rails', 'init') +#require File.join(File.dirname(__FILE__), 'rails', 'init') +require File.join(File.dirname(__FILE__), 'lib', 'less', 'controller_extension') if Rails.env == 'development' \ No newline at end of file diff --git a/rails/init.rb b/rails/init.rb deleted file mode 100644 index 17ff689..0000000 --- a/rails/init.rb +++ /dev/null @@ -1 +0,0 @@ -require File.join(File.dirname(__FILE__), '..', 'lib', 'less', 'controller_extension') if RAILS_ENV == 'development' \ No newline at end of file From 9b242471d73b6b27104c1573c491ac9a10446543 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Wed, 27 Oct 2010 08:27:57 -0700 Subject: [PATCH 2/3] Added newline after css file banner comment --- lib/less/more.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/less/more.rb b/lib/less/more.rb index 6552ba1..3e3e03f 100644 --- a/lib/less/more.rb +++ b/lib/less/more.rb @@ -15,7 +15,7 @@ end class Less::More - HEADER = %{/*\n\n\n\n\n\tThis file was auto generated by Less (http://lesscss.org). To change the contents of this file, edit %s instead.\n\n\n\n\n*/} + HEADER = %{/*\n\n\n\n\n\tThis file was auto generated by Less (http://lesscss.org). To change the contents of this file, edit %s instead.\n\n\n\n\n*/\n} class << self # Less::More.compression = true/false --- compress generated css ? (default: false) From dcdb7ae5f1e813fbc1fa46c1ec7a5de8ba24df13 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Wed, 27 Oct 2010 08:55:19 -0700 Subject: [PATCH 3/3] fixed fake Rails in test_helper and used Rails.env instead of RAILS_ENV --- init.rb | 4 ++-- test/test_helper.rb | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/init.rb b/init.rb index 2a62797..229d512 100644 --- a/init.rb +++ b/init.rb @@ -1,2 +1,2 @@ -#require File.join(File.dirname(__FILE__), 'rails', 'init') -require File.join(File.dirname(__FILE__), 'lib', 'less', 'controller_extension') if Rails.env == 'development' \ No newline at end of file +require File.join(File.dirname(__FILE__), 'lib', 'less', 'controller_extension') if Rails.env == 'development' + diff --git a/test/test_helper.rb b/test/test_helper.rb index f705639..3b950e7 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -12,9 +12,13 @@ def self.root def self.backtrace_cleaner ActiveSupport::BacktraceCleaner.new end + + def self.env + 'development' + end end -RAILS_ENV = 'development' +#RAILS_ENV = 'development' # load plugin $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')