Permalink
Browse files

updated to rails 2.3.8, yay

  • Loading branch information...
1 parent 58ea732 commit be1754df8c33c75f1eac8a1cf1371a40d86d9d34 @saturnflyer saturnflyer committed Jun 15, 2010
Showing 634 changed files with 97,030 additions and 22,450 deletions.
View
@@ -1,81 +0,0 @@
-require 'rake'
-require 'rake/rdoctask'
-
-env = %(PKG_BUILD="#{ENV['PKG_BUILD']}") if ENV['PKG_BUILD']
-
-PROJECTS = %w(activesupport railties actionpack actionmailer activeresource activerecord)
-
-Dir["#{File.dirname(__FILE__)}/*/lib/*/version.rb"].each do |version_path|
- require version_path
-end
-
-desc 'Run all tests by default'
-task :default => :test
-
-%w(test rdoc pgem package release).each do |task_name|
- desc "Run #{task_name} task for all projects"
- task task_name do
- PROJECTS.each do |project|
- system %(cd #{project} && #{env} #{$0} #{task_name})
- end
- end
-end
-
-
-desc "Generate documentation for the Rails framework"
-Rake::RDocTask.new do |rdoc|
- rdoc.rdoc_dir = 'doc/rdoc'
- rdoc.title = "Ruby on Rails Documentation"
-
- rdoc.options << '--line-numbers' << '--inline-source'
- rdoc.options << '-A cattr_accessor=object'
- rdoc.options << '--charset' << 'utf-8'
-
- rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : './doc/template/horo'
-
- rdoc.rdoc_files.include('railties/CHANGELOG')
- rdoc.rdoc_files.include('railties/MIT-LICENSE')
- rdoc.rdoc_files.include('railties/README')
- rdoc.rdoc_files.include('railties/lib/{*.rb,commands/*.rb,rails/*.rb,rails_generator/*.rb}')
-
- rdoc.rdoc_files.include('activerecord/README')
- rdoc.rdoc_files.include('activerecord/CHANGELOG')
- rdoc.rdoc_files.include('activerecord/lib/active_record/**/*.rb')
- rdoc.rdoc_files.exclude('activerecord/lib/active_record/vendor/*')
-
- rdoc.rdoc_files.include('activeresource/README')
- rdoc.rdoc_files.include('activeresource/CHANGELOG')
- rdoc.rdoc_files.include('activeresource/lib/active_resource.rb')
- rdoc.rdoc_files.include('activeresource/lib/active_resource/*')
-
- rdoc.rdoc_files.include('actionpack/README')
- rdoc.rdoc_files.include('actionpack/CHANGELOG')
- rdoc.rdoc_files.include('actionpack/lib/action_controller/**/*.rb')
- rdoc.rdoc_files.include('actionpack/lib/action_view/**/*.rb')
- rdoc.rdoc_files.exclude('actionpack/lib/action_controller/vendor/*')
-
- rdoc.rdoc_files.include('actionmailer/README')
- rdoc.rdoc_files.include('actionmailer/CHANGELOG')
- rdoc.rdoc_files.include('actionmailer/lib/action_mailer/base.rb')
- rdoc.rdoc_files.exclude('actionmailer/lib/action_mailer/vendor/*')
-
- rdoc.rdoc_files.include('activesupport/README')
- rdoc.rdoc_files.include('activesupport/CHANGELOG')
- rdoc.rdoc_files.include('activesupport/lib/active_support/**/*.rb')
- rdoc.rdoc_files.exclude('activesupport/lib/active_support/vendor/*')
-end
-
-# Enhance rdoc task to copy referenced images also
-task :rdoc do
- FileUtils.mkdir_p "doc/rdoc/files/examples/"
- FileUtils.copy "activerecord/examples/associations.png", "doc/rdoc/files/examples/associations.png"
-end
-
-desc "Publish API docs for Rails as a whole and for each component"
-task :pdoc => :rdoc do
- require 'rake/contrib/sshpublisher'
- Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/api", "doc/rdoc").upload
- PROJECTS.each do |project|
- system %(cd #{project} && #{env} #{$0} pdoc)
- end
-end
@@ -1,15 +1,33 @@
+*2.3.8 (May 24, 2010)*
+
+* Version bump.
+
+
+*2.3.7 (May 24, 2010)*
+
+* Version bump.
+
+
+*2.3.6 (May 23, 2010)*
+
+* Upgrade TMail from 1.2.3 to 1.2.7. [Mikel Lindsaar]
+
+
*2.3.5 (November 25, 2009)*
* Minor Bug Fixes and deprecation warnings
+
*2.3.4 (September 4, 2009)*
* Minor bug fixes.
+
*2.3.3 (July 12, 2009)*
* No changes, just a version bump.
+
*2.3.2 [Final] (March 15, 2009)*
* Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2009 David Heinemeier Hansson
+Copyright (c) 2004-2010 David Heinemeier Hansson
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -54,7 +54,7 @@ spec = Gem::Specification.new do |s|
s.rubyforge_project = "actionmailer"
s.homepage = "http://www.rubyonrails.org"
- s.add_dependency('actionpack', '= 2.3.5' + PKG_BUILD)
+ s.add_dependency('actionpack', '= 2.3.8' + PKG_BUILD)
s.has_rdoc = true
s.requirements << 'none'
@@ -1,5 +1,5 @@
#--
-# Copyright (c) 2004-2009 David Heinemeier Hansson
+# Copyright (c) 2004-2010 David Heinemeier Hansson
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -593,7 +593,7 @@ def template_root=(root)
end
def template_path
- "#{template_root}/#{mailer_name}"
+ File.join(template_root, mailer_name)
end
def initialize_template_class(assigns)
@@ -675,7 +675,7 @@ def create_mail
def perform_delivery_smtp(mail)
destinations = mail.destinations
mail.ready_to_send
- sender = (mail['return-path'] && mail['return-path'].spec) || mail['from']
+ sender = (mail['return-path'] && mail['return-path'].spec) || Array(mail.from).first
smtp = Net::SMTP.new(smtp_settings[:address], smtp_settings[:port])
smtp.enable_starttls_auto if smtp_settings[:enable_starttls_auto] && smtp.respond_to?(:enable_starttls_auto)
@@ -1,3 +1,4 @@
+# encoding: us-ascii
module ActionMailer
module Quoting #:nodoc:
# Convert the given text into quoted printable format, with an instruction
@@ -1,46 +0,0 @@
-=begin rdoc
-
-= Attachment handling file
-
-=end
-
-require 'stringio'
-
-module TMail
- class Attachment < StringIO
- attr_accessor :original_filename, :content_type
- end
-
- class Mail
- def has_attachments?
- multipart? && parts.any? { |part| attachment?(part) }
- end
-
- def attachment?(part)
- part.disposition_is_attachment? || part.content_type_is_text?
- end
-
- def attachments
- if multipart?
- parts.collect { |part|
- if part.multipart?
- part.attachments
- elsif attachment?(part)
- content = part.body # unquoted automatically by TMail#body
- file_name = (part['content-location'] &&
- part['content-location'].body) ||
- part.sub_header("content-type", "name") ||
- part.sub_header("content-disposition", "filename")
-
- next if file_name.blank? || content.blank?
-
- attachment = Attachment.new(content)
- attachment.original_filename = file_name.strip
- attachment.content_type = part.content_type
- attachment
- end
- }.flatten.compact
- end
- end
- end
-end
Oops, something went wrong.

0 comments on commit be1754d

Please sign in to comment.