activesupport/lib/active_support/vendor.rb @@ -6,7 +6,7 @@ module ActionView self.default_format = Mime::XML def compile(template) - require 'active_support/vendor/builder' + require 'builder' "xml = ::Builder::XmlMarkup.new(:indent => 2);" + "self.output_buffer = xml.target!;" + template.source + actionpack/lib/action_view/template/handlers/builder.rb @@ -1,5 +1,5 @@ require 'abstract_unit' -require 'active_support/vendor/tzinfo' +require 'tzinfo' TZInfo::Timezone.cattr_reader :loaded_zones actionpack/test/template/form_options_helper_test.rb @@ -35,6 +35,7 @@ module ActiveSupport end require 'active_support/autoload' +require 'active_support/vendor' -require 'active_support/vendor/i18n' +require 'i18n' I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" activesupport/lib/active_support.rb @@ -1,4 +1,4 @@ -require 'active_support/vendor/memcache' +require 'memcache' module ActiveSupport module Cache activesupport/lib/active_support/cache/mem_cache_store.rb @@ -157,7 +157,7 @@ class Array # def to_xml(options = {}) raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml } - require 'active_support/vendor/builder' unless defined?(Builder) + require 'builder' unless defined?(Builder) options = options.dup options[:root] ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(first.class.name)) : "records" activesupport/lib/active_support/core_ext/array/conversions.rb @@ -84,7 +84,7 @@ class Hash alias_method :to_param, :to_query def to_xml(options = {}) - require 'active_support/vendor/builder' unless defined?(Builder) + require 'builder' unless defined?(Builder) options = options.dup options[:indent] ||= 2 activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -6,7 +6,7 @@ rescue LoadError # fast_xs extension unavailable else begin - require 'active_support/vendor/builder' + require 'builder' rescue LoadError # builder demands the first shot at defining String#to_xs end activesupport/lib/active_support/core_ext/string/xchar.rb @@ -306,7 +306,7 @@ module ActiveSupport # TODO: Preload instead of lazy load for thread safety def tzinfo - require 'active_support/vendor/tzinfo' unless defined?(TZInfo) + require 'tzinfo' unless defined?(TZInfo) @tzinfo ||= TZInfo::Timezone.get(MAPPING[name]) end activesupport/lib/active_support/values/time_zone.rb @@ -19,7 +19,7 @@ require 'active_support/test_case' require 'active_support/ruby/shim' def uses_memcached(test_name) - require 'active_support/vendor/memcache' + require 'memcache' begin MemCache.new('localhost').stats yield activesupport/test/abstract_unit.rb activesupport/lib/active_support/vendor/builder.rb activesupport/lib/active_support/vendor/i18n.rb activesupport/lib/active_support/vendor/memcache.rb activesupport/lib/active_support/vendor/tzinfo.rb 772a32a22d71f7a22108719d88c94959ae4942b6 Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/rails/commit/0bd6e933c01868db7c7e20d46c972c4e7395b743 0bd6e933c01868db7c7e20d46c972c4e7395b743 2009-09-24T18:38:18-07:00 2009-09-24T18:36:40-07:00 Restore split between require-time and runtime load path mungery. Simplifies vendor requires. d91dbf5aaf990748082e42eb772ba049844794a3 Jeremy Kemper jeremy@bitsweat.net