diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 22:55:46 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 22:55:46 -0500 |
| commit | b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2 (patch) | |
| tree | 05ae73741366a390fd543b67f7080325c8d7525e /actionpack | |
| parent | 6f9e449830902319d3c0897e67d8ac9c89bff39d (diff) | |
| download | rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.gz rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.tar.bz2 rails-b2f0b8cbda74cc89834b2db749fb0fbe44f5d8f2.zip | |
Rollback AS bundler work and improve activation of vendored dependencies
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/Gemfile | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template/handlers/builder.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/form_options_helper_test.rb | 2 |
4 files changed, 3 insertions, 9 deletions
diff --git a/actionpack/Gemfile b/actionpack/Gemfile index 8abf63bd35..b1579b427b 100644 --- a/actionpack/Gemfile +++ b/actionpack/Gemfile @@ -9,12 +9,6 @@ only :test do gem "mocha" gem "sqlite3-ruby" gem "RedCloth" - - activesupport_vendor = rails_root.join('activesupport', 'lib', 'active_support', 'vendor') - - gem 'builder', '2.1.2', :vendored_at => activesupport_vendor.join('builder-2.1.2') - gem 'memcache-client', '1.6.5', :vendored_at => activesupport_vendor.join('memcache-client-1.6.5') - gem 'tzinfo', '0.3.13', :vendored_at => activesupport_vendor.join('tzinfo-0.3.13') end disable_system_gems diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb index 5f381f7bf0..ba0d17b5af 100644 --- a/actionpack/lib/action_view/template/handlers/builder.rb +++ b/actionpack/lib/action_view/template/handlers/builder.rb @@ -6,7 +6,7 @@ module ActionView self.default_format = Mime::XML def compile(template) - require 'builder' + require 'active_support/vendor/builder' "xml = ::Builder::XmlMarkup.new(:indent => 2);" + "self.output_buffer = xml.target!;" + template.source + diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index f1914217f4..7776bd0704 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -7,7 +7,7 @@ $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers') require 'bundler_helper' -ensure_requirable %w( rack rack/test sqlite3 builder memcache tzinfo ) +ensure_requirable %w( rack rack/test sqlite3 ) ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp') diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb index aa40e46aa8..f3cdab05bf 100644 --- a/actionpack/test/template/form_options_helper_test.rb +++ b/actionpack/test/template/form_options_helper_test.rb @@ -1,5 +1,5 @@ require 'abstract_unit' -require 'tzinfo' +require 'active_support/vendor/tzinfo' TZInfo::Timezone.cattr_reader :loaded_zones |