diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-23 15:26:32 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-23 15:26:32 -0800 |
| commit | 9f5ab945b7118a317a12bd46c73d24575f31ce3f (patch) | |
| tree | 2a1a48663005fb166be05272763124c21ffc0aac /activesupport/lib | |
| parent | e931012287df0bca83cae04d95c2e0835ae08758 (diff) | |
| download | rails-9f5ab945b7118a317a12bd46c73d24575f31ce3f.tar.gz rails-9f5ab945b7118a317a12bd46c73d24575f31ce3f.tar.bz2 rails-9f5ab945b7118a317a12bd46c73d24575f31ce3f.zip | |
Lazy-require XmlSimple. Move CGI require to object conversions where it's actually used.
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/conversions.rb | 4 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/conversions.rb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index a76c8a2259..fe38fb665b 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -1,6 +1,4 @@ require 'date' -require 'cgi' -require 'xmlsimple' # Locked down XmlSimple#xml_in_string class XmlSimple @@ -168,6 +166,8 @@ module ActiveSupport #:nodoc: module ClassMethods def from_xml(xml) + require 'xmlsimple' + # TODO: Refactor this into something much cleaner that doesn't rely on XmlSimple typecast_xml_value(undasherize_keys(XmlSimple.xml_in_string(xml, 'forcearray' => false, diff --git a/activesupport/lib/active_support/core_ext/object/conversions.rb b/activesupport/lib/active_support/core_ext/object/conversions.rb index ad752f0fc5..1dee171ec4 100644 --- a/activesupport/lib/active_support/core_ext/object/conversions.rb +++ b/activesupport/lib/active_support/core_ext/object/conversions.rb @@ -1,3 +1,5 @@ +require 'cgi' + class Object # Alias of <tt>to_s</tt>. def to_param @@ -11,4 +13,4 @@ class Object def to_query(key) "#{CGI.escape(key.to_s)}=#{CGI.escape(to_param.to_s)}" end -end
\ No newline at end of file +end |