Permalink
Browse files

Merge remote branch 'mikel/master'

  • Loading branch information...
2 parents 7b8c647 + a06a5a6 commit 8399a315f5a2dc1dd3d9efd75d66151c793fa664 @jeremy jeremy committed Jan 28, 2010
Showing with 14 additions and 19,756 deletions.
  1. +2 −0 actionmailer/CHANGELOG
  2. +2 −1 actionmailer/actionmailer.gemspec
  3. +1 −1 actionmailer/lib/action_mailer.rb
  4. +0 −1,467 actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
  5. +0 −10 actionmailer/lib/action_mailer/vendor/text_format.rb
  6. +6 −0 activesupport/CHANGELOG
  7. +0 −100 activesupport/Rakefile
  8. +3 −0 activesupport/activesupport.gemspec
  9. +0 −2 activesupport/lib/active_support.rb
  10. +0 −19 activesupport/lib/active_support/vendor.rb
  11. +0 −113 activesupport/lib/active_support/vendor/builder-2.1.2/lib/blankslate.rb
  12. +0 −13 activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder.rb
  13. +0 −20 activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/blankslate.rb
  14. +0 −250 activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/css.rb
  15. +0 −115 activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xchar.rb
  16. +0 −139 activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlbase.rb
  17. +0 −63 activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlevents.rb
  18. +0 −328 activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlmarkup.rb
  19. +0 −1,133 activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb
  20. +0 −33 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo.rb
  21. +0 −47 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/data_timezone.rb
  22. +0 −228 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/data_timezone_info.rb
  23. +0 −55 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Africa/Algiers.rb
  24. +0 −219 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Africa/Cairo.rb
  25. +0 −42 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Africa/Casablanca.rb
  26. +0 −18 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Africa/Harare.rb
  27. +0 −25 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Africa/Johannesburg.rb
  28. +0 −22 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Africa/Monrovia.rb
  29. +0 −23 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Africa/Nairobi.rb
  30. +0 −84 .../lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
  31. +0 −23 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Bogota.rb
  32. +0 −23 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Caracas.rb
  33. +0 −283 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Chicago.rb
  34. +0 −136 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Chihuahua.rb
  35. +0 −204 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Denver.rb
  36. +0 −161 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Godthab.rb
  37. +0 −27 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Guatemala.rb
  38. +0 −24 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Guyana.rb
  39. +0 −274 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Halifax.rb
  40. +0 −149 ...rt/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb
  41. +0 −194 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Juneau.rb
  42. +0 −22 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/La_Paz.rb
  43. +0 −35 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Lima.rb
  44. +0 −232 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Los_Angeles.rb
  45. +0 −139 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Mazatlan.rb
  46. +0 −144 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Mexico_City.rb
  47. +0 −131 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Monterrey.rb
  48. +0 −282 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/New_York.rb
  49. +0 −30 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Phoenix.rb
  50. +0 −74 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Regina.rb
  51. +0 −205 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Santiago.rb
  52. +0 −171 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Sao_Paulo.rb
  53. +0 −288 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/St_Johns.rb
  54. +0 −196 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/America/Tijuana.rb
  55. +0 −67 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Almaty.rb
  56. +0 −73 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Baghdad.rb
  57. +0 −161 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Baku.rb
  58. +0 −20 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Bangkok.rb
  59. +0 −33 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Chongqing.rb
  60. +0 −30 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Colombo.rb
  61. +0 −112 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Dhaka.rb
  62. +0 −90 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Hong_Kong.rb
  63. +0 −165 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Irkutsk.rb
  64. +0 −30 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Jakarta.rb
  65. +0 −163 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Jerusalem.rb
  66. +0 −20 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Kabul.rb
  67. +0 −163 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Kamchatka.rb
  68. +0 −114 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Karachi.rb
  69. +0 −20 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Kathmandu.rb
  70. +0 −25 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Kolkata.rb
  71. +0 −163 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb
  72. +0 −31 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb
  73. +0 −18 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Kuwait.rb
  74. +0 −163 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Magadan.rb
  75. +0 −18 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Muscat.rb
  76. +0 −164 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Novosibirsk.rb
  77. +0 −24 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Rangoon.rb
  78. +0 −18 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Riyadh.rb
  79. +0 −34 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Seoul.rb
  80. +0 −35 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Shanghai.rb
  81. +0 −33 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Singapore.rb
  82. +0 −59 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Taipei.rb
  83. +0 −47 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Tashkent.rb
  84. +0 −78 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Tbilisi.rb
  85. +0 −121 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Tehran.rb
  86. +0 −30 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Tokyo.rb
  87. +0 −65 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb
  88. +0 −33 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Urumqi.rb
  89. +0 −164 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Vladivostok.rb
  90. +0 −163 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Yakutsk.rb
  91. +0 −165 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Yekaterinburg.rb
  92. +0 −165 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Asia/Yerevan.rb
  93. +0 −270 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Atlantic/Azores.rb
  94. +0 −23 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb
  95. +0 −18 ...esupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Atlantic/South_Georgia.rb
  96. +0 −187 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Australia/Adelaide.rb
  97. +0 −35 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Australia/Brisbane.rb
  98. +0 −29 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Australia/Darwin.rb
  99. +0 −193 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Australia/Hobart.rb
  100. +0 −185 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Australia/Melbourne.rb
  101. +0 −37 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Australia/Perth.rb
  102. +0 −185 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Australia/Sydney.rb
  103. +0 −16 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Etc/UTC.rb
  104. +0 −228 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Amsterdam.rb
  105. +0 −185 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Athens.rb
  106. +0 −163 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Belgrade.rb
  107. +0 −188 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Berlin.rb
  108. +0 −13 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Bratislava.rb
  109. +0 −232 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Brussels.rb
  110. +0 −181 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Bucharest.rb
  111. +0 −197 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Budapest.rb
  112. +0 −179 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Copenhagen.rb
  113. +0 −276 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Dublin.rb
  114. +0 −163 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Helsinki.rb
  115. +0 −218 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Istanbul.rb
  116. +0 −168 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Kiev.rb
  117. +0 −268 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Lisbon.rb
  118. +0 −13 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Ljubljana.rb
  119. +0 −288 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/London.rb
  120. +0 −211 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Madrid.rb
  121. +0 −170 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Minsk.rb
  122. +0 −181 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Moscow.rb
  123. +0 −232 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Paris.rb
  124. +0 −187 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Prague.rb
  125. +0 −176 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Riga.rb
  126. +0 −215 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Rome.rb
  127. +0 −13 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Sarajevo.rb
  128. +0 −13 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Skopje.rb
  129. +0 −173 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Sofia.rb
  130. +0 −165 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Stockholm.rb
  131. +0 −172 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Tallinn.rb
  132. +0 −183 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Vienna.rb
  133. +0 −170 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Vilnius.rb
  134. +0 −212 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Warsaw.rb
  135. +0 −13 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Europe/Zagreb.rb
  136. +0 −202 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Auckland.rb
  137. +0 −25 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Fiji.rb
  138. +0 −22 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Guam.rb
  139. +0 −28 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Honolulu.rb
  140. +0 −20 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Majuro.rb
  141. +0 −25 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Midway.rb
  142. +0 −25 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Noumea.rb
  143. +0 −26 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Pago_Pago.rb
  144. +0 −20 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Port_Moresby.rb
  145. +0 −27 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/definitions/Pacific/Tongatapu.rb
  146. +0 −52 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/info_timezone.rb
  147. +0 −51 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/linked_timezone.rb
  148. +0 −44 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/linked_timezone_info.rb
  149. +0 −98 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/offset_rationals.rb
  150. +0 −56 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/ruby_core_support.rb
  151. +0 −292 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/time_or_datetime.rb
  152. +0 −508 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/timezone.rb
  153. +0 −56 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/timezone_definition.rb
  154. +0 −40 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/timezone_info.rb
  155. +0 −94 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/timezone_offset_info.rb
  156. +0 −198 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/timezone_period.rb
  157. +0 −129 activesupport/lib/active_support/vendor/tzinfo-0.3.16/lib/tzinfo/timezone_transition_info.rb
View
@@ -1,5 +1,7 @@
*Rails 3.0 (pending)*
+* Unvendor'd text-format, now requires text-format gem
+
* Whole new API added with tests. See base.rb for full details. Old API is deprecated.
* The Mail::Message class has helped methods for all the field types that return 'common' defaults for the common use case, so to get the subject, mail.subject will give you a string, mail.date will give you a DateTime object, mail.from will give you an array of address specs (mikel@test.lindsaar.net) etc. If you want to access the field object itself, call mail[:field_name] which will return the field object you want, which you can then chain, like mail[:from].formatted
@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
s.homepage = "http://www.rubyonrails.org"
s.add_dependency('actionpack', '= 3.0.pre')
- s.add_dependency('mail', '~> 2.1.1')
+ s.add_dependency('mail', '~> 2.1.2')
+ s.add_dependency('text-format', '~> 1.0.0')
s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
s.has_rdoc = true
@@ -45,5 +45,5 @@ module ActionMailer
module Text
extend ActiveSupport::Autoload
- autoload :Format, 'action_mailer/vendor/text_format'
+ autoload :Format, 'text/format'
end

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,10 +0,0 @@
-# Prefer gems to the bundled libs.
-require 'rubygems'
-
-begin
- gem 'text-format', '>= 0.6.3'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/text-format-0.6.3"
-end
-
-require 'text/format'
View
@@ -1,5 +1,11 @@
*Edge*
+* Unvendor'd Memcach Client. Now requires the Builder gem as a dependency [Mikel Lindsaar]
+
+* Unvendor'd Builder. Now requires the Builder gem as a dependency [Mikel Lindsaar]
+
+* Unvendor'd TZInfo. Now requires the TZInfo gem as a dependency [Mikel Lindsaar]
+
* YAML serialization for OrderedHash. #3608 [Gregor Schmidt]
* Update bundled TZInfo to v0.3.16 [Geoff Buesing]
View
@@ -41,7 +41,6 @@ Rake::RDocTask.new { |rdoc|
rdoc.rdoc_files.include('README', 'CHANGELOG')
rdoc.rdoc_files.include('lib/active_support.rb')
rdoc.rdoc_files.include('lib/active_support/**/*.rb')
- rdoc.rdoc_files.exclude('lib/active_support/vendor/*')
}
spec = eval(File.read('activesupport.gemspec'))
@@ -74,102 +73,3 @@ task :release => [ :package ] do
rubyforge.login
rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
end
-
-
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
-require 'active_support/values/time_zone'
-
-namespace :tzinfo do
- desc "Update bundled tzinfo gem. Only copies the subset of classes and definitions required to support Rails time zone features."
- task :update => ['tzinfo:copy_classes', 'tzinfo:copy_definitions'] do
- Rake::Task['tzinfo:cleanup_tmp'].invoke
- puts <<-EOV
- *** FINAL TZINFO BUNDLING STEPS ***
-
- 1. Update TZInfo version in lib/active_support/vendor.rb
- 2. gem uninstall tzinfo on local system before running tests, to ensure tests are running against bundled version
-
- If a test fails because a particular zone can't be found, it's likely because the TZInfo identifier in the
- ActiveSupport::TimeZone::MAPPING hash is referencing a linked timezone instead of referencing the timezone directly.
- In this case, just change the MAPPING value to the correct identifier, and unpack TZInfo again.
- EOV
- end
-
- task :unpack_gem do
- mkdir_p "tmp"
- cd "tmp"
- sh "gem unpack --version #{ENV['VERSION'] || "'> 0'"} tzinfo"
- cd ".."
- end
-
- task :copy_classes => :unpack_gem do
- mkdir_p "#{destination_path}/lib/tzinfo"
- cp "#{tmp_path}/lib/tzinfo.rb", "#{destination_path}/lib"
- comment_requires_for_excluded_classes!('lib/tzinfo.rb')
- files = FileList["#{tmp_path}/lib/tzinfo/*.rb"]
- files.each do |file|
- filename = File.basename(file)
- unless excluded_classes.include? filename.sub(/.rb$/, '')
- cp "#{tmp_path}/lib/tzinfo/#{filename}", "#{destination_path}/lib/tzinfo"
- comment_requires_for_excluded_classes!("lib/tzinfo/#{filename}")
- end
- end
- end
-
- task :copy_definitions => :unpack_gem do
- definitions_path = "#{destination_path}/lib/tzinfo/definitions/"
- mkdir_p definitions_path
- ActiveSupport::TimeZone::MAPPING.values.each do |zone|
- subdir = nil
- if /\// === zone
- subdir = zone.sub(/\w+$/, '')
- mkdir_p "#{definitions_path}/#{subdir}"
- end
- cp "#{tmp_path}/lib/tzinfo/definitions/#{zone}.rb", "#{definitions_path}/#{subdir}"
- end
- end
-
- task :cleanup_tmp do
- rm_rf "tmp"
- end
-
- def comment_requires_for_excluded_classes!(file)
- lines = open("#{destination_path}/#{file}") {|f| f.readlines}
- updated = false
-
- new_lines = []
- lines.each do |line|
- if Regexp.new("require 'tzinfo/(#{excluded_classes.join('|')})'") === line
- updated = true
- new_lines << "# #{line}"
- else
- new_lines << line
- end
- end
-
- if updated
- open("#{destination_path}/#{file}", "w") {|f| f.write(new_lines.join)}
- end
- end
-
- def version
- ENV['VERSION'] ||= get_unpacked_version
- end
-
- def get_unpacked_version
- m = (FileList["tmp/tzinfo-*"].to_s.match /\d+\.\d+\.\d+/)
- m ? m[0] : raise(LoadError, "TZInfo gem must be installed locally. `gem install tzinfo` and try again")
- end
-
- def tmp_path
- "tmp/tzinfo-#{version}"
- end
-
- def destination_path
- "lib/active_support/vendor/tzinfo-#{version}"
- end
-
- def excluded_classes
- %w(country country_index_definition country_info country_timezone timezone_index_definition timezone_proxy tzdataparser)
- end
-end
@@ -7,6 +7,9 @@ Gem::Specification.new do |s|
s.description = %q{Utility library which carries commonly used classes and goodies from the Rails framework}
s.add_dependency('i18n', '~> 0.3.0')
+ s.add_dependency('tzinfo', '~> 0.3.16')
+ s.add_dependency('builder', '~> 2.1.2')
+ s.add_dependency('memcache-client', '~> 1.7.5')
s.files = Dir['CHANGELOG', 'README', 'lib/**/*']
s.require_path = 'lib'
@@ -69,5 +69,3 @@ module ActiveSupport
autoload :TestCase
end
-
-require 'active_support/vendor'
@@ -1,19 +0,0 @@
-require 'pathname'
-
-def ActiveSupport.requirable?(file)
- $LOAD_PATH.any? { |p| Dir.glob("#{p}/#{file}.*").any? }
-end
-
-[%w(builder 2.1.2), %w(memcache-client 1.7.5), %w(tzinfo 0.3.16)].each do |lib, version|
- # If the lib is not already requirable
- unless ActiveSupport.requirable? lib
- # Try to activate a gem ~> satisfying the requested version first.
- begin
- gem lib, ">= #{version}"
- # Use the vendored lib if the gem's missing or we aren't using RubyGems.
- rescue LoadError, NoMethodError
- # There could be symlinks
- $LOAD_PATH.unshift Pathname.new(__FILE__).dirname.join("vendor/#{lib}-#{version}/lib").realpath.to_s
- end
- end
-end
@@ -1,113 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-######################################################################
-# BlankSlate provides an abstract base class with no predefined
-# methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
-# BlankSlate is useful as a base class when writing classes that
-# depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
-#
-class BlankSlate
- class << self
-
- # Hide the method named +name+ in the BlankSlate class. Don't
- # hide +instance_eval+ or any method beginning with "__".
- def hide(name)
- if instance_methods.include?(name.to_s) and
- name !~ /^(__|instance_eval)/
- @hidden_methods ||= {}
- @hidden_methods[name.to_sym] = instance_method(name)
- undef_method name
- end
- end
-
- def find_hidden_method(name)
- @hidden_methods ||= {}
- @hidden_methods[name] || superclass.find_hidden_method(name)
- end
-
- # Redefine a previously hidden method so that it may be called on a blank
- # slate object.
- def reveal(name)
- bound_method = nil
- unbound_method = find_hidden_method(name)
- fail "Don't know how to reveal method '#{name}'" unless unbound_method
- define_method(name) do |*args|
- bound_method ||= unbound_method.bind(self)
- bound_method.call(*args)
- end
- end
- end
-
- instance_methods.each { |m| hide(m) }
-end
-
-######################################################################
-# Since Ruby is very dynamic, methods added to the ancestors of
-# BlankSlate <em>after BlankSlate is defined</em> will show up in the
-# list of available BlankSlate methods. We handle this by defining a
-# hook in the Object and Kernel classes that will hide any method
-# defined after BlankSlate has been loaded.
-#
-module Kernel
- class << self
- alias_method :blank_slate_method_added, :method_added
-
- # Detect method additions to Kernel and remove them in the
- # BlankSlate class.
- def method_added(name)
- result = blank_slate_method_added(name)
- return result if self != Kernel
- BlankSlate.hide(name)
- result
- end
- end
-end
-
-######################################################################
-# Same as above, except in Object.
-#
-class Object
- class << self
- alias_method :blank_slate_method_added, :method_added
-
- # Detect method additions to Object and remove them in the
- # BlankSlate class.
- def method_added(name)
- result = blank_slate_method_added(name)
- return result if self != Object
- BlankSlate.hide(name)
- result
- end
-
- def find_hidden_method(name)
- nil
- end
- end
-end
-
-######################################################################
-# Also, modules included into Object need to be scanned and have their
-# instance methods removed from blank slate. In theory, modules
-# included into Kernel would have to be removed as well, but a
-# "feature" of Ruby prevents late includes into modules from being
-# exposed in the first place.
-#
-class Module
- alias blankslate_original_append_features append_features
- def append_features(mod)
- result = blankslate_original_append_features(mod)
- return result if mod != Object
- instance_methods.each do |name|
- BlankSlate.hide(name)
- end
- result
- end
-end
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-#--
-# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-require 'builder/xmlmarkup'
-require 'builder/xmlevents'
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-require 'blankslate'
-
-######################################################################
-# BlankSlate has been promoted to a top level name and is now
-# available as a standalone gem. We make the name available in the
-# Builder namespace for compatibility.
-#
-module Builder
- BlankSlate = ::BlankSlate
-end
Oops, something went wrong.

0 comments on commit 8399a31

Please sign in to comment.