actionpack 1.11.0 → 1.11.1

data/lib/action_controller/session/active_record_store.rb

@@ -5,33 +5,42 @@ require 'base64'
 
 class CGI
   class Session
-    # Return this session's underlying Session model. Useful for the DB-backed session stores.
+    # Return this session's underlying Session instance. Useful for the DB-backed session stores.
     def model
-      @dbman.model rescue nil
+      @dbman.model if @dbman
     end
 
-    # Proxy missing methods to the underlying Session model.
-    def method_missing(method, *args, &block)
-      if model then model.send(method, *args, &block) else super end
-    end
 
-    # A session store backed by an Active Record class.
+    # A session store backed by an Active Record class.  A default class is
+    # provided, but any object duck-typing to an Active Record +Session+ class
+    # with text +session_id+ and +data+ attributes is sufficient.
     #
-    # A default class is provided, but any object duck-typing to an Active
-    # Record +Session+ class with text +session_id+ and +data+ attributes
-    # may be used as the backing store.
+    # The default assumes a +sessions+ tables with columns:
+    #   +id+ (numeric primary key),
+    #   +session_id+ (text, or longtext if your session data exceeds 65K), and
+    #   +data+ (text or longtext; careful if your session data exceeds 65KB).
+    # The +session_id+ column should always be indexed for speedy lookups.
+    # Session data is marshaled to the +data+ column in Base64 format.
+    # If the data you write is larger than the column's size limit,
+    # ActionController::SessionOverflowError will be raised.
     #
-    # The default assumes a +sessions+ tables with columns +id+ (numeric
-    # primary key), +session_id+ (text, or longtext if your session data exceeds 65K), 
-    # and +data+ (text).  Session data is marshaled to +data+.  +session_id+ should be 
-    # indexed for speedy lookups.
+    # You may configure the table name, primary key, and data column.
+    # For example, at the end of config/environment.rb:
+    #   CGI::Session::ActiveRecordStore::Session.table_name = 'legacy_session_table'
+    #   CGI::Session::ActiveRecordStore::Session.primary_key = 'session_id'
+    #   CGI::Session::ActiveRecordStore::Session.data_column_name = 'legacy_session_data'
+    # Note that setting the primary key to the session_id frees you from
+    # having a separate id column if you don't want it.  However, you must
+    # set session.model.id = session.session_id by hand!  A before_filter
+    # on ApplicationController is a good place.
     #
     # Since the default class is a simple Active Record, you get timestamps
     # for free if you add +created_at+ and +updated_at+ datetime columns to
     # the +sessions+ table, making periodic session expiration a snap.
     #
-    # You may provide your own session class, whether a feature-packed
-    # Active Record or a bare-metal high-performance SQL store, by setting
+    # You may provide your own session class implementation, whether a
+    # feature-packed Active Record or a bare-metal high-performance SQL
+    # store, by setting
     #   +CGI::Session::ActiveRecordStore.session_class = MySessionClass+
     # You must implement these methods:
     #   self.find_by_session_id(session_id)
@@ -41,28 +50,28 @@ class CGI
     #   save
     #   destroy
     #
-    # The fast SqlBypass class is a generic SQL session store.  You may
+    # The example SqlBypass class is a generic SQL session store.  You may
     # use it as a basis for high-performance database-specific stores.
-    #
-    # If the data you are attempting to write to the +data+ column is larger
-    # than the column's size limit, ActionController::SessionOverflowError 
-    # will be raised.
     class ActiveRecordStore
       # The default Active Record class.
       class Session < ActiveRecord::Base
-        before_update :loaded? # Don't try to save if we haven't loaded the session
+        # Customizable data column name.  Defaults to 'data'.
+        cattr_accessor :data_column_name
+        self.data_column_name = 'data'
+
+        # Don't try to save if we haven't loaded the session.
+        before_update :loaded?
         before_save   :marshal_data!
-        before_save   :ensure_data_not_too_big
-        
-        class << self
+        before_save   :raise_on_session_data_overflow!
 
+        class << self
           # Don't try to reload ARStore::Session in dev mode.
           def reloadable? #:nodoc:
             false
           end
-          
+
           def data_column_size_limit
-            columns_hash['data'].limit
+            @data_column_size_limit ||= columns_hash[@@data_column_name].limit
           end
 
           # Hook to set up sessid compatibility.
@@ -71,15 +80,15 @@ class CGI
             find_by_session_id(session_id)
           end
 
-          def marshal(data)     Base64.encode64(Marshal.dump(data)) end
-          def unmarshal(data)   Marshal.load(Base64.decode64(data)) end
+          def marshal(data)   Base64.encode64(Marshal.dump(data)) if data end
+          def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
 
           def create_table!
             connection.execute <<-end_sql
               CREATE TABLE #{table_name} (
                 id INTEGER PRIMARY KEY,
                 #{connection.quote_column_name('session_id')} TEXT UNIQUE,
-                #{connection.quote_column_name('data')} TEXT(255)
+                #{connection.quote_column_name(@@data_column_name)} TEXT(255)
               )
             end_sql
           end
@@ -110,22 +119,16 @@ class CGI
 
         # Lazy-unmarshal session state.
         def data
-          unless @data
-            case data = read_attribute('data')
-              when String
-                @data = self.class.unmarshal(data)
-              else
-                @data = data || {}
-            end
-          end
-          @data
+          @data ||= self.class.unmarshal(read_attribute(@@data_column_name)) || {}
         end
 
         private
+          attr_writer :data
+
           def marshal_data!
-            write_attribute('data', self.class.marshal(self.data))
+            write_attribute(@@data_column_name, self.class.marshal(self.data))
           end
-          
+
           # Has the session been loaded yet?
           def loaded?
             !! @data
@@ -134,15 +137,17 @@ class CGI
           # Ensures that the data about to be stored in the database is not
           # larger than the data storage column. Raises
           # ActionController::SessionOverflowError.
-          def ensure_data_not_too_big
-            return unless limit = self.class.data_column_size_limit
-            raise ActionController::SessionOverflowError, ActionController::SessionOverflowError::DEFAULT_MESSAGE if read_attribute('data').size > limit
+          def raise_on_session_data_overflow!
+            limit = self.class.data_column_size_limit
+            if loaded? and limit and read_attribute(@@data_column_name).size > limit
+              raise ActionController::SessionOverflowError
+            end
           end
-
       end
 
       # A barebones session store which duck-types with the default session
-      # store but bypasses Active Record and issues SQL directly.
+      # store but bypasses Active Record and issues SQL directly.  This is
+      # an example session model class meant as a basis for your own classes.
       #
       # The database connection, table name, and session id and data columns
       # are configurable class attributes.  Marshaling and unmarshaling
@@ -182,8 +187,8 @@ class CGI
             end
           end
 
-          def marshal(data)     Base64.encode64(Marshal.dump(data)) end
-          def unmarshal(data)   Marshal.load(Base64.decode64(data)) end
+          def marshal(data)   Base64.encode64(Marshal.dump(data)) if data end
+          def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
 
           def create_table!
             @@connection.execute <<-end_sql
@@ -219,7 +224,7 @@ class CGI
         def data
           unless @data
             if @marshaled_data
-              @data, @marshaled_data = self.class.unmarshal(@marshaled_data), nil
+              @data, @marshaled_data = self.class.unmarshal(@marshaled_data) || {}, nil
             else
               @data = {}
             end
@@ -257,13 +262,13 @@ class CGI
             end_sql
           end
         end
-
       end
 
+
       # The class used for session storage.  Defaults to
       # CGI::Session::ActiveRecordStore::Session.
       cattr_accessor :session_class
-      @@session_class = Session
+      self.session_class = Session
 
       # Find or instantiate a session given a CGI::Session.
       def initialize(session, option = nil)
@@ -273,6 +278,7 @@ class CGI
             raise CGI::Session::NoSession, 'uninitialized session'
           end
           @session = @@session_class.new(:session_id => session_id, :data => {})
+          @session.save
         end
       end
 

data/lib/action_controller/templates/rescues/_request_and_response.rhtml

@@ -31,8 +31,6 @@
   request_parameters_without_action.delete("controller")
   
   request_dump  = request_parameters_without_action.inspect.gsub(/,/, ",\n")
-  session_dump  = @request.session.instance_variable_get("@data").inspect.gsub(/,/, ",\n")
-  response_dump = @response.inspect.gsub(/,/, ",\n")
 %>
 
 <h2 style="margin-top: 30px">Request</h2>

data/lib/action_controller/vendor/html-scanner/html/node.rb

@@ -497,7 +497,7 @@ module HTML #:nodoc:
       def match_condition(value, condition)
         case condition
           when String
-            value && value.index(condition)
+            value && value == condition
           when Regexp
             value && value.match(condition)
           when Numeric

data/lib/action_controller/vendor/html-scanner/html/node.rb.rej

@@ -0,0 +1,17 @@
+***************
+*** 264,270 ****
+    
+    # A CDATA node is simply a text node with a specialized way of displaying
+    # itself.
+-   class CDATA < Text
+      def to_s
+        "<![CDATA[#{super}]>"
+      end
+--- 264,270 ----
+    
+    # A CDATA node is simply a text node with a specialized way of displaying
+    # itself.
++   class CDATA < Text #:nodoc:
+      def to_s
+        "<![CDATA[#{super}]>"
+      end

data/lib/action_pack/version.rb

@@ -1,8 +1,8 @@
 module ActionPack
-  module Version #:nodoc:
+  module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 11
-    TINY  = 0
+    TINY  = 1
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/action_view/base.rb

@@ -157,13 +157,12 @@ module ActionView #:nodoc:
 
     class ObjectWrapper < Struct.new(:value) #:nodoc:
     end
-    
+
     def self.load_helpers(helper_dir)#:nodoc:
       Dir.foreach(helper_dir) do |helper_file| 
-        next unless helper_file =~ /_helper.rb$/
-        require helper_dir + helper_file
-        helper_module_name = helper_file.capitalize.gsub(/_([a-z])/) { |m| $1.capitalize }[0..-4]
-
+        next unless helper_file =~ /^([a-z][a-z_]*_helper).rb$/
+        require File.join(helper_dir, $1)
+        helper_module_name = $1.camelize
         class_eval("include ActionView::Helpers::#{helper_module_name}") if Helpers.const_defined?(helper_module_name)
       end
     end

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -35,7 +35,7 @@ module ActionView
         compute_public_path(source, 'javascripts', 'js')        
       end
 
-      JAVASCRIPT_DEFAULT_SOURCES = ['prototype', 'effects', 'dragdrop', 'controls']
+      JAVASCRIPT_DEFAULT_SOURCES = ['prototype', 'effects', 'dragdrop', 'controls'] unless const_defined?(:JAVASCRIPT_DEFAULT_SOURCES)
       @@javascript_default_sources = JAVASCRIPT_DEFAULT_SOURCES.dup
 
       # Returns a script include tag per source given as argument. Examples:
@@ -60,7 +60,7 @@ module ActionView
       def javascript_include_tag(*sources)
         options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
         if sources.first == :defaults
-          sources = @@javascript_default_sources
+          sources = @@javascript_default_sources.dup
           if defined?(RAILS_ROOT) and File.exists?("#{RAILS_ROOT}/public/javascripts/application.js")
             sources << 'application' 
           end

data/lib/action_view/helpers/form_options_helper.rb

@@ -109,7 +109,7 @@ module ActionView
         container = container.to_a if Hash === container
 
         options_for_select = container.inject([]) do |options, element|
-          if element.is_a?(Array) || element.is_a?(Range)
+          if !element.is_a?(String) and element.respond_to?(:first) and element.respond_to?(:last)
             is_selected = ( (selected.respond_to?(:include?) ? selected.include?(element.last) : element.last == selected) )
             is_selected = ( (selected.respond_to?(:include?) && !selected.is_a?(String) ? selected.include?(element.last) : element.last == selected) )
             if is_selected

data/lib/action_view/helpers/form_tag_helper.rb

@@ -95,7 +95,7 @@ module ActionView
       # Options:
       # * <tt>:size</tt> - A string specifying the dimensions of the textarea.
       #     # Outputs <textarea name="body" id="body" cols="25" rows="10"></textarea>
-      #     <%= text_area_tag "body", nil, :size => 25x10 %>
+      #     <%= text_area_tag "body", nil, :size => "25x10" %>
       def text_area_tag(name, content = nil, options = {})
         options = options.stringify_keys
         if options["size"]

data/lib/action_view/helpers/java_script_macros_helper.rb

@@ -28,21 +28,23 @@ module ActionView
       #                       be sent after the user presses "ok".
       # 
       # Addtional +options+ are:
-      # <tt>:rows</tt>::        Number of rows (more than 1 will use a TEXTAREA)
-      # <tt>:cancel_text</tt>:: The text on the cancel link. (default: "cancel")
-      # <tt>:ok_text</tt>::     The text on the save link. (default: "ok")
-      # <tt>:options</tt>::     Pass through options to the AJAX call (see prototype's Ajax.Updater)
-      # <tt>:with</tt>::        JavaScript snippet that should return what is to be sent
-      #                         in the AJAX call, +form+ is an implicit parameter
+      # <tt>:rows</tt>::              Number of rows (more than 1 will use a TEXTAREA)
+      # <tt>:cancel_text</tt>::       The text on the cancel link. (default: "cancel")
+      # <tt>:save_text</tt>::         The text on the save link. (default: "ok")
+      # <tt>:external_control</tt>::  The id of an external control used to enter edit mode.
+      # <tt>:options</tt>::           Pass through options to the AJAX call (see prototype's Ajax.Updater)
+      # <tt>:with</tt>::              JavaScript snippet that should return what is to be sent
+      #                               in the AJAX call, +form+ is an implicit parameter
       def in_place_editor(field_id, options = {})
         function =  "new Ajax.InPlaceEditor("
         function << "'#{field_id}', "
         function << "'#{url_for(options[:url])}'"
 
         js_options = {}
-        js_options['cancelText'] = options[:cancel_text] if options[:cancel_text]
-        js_options['okText'] = options[:save_text] if options[:save_text]
+        js_options['cancelText'] = %('#{options[:cancel_text]}') if options[:cancel_text]
+        js_options['okText'] = %('#{options[:save_text]}') if options[:save_text]
         js_options['rows'] = options[:rows] if options[:rows]
+        js_options['externalControl'] = options[:external_control] if options[:external_control]
         js_options['ajaxOptions'] = options[:options] if options[:options]
         js_options['callback']   = "function(form) { return #{options[:with]} }" if options[:with]
         function << (', ' + options_for_javascript(js_options)) unless js_options.empty?
@@ -59,7 +61,7 @@ module ActionView
         tag = ::ActionView::Helpers::InstanceTag.new(object, method, self)
         tag_options = {:tag => "span", :id => "#{object}_#{method}_#{tag.object.id}_in_place_editor", :class => "in_place_editor_field"}.merge!(tag_options)
         in_place_editor_options[:url] = in_place_editor_options[:url] || url_for({ :action => "set_#{object}_#{method}", :id => tag.object.id })
-        tag.to_content_tag(tag_options[:tag], tag_options) +
+        tag.to_content_tag(tag_options.delete(:tag), tag_options) +
         in_place_editor(tag_options[:id], in_place_editor_options)
       end
       

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

@@ -80,7 +80,10 @@ Autocompleter.Base.prototype = {
 
   show: function() {
     if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix && (navigator.appVersion.indexOf('MSIE')>0) && (Element.getStyle(this.update, 'position')=='absolute')) {
+    if(!this.iefix && 
+      (navigator.appVersion.indexOf('MSIE')>0) &&
+      (navigator.userAgent.indexOf('Opera')<0) &&
+      (Element.getStyle(this.update, 'position')=='absolute')) {
       new Insertion.After(this.update, 
        '<iframe id="' + this.update.id + '_iefix" '+
        'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
@@ -718,4 +721,30 @@ Ajax.InPlaceEditor.prototype = {
       Event.stopObserving(this.options.externalControl, 'mouseout', this.mouseoutListener);
     }
   }
+};
+
+// Delayed observer, like Form.Element.Observer, 
+// but waits for delay after last key input
+// Ideal for live-search fields
+
+Form.Element.DelayedObserver = Class.create();
+Form.Element.DelayedObserver.prototype = {
+  initialize: function(element, delay, callback) {
+    this.delay     = delay || 0.5;
+    this.element   = $(element);
+    this.callback  = callback;
+    this.timer     = null;
+    this.lastValue = $F(this.element); 
+    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
+  },
+  delayedListener: function(event) {
+    if(this.lastValue == $F(this.element)) return;
+    if(this.timer) clearTimeout(this.timer);
+    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
+    this.lastValue = $F(this.element);
+  },
+  onTimerEvent: function() {
+    this.timer = null;
+    this.callback(this.element, $F(this.element));
+  }
 };

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

@@ -1,7 +1,5 @@
 // Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 // 
-// Element.Class part Copyright (c) 2005 by Rick Olson
-// 
 // See scriptaculous.js for full license.
 
 /*--------------------------------------------------------------------------*/
@@ -31,6 +29,8 @@ var Droppables = {
         options._containers.push($(containment));
       }
     }
+    
+    if(options.accept) options.accept = [options.accept].flatten();
 
     Element.makePositioned(element); // fix IE
     options.element = element;
@@ -49,20 +49,21 @@ var Droppables = {
       ((!drop._containers) ||
         this.isContained(element, drop)) &&
       ((!drop.accept) ||
-        (Element.Class.has_any(element, drop.accept))) &&
+        (Element.classNames(element).detect( 
+          function(v) { return drop.accept.include(v) } ) )) &&
       Position.within(drop.element, pX, pY) );
   },
 
   deactivate: function(drop) {
     if(drop.hoverclass)
-      Element.Class.remove(drop.element, drop.hoverclass);
+      Element.removeClassName(drop.element, drop.hoverclass);
     this.last_active = null;
   },
 
   activate: function(drop) {
     if(this.last_active) this.deactivate(this.last_active);
     if(drop.hoverclass)
-      Element.Class.add(drop.element, drop.hoverclass);
+      Element.addClassName(drop.element, drop.hoverclass);
     this.last_active = drop;
   },
 
@@ -105,13 +106,25 @@ var Droppables = {
 var Draggables = {
   observers: [],
   addObserver: function(observer) {
-    this.observers.push(observer);    
+    this.observers.push(observer);
+    this._cacheObserverCallbacks();
   },
-  removeObserver: function(element) {  // element instead of obsever fixes mem leaks
+  removeObserver: function(element) {  // element instead of observer fixes mem leaks
     this.observers = this.observers.reject( function(o) { return o.element==element });
+    this._cacheObserverCallbacks();
+  },
+  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
+    if(this[eventName+'Count'] > 0)
+      this.observers.each( function(o) {
+        if(o[eventName]) o[eventName](eventName, draggable, event);
+      });
   },
-  notify: function(eventName, draggable) {  // 'onStart', 'onEnd'
-    this.observers.invoke(eventName, draggable);
+  _cacheObserverCallbacks: function() {
+    ['onStart','onEnd','onDrag'].each( function(eventName) {
+      Draggables[eventName+'Count'] = Draggables.observers.select(
+        function(o) { return o[eventName]; }
+      ).length;
+    });
   }
 }
 
@@ -138,7 +151,7 @@ Draggable.prototype = {
 
     this.element      = $(element);
     if(options.handle && (typeof options.handle == 'string'))
-      this.handle = Element.Class.childrenWith(this.element, options.handle)[0];
+      this.handle = Element.childrenWithClassName(this.element, options.handle)[0];
       
     if(!this.handle) this.handle = $(options.handle);
     if(!this.handle) this.handle = this.element;
@@ -219,7 +232,7 @@ Draggable.prototype = {
     }
 
     if(success) Droppables.fire(event, this.element);
-    Draggables.notify('onEnd', this);
+    Draggables.notify('onEnd', this, event);
 
     var revert = this.options.revert;
     if(revert && typeof revert == 'function') revert = revert(this.element);
@@ -290,11 +303,12 @@ Draggable.prototype = {
           this.element.parentNode.insertBefore(this._clone, this.element);
         }
 
-        Draggables.notify('onStart', this);
+        Draggables.notify('onStart', this, event);
         if(this.options.starteffect) this.options.starteffect(this.element);
       }
 
       Droppables.show(event, this.element);
+      Draggables.notify('onDrag', this, event);
       this.draw(event);
       if(this.options.change) this.options.change(this);
 
@@ -413,7 +427,7 @@ var Sortable = {
     (this.findElements(element, options) || []).each( function(e) {
       // handles are per-draggable
       var handle = options.handle ? 
-        Element.Class.childrenWith(e, options.handle)[0] : e;    
+        Element.childrenWithClassName(e, options.handle)[0] : e;    
       options.draggables.push(
         new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
       Droppables.add(e, options_for_droppable);
@@ -434,7 +448,7 @@ var Sortable = {
     var elements = [];
     $A(element.childNodes).each( function(e) {
       if(e.tagName && e.tagName==options.tag.toUpperCase() &&
-        (!options.only || (Element.Class.has(e, options.only))))
+        (!options.only || (Element.hasClassName(e, options.only))))
           elements.push(e);
       if(options.tree) {
         var grandchildren = this.findElements(e, options);
@@ -491,14 +505,20 @@ var Sortable = {
     if(!Sortable._marker) {
       Sortable._marker = $('dropmarker') || document.createElement('DIV');
       Element.hide(Sortable._marker);
-      Element.Class.add(Sortable._marker, 'dropmarker');
+      Element.addClassName(Sortable._marker, 'dropmarker');
       Sortable._marker.style.position = 'absolute';
       document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
     }    
     var offsets = Position.cumulativeOffset(dropon);
-    Sortable._marker.style.top  = offsets[1] + 'px';
-    if(position=='after') Sortable._marker.style.top = (offsets[1]+dropon.clientHeight) + 'px';
     Sortable._marker.style.left = offsets[0] + 'px';
+    Sortable._marker.style.top = offsets[1] + 'px';
+    
+    if(position=='after')
+      if(sortable.overlap == 'horizontal') 
+        Sortable._marker.style.left = (offsets[0]+dropon.clientWidth) + 'px';
+      else
+        Sortable._marker.style.top = (offsets[1]+dropon.clientHeight) + 'px';
+    
     Element.show(Sortable._marker);
   },