actionpack 1.8.0 → 1.8.1

data/CHANGELOG

@@ -1,3 +1,20 @@
+*1.8.1* (20th April, 2005)
+
+* Added xml_http_request/xhr method for simulating XMLHttpRequest in functional tests #1151 [Sam Stephenson]. Example:
+
+    xhr :post, :index
+
+* Fixed that Ajax.Base.options.asynchronous wasn't being respected in Ajax.Request (thanks Jon Casey)
+
+* Fixed that :get, :post, and the others should take a flash array as the third argument just like process #1144 [rails@cogentdude.com]
+
+* Fixed a problem with Flash.now
+
+* Fixed stringification on all assigned hashes. The sacrifice is that assigns[:person] won't work in testing. Instead assigns["person"] or assigns(:person) must be used. In other words, the keys of assigns stay strings but we've added a method-based accessor to appease the need for symbols.
+
+* Fixed that rendering a template would require a connection to the database #1146
+
+
 *1.8.0* (19th April, 2005)
 
 * Added assert_tag and assert_no_tag as a much improved alternative to the deprecated assert_template_xpath_match #1126 [Jamis Buck]
@@ -36,7 +53,7 @@
 
 * Fixed that you can now pass an alternative :href option to link_to_function/remote in order to point to somewhere other than # if the javascript fails or is turned off. You can do the same with form_remote_tag by passing in :action. #1113 [Sam Stephenson]
 
-* Fixed DateHelper to return values on the option tags such that they'll work properly in IE with form_remote_tag #1024 [rscottmace@gmail.com]
+* Fixed DateHelper to return values on the option tags such that they'll work properly in IE with form_remote_tag #1024 [Scott Raymond]
 
 * Fixed FormTagHelper#check_box to respect checked #1049 [DelynnB]
 

data/lib/action_controller/assertions.rb

@@ -14,10 +14,14 @@ module Test #:nodoc:
     # 
     # These collections can be used just like any other hash:
     #
-    #   assert_not_nil assigns[:person] # makes sure that a @person instance variable was set
+    #   assert_not_nil assigns(:person) # makes sure that a @person instance variable was set
     #   assert_equal "Dave", cookies[:name] # makes sure that a cookie called :name was set as "Dave"
     #   assert flash.empty? # makes sure that there's nothing in the flash
     #
+    # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
+    # appease our yearning for symbols, though, an alternative accessor has been deviced using a method call instead of index referencing.
+    # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
+    #
     # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
     #
     # For redirects within the same controller, you can even call follow_redirect and the redirect will be follow triggering another

data/lib/action_controller/benchmarking.rb

@@ -19,11 +19,14 @@ module ActionController #:nodoc:
       if logger.nil?
         render_without_benchmark(template_name, status)
       else
-        db_runtime = ActiveRecord::Base.connection.reset_runtime
+        db_runtime = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
         @rendering_runtime = Benchmark::measure{ render_without_benchmark(template_name, status) }.real
-        @db_rt_before_render = db_runtime
-        @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime
-        @rendering_runtime -= @db_rt_after_render
+
+        if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
+          @db_rt_before_render = db_runtime
+          @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime
+          @rendering_runtime -= @db_rt_after_render
+        end
       end
     end    
 

data/lib/action_controller/test_process.rb

@@ -258,13 +258,19 @@ module Test
         # execute the request simulating a specific http method and set/volley the response
         %w( get post put delete head ).each do |method|
           class_eval <<-EOV
-            def #{method}(action, parameters = nil, session = nil)
+            def #{method}(action, parameters = nil, session = nil, flash = nil)
               @request.env['REQUEST_METHOD'] = "#{method.upcase}"
-              process(action, parameters, session)
+              process(action, parameters, session, flash)
             end
           EOV
         end
 
+        def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil)
+          @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+          self.send(request_method, action, parameters, session, flash)
+        end
+        alias xhr :xml_http_request
+
         def follow_redirect
           if @response.redirected_to[:controller]
             raise "Can't follow redirects outside of current controller (#{@response.redirected_to[:controller]})"

data/lib/action_view/base.rb

@@ -157,7 +157,7 @@ module ActionView #:nodoc:
     end
 
     def initialize(base_path = nil, assigns_for_first_render = {}, controller = nil)#:nodoc:
-      @base_path, @assigns = base_path, assigns_for_first_render.with_indifferent_access
+      @base_path, @assigns = base_path, assigns_for_first_render
       @controller = controller
     end
 

data/lib/action_view/helpers/form_options_helper.rb

@@ -10,21 +10,47 @@ module ActionView
     # and <tt>time_zone_select</tt> methods take an <tt>options</tt> parameter,
     # a hash.
     #
-    # * <tt>:include_blank</tt> - set to true if the first option element of the select element is a blank. Useful if there is not a default value required for the select element.
+    # * <tt>:include_blank</tt> - set to true if the first option element of the select element is a blank. Useful if there is not a default value required for the select element. For example,
+    #
     #   select("post", "category", Post::CATEGORIES, {:include_blank => true})
     #
-    # Could become:
+    # could become:
     #
     #   <select name="post[category]">
     #     <option></option>
     #     <option>joke</option>
     #     <option>poem</option>
     #   </select>
+    #
+    # Another common case is a select tag for an <tt>belongs_to</tt>-associated object. For example,
+    #
+    #   select("post", "person_id", Person.find_all.collect {|p| [ p.name, p.id ] })
+    #
+    # could become:
+    #
+    #   <select name="post[person_id]">
+    #     <option value="1">David</option>
+    #     <option value="2">Sam</option>
+    #     <option value="3">Tobias</option>
+    #   </select>
     module FormOptionsHelper
       include ERB::Util
 
       # Create a select tag and a series of contained option tags for the provided object and method.
       # The option currently held by the object will be selected, provided that the object is available.
+      # See options_for_select for the required format of the choices parameter.
+      #
+      # Example with @post.person_id => 1:
+      #   select("post", "person_id", Person.find_all.collect {|p| [ p.name, p.id ] }, { :include_blank => true })
+      #
+      # could become:
+      #
+      #   <select name="post[person_id">
+      #     <option></option>
+      #     <option value="1" selected="selected">David</option>
+      #     <option value="2">Sam</option>
+      #     <option value="3">Tobias</option>
+      #   </select>
       #
       # This can be used to provide a default set of options in the standard way: before rendering the create form, a
       # new model instance is assigned the default options and bound to @model_name. Usually this model is not saved

data/lib/action_view/helpers/javascripts/prototype.js

@@ -1,4 +1,4 @@
-/*  Prototype: an object-oriented Javascript library, version 1.2.0
+/*  Prototype: an object-oriented Javascript library, version 1.2.1
  *  (c) 2005 Sam Stephenson <sam@conio.net>
  *
  *  THIS FILE IS AUTOMATICALLY GENERATED. When sending patches, please diff
@@ -11,7 +11,7 @@
 /*--------------------------------------------------------------------------*/
 
 var Prototype = {
-  Version: '1.2.0'
+  Version: '1.2.1'
 }
 
 var Class = {
@@ -184,7 +184,8 @@ Ajax.Request.prototype = (new Ajax.Base()).extend({
       if (this.options.method == 'get')
         url += '?' + this.options.parameters + '&_=';
     
-      this.transport.open(this.options.method, url, true);
+      this.transport.open(this.options.method, url,
+        this.options.asynchronous);
       
       if (this.options.asynchronous) {
         this.transport.onreadystatechange = this.onStateChange.bind(this);

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '1.8.0' + PKG_BUILD
+PKG_VERSION   = '1.8.1' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
-date: 2005-04-19
+  version: 1.8.1
+date: 2005-04-20
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib