actionpack 1.13.1 → 1.13.2

data/test/controller/routing_test.rb

@@ -236,7 +236,39 @@ class LegacyRouteSetTests < Test::Unit::TestCase
       map.connect ':controller/:action/:id'
     end
   end
+  
+  def test_should_list_options_diff_when_routing_requirements_dont_match
+    rs.draw do |map|
+      map.post 'post/:id', :controller=> 'post', :action=> 'show', :requirements => {:id => /\d+/}
+    end
+    exception = assert_raise(ActionController::RoutingError) { rs.generate(:controller => 'post', :action => 'show', :bad_param => "foo", :use_route => "post") }
+    assert_match /^post_url failed to generate/, exception.message
+    from_match = exception.message.match(/from \{[^\}]+\}/).to_s
+    assert_match /:bad_param=>"foo"/,   from_match
+    assert_match /:action=>"show"/,     from_match
+    assert_match /:controller=>"post"/, from_match
+    
+    expected_match = exception.message.match(/expected: \{[^\}]+\}/).to_s
+    assert_no_match /:bad_param=>"foo"/,   expected_match
+    assert_match    /:action=>"show"/,     expected_match
+    assert_match    /:controller=>"post"/, expected_match
 
+    diff_match = exception.message.match(/diff: \{[^\}]+\}/).to_s
+    assert_match    /:bad_param=>"foo"/,   diff_match
+    assert_no_match /:action=>"show"/,     diff_match
+    assert_no_match /:controller=>"post"/, diff_match
+  end
+
+  # this specifies the case where your formerly would get a very confusing error message with an empty diff
+  def test_should_have_better_error_message_when_options_diff_is_empty
+    rs.draw do |map|
+      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?]
+    assert_equal expected_message, exception.message
+  end
+  
   def test_dynamic_path_allowed
     rs.draw do |map|
       map.connect '*path', :controller => 'content', :action => 'show_file'

data/test/controller/test_test.rb

@@ -8,6 +8,12 @@ class TestTest < Test::Unit::TestCase
       render :text => 'ignore me'
     end
 
+    def set_session
+      session['string'] = 'A wonder'
+      session[:symbol] = 'it works'
+      render :text => 'Success'
+    end
+
     def render_raw_post
       raise Test::Unit::AssertionFailedError, "#raw_post is blank" if request.raw_post.blank?
       render :text => request.raw_post
@@ -111,6 +117,14 @@ HTML
     assert_equal '>value<', flash['test']
   end
 
+  def test_process_with_session
+    process :set_session
+    assert_equal 'A wonder', session['string'], "A value stored in the session should be available by string key"
+    assert_equal 'A wonder', session[:string], "Test session hash should allow indifferent access"
+    assert_equal 'it works', session['symbol'], "Test session hash should allow indifferent access"
+    assert_equal 'it works', session[:symbol], "Test session hash should allow indifferent access"
+  end
+
   def test_process_with_request_uri_with_no_params
     process :test_uri
     assert_equal "/test_test/test/test_uri", @response.body

data/test/template/form_options_helper_test.rb

@@ -360,6 +360,25 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     )
   end
 
+  def test_collection_select_with_multiple_option_appends_array_brackets
+    @posts = [
+      Post.new("<Abe> went home", "<Abe>", "To a little house", "shh!"),
+      Post.new("Babe went home", "Babe", "To a little house", "shh!"),
+      Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
+    ]
+
+    @post = Post.new
+    @post.author_name = "Babe"
+
+    expected = "<select id=\"post_author_name\" name=\"post[author_name][]\" multiple=\"multiple\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>"
+
+    # Should suffix default name with [].
+    assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, :multiple => true)
+
+    # Shouldn't suffix custom name with [].
+    assert_dom_equal expected, collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true, :name => 'post[author_name][]' }, :multiple => true)
+  end
+
   def test_country_select
     @post = Post.new
     @post.origin = "Denmark"

data/test/template/text_helper_test.rb

@@ -130,7 +130,9 @@ class TextHelperTest < Test::Unit::TestCase
               http://www.rubyonrails.com/contact;new
               http://www.rubyonrails.com/contact;new%20with%20spaces
               http://www.rubyonrails.com/contact;new?with=query&string=params
-              http://www.rubyonrails.com/~minam/contact;new?with=query&string=params)
+              http://www.rubyonrails.com/~minam/contact;new?with=query&string=params
+              http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
+            )
 
     urls.each do |url|
       assert_equal %(<a href="#{url}">#{url}</a>), auto_link(url)
@@ -151,6 +153,14 @@ class TextHelperTest < Test::Unit::TestCase
     link4_result = %{<a href="#{link4_raw}">#{link4_raw}</a>}
     link5_raw    = 'http://foo.example.com:3000/controller/action'
     link5_result = %{<a href="#{link5_raw}">#{link5_raw}</a>}
+    link6_raw    = 'http://foo.example.com:3000/controller/action+pack'
+    link6_result = %{<a href="#{link6_raw}">#{link6_raw}</a>}
+    link7_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor-123'
+    link7_result = %{<a href="#{link7_raw}">#{link7_raw}</a>}
+    link8_raw    = 'http://foo.example.com:3000/controller/action.html'
+    link8_result = %{<a href="#{link8_raw}">#{link8_raw}</a>}
+    link9_raw    = 'http://business.timesonline.co.uk/article/0,,9065-2473189,00.html'
+    link9_result = %{<a href="#{link9_raw}">#{link9_raw}</a>}
 
     assert_equal %(hello #{email_result}), auto_link("hello #{email_raw}", :email_addresses)
     assert_equal %(Go to #{link_result}), auto_link("Go to #{link_raw}", :urls)
@@ -176,6 +186,20 @@ class TextHelperTest < Test::Unit::TestCase
     assert_equal %(<p>Link #{link4_result}</p>), auto_link("<p>Link #{link4_raw}</p>")
     assert_equal %(<p>#{link4_result} Link</p>), auto_link("<p>#{link4_raw} Link</p>")
     assert_equal %(<p>#{link5_result} Link</p>), auto_link("<p>#{link5_raw} Link</p>")
+    assert_equal %(<p>#{link6_result} Link</p>), auto_link("<p>#{link6_raw} Link</p>")
+    assert_equal %(<p>#{link7_result} Link</p>), auto_link("<p>#{link7_raw} Link</p>")
+    assert_equal %(Go to #{link8_result}), auto_link("Go to #{link8_raw}", :urls)
+    assert_equal %(Go to #{link8_raw}), auto_link("Go to #{link8_raw}", :email_addresses)
+    assert_equal %(<p>Link #{link8_result}</p>), auto_link("<p>Link #{link8_raw}</p>")
+    assert_equal %(<p>#{link8_result} Link</p>), auto_link("<p>#{link8_raw} Link</p>")
+    assert_equal %(Go to #{link8_result}.), auto_link(%(Go to #{link8_raw}.))
+    assert_equal %(<p>Go to #{link8_result}. seriously, #{link8_result}? i think I'll say hello to #{email_result}. instead.</p>), auto_link(%(<p>Go to #{link8_raw}. seriously, #{link8_raw}? i think I'll say hello to #{email_raw}. instead.</p>))
+    assert_equal %(Go to #{link9_result}), auto_link("Go to #{link9_raw}", :urls)
+    assert_equal %(Go to #{link9_raw}), auto_link("Go to #{link9_raw}", :email_addresses)
+    assert_equal %(<p>Link #{link9_result}</p>), auto_link("<p>Link #{link9_raw}</p>")
+    assert_equal %(<p>#{link9_result} Link</p>), auto_link("<p>#{link9_raw} Link</p>")
+    assert_equal %(Go to #{link9_result}.), auto_link(%(Go to #{link9_raw}.))
+    assert_equal %(<p>Go to #{link9_result}. seriously, #{link9_result}? i think I'll say hello to #{email_result}. instead.</p>), auto_link(%(<p>Go to #{link9_raw}. seriously, #{link9_raw}? i think I'll say hello to #{email_raw}. instead.</p>))
     assert_equal '', auto_link(nil)
     assert_equal '', auto_link('')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.13.1
-date: 2007-01-18 00:00:00 -06:00
+  version: 1.13.2
+date: 2007-02-05 00:00:00 -06:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
 - lib
@@ -67,7 +67,6 @@ files:
 - lib/action_controller/rescue.rb
 - lib/action_controller/resources.rb
 - lib/action_controller/response.rb
-- lib/action_controller/response.rb.rej
 - lib/action_controller/routing.rb
 - lib/action_controller/scaffolding.rb
 - lib/action_controller/session
@@ -150,7 +149,6 @@ files:
 - lib/action_view/helpers/javascripts/dragdrop.js
 - lib/action_view/helpers/javascripts/effects.js
 - lib/action_view/helpers/javascripts/prototype.js
-- lib/action_view/helpers/javascripts/prototype.js.rej
 - test/abstract_unit.rb
 - test/active_record_unit.rb
 - test/activerecord
@@ -377,5 +375,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.4.1
     version: 

data/lib/action_controller/response.rb.rej

@@ -1,17 +0,0 @@
-***************
-*** 27,33 ****
-  
-      def redirect(to_url, permanently = false)
-        @headers["Status"]   = "302 Found" unless @headers["Status"] == "301 Moved Permanently"
--       @headers["location"] = to_url
-  
-        @body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"
-      end
---- 27,33 ----
-  
-      def redirect(to_url, permanently = false)
-        @headers["Status"]   = "302 Found" unless @headers["Status"] == "301 Moved Permanently"
-+       @headers["Location"] = to_url
-  
-        @body = "<html><body>You are being <a href=\"#{to_url}\">redirected</a>.</body></html>"
-      end

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

@@ -1,561 +0,0 @@
-***************
-*** 1,4 ****
-  /*  Prototype JavaScript framework, version 1.5.0_rc2
--  *  (c) 2005, 2006 Sam Stephenson <sam@conio.net>
-   *
-   *  Prototype is freely distributable under the terms of an MIT-style license.
---- 1,4 ----
-  /*  Prototype JavaScript framework, version 1.5.0_rc2
-+  *  (c) 2005-2007 Sam Stephenson
-   *
-   *  Prototype is freely distributable under the terms of an MIT-style license.
-***************
-*** 146,149 ****
-    }
-  }
-  Object.extend(String.prototype, {
-    gsub: function(pattern, replacement) {
---- 146,153 ----
-    }
-  }
-+ String.interpret = function(value){
-+   return value == null ? '' : String(value);
-+ }
-+ 
-  Object.extend(String.prototype, {
-    gsub: function(pattern, replacement) {
-***************
-*** 154,158 ****
-        if (match = source.match(pattern)) {
-          result += source.slice(0, match.index);
--         result += (replacement(match) || '').toString();
-          source  = source.slice(match.index + match[0].length);
-        } else {
---- 158,162 ----
-        if (match = source.match(pattern)) {
-          result += source.slice(0, match.index);
-+         result += String.interpret(replacement(match));
-          source  = source.slice(match.index + match[0].length);
-        } else {
-***************
-*** 248,269 ****
-    },
-  
-    camelize: function() {
--     var oStringList = this.split('-');
--     if (oStringList.length == 1) return oStringList[0];
-- 
--     var camelizedString = this.indexOf('-') == 0
--       ? oStringList[0].charAt(0).toUpperCase() + oStringList[0].substring(1)
--       : oStringList[0];
-- 
--     for (var i = 1, length = oStringList.length; i < length; i++) {
--       var s = oStringList[i];
--       camelizedString += s.charAt(0).toUpperCase() + s.substring(1);
--     }
-- 
--     return camelizedString;
-    },
-  
-    underscore: function() {
--     return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'-').toLowerCase();
-    },
-  
---- 252,280 ----
-    },
-  
-+   succ: function() {
-+     return this.slice(0, this.length - 1) +
-+       String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
-+   },
-+ 
-    camelize: function() {
-+     var parts = this.split('-'), len = parts.length;
-+     if (len == 1) return parts[0];
-+ 
-+     var camelized = this.charAt(0) == '-'
-+       ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
-+       : parts[0];
-+ 
-+     for (var i = 1; i < len; i++)
-+       camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-+ 
-+     return camelized;
-+   },
-+ 
-+   capitalize: function(){
-+     return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-    },
-  
-    underscore: function() {
-+     return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
-    },
-  
-***************
-*** 301,305 ****
-        var before = match[1];
-        if (before == '\\') return match[2];
--       return before + (object[match[3]] || '').toString();
-      });
-    }
---- 312,316 ----
-        var before = match[1];
-        if (before == '\\') return match[2];
-+       return before + String.interpret(object[match[3]]);
-      });
-    }
-***************
-*** 330,334 ****
-      while ((index += number) < array.length)
-        slices.push(array.slice(index, index+number));
--     return slices.collect(iterator || Prototype.K);
-    },
-  
---- 341,345 ----
-      while ((index += number) < array.length)
-        slices.push(array.slice(index, index+number));
-+     return slices.map(iterator);
-    },
-  
-***************
-*** 354,358 ****
-      var results = [];
-      this.each(function(value, index) {
--       results.push(iterator(value, index));
-      });
-      return results;
---- 365,369 ----
-      var results = [];
-      this.each(function(value, index) {
-+       results.push((iterator || Prototype.K)(value, index));
-      });
-      return results;
-***************
-*** 401,410 ****
-  
-    inGroupsOf: function(number, fillWith) {
--     fillWith = fillWith || null;
--     var results = this.eachSlice(number);
--     if (results.length > 0) (number - results.last().length).times(function() {
--       results.last().push(fillWith)
--     });
--     return results;
-    },
-  
---- 412,420 ----
-  
-    inGroupsOf: function(number, fillWith) {
-+     fillWith = fillWith === undefined ? null : fillWith;
-+     return this.eachSlice(number, function(slice) {
-+       while(slice.length < number) slice.push(fillWith);
-+       return slice;
-+     });
-    },
-  
-***************
-*** 418,422 ****
-    invoke: function(method) {
-      var args = $A(arguments).slice(1);
--     return this.collect(function(value) {
-        return value[method].apply(value, args);
-      });
---- 428,432 ----
-    invoke: function(method) {
-      var args = $A(arguments).slice(1);
-+     return this.map(function(value) {
-        return value[method].apply(value, args);
-      });
-***************
-*** 470,474 ****
-  
-    sortBy: function(iterator) {
--     return this.collect(function(value, index) {
-        return {value: value, criteria: iterator(value, index)};
-      }).sort(function(left, right) {
---- 480,484 ----
-  
-    sortBy: function(iterator) {
-+     return this.map(function(value, index) {
-        return {value: value, criteria: iterator(value, index)};
-      }).sort(function(left, right) {
-***************
-*** 479,483 ****
-  
-    toArray: function() {
--     return this.collect(Prototype.K);
-    },
-  
---- 489,493 ----
-  
-    toArray: function() {
-+     return this.map();
-    },
-  
-***************
-*** 491,494 ****
-        return iterator(collections.pluck(index));
-      });
-    },
-  
---- 501,508 ----
-        return iterator(collections.pluck(index));
-      });
-+   },
-+ 
-+   size: function() {
-+     return this.toArray().length;
-    },
-  
-***************
-*** 543,547 ****
-    compact: function() {
-      return this.select(function(value) {
--       return value != undefined || value != null;
-      });
-    },
---- 557,561 ----
-    compact: function() {
-      return this.select(function(value) {
-+       return value != null;
-      });
-    },
-***************
-*** 585,588 ****
-    },
-  
-    inspect: function() {
-      return '[' + this.map(Object.inspect).join(', ') + ']';
---- 599,606 ----
-    },
-  
-+   size: function() {
-+     return this.length;
-+   },
-+ 
-    inspect: function() {
-      return '[' + this.map(Object.inspect).join(', ') + ']';
-***************
-*** 591,594 ****
-  
-  Array.prototype.toArray = Array.prototype.clone;
-  
-  if(window.opera){
---- 609,617 ----
-  
-  Array.prototype.toArray = Array.prototype.clone;
-+ 
-+ function $w(string){
-+   string = string.strip();
-+   return string ? string.split(/\s+/) : [];
-+ }
-  
-  if(window.opera){
-***************
-*** 802,807 ****
-  
-        this.transport.open(this.options.method.toUpperCase(), this.url,
--         this.options.asynchronous, this.options.username,
--         this.options.password);
-  
-        if (this.options.asynchronous)
---- 825,829 ----
-  
-        this.transport.open(this.options.method.toUpperCase(), this.url,
-+         this.options.asynchronous);
-  
-        if (this.options.asynchronous)
-***************
-*** 885,888 ****
-          this.dispatchException(e);
-        }
-      }
-  
---- 907,914 ----
-          this.dispatchException(e);
-        }
-+ 
-+       if ((this.getHeader('Content-type') || 'text/javascript').strip().
-+         match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
-+           this.evalResponse();
-      }
-  
-***************
-*** 895,902 ****
-  
-      if (state == 'Complete') {
--       if ((this.getHeader('Content-type') || '').strip().
--         match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
--           this.evalResponse();
-- 
-        // avoid memory leak in MSIE: clean up
-        this.transport.onreadystatechange = Prototype.emptyFunction;
---- 921,924 ----
-  
-      if (state == 'Complete') {
-        // avoid memory leak in MSIE: clean up
-        this.transport.onreadystatechange = Prototype.emptyFunction;
-***************
-*** 1058,1063 ****
-  
-  Element.extend = function(element) {
--   if (!element) return;
--   if (_nativeExtensions || element.nodeType == 3) return element;
-  
-    if (!element._extended && element.tagName && element != window) {
---- 1080,1084 ----
-  
-  Element.extend = function(element) {
-+   if (!element || _nativeExtensions || element.nodeType == 3) return element;
-  
-    if (!element._extended && element.tagName && element != window) {
-***************
-*** 1163,1168 ****
-  
-    descendants: function(element) {
--     element = $(element);
--     return $A(element.getElementsByTagName('*'));
-    },
-  
---- 1184,1188 ----
-  
-    descendants: function(element) {
-+     return $A($(element).getElementsByTagName('*'));
-    },
-  
-***************
-*** 1188,1195 ****
-  
-    match: function(element, selector) {
--     element = $(element);
-      if (typeof selector == 'string')
-        selector = new Selector(selector);
--     return selector.match(element);
-    },
-  
---- 1208,1214 ----
-  
-    match: function(element, selector) {
-      if (typeof selector == 'string')
-        selector = new Selector(selector);
-+     return selector.match($(element));
-    },
-  
-***************
-*** 1216,1220 ****
-  
-    getElementsByClassName: function(element, className) {
--     element = $(element);
-      return document.getElementsByClassName(className, element);
-    },
---- 1235,1238 ----
-  
-    getElementsByClassName: function(element, className) {
-      return document.getElementsByClassName(className, element);
-    },
-***************
-*** 1225,1230 ****
-  
-    getHeight: function(element) {
--     element = $(element);
--     return element.offsetHeight;
-    },
-  
---- 1243,1247 ----
-  
-    getHeight: function(element) {
-+     return $(element).offsetHeight;
-    },
-  
-***************
-*** 1252,1255 ****
-      if (!(element = $(element))) return;
-      Element.classNames(element).remove(className);
-      return element;
-    },
---- 1269,1278 ----
-      if (!(element = $(element))) return;
-      Element.classNames(element).remove(className);
-+     return element;
-+   },
-+ 
-+   toggleClassName: function(element, className) {
-+     if (!(element = $(element))) return;
-+     Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className);
-      return element;
-    },
-***************
-*** 1291,1297 ****
-    scrollTo: function(element) {
-      element = $(element);
--     var x = element.x ? element.x : element.offsetLeft,
--         y = element.y ? element.y : element.offsetTop;
--     window.scrollTo(x, y);
-      return element;
-    },
---- 1314,1319 ----
-    scrollTo: function(element) {
-      element = $(element);
-+     var pos = Position.cumulativeOffset(element);
-+     window.scrollTo(pos[0], pos[1]);
-      return element;
-    },
-***************
-*** 1299,1320 ****
-    getStyle: function(element, style) {
-      element = $(element);
--     var inline = (style == 'float' ?
--       (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat') : style);
--     var value = element.style[inline.camelize()];
-      if (!value) {
-        if (document.defaultView && document.defaultView.getComputedStyle) {
-          var css = document.defaultView.getComputedStyle(element, null);
--         value = css ? css.getPropertyValue(style) : null;
-        } else if (element.currentStyle) {
--         value = element.currentStyle[inline.camelize()];
-        }
-      }
-  
-      if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none'))
--       value = element['offset'+style.charAt(0).toUpperCase()+style.substring(1)] + 'px';
-  
-      if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
-        if (Element.getStyle(element, 'position') == 'static') value = 'auto';
-- 
-      return value == 'auto' ? null : value;
-    },
---- 1321,1347 ----
-    getStyle: function(element, style) {
-      element = $(element);
-+     var camelizedStyle = (style == 'float' ?
-+       (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat') : style).camelize();
-+     var value = element.style[camelizedStyle];
-      if (!value) {
-        if (document.defaultView && document.defaultView.getComputedStyle) {
-          var css = document.defaultView.getComputedStyle(element, null);
-+         value = css ? css[camelizedStyle] : null;
-        } else if (element.currentStyle) {
-+         value = element.currentStyle[camelizedStyle];
-        }
-      }
-  
-      if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none'))
-+       value = element['offset'+style.capitalize()] + 'px';
-  
-      if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
-        if (Element.getStyle(element, 'position') == 'static') value = 'auto';
-+     if(style == 'opacity') {
-+       if(value) return parseFloat(value);
-+       if(value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-+         if(value[1]) return parseFloat(value[1]) / 100;
-+       return 1.0;
-+     }
-      return value == 'auto' ? null : value;
-    },
-***************
-*** 1322,1329 ****
-    setStyle: function(element, style) {
-      element = $(element);
--     for (var name in style)
--       element.style[ (name == 'float' ?
--         ((typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat') : name).camelize()
--       ] = style[name];
-      return element;
-    },
---- 1349,1369 ----
-    setStyle: function(element, style) {
-      element = $(element);
-+     for (var name in style) {
-+       var value = style[name];
-+       if(name == 'opacity') {
-+         if (value == 1) {
-+           value = (/Gecko/.test(navigator.userAgent) &&
-+             !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 0.999999 : 1.0;
-+           if(/MSIE/.test(navigator.userAgent) && !window.opera)
-+             element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
-+         } else {
-+           if(value < 0.00001) value = 0;
-+           if(/MSIE/.test(navigator.userAgent) && !window.opera)
-+             element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
-+               'alpha(opacity='+value*100+')';
-+         }
-+       } else if(name == 'float') name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat';
-+       element.style[name.camelize()] = value;
-+     }
-      return element;
-    },
-***************
-*** 1652,1656 ****
-        conditions.push('true');
-      if (clause = params.id)
--       conditions.push('element.id == ' + clause.inspect());
-      if (clause = params.tagName)
-        conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
---- 1692,1696 ----
-        conditions.push('true');
-      if (clause = params.id)
-+       conditions.push('element.getAttribute("id") == ' + clause.inspect());
-      if (clause = params.tagName)
-        conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
-***************
-*** 1713,1717 ****
-    matchElements: function(elements, expression) {
-      var selector = new Selector(expression);
--     return elements.select(selector.match.bind(selector)).collect(Element.extend);
-    },
-  
---- 1753,1757 ----
-    matchElements: function(elements, expression) {
-      var selector = new Selector(expression);
-+     return elements.select(selector.match.bind(selector)).map(Element.extend);
-    },
-  
-***************
-*** 1753,1757 ****
-  Form.Methods = {
-    serialize: function(form) {
--     return Form.serializeElements($(form).getElements());
-    },
-  
---- 1793,1797 ----
-  Form.Methods = {
-    serialize: function(form) {
-+     return Form.serializeElements(Form.getElements(form));
-    },
-  
-***************
-*** 1768,1777 ****
-    getInputs: function(form, typeName, name) {
-      form = $(form);
--     var inputs = form.getElementsByTagName('input');
-  
-      if (!typeName && !name)
--       return inputs;
-- 
--     var matchingInputs = new Array();
-      for (var i = 0, length = inputs.length; i < length; i++) {
-        var input = inputs[i];
---- 1808,1816 ----
-    getInputs: function(form, typeName, name) {
-      form = $(form);
-+     var inputs = form.getElementsByTagName('input'), matchingInputs = [];
-  
-      if (!typeName && !name)
-+       return $A(inputs).map(Element.extend);
-+ 
-      for (var i = 0, length = inputs.length; i < length; i++) {
-        var input = inputs[i];
-***************
-*** 1969,1973 ****
-    onTimerEvent: function() {
-      var value = this.getValue();
--     if (this.lastValue != value) {
-        this.callback(this.element, value);
-        this.lastValue = value;
---- 2008,2014 ----
-    onTimerEvent: function() {
-      var value = this.getValue();
-+     var changed = ('string' == typeof this.lastValue && 'string' == typeof value
-+       ? this.lastValue != value : String(this.lastValue) != String(value));
-+     if (changed) {
-        this.callback(this.element, value);
-        this.lastValue = value;