radiant 0.9.0.rc2 → 0.9.1

data/vendor/rails/actionmailer/lib/action_mailer/vendor/{tmail-1.2.3 → tmail-1.2.7}/tmail/version.rb

@@ -32,7 +32,7 @@ module TMail
   module VERSION
     MAJOR = 1
     MINOR = 2
-    TINY  = 3
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/vendor/rails/actionmailer/lib/action_mailer/vendor/tmail.rb

@@ -2,9 +2,9 @@
 require 'rubygems'
 
 begin
-  gem 'tmail', '~> 1.2.3'
+  gem 'tmail', '~> 1.2.7'
 rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/tmail-1.2.3"
+  $:.unshift "#{File.dirname(__FILE__)}/tmail-1.2.7"
 end
 
 module TMail

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

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

data/vendor/rails/actionmailer/test/abstract_unit.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'test/unit'
 
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
-$:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
-$:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
+$:.unshift File.expand_path('../../lib', __FILE__)
+$:.unshift File.expand_path('../../../activesupport/lib', __FILE__)
+$:.unshift File.expand_path('../../../actionpack/lib', __FILE__)
 require 'action_mailer'
 require 'action_mailer/test_case'
 
@@ -17,7 +17,7 @@ ActionView::Template.register_template_handler :bak, lambda { |template| "Lame b
 $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers"
 
 ActionView::Base.cache_template_loading = true
-FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
+FIXTURE_LOAD_PATH = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
 ActionMailer::Base.template_root = FIXTURE_LOAD_PATH
 
 class MockSMTP

data/vendor/rails/actionmailer/test/fixtures/helpers/example_helper.rb

@@ -1,5 +1,5 @@
 module ExampleHelper
   def example_format(text)
-    "<em><strong><small>#{h(text)}</small></strong></em>".html_safe!
+    "<em><strong><small>#{h(text)}</small></strong></em>".html_safe
   end
 end

data/vendor/rails/actionmailer/test/mail_service_test.rb

@@ -29,6 +29,18 @@ class TestMailer < ActionMailer::Base
     self.body       = "Goodbye, Mr. #{recipient}"
   end
 
+  def from_with_name
+    from       "System <system@loudthinking.com>"
+    recipients "root@loudthinking.com"
+    body       "Nothing to see here."
+  end
+
+  def from_without_name
+    from       "system@loudthinking.com"
+    recipients "root@loudthinking.com"
+    body       "Nothing to see here."
+  end
+
   def cc_bcc(recipient)
     recipients recipient
     subject    "testing bcc/cc"
@@ -454,6 +466,28 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
   end
 
+  def test_from_without_name_for_smtp
+    ActionMailer::Base.delivery_method = :smtp
+    TestMailer.deliver_from_without_name
+
+    mail = MockSMTP.deliveries.first
+    assert_not_nil mail
+    mail, from, to = mail
+
+    assert_equal 'system@loudthinking.com', from.to_s
+  end
+
+  def test_from_with_name_for_smtp
+    ActionMailer::Base.delivery_method = :smtp
+    TestMailer.deliver_from_with_name
+
+    mail = MockSMTP.deliveries.first
+    assert_not_nil mail
+    mail, from, to = mail
+
+    assert_equal 'system@loudthinking.com', from.to_s
+  end
+
   def test_reply_to
     expected = new_mail
 
@@ -700,8 +734,8 @@ EOF
     expected.date    = Time.local 2004, 12, 12
 
     created = TestMailer.create_utf8_body @recipient
-    assert_match(/\nFrom: =\?utf-8\?Q\?Foo_.*?\?= <extended@example.net>\r/, created.encoded)
-    assert_match(/\nTo: =\?utf-8\?Q\?Foo_.*?\?= <extended@example.net>, Example Recipient <me/, created.encoded)
+    assert_match(/From:\ =\?utf\-8\?Q\?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC\?=\ <extended@example\.net>/, created.encoded)
+    assert_match(/To:\ =\?utf\-8\?Q\?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC\?=\ <extended@example\.net>/, created.encoded)
   end
 
   def test_receive_decodes_base64_encoded_mail
@@ -827,6 +861,26 @@ EOF
     assert_equal "text/yaml", mail.parts[2].content_type
   end
 
+  def test_implicitly_path_when_running_from_none_rails_root
+    exected_path = File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "test_mailer"))
+    with_a_rails_root do
+      Dir.chdir "/" do
+        template_path = TestMailer.allocate.send(:template_path)
+        assert_equal exected_path, File.expand_path(template_path)
+      end
+    end
+  end
+
+
+  def test_implicitly_multipart_messages_run_from_another_location_with_a_rails_root
+    with_a_rails_root do
+      Dir.chdir "/" do
+        mail = TestMailer.create_implicitly_multipart_example(@recipient)
+        assert_equal 3, mail.parts.length
+      end
+    end
+  end
+
   def test_implicitly_multipart_messages_with_charset
     mail = TestMailer.create_implicitly_multipart_example(@recipient, 'iso-8859-1')
 
@@ -975,6 +1029,16 @@ EOF
   ensure
     ActionMailer::Base.smtp_settings[:enable_starttls_auto] = true
   end
+
+private
+  def with_a_rails_root
+    old_root = ::RAILS_ROOT if defined? ::RAILS_ROOT
+    Object.const_set(:RAILS_ROOT, File.join(File.dirname(__FILE__)))
+    yield
+  ensure
+    Object.send(:remove_const, :RAILS_ROOT) if defined? ::RAILS_ROOT
+    Object.const_set(:RAILS_ROOT, old_root) if old_root
+  end
 end
 
 class InheritableTemplateRootTest < Test::Unit::TestCase

data/vendor/rails/actionmailer/test/quoting_test.rb

@@ -23,9 +23,13 @@ class QuotingTest < Test::Unit::TestCase
   end
 
   def test_unqoute_multiple
-    a ="=?utf-8?q?Re=3A_=5B12=5D_=23137=3A_Inkonsistente_verwendung_von_=22Hin?==?utf-8?b?enVmw7xnZW4i?="
-    b = TMail::Unquoter.unquote_and_convert_to(a, 'utf-8')
-    assert_equal "Re: [12] #137: Inkonsistente verwendung von \"Hinzuf\303\274gen\"", b
+    quoted ="=?utf-8?q?Re=3A_=5B12=5D_=23137=3A_Inkonsistente_verwendung_von_=22Hin?==?utf-8?b?enVmw7xnZW4i?="
+    actual = TMail::Unquoter.unquote_and_convert_to(quoted, 'utf-8')
+
+    expected = "Re: [12] #137: Inkonsistente verwendung von \"Hinzuf\303\274gen\""
+    expected.force_encoding 'ASCII-8BIT' if expected.respond_to?(:force_encoding)
+
+    assert_equal expected, actual
   end
 
   def test_unqoute_in_the_middle
@@ -71,7 +75,9 @@ class QuotingTest < Test::Unit::TestCase
 
   def test_email_with_partially_quoted_subject
     mail = TMail::Mail.parse(IO.read("#{File.dirname(__FILE__)}/fixtures/raw_email_with_partially_quoted_subject"))
-    assert_equal "Re: Test: \"\346\274\242\345\255\227\" mid \"\346\274\242\345\255\227\" tail", mail.subject
+    expected = "Re: Test: \"\346\274\242\345\255\227\" mid \"\346\274\242\345\255\227\" tail"
+    expected.force_encoding('ASCII-8BIT') if expected.respond_to?(:force_encoding)
+    assert_equal expected, mail.subject
   end
 
   private

data/vendor/rails/actionpack/CHANGELOG

@@ -1,3 +1,58 @@
+*2.3.8 (May 24, 2010)*
+
+* HTML safety: fix compatibility *without* the optional rails_xss plugin.
+
+
+*2.3.7 (May 24, 2010)*
+
+* HTML safety: fix compatibility with the optional rails_xss plugin.  [Nathan Weizenbaum, Santiago Pastorino]
+
+
+*2.3.6 (May 23, 2010)*
+
+* JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option.  #2584 [Matthew Moore, Joe Martinez, Elad Meidar, Santiago Pastorino]
+
+* Ruby 1.9: ERB template encoding using a magic comment at the top of the file.  [Jeremy Kemper]
+    <%# encoding: utf-8 %>
+
+* Fixed that default locale templates should be used if the current locale template is missing [DHH]
+
+* Fixed that PrototypeHelper#update_page should return html_safe [DHH]
+
+* Fixed that much of DateHelper wouldn't return html_safe? strings [DHH]
+
+* Fixed that fragment caching should return a cache hit as html_safe (or it would all just get escaped) [DHH]
+
+* Introduce String#html_safe for rails_xss plugin and forward-compatibility with Rails 3.  [Michael Koziarski, Santiago Pastorino, José Ignacio Costa]
+
+* Added :alert, :notice, and :flash as options to ActionController::Base#redirect_to that'll automatically set the proper flash before the redirection [DHH]. Examples:
+
+    flash[:notice] = 'Post was created'
+    redirect_to(@post)
+  
+  ...becomes:
+  
+    redirect_to(@post, :notice => 'Post was created')
+
+* Added ActionController::Base#notice/= and ActionController::Base#alert/= as a convenience accessors in both the controller and the view for flash[:notice]/= and flash[:alert]/= [DHH]
+
+* Added cookies.permanent, cookies.signed, and cookies.permanent.signed accessor for common cookie actions [DHH]. Examples:
+
+    cookies.permanent[:prefers_open_id] = true
+    # => Set-Cookie: prefers_open_id=true; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+
+    cookies.signed[:discount] = 45
+    # => Set-Cookie: discount=BAhpMg==--2c1c6906c90a3bc4fd54a51ffb41dffa4bf6b5f7; path=/
+
+    cookies.signed[:discount]
+    # => 45 (if the cookie was changed, you'll get a InvalidSignature exception)
+
+    cookies.permanent.signed[:remember_me] = current_user.id
+    # => Set-Cookie: discount=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+    
+  ...to use the signed cookies, you need to set a secret to ActionController::Base.cookie_verifier_secret (automatically done in config/initializers/cookie_verification_secret.rb for new Rails applications).
+
+
 *2.3.5 (November 25, 2009)*
 
 * Minor Bug Fixes and deprecation warnings

data/vendor/rails/actionpack/MIT-LICENSE

@@ -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

data/vendor/rails/actionpack/README

@@ -155,20 +155,20 @@ A short rundown of the major features:
     map.connect 'clients/:client_name/:project_name/:controller/:action'
 
     Accessing /clients/37signals/basecamp/project/dash calls ProjectController#dash with
-    { "client_name" => "37signals", "project_name" => "basecamp" } in params[:params]
+    { "client_name" => "37signals", "project_name" => "basecamp" }.
     
-    From that URL, you can rewrite the redirect in a number of ways:
+    From that URL you can redirect providing new parameters in a number of ways:
     
-    redirect_to(:action => "edit") =>
-      /clients/37signals/basecamp/project/dash
+    redirect_to :action => "edit"
+    # /clients/37signals/basecamp/project/edit
 
-    redirect_to(:client_name => "nextangle", :project_name => "rails") =>
-      /clients/nextangle/rails/project/dash
+    redirect_to :client_name => "nextangle", :project_name => "rails"
+    # /clients/nextangle/rails/project/dash
 
   {Learn more}[link:classes/ActionController/Base.html]
 
 
-* Javascript and Ajax integration
+* JavaScript and Ajax integration
 
     link_to_function "Greeting", "alert('Hello world!')"
     link_to_remote "Delete this post", :update => "posts", 

data/vendor/rails/actionpack/Rakefile

@@ -79,8 +79,8 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 2.3.5' + PKG_BUILD)
-  s.add_dependency('rack', '~> 1.0.0')
+  s.add_dependency('activesupport', '= 2.3.8' + PKG_BUILD)
+  s.add_dependency('rack', '~> 1.1.0')
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'

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

@@ -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
@@ -31,7 +31,7 @@ rescue LoadError
   end
 end
 
-gem 'rack', '~> 1.0.1'
+gem 'rack', '~> 1.1.0'
 require 'rack'
 require 'action_controller/cgi_ext'
 

data/vendor/rails/actionpack/lib/action_controller/assertions/response_assertions.rb

@@ -144,16 +144,25 @@ module ActionController
         end
 
         def normalize_argument_to_redirection(fragment)
-          after_routing = @controller.url_for(fragment)
-          if after_routing =~ %r{^\w+://.*}
-            after_routing
-          else
-            # FIXME - this should probably get removed.
-            if after_routing.first != '/'
-              after_routing = '/' + after_routing
+          case fragment
+          when %r{^\w[\w\d+.-]*:.*}
+            fragment
+          when String
+            if fragment =~ %r{^\w[\w\d+.-]*:.*}
+              fragment
+            else
+              if fragment !~ /^\//
+                ActiveSupport::Deprecation.warn "Omitting the leading slash on a path with assert_redirected_to is deprecated. Use '/#{fragment}' instead.", caller(2)
+                fragment = "/#{fragment}"
+              end
+              @request.protocol + @request.host_with_port + fragment
             end
-            @request.protocol + @request.host_with_port + after_routing
-          end
+          when :back
+            raise RedirectBackError unless refer = @request.headers["Referer"]
+            refer
+          else
+            @controller.url_for(fragment)
+          end.gsub(/[\r\n]/, '')
         end
     end
   end

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

@@ -616,15 +616,6 @@ module ActionController #:nodoc:
       # displayed on:
       #
       #   url_for :controller => 'posts', :action => nil
-      #
-      # If you explicitly want to create a URL that's almost the same as the current URL, you can do so using the
-      # <tt>:overwrite_params</tt> options. Say for your posts you have different views for showing and printing them.
-      # Then, in the show view, you get the URL for the print view like this
-      #
-      #   url_for :overwrite_params => { :action => 'print' }
-      #
-      # This takes the current URL as is and only exchanges the action. In contrast, <tt>url_for :action => 'print'</tt>
-      # would have slashed-off the path components after the changed action.
       def url_for(options = {})
         options ||= {}
         case options
@@ -1092,10 +1083,19 @@ module ActionController #:nodoc:
       # The redirection happens as a "302 Moved" header unless otherwise specified.
       #
       # Examples:
-      #   redirect_to post_url(@post), :status=>:found
-      #   redirect_to :action=>'atom', :status=>:moved_permanently
-      #   redirect_to post_url(@post), :status=>301
-      #   redirect_to :action=>'atom', :status=>302
+      #   redirect_to post_url(@post), :status => :found
+      #   redirect_to :action=>'atom', :status => :moved_permanently
+      #   redirect_to post_url(@post), :status => 301
+      #   redirect_to :action=>'atom', :status => 302
+      #
+      # It is also possible to assign a flash message as part of the redirection. There are two special accessors for commonly used the flash names
+      # +alert+ and +notice+ as well as a general purpose +flash+ bucket.
+      #
+      # Examples:
+      #   redirect_to post_url(@post), :alert => "Watch it, mister!"
+      #   redirect_to post_url(@post), :status=> :found, :notice => "Pay attention to the road"
+      #   redirect_to post_url(@post), :status => 301, :flash => { :updated_post_id => @post.id }
+      #   redirect_to { :action=>'atom' }, :alert => "Something serious happened"
       #
       # When using <tt>redirect_to :back</tt>, if there is no referrer,
       # RedirectBackError will be raised. You may specify some fallback
@@ -1412,7 +1412,7 @@ module ActionController #:nodoc:
   end
 
   Base.class_eval do
-    [ Filters, Layout, Benchmarking, Rescue, Flash, MimeResponds, Helpers,
+    [ Filters, Layout, Benchmarking, Rescue, MimeResponds, Helpers, Flash,
       Cookies, Caching, Verification, Streaming, SessionManagement,
       HttpAuthentication::Basic::ControllerMethods, HttpAuthentication::Digest::ControllerMethods,
       RecordIdentifier, RequestForgeryProtection, Translation

data/vendor/rails/actionpack/lib/action_controller/caching/fragments.rb

@@ -37,7 +37,7 @@ module ActionController #:nodoc:
       def fragment_for(buffer, name = {}, options = nil, &block) #:nodoc:
         if perform_caching
           if cache = read_fragment(name, options)
-            buffer.concat(cache)
+            buffer.safe_concat(cache.html_safe)
           else
             pos = buffer.length
             block.call
@@ -52,9 +52,9 @@ module ActionController #:nodoc:
       def write_fragment(key, content, options = nil)
         return content unless cache_configured?
 
-        key = fragment_cache_key(key)
-
         self.class.benchmark "Cached fragment miss: #{key}" do
+          key = fragment_cache_key(key)
+          content = content.html_safe.to_str if content.respond_to?(:html_safe)
           cache_store.write(key, content, options)
         end
 
@@ -65,10 +65,10 @@ module ActionController #:nodoc:
       def read_fragment(key, options = nil)
         return unless cache_configured?
 
-        key = fragment_cache_key(key)
-
         self.class.benchmark "Cached fragment hit: #{key}" do
-          cache_store.read(key, options)
+          key = fragment_cache_key(key)
+          result = cache_store.read(key, options)
+          result.respond_to?(:html_safe) ? result.html_safe : result
         end
       end
 

data/vendor/rails/actionpack/lib/action_controller/cookies.rb

@@ -46,6 +46,7 @@ module ActionController #:nodoc:
   module Cookies
     def self.included(base)
       base.helper_method :cookies
+      base.cattr_accessor :cookie_verifier_secret
     end
 
     protected
@@ -56,6 +57,8 @@ module ActionController #:nodoc:
   end
 
   class CookieJar < Hash #:nodoc:
+    attr_reader :controller
+    
     def initialize(controller)
       @controller, @cookies = controller, controller.request.cookies
       super()
@@ -91,5 +94,98 @@ module ActionController #:nodoc:
       @controller.response.delete_cookie(key, options)
       value
     end
+
+    # Returns a jar that'll automatically set the assigned cookies to have an expiration date 20 years from now. Example:
+    #
+    #   cookies.permanent[:prefers_open_id] = true
+    #   # => Set-Cookie: prefers_open_id=true; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+    #
+    # This jar is only meant for writing. You'll read permanent cookies through the regular accessor.
+    #
+    # This jar allows chaining with the signed jar as well, so you can set permanent, signed cookies. Examples:
+    #
+    #   cookies.permanent.signed[:remember_me] = current_user.id
+    #   # => Set-Cookie: discount=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+    def permanent
+      @permanent ||= PermanentCookieJar.new(self)
+    end
+    
+    # Returns a jar that'll automatically generate a signed representation of cookie value and verify it when reading from
+    # the cookie again. This is useful for creating cookies with values that the user is not supposed to change. If a signed
+    # cookie was tampered with by the user (or a 3rd party), an ActiveSupport::MessageVerifier::InvalidSignature exception will
+    # be raised.
+    #
+    # This jar requires that you set a suitable secret for the verification on ActionController::Base.cookie_verifier_secret.
+    #
+    # Example:
+    #
+    #   cookies.signed[:discount] = 45
+    #   # => Set-Cookie: discount=BAhpMg==--2c1c6906c90a3bc4fd54a51ffb41dffa4bf6b5f7; path=/
+    #
+    #   cookies.signed[:discount] # => 45
+    def signed
+      @signed ||= SignedCookieJar.new(self)
+    end
+  end
+  
+  class PermanentCookieJar < CookieJar #:nodoc:
+    def initialize(parent_jar)
+      @parent_jar = parent_jar
+    end
+
+    def []=(key, options)
+      if options.is_a?(Hash)
+        options.symbolize_keys!
+      else
+        options = { :value => options }
+      end
+      
+      options[:expires] = 20.years.from_now
+      @parent_jar[key] = options
+    end
+
+    def signed
+      @signed ||= SignedCookieJar.new(self)
+    end
+
+    def controller
+      @parent_jar.controller
+    end
+
+    def method_missing(method, *arguments, &block)
+      @parent_jar.send(method, *arguments, &block)
+    end
+  end
+  
+  class SignedCookieJar < CookieJar #:nodoc:
+    def initialize(parent_jar)
+      unless parent_jar.controller.class.cookie_verifier_secret
+        raise "You must set ActionController::Base.cookie_verifier_secret to use signed cookies"
+      end
+
+      @parent_jar = parent_jar
+      @verifier = ActiveSupport::MessageVerifier.new(@parent_jar.controller.class.cookie_verifier_secret)
+    end
+    
+    def [](name)
+      if value = @parent_jar[name]
+        @verifier.verify(value)
+      end
+    end
+    
+    def []=(key, options)
+      if options.is_a?(Hash)
+        options.symbolize_keys!
+        options[:value] = @verifier.generate(options[:value])
+      else
+        options = { :value => @verifier.generate(options) }
+      end
+      
+      @parent_jar[key] = options
+    end
+    
+    def method_missing(method, *arguments, &block)
+      @parent_jar.send(method, *arguments, &block)
+    end
   end
 end