radiant 0.6.3 → 0.6.4

data/vendor/rails/actionpack/test/controller/routing_test.rb

@@ -265,7 +265,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
       map.content '/content/:query', :controller => 'content', :action => 'show'
     end
     exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'content', :action => 'show', :use_route => "content") }
-    expected_message = %[content_url failed to generate from {:action=>"show", :controller=>"content"} - you may have ambiguous routes, or you may need to supply additional parameters for this route.  content_url has the following required parameters: ["content", :query] - are they all satisifed?]
+    expected_message = "content_url failed to generate from #{{:action=>"show", :controller=>"content"}.inspect} - you may have ambiguous routes, or you may need to supply additional parameters for this route.  content_url has the following required parameters: [\"content\", :query] - are they all satisifed?"
     assert_equal expected_message, exception.message
   end
   
@@ -946,7 +946,7 @@ class RouteTest < Test::Unit::TestCase
   end
 
   def test_expand_array_build_query_string
-    assert_equal '?x[]=1&x[]=2', order_query_string(@route.build_query_string(:x => [1, 2]))
+    assert_equal '?x%5B%5D=1&x%5B%5D=2', order_query_string(@route.build_query_string(:x => [1, 2]))
   end
 
   def test_escape_spaces_build_query_string_selected_keys

data/vendor/rails/actionpack/test/controller/test_test.rb

@@ -482,6 +482,22 @@ HTML
     end
   end
 
+  def test_request_uri_updates
+    get :test_params
+    uri = @request.request_uri
+    assert_equal @request.env['REQUEST_URI'], uri
+    
+    get :test_uri
+    assert_not_equal uri, @request.request_uri
+    uri = @request.request_uri
+    assert_equal @request.env['REQUEST_URI'], uri
+
+    get :test_uri, :testing => true
+    assert_not_equal uri, @request.request_uri
+    uri = @request.request_uri
+    assert_equal @request.env['REQUEST_URI'], uri
+  end
+
   protected
     def with_foo_routing
       with_routing do |set|

data/vendor/rails/actionpack/test/controller/url_rewriter_test.rb

@@ -17,15 +17,12 @@ class UrlRewriterTests < Test::Unit::TestCase
     assert_match %r(/hi/hi/2$), u
   end
   
-
-  private
-    def split_query_string(str)
-      [str[0].chr] + str[1..-1].split(/&/).sort
-    end
-  
-    def assert_query_equal(q1, q2)
-      assert_equal(split_query_string(q1), split_query_string(q2))
-    end
+  def test_anchor
+    assert_equal(
+      'http://test.host/c/a/i#anchor',
+      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor')
+    )
+  end
 end
 
 class UrlWriterTests < Test::Unit::TestCase
@@ -75,6 +72,12 @@ class UrlWriterTests < Test::Unit::TestCase
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
     )
   end
+
+  def test_anchor
+    assert_equal('/c/a#anchor',
+      W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => 'anchor')
+    )
+  end
   
   def test_named_route
     ActionController::Routing::Routes.draw do |map|
@@ -111,5 +114,58 @@ class UrlWriterTests < Test::Unit::TestCase
   ensure
     ActionController::Routing::Routes.load!
   end
-  
+
+  def test_one_parameter
+    assert_equal('/c/a?param=val',
+      W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :param => 'val')
+    )
+  end
+
+  def test_two_parameters
+    url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :p1 => 'X1', :p2 => 'Y2')
+    params = extract_params(url)
+    assert_equal params[0], { :p1 => 'X1' }.to_query
+    assert_equal params[1], { :p2 => 'Y2' }.to_query
+  end
+
+  def test_hash_parameter
+    url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :query => {:name => 'Bob', :category => 'prof'})
+    params = extract_params(url)
+    assert_equal params[0], { 'query[category]' => 'prof' }.to_query
+    assert_equal params[1], { 'query[name]'     => 'Bob'  }.to_query
+  end
+
+  def test_array_parameter
+    url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :query => ['Bob', 'prof'])
+    params = extract_params(url)
+    assert_equal params[0], { 'query[]' => 'Bob'  }.to_query
+    assert_equal params[1], { 'query[]' => 'prof' }.to_query
+  end
+
+  def test_hash_recursive_parameters
+    url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :query => {:person => {:name => 'Bob', :position => 'prof'}, :hobby => 'piercing'})
+    params = extract_params(url)
+    assert_equal params[0], { 'query[hobby]'            => 'piercing' }.to_query
+    assert_equal params[1], { 'query[person][name]'     => 'Bob'      }.to_query
+    assert_equal params[2], { 'query[person][position]' => 'prof'     }.to_query
+  end
+
+  def test_hash_recursive_and_array_parameters
+    url = W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :id => 101, :query => {:person => {:name => 'Bob', :position => ['prof', 'art director']}, :hobby => 'piercing'})
+    assert_match %r(^/c/a/101), url
+    params = extract_params(url)
+    assert_equal params[0], { 'query[hobby]'              => 'piercing'     }.to_query
+    assert_equal params[1], { 'query[person][name]'       => 'Bob'          }.to_query
+    assert_equal params[2], { 'query[person][position][]' => 'art director' }.to_query
+    assert_equal params[3], { 'query[person][position][]' => 'prof'         }.to_query
+  end
+
+  def test_path_generation_for_symbol_parameter_keys
+    assert_generates("/image", :controller=> :image)
+  end
+
+  private
+    def extract_params(url)
+      url.split('?', 2).last.split('&')
+    end
 end

data/vendor/rails/actionpack/test/controller/verification_test.rb

@@ -34,9 +34,16 @@ class VerificationTest < Test::Unit::TestCase
 
     verify :only => :must_be_post, :method => :post, :render => { :status => 405, :text => "Must be post" }, :add_headers => { "Allow" => "POST" }
 
+    verify :only => :guarded_one_for_named_route_test, :params => "one",
+           :redirect_to => :foo_url
+
     def guarded_one
       render :text => "#{params[:one]}"
     end
+    
+    def guarded_one_for_named_route_test
+      render :text => "#{params[:one]}"
+    end
 
     def guarded_with_flash
       render :text => "#{params[:one]}"
@@ -94,6 +101,14 @@ class VerificationTest < Test::Unit::TestCase
     @controller = TestController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    ActionController::Routing::Routes.add_named_route :foo, '/foo', :controller => 'test', :action => 'foo'
+  end
+  
+  def test_no_deprecation_warning_for_named_route
+    assert_not_deprecated do
+      get :guarded_one_for_named_route_test, :two => "not one"
+      assert_redirected_to '/foo'
+    end
   end
 
   def test_guarded_one_with_prereqs

data/vendor/rails/actionpack/test/fixtures/test/hello_world.rxml

@@ -1,3 +1,4 @@
 xml.html do
   xml.p "Hello"
-end
+end
+"String return value"

data/vendor/rails/actionpack/test/template/asset_tag_helper_test.rb

@@ -165,7 +165,12 @@ class AssetTagHelperTest < Test::Unit::TestCase
 
   def test_preset_empty_asset_id
     Object.send(:const_set, :RAILS_ROOT, File.dirname(__FILE__) + "/../fixtures/")
+    # on windows, setting ENV["XXX"] to "" makes ENV["XXX"] return nil
+    if RUBY_PLATFORM =~ /win32/
+      ENV["RAILS_ASSET_ID"] = " "
+    else
     ENV["RAILS_ASSET_ID"] = ""
+    end
     assert_equal %(<img alt="Rails" src="/images/rails.png" />), image_tag("rails.png")
   end
 

data/vendor/rails/actionpack/test/template/compiled_templates_test.rb

@@ -71,7 +71,12 @@ class CompiledTemplateTests < Test::Unit::TestCase
   end
 
   def test_compile_time
-    `echo '#{@a}' > #{@a}; echo '#{@b}' > #{@b}; ln -s #{@a} #{@s}`
+    File.open(@a, "w"){|f| f.puts @a}
+    File.open(@b, "w"){|f| f.puts @b}
+
+    # windows doesn't support symlinks (even under cygwin)
+    windows = (RUBY_PLATFORM =~ /win32/)
+    `ln -s #{@a} #{@s}` unless windows
 
     v = ActionView::Base.new
     v.base_path = '.'
@@ -79,47 +84,54 @@ class CompiledTemplateTests < Test::Unit::TestCase
 
     sleep 1
     t = Time.now
+    sleep 1
+
     v.compile_and_render_template(:rhtml, '', @a)
     v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s)
+    v.compile_and_render_template(:rhtml, '', @s) unless windows
+
     a_n = v.method_names[@a]
     b_n = v.method_names[@b]
-    s_n = v.method_names[@s]
+    s_n = v.method_names[@s]  unless windows
+    ct_a = v.compile_time[a_n]
+    ct_b = v.compile_time[b_n]
+    ct_s = v.compile_time[s_n] unless windows
     # all of the files have changed since last compile
     assert v.compile_time[a_n] > t
     assert v.compile_time[b_n] > t
-    assert v.compile_time[s_n] > t
+    assert v.compile_time[s_n] > t unless windows
 
     sleep 1
-    t = Time.now
     v.compile_and_render_template(:rhtml, '', @a)
     v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s)
+    v.compile_and_render_template(:rhtml, '', @s) unless windows
     # none of the files have changed since last compile
-    assert v.compile_time[a_n] < t
-    assert v.compile_time[b_n] < t
-    assert v.compile_time[s_n] < t
+    # so they should not have been recmpiled
+    assert_equal ct_a, v.compile_time[a_n]
+    assert_equal ct_b, v.compile_time[b_n]
+    assert_equal ct_s, v.compile_time[s_n] unless windows
 
-    `rm #{@s}; ln -s #{@b} #{@s}`
+    `rm #{@s}; ln -s #{@b} #{@s}` unless windows
     v.compile_and_render_template(:rhtml, '', @a)
     v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s)
+    v.compile_and_render_template(:rhtml, '', @s) unless windows
     # the symlink has changed since last compile
-    assert v.compile_time[a_n] < t
-    assert v.compile_time[b_n] < t
-    assert v.compile_time[s_n] > t
+    assert_equal ct_a, v.compile_time[a_n]
+    assert_equal ct_b, v.compile_time[b_n]
+    assert v.compile_time[s_n] > t unless windows
 
     sleep 1
-    `touch #{@b}`
+    FileUtils.touch @b
     t = Time.now
+    sleep 1
     v.compile_and_render_template(:rhtml, '', @a)
     v.compile_and_render_template(:rhtml, '', @b)
-    v.compile_and_render_template(:rhtml, '', @s)
+    v.compile_and_render_template(:rhtml, '', @s) unless windows
     # the file at the end of the symlink has changed since last compile
     # both the symlink and the file at the end of it should be recompiled
     assert v.compile_time[a_n] < t
     assert v.compile_time[b_n] > t
-    assert v.compile_time[s_n] > t
+    assert v.compile_time[s_n] > t unless windows
   end
 end
 

data/vendor/rails/actionpack/test/template/javascript_helper_test.rb

@@ -36,14 +36,14 @@ class JavaScriptHelperTest < Test::Unit::TestCase
     html = link_to_function( "Greet me!" ) do |page|
       page.replace_html 'header', "<h1>Greetings</h1>"
     end
-    assert_dom_equal %(<a href="#" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);; return false;">Greet me!</a>), html
+    assert_dom_equal %q(<a href="#" onclick="Element.update(&quot;header&quot;, &quot;\074h1\076Greetings\074/h1\076&quot;);; return false;">Greet me!</a>), html
   end
 
   def test_link_to_function_with_rjs_block_and_options
     html = link_to_function( "Greet me!", :class => "updater" ) do |page|
       page.replace_html 'header', "<h1>Greetings</h1>"
     end
-    assert_dom_equal %(<a href="#" class="updater" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);; return false;">Greet me!</a>), html
+    assert_dom_equal %q(<a href="#" class="updater" onclick="Element.update(&quot;header&quot;, &quot;\074h1\076Greetings\074/h1\076&quot;);; return false;">Greet me!</a>), html
   end
 
   def test_button_to_function
@@ -55,13 +55,13 @@ class JavaScriptHelperTest < Test::Unit::TestCase
     html = button_to_function( "Greet me!" ) do |page|
       page.replace_html 'header', "<h1>Greetings</h1>"
     end
-    assert_dom_equal %(<input type="button" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);;" value="Greet me!" />), html
+    assert_dom_equal %q(<input type="button" onclick="Element.update(&quot;header&quot;, &quot;\074h1\076Greetings\074/h1\076&quot;);;" value="Greet me!" />), html
   end
 
   def test_button_to_function_with_rjs_block_and_options
     html = button_to_function( "Greet me!", :class => "greeter" ) do |page|
       page.replace_html 'header', "<h1>Greetings</h1>"
     end
-    assert_dom_equal %(<input type="button" class="greeter" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);;" value="Greet me!" />), html
+    assert_dom_equal %q(<input type="button" class="greeter" onclick="Element.update(&quot;header&quot;, &quot;\074h1\076Greetings\074/h1\076&quot;);;" value="Greet me!" />), html
   end
 end

data/vendor/rails/actionpack/test/template/number_helper_test.rb

@@ -22,7 +22,7 @@ class NumberHelperTest < Test::Unit::TestCase
   def test_number_to_currency
     assert_equal("$1,234,567,890.50", number_to_currency(1234567890.50))
     assert_equal("$1,234,567,890.51", number_to_currency(1234567890.506))
-    assert_equal("$1,234,567,890", number_to_currency(1234567890.50, {:precision => 0}))
+    assert_equal("$1,234,567,891", number_to_currency(1234567890.51, {:precision => 0}))
     assert_equal("$1,234,567,890.5", number_to_currency(1234567890.50, {:precision => 1}))
     assert_equal("&pound;1234567890,50", number_to_currency(1234567890.50, {:unit => "&pound;", :separator => ",", :delimiter => ""}))
     assert_equal("$1,234,567,890.50", number_to_currency("1234567890.50"))

data/vendor/rails/actionpack/test/template/prototype_helper_test.rb

@@ -125,7 +125,7 @@ class PrototypeHelperTest < Test::Unit::TestCase
   end
   
   def test_observe_field
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/reorder_if_empty', {asynchronous:true, evalScripts:true})})\n//]]>\n</script>),
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/reorder_if_empty', {asynchronous:true, evalScripts:true, parameters:value})})\n//]]>\n</script>),
       observe_field("glass", :frequency => 5.minutes, :url => { :action => "reorder_if_empty" })
   end
   
@@ -135,7 +135,7 @@ class PrototypeHelperTest < Test::Unit::TestCase
   end
   
   def test_observe_form
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Observer('cart', 2, function(element, value) {new Ajax.Request('http://www.example.com/cart_changed', {asynchronous:true, evalScripts:true})})\n//]]>\n</script>),
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Observer('cart', 2, function(element, value) {new Ajax.Request('http://www.example.com/cart_changed', {asynchronous:true, evalScripts:true, parameters:value})})\n//]]>\n</script>),
       observe_form("cart", :frequency => 2, :url => { :action => "cart_changed" })
   end
   
@@ -170,23 +170,23 @@ class JavaScriptGeneratorTest < Test::Unit::TestCase
   end
   
   def test_insert_html_with_string
-    assert_equal 'new Insertion.Top("element", "<p>This is a test</p>");',
+    assert_equal 'new Insertion.Top("element", "\074p\076This is a test\074/p\076");',
       @generator.insert_html(:top, 'element', '<p>This is a test</p>')
-    assert_equal 'new Insertion.Bottom("element", "<p>This is a test</p>");',
+    assert_equal 'new Insertion.Bottom("element", "\074p\076This is a test\074/p\076");',
       @generator.insert_html(:bottom, 'element', '<p>This is a test</p>')
-    assert_equal 'new Insertion.Before("element", "<p>This is a test</p>");',
+    assert_equal 'new Insertion.Before("element", "\074p\076This is a test\074/p\076");',
       @generator.insert_html(:before, 'element', '<p>This is a test</p>')
-    assert_equal 'new Insertion.After("element", "<p>This is a test</p>");',
+    assert_equal 'new Insertion.After("element", "\074p\076This is a test\074/p\076");',
       @generator.insert_html(:after, 'element', '<p>This is a test</p>')
   end
   
   def test_replace_html_with_string
-    assert_equal 'Element.update("element", "<p>This is a test</p>");',
+    assert_equal 'Element.update("element", "\074p\076This is a test\074/p\076");',
       @generator.replace_html('element', '<p>This is a test</p>')
   end
   
   def test_replace_element_with_string
-    assert_equal 'Element.replace("element", "<div id=\"element\"><p>This is a test</p></div>");',
+    assert_equal 'Element.replace("element", "\074div id=\"element\"\076\074p\076This is a test\074/p\076\074/div\076");',
       @generator.replace('element', '<div id="element"><p>This is a test</p></div>')
   end
   
@@ -241,12 +241,12 @@ class JavaScriptGeneratorTest < Test::Unit::TestCase
     @generator.remove('foo', 'bar')
     @generator.replace_html('baz', '<p>This is a test</p>')
     
-    assert_equal <<-EOS.chomp, @generator.to_s
-new Insertion.Top("element", "<p>This is a test</p>");
-new Insertion.Bottom("element", "<p>This is a test</p>");
+    expected = %q(new Insertion.Top("element", "\074p\076This is a test\074/p\076");
+new Insertion.Bottom("element", "\074p\076This is a test\074/p\076");
 ["foo", "bar"].each(Element.remove);
-Element.update("baz", "<p>This is a test</p>");
-    EOS
+Element.update("baz", "\074p\076This is a test\074/p\076");)
+
+    assert_equal expected, @generator.to_s
   end
 
   def test_element_access

data/vendor/rails/actionwebservice/CHANGELOG

@@ -1,3 +1,17 @@
+*1.2.5* (October 12th, 2007)
+
+* Depend on Action Pack 1.13.5
+
+* Depend on Active Record 1.15.5
+
+
+*1.2.4* (October 4th, 2007)
+
+* Depend on Action Pack 1.13.4
+
+* Depend on Active Record 1.15.4
+
+
 *1.2.3* (March 12th, 2007)
 
 * Depend on Action Pack 1.13.3

data/vendor/rails/actionwebservice/Rakefile

@@ -71,8 +71,8 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "aws"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.13.3' + PKG_BUILD)
-  s.add_dependency('activerecord', '= 1.15.3' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.13.5' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 1.15.5' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

data/vendor/rails/actionwebservice/lib/action_web_service/version.rb

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

data/vendor/rails/activerecord/CHANGELOG

@@ -1,3 +1,37 @@
+*1.15.5* (October 12th, 2007)
+
+* Depend on Action Pack 1.4.4
+
+
+*1.15.4* (October 4th, 2007)
+
+* Fix #count on a has_many :through association so that it recognizes the :uniq option. Closes #8801 [lifofifo]
+
+* Don't clobber includes passed to has_many.count [danger]
+
+* Make sure has_many uses :include when counting [danger]
+
+* Save associated records only if the association is already loaded.  #8713 [blaine]
+
+* Changing the :default Date format doesn't break date quoting.  #6312 [bshand, Elias]
+
+* Allow nil serialized attributes with a set class constraint. #7293 [sandofsky]
+
+* belongs_to assignment creates a new proxy rather than modifying its target in-place.  #8412 [mmangino@elevatedrails.com]
+
+* Fix column type detection while loading fixtures.  Closes #7987 [roderickvd]
+
+* Document deep eager includes.  #6267 [Josh Susser, Dan Manges]
+
+* Oracle: extract column length for CHAR also.  #7866 [ymendel]
+
+* Small additions and fixes for ActiveRecord documentation.  Closes #7342 [jeremymcanally]
+
+* SQLite: binary escaping works with $KCODE='u'.  #7862 [tsuka]
+
+* Improved cloning performance by relying less on exception raising #8159 [Blaine]
+
+
 *1.15.3* (March 12th, 2007)
 
 * Allow a polymorphic :source for has_many :through associations. Closes #7143 [protocool]