Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

CHANGELOG

@@ -1,3 +1,12 @@
+* 0.16.5: Rails 2.3.2
+
+* Runs on the Stable Release, Rails 2.3.2.
+* Support for audio/speex audio files.
+* Updated for itex2MML 1.3.7. (You should
+  upgrade that, as well.)
+* Tests for BlahTeX/PNG (if installed).
+
+------------------------------------------------------------------------------
 * 0.16.4
 
 New Features:

app/controllers/application_controller.rb

@@ -57,6 +57,7 @@ def connect_to_model
     '.mov' => 'video/quicktime',
     '.mp3' => 'audio/mpeg',
     '.mp4' => 'video/mp4',
+    '.spx' => 'audio/speex',
     '.txt' => 'text/plain',
     '.tex' => 'text/plain',
     '.wav' => 'audio/x-wav',
@@ -72,6 +73,7 @@ def connect_to_model
     'audio/mpeg'               => 'inline',
     'audio/x-wav'              => 'inline',
     'audio/x-aiff'             => 'inline',
+    'audio/speex'             => 'inline',
     'audio/ogg'                => 'inline',
     'video/ogg'                => 'inline',
     'video/mp4'                => 'inline',
@@ -260,7 +262,7 @@ module Instiki
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 16
-    TINY  = 4
+    TINY  = 5 
     SUFFIX = '(MML+)'
     PRERELEASE =  false
     if PRERELEASE

test/functional/wiki_controller_test.rb

@@ -208,9 +208,9 @@ def test_export_markup
 #    end
 
   else
-    puts 'Warning: tests involving pdflatex are very slow, therefore they are disabled by default.'
-    puts '         Set environment variable INSTIKI_TEST_PDFLATEX or global Ruby variable'
-    puts '         $INSTIKI_TEST_PDFLATEX to enable them.'
+#    puts 'Warning: tests involving pdflatex are very slow, therefore they are disabled by default.'
+#    puts '         Set environment variable INSTIKI_TEST_PDFLATEX or global Ruby variable'
+#    puts '         $INSTIKI_TEST_PDFLATEX to enable them.'
   end
 
 #  def test_export_tex    

vendor/rails/actionmailer/CHANGELOG

@@ -1,10 +1,7 @@
-*2.3.1 [RC2] (March 5, 2009)*
+*2.3.2 [Final] (March 15, 2009)*
 
 * Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]
 
-
-*2.3.0 [RC1] (February 1st, 2009)*
-
 * Fixed RFC-2045 quoted-printable bug #1421 [squadette]
 
 * Fixed that no body charset would be set when there are attachments present #740 [Paweł Kondzior]

vendor/rails/actionmailer/Rakefile

@@ -55,7 +55,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.3.1' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.2' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

vendor/rails/actionmailer/lib/action_mailer/base.rb

@@ -479,7 +479,7 @@ def create!(method_name, *parameters) #:nodoc:
             )
           end
           unless @parts.empty?
-            @content_type = "multipart/alternative"
+            @content_type = "multipart/alternative" if @content_type !~ /^multipart/
             @parts = sort_parts(@parts, @implicit_parts_order)
           end
         end

vendor/rails/actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb

@@ -1150,7 +1150,7 @@ def test_format_style
       assert_equal(Text::Format::JUSTIFY, @format_o.format_style)
       assert_match(/^of freedom, and that government of the people, by the  people,  for  the$/,
                    @format_o.format(GETTYSBURG).split("\n")[-3])
-      assert_raises(ArgumentError) { @format_o.format_style = 33 }
+      assert_raise(ArgumentError) { @format_o.format_style = 33 }
     end
 
     def test_tag_paragraph

vendor/rails/actionmailer/lib/action_mailer/version.rb

@@ -2,7 +2,7 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

vendor/rails/actionmailer/test/mail_layout_test.rb

@@ -21,10 +21,12 @@ def nolayout(recipient)
     body       render(:inline => "Hello, <%= @world %>", :layout => false, :body => { :world => "Earth" })
   end
 
-  def multipart(recipient)
+  def multipart(recipient, type = nil)
     recipients recipient
     subject    "You have a mail"
     from       "tester@example.com"
+
+    content_type(type) if type
   end
 end
 
@@ -64,6 +66,19 @@ def test_should_pickup_default_layout
 
   def test_should_pickup_multipart_layout
     mail = AutoLayoutMailer.create_multipart(@recipient)
+    assert_equal "multipart/alternative", mail.content_type
+    assert_equal 2, mail.parts.size
+
+    assert_equal 'text/plain', mail.parts.first.content_type
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+
+    assert_equal 'text/html', mail.parts.last.content_type
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+  end
+
+  def test_should_pickup_multipartmixed_layout
+    mail = AutoLayoutMailer.create_multipart(@recipient, "multipart/mixed")
+    assert_equal "multipart/mixed", mail.content_type
     assert_equal 2, mail.parts.size
 
     assert_equal 'text/plain', mail.parts.first.content_type
@@ -73,6 +88,19 @@ def test_should_pickup_multipart_layout
     assert_equal "Hello from layout text/html multipart", mail.parts.last.body
   end
 
+  def test_should_fix_multipart_layout
+    mail = AutoLayoutMailer.create_multipart(@recipient, "text/plain")
+    assert_equal "multipart/alternative", mail.content_type
+    assert_equal 2, mail.parts.size
+
+    assert_equal 'text/plain', mail.parts.first.content_type
+    assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body
+
+    assert_equal 'text/html', mail.parts.last.content_type
+    assert_equal "Hello from layout text/html multipart", mail.parts.last.body
+  end
+
+
   def test_should_pickup_layout_given_to_render
     mail = AutoLayoutMailer.create_spam(@recipient)
     assert_equal "Spammer layout Hello, Earth", mail.body.strip

vendor/rails/actionmailer/test/mail_service_test.rb

@@ -1069,7 +1069,7 @@ def test_should_not_respond_to_method_where_deliver_is_not_a_suffix
   end
 
   def test_should_still_raise_exception_with_expected_message_when_calling_an_undefined_method
-    error = assert_raises NoMethodError do
+    error = assert_raise NoMethodError do
       RespondToMailer.not_a_method
     end
 

vendor/rails/actionmailer/test/test_helper_test.rb

@@ -26,7 +26,7 @@ def test_mailer_class_is_correctly_inferred
   end
 
   def test_determine_default_mailer_raises_correct_error
-    assert_raises(ActionMailer::NonInferrableMailerError) do
+    assert_raise(ActionMailer::NonInferrableMailerError) do
       self.class.determine_default_mailer("NotAMailerTest")
     end
   end
@@ -84,7 +84,7 @@ def test_assert_no_emails
   end
 
   def test_assert_emails_too_few_sent
-    error = assert_raises ActiveSupport::TestCase::Assertion do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 2 do
         TestHelperMailer.deliver_test
       end
@@ -94,7 +94,7 @@ def test_assert_emails_too_few_sent
   end
 
   def test_assert_emails_too_many_sent
-    error = assert_raises ActiveSupport::TestCase::Assertion do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_emails 1 do
         TestHelperMailer.deliver_test
         TestHelperMailer.deliver_test
@@ -105,7 +105,7 @@ def test_assert_emails_too_many_sent
   end
 
   def test_assert_no_emails_failure
-    error = assert_raises ActiveSupport::TestCase::Assertion do
+    error = assert_raise ActiveSupport::TestCase::Assertion do
       assert_no_emails do
         TestHelperMailer.deliver_test
       end

vendor/rails/actionpack/CHANGELOG

@@ -1,20 +1,19 @@
-*2.3.1 [RC2] (March 5, 2009)*
+*2.3.2 [Final] (March 15, 2009)*
 
 * Fixed that redirection would just log the options, not the final url (which lead to "Redirected to #<Post:0x23150b8>") [DHH]
 
 * Added ability to pass in :public => true to fresh_when, stale?, and expires_in to make the request proxy cachable #2095 [Gregg Pollack]
 
 * Fixed that passing a custom form builder would be forwarded to nested fields_for calls #2023 [Eloy Duran/Nate Wiger]
 
+* Form option helpers now support disabled option tags and the use of lambdas for selecting/disabling option tags from collections #837 [Tekin]
+
 * Added partial scoping to TranslationHelper#translate, so if you call translate(".foo") from the people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo") [DHH]
 
 * Fix a syntax error in current_page?() that was prevent matches against URL's with multiple query parameters #1385, #1868 [chris finne/Andrew White]
 
 * Added localized rescue template when I18n.locale is set (ex: public/404.da.html) #1835 [José Valim]
 
-
-*2.3.0 [RC1] (February 1st, 2009)*
-
 * Make the form_for and fields_for helpers support the new Active Record nested update options.  #1202 [Eloy Duran]
 
 		<% form_for @person do |person_form| %>

vendor/rails/actionpack/Rakefile

@@ -80,8 +80,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.3.1' + PKG_BUILD)
-  s.add_dependency('rack', '>= 0.9.0')
+  s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'

vendor/rails/actionpack/lib/action_controller.rb

@@ -31,7 +31,12 @@
   end
 end
 
-require 'action_controller/vendor/rack-1.0/rack'
+begin
+  gem 'rack', '~> 1.0.0'
+  require 'rack'
+rescue Gem::LoadError
+  require 'action_controller/vendor/rack-1.0/rack'
+end
 
 module ActionController
   # TODO: Review explicit to see if they will automatically be handled by

vendor/rails/actionpack/lib/action_controller/base.rb

@@ -907,13 +907,15 @@ def render(options = nil, extra_options = {}, &block) #:doc:
             extra_options[:template] = options
           end
 
+          options = extra_options
+        elsif !options.is_a?(Hash)
+          extra_options[:partial] = options
           options = extra_options
         end
 
         layout = pick_layout(options)
         response.layout = layout.path_without_format_and_extension if layout
         logger.info("Rendering template within #{layout.path_without_format_and_extension}") if logger && layout
-        layout = layout.path_without_format_and_extension if layout
 
         if content_type = options[:content_type]
           response.content_type = content_type.to_s
@@ -1206,10 +1208,12 @@ def expires_in(seconds, options = {}) #:doc:
         cache_control = response.headers["Cache-Control"].split(",").map {|k| k.strip }
 
         cache_control << "max-age=#{seconds}"
+        cache_control.delete("no-cache")
         if options[:public]
           cache_control.delete("private")
-          cache_control.delete("no-cache")
           cache_control << "public"
+        else
+          cache_control << "private"
         end
 
         # This allows for additional headers to be passed through like 'max-stale' => 5.hours

vendor/rails/actionpack/lib/action_controller/caching/actions.rb

@@ -129,24 +129,23 @@ class ActionCachePath
         attr_reader :path, :extension
 
         class << self
-          def path_for(controller, options, infer_extension=true)
+          def path_for(controller, options, infer_extension = true)
             new(controller, options, infer_extension).path
           end
         end
 
         # When true, infer_extension will look up the cache path extension from the request's path & format.
-        # This is desirable when reading and writing the cache, but not when expiring the cache -  expire_action should expire the same files regardless of the request format.
-        def initialize(controller, options = {}, infer_extension=true)
-          if infer_extension and options.is_a? Hash
-            request_extension = extract_extension(controller.request)
-            options = options.reverse_merge(:format => request_extension)
+        # This is desirable when reading and writing the cache, but not when expiring the cache -
+        # expire_action should expire the same files regardless of the request format.
+        def initialize(controller, options = {}, infer_extension = true)
+          if infer_extension
+            extract_extension(controller.request)
+            options = options.reverse_merge(:format => @extension) if options.is_a?(Hash)
           end
+
           path = controller.url_for(options).split('://').last
           normalize!(path)
-          if infer_extension
-            @extension = request_extension
-            add_extension!(path, @extension)
-          end
+          add_extension!(path, @extension)
           @path = URI.unescape(path)
         end
 
@@ -162,13 +161,7 @@ def add_extension!(path, extension)
           def extract_extension(request)
             # Don't want just what comes after the last '.' to accommodate multi part extensions
             # such as tar.gz.
-            extension = request.path[/^[^.]+\.(.+)$/, 1]
-
-            # If there's no extension in the path, check request.format
-            if extension.nil?
-              extension = request.cache_format
-            end
-            extension
+            @extension = request.path[/^[^.]+\.(.+)$/, 1] || request.cache_format
           end
       end
     end