actionpack 1.10.2 → 1.11.0

data/lib/action_controller/dependencies.rb

@@ -27,7 +27,7 @@ module ActionController #:nodoc:
     #   end
     #
     # Also note, that if the models follow the pattern of just 1 class per file in the form of MyClass => my_class.rb, then these
-    # classes doesn't have to be required as Active Support will auto-require them.
+    # classes don't have to be required as Active Support will auto-require them.
     module ClassMethods
       # Specifies a variable number of models that this controller depends on. Models are normally Active Record classes or a similar
       # backend for modelling entity classes.

data/lib/action_controller/filters.rb

@@ -41,7 +41,7 @@ module ActionController #:nodoc:
     #
     # Now any actions performed on the BankController will have the audit method called before. On the VaultController,
     # first the audit method is called, then the verify_credentials method. If the audit method returns false, then 
-    # verify_credentials and the intended action is never called.
+    # verify_credentials and the intended action are never called.
     #
     # == Filter types
     #
@@ -74,7 +74,7 @@ module ActionController #:nodoc:
     #
     # As you can see, the block expects to be passed the controller after it has assigned the request to the internal variables.
     # This means that the block has access to both the request and response objects complete with convenience methods for params,
-    # session, template, and assigns. Note: The inline method doesn't strictly has to be a block. Any object that responds to call
+    # session, template, and assigns. Note: The inline method doesn't strictly have to be a block; any object that responds to call
     # and returns 1 or -1 on arity will do (such as a Proc or an Method object).
     #
     # == Filter chain ordering
@@ -127,6 +127,25 @@ module ActionController #:nodoc:
     #     end
     #   end
     #
+    # == Filter chain skipping
+    #
+    # Some times its convenient to specify a filter chain in a superclass that'll hold true for the majority of the 
+    # subclasses, but not necessarily all of them. The subclasses that behave in exception can then specify which filters
+    # they would like to be relieved of. Examples
+    #
+    #   class ApplicationController < ActionController::Base
+    #     before_filter :authenticate
+    #   end
+    #
+    #   class WeblogController < ApplicationController
+    #     # will run the :authenticate filter
+    #   end
+    #
+    #   class SignupController < ActionController::Base
+    #     # will not run the :authenticate filter
+    #     skip_before_filter :authenticate
+    #   end
+    #
     # == Filter conditions
     #
     # Filters can be limited to run for only specific actions. This can be expressed either by listing the actions to
@@ -143,7 +162,7 @@ module ActionController #:nodoc:
     #       end
     #   end
     # 
-    # When setting conditions on inline method (proc) filters the condition must come first and be placed in parenthesis.
+    # When setting conditions on inline method (proc) filters the condition must come first and be placed in parentheses.
     #
     #   class UserPreferences < ActionController::Base
     #     before_filter(:except => :new) { # some proc ... }
@@ -229,6 +248,24 @@ module ActionController #:nodoc:
       # Short-hand for append_around_filter since that's the most common of the two.
       alias :around_filter :append_around_filter
       
+      # Removes the specified filters from the +before+ filter chain. Note that this only works for skipping method-reference 
+      # filters, not procs. This is especially useful for managing the chain in inheritance hierarchies where only one out
+      # of many sub-controllers need a different hierarchy.
+      def skip_before_filter(*filters)
+        for filter in filters.flatten
+          write_inheritable_attribute("before_filters", read_inheritable_attribute("before_filters") - [ filter ])
+        end
+      end
+
+      # Removes the specified filters from the +after+ filter chain. Note that this only works for skipping method-reference 
+      # filters, not procs. This is especially useful for managing the chain in inheritance hierarchies where only one out
+      # of many sub-controllers need a different hierarchy.
+      def skip_after_filter(*filters)
+        for filter in filters.flatten
+          write_inheritable_attribute("after_filters", read_inheritable_attribute("after_filters") - [ filter ])
+        end
+      end
+      
       # Returns all the before filters for this class and all its ancestors.
       def before_filters #:nodoc:
         read_inheritable_attribute("before_filters")

data/lib/action_controller/flash.rb

@@ -40,6 +40,10 @@ module ActionController #:nodoc:
         @flash.discard(k)
         v
       end
+      
+      def [](k)
+        @flash[k]
+      end
     end
     
     class FlashHash < Hash

data/lib/action_controller/helpers.rb

@@ -19,7 +19,7 @@ module ActionController #:nodoc:
       end
     end
 
-    # The template helpers serves to relieve the templates from including the same inline code again and again. It's a
+    # The template helpers serve to relieve the templates from including the same inline code again and again. It's a
     # set of standardized methods for working with forms (FormHelper), dates (DateHelper), texts (TextHelper), and 
     # Active Records (ActiveRecordHelper) that's available to all templates by default.
     #

data/lib/action_controller/layout.rb

@@ -24,7 +24,7 @@ module ActionController #:nodoc:
     # and if you ever want to change the structure of these two includes, you'll have to change all the templates.
     #
     # With layouts, you can flip it around and have the common structure know where to insert changing content. This means
-    # that the header and footer is only mentioned in one place, like this:
+    # that the header and footer are only mentioned in one place, like this:
     #
     #   <!-- The header part of this layout -->
     #   <%= @content_for_layout %>
@@ -219,6 +219,7 @@ module ActionController #:nodoc:
         end
 
         erase_render_results
+        add_variables_to_assigns
         @template.instance_variable_set("@content_for_layout", content_for_layout)
         render_text(@template.render_file(layout, true), deprecated_status)
       else

data/lib/action_controller/pagination.rb

@@ -49,7 +49,8 @@ module ActionController
   #   def list
   #     @person_pages = Paginator.new self, Person.count, 10, @params['page']
   #     @people = Person.find :all, :order => 'last_name, first_name', 
-  #               :conditions => @person_pages.current.to_sql
+  #                           :limit  =>  @person_pages.items_per_page,
+  #                           :offset =>  @person_pages.current.offset
   #   end
   # 
   # Explicitly creates the paginator from the previous example and uses 

data/lib/action_controller/rescue.rb

@@ -56,7 +56,7 @@ module ActionController #:nodoc:
         end
       end
 
-      # Overwrite to expand the meaning of a local request in order to show local rescues on other occurences than
+      # Overwrite to expand the meaning of a local request in order to show local rescues on other occurrences than
       # the remote IP being 127.0.0.1. For example, this could include the IP of the developer machine when debugging
       # remotely.
       def local_request? #:doc:

data/lib/action_controller/session/active_record_store.rb

@@ -50,10 +50,10 @@ class CGI
     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
         before_save   :marshal_data!
         before_save   :ensure_data_not_too_big
-        before_update :data_changed?
-
+        
         class << self
 
           # Don't try to reload ARStore::Session in dev mode.
@@ -73,7 +73,6 @@ class CGI
 
           def marshal(data)     Base64.encode64(Marshal.dump(data)) end
           def unmarshal(data)   Marshal.load(Base64.decode64(data)) end
-          def fingerprint(data) Digest::MD5.hexdigest(data)         end
 
           def create_table!
             connection.execute <<-end_sql
@@ -109,17 +108,14 @@ class CGI
             end
         end
 
-        # Lazy-unmarshal session state.  Take a fingerprint so we can detect
-        # whether to save changes later.
+        # Lazy-unmarshal session state.
         def data
           unless @data
-            case @data = read_attribute('data')
+            case data = read_attribute('data')
               when String
-                @fingerprint = self.class.fingerprint(@data)
-                @data = self.class.unmarshal(@data)
-              when nil
-                @data = {}
-                @fingerprint = nil
+                @data = self.class.unmarshal(data)
+              else
+                @data = data || {}
             end
           end
           @data
@@ -127,12 +123,12 @@ class CGI
 
         private
           def marshal_data!
-            write_attribute('data', self.class.marshal(@data || {}))
+            write_attribute('data', self.class.marshal(self.data))
           end
-
-          def data_changed?
-            old_fingerprint, @fingerprint = @fingerprint, self.class.fingerprint(read_attribute('data'))
-            old_fingerprint != @fingerprint
+          
+          # Has the session been loaded yet?
+          def loaded?
+            !! @data
           end
 
           # Ensures that the data about to be stored in the database is not
@@ -188,7 +184,6 @@ class CGI
 
           def marshal(data)     Base64.encode64(Marshal.dump(data)) end
           def unmarshal(data)   Marshal.load(Base64.decode64(data)) end
-          def fingerprint(data) Digest::MD5.hexdigest(data)         end
 
           def create_table!
             @@connection.execute <<-end_sql
@@ -220,16 +215,13 @@ class CGI
           @new_record
         end
 
-        # Lazy-unmarshal session state.  Take a fingerprint so we can detect
-        # whether to save changes later.
+        # Lazy-unmarshal session state.
         def data
           unless @data
             if @marshaled_data
-              @fingerprint = self.class.fingerprint(@marshaled_data)
               @data, @marshaled_data = self.class.unmarshal(@marshaled_data), nil
             else
               @data = {}
-              @fingerprint = nil
             end
           end
           @data
@@ -249,14 +241,11 @@ class CGI
                 #{@@connection.quote(marshaled_data)} )
             end_sql
           else
-            old_fingerprint, @fingerprint = @fingerprint, self.class.fingerprint(marshaled_data)
-            if old_fingerprint != @fingerprint
-              @@connection.update <<-end_sql, 'Update session'
-                UPDATE #{@@table_name}
-                SET #{@@connection.quote_column_name(@@data_column)}=#{@@connection.quote(marshaled_data)}
-                WHERE #{@@connection.quote_column_name(@@session_id_column)}=#{@@connection.quote(session_id)}
-              end_sql
-            end
+            @@connection.update <<-end_sql, 'Update session'
+              UPDATE #{@@table_name}
+              SET #{@@connection.quote_column_name(@@data_column)}=#{@@connection.quote(marshaled_data)}
+              WHERE #{@@connection.quote_column_name(@@session_id_column)}=#{@@connection.quote(session_id)}
+            end_sql
           end
         end
 

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

@@ -4,9 +4,6 @@
     ["Framework Trace", @exception.framework_backtrace],
     ["Full Trace", @exception.clean_backtrace]
   ]
-  if defined?(RAILS_ROOT)
-    traces.each { |name, trace| trace.map! { |p| p.gsub(/^#{RAILS_ROOT}/, '<b>#{RAILS_ROOT}</b>') } }
-  end
   names = traces.collect {|name, trace| name}
 %>
 

data/lib/action_controller/templates/scaffolds/layout.rhtml

@@ -30,7 +30,7 @@
 
     #ErrorExplanation {
       width: 400px;
-      border: 2px solid 'red';
+      border: 2px solid red;
       padding: 7px;
       padding-bottom: 12px;
       margin-bottom: 20px;

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

@@ -1,5 +1,5 @@
-require 'html/tokenizer'
-require 'html/node'
+require File.dirname(__FILE__) + '/tokenizer'
+require File.dirname(__FILE__) + '/node'
 
 module HTML #:nodoc:
   

data/lib/action_pack.rb

@@ -0,0 +1,24 @@
+#--
+# Copyright (c) 2004 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+require 'action_pack/version'

data/lib/action_pack/version.rb

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

data/lib/action_view/base.rb

@@ -122,7 +122,7 @@ module ActionView #:nodoc:
     attr_accessor :base_path, :assigns, :template_extension
     attr_accessor :controller
 
-    attr_reader :logger, :params, :response, :session, :headers, :flash
+    attr_reader :logger, :params, :request, :response, :session, :headers, :flash
 
     # Specify trim mode for the ERB compiler. Defaults to '-'.
     # See ERB documentation for suitable values.

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -35,6 +35,9 @@ module ActionView
         compute_public_path(source, 'javascripts', 'js')        
       end
 
+      JAVASCRIPT_DEFAULT_SOURCES = ['prototype', 'effects', 'dragdrop', 'controls']
+      @@javascript_default_sources = JAVASCRIPT_DEFAULT_SOURCES.dup
+
       # Returns a script include tag per source given as argument. Examples:
       #
       #   javascript_include_tag "xmlhr" # =>
@@ -46,8 +49,9 @@ module ActionView
       #
       #   javascript_include_tag :defaults # =>
       #     <script type="text/javascript" src="/javascripts/prototype.js"></script>
-      #     <script type="text/javascript" src="/javascripts/scriptaculous.js"></script>
-      #     <script type="text/javascript" src="/javascripts/application.js"></script> *see beloe
+      #     <script type="text/javascript" src="/javascripts/effects.js"></script>
+      #     ...
+      #     <script type="text/javascript" src="/javascripts/application.js"></script> *see below
       #   
       # If there's an <tt>application.js</tt> file in your <tt>public/javascripts</tt> directory,
       # <tt>javascript_include_tag :defaults</tt> will automatically include it. This file
@@ -56,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 = ['prototype', 'scriptaculous']
+          sources = @@javascript_default_sources
           if defined?(RAILS_ROOT) and File.exists?("#{RAILS_ROOT}/public/javascripts/application.js")
             sources << 'application' 
           end
@@ -66,6 +70,20 @@ module ActionView
           content_tag("script", "", { "type" => "text/javascript", "src" => source }.merge(options))
         }.join("\n")
       end
+      
+      # Register one or more additional JavaScript files to be included when
+      #   
+      #   javascript_include_tag :defaults
+      #
+      # is called. This method is intended to be called only from plugin initialization
+      # to register extra .js files the plugin installed in <tt>public/javascripts</tt>.
+      def self.register_javascript_include_default(*sources)
+        @@javascript_default_sources.concat(sources)
+      end
+      
+      def self.reset_javascript_include_default #:nodoc:
+        @@javascript_default_sources = JAVASCRIPT_DEFAULT_SOURCES.dup
+      end
 
       # Returns path to a stylesheet asset. Example:
       #

data/lib/action_view/helpers/form_options_helper.rb

@@ -146,7 +146,7 @@ module ActionView
       # Returns a string of option tags, like options_from_collection_for_select, but surrounds them with <optgroup> tags.
       #
       # An array of group objects are passed. Each group should return an array of options when calling group_method
-      # Each group should should return its name when calling group_label_method.
+      # Each group should return its name when calling group_label_method.
       #
       # html_option_groups_from_collection(@continents, "countries", "continent_name", "country_id", "country_name", @selected_country.id)
       #

data/lib/action_view/helpers/javascript_helper.rb

@@ -377,6 +377,7 @@ module ActionView
       # http://script.aculo.us for more documentation.
       def visual_effect(name, element_id = false, js_options = {})
         element = element_id ? "'#{element_id}'" : "element"
+        js_options[:queue] = "'#{js_options[:queue]}'" if js_options[:queue]
         "new Effect.#{name.to_s.camelize}(#{element},#{options_for_javascript(js_options)});"
       end
       

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

@@ -184,7 +184,10 @@ Autocompleter.Base.prototype = {
         this.show();
         this.active = true;
       }
-    } else this.hide();
+    } else {
+      this.active = false;
+      this.hide();
+    }
   },
   
   markPrevious: function() {
@@ -425,6 +428,15 @@ Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), {
 //
 // see documentation on http://wiki.script.aculo.us/scriptaculous/show/Ajax.InPlaceEditor
 
+// Use this if you notice weird scrolling problems on some browsers,
+// the DOM might be a bit confused when this gets called so do this
+// waits 1 ms (with setTimeout) until it does the activation
+Field.scrollFreeActivate = function(field) {
+  setTimeout(function() {
+    Field.activate(field);
+  }, 1);
+}
+
 Ajax.InPlaceEditor = Class.create();
 Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99";
 Ajax.InPlaceEditor.prototype = {
@@ -490,7 +502,7 @@ Ajax.InPlaceEditor.prototype = {
       Event.observe(this.options.externalControl, 'mouseout', this.mouseoutListener);
     }
   },
-  enterEditMode: function() {
+  enterEditMode: function(evt) {
     if (this.saving) return;
     if (this.editing) return;
     this.editing = true;
@@ -501,11 +513,12 @@ Ajax.InPlaceEditor.prototype = {
     Element.hide(this.element);
     this.createForm();
     this.element.parentNode.insertBefore(this.form, this.element);
-    Field.focus(this.editField);
+    Field.scrollFreeActivate(this.editField);
     // stop the event to avoid a page refresh in Safari
-    if (arguments.length > 1) {
-      Event.stop(arguments[0]);
+    if (evt) {
+      Event.stop(evt);
     }
+    return false;
   },
   createForm: function() {
     this.form = document.createElement("form");