actionpack 3.2.1 → 3.2.2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Rails 3.2.2 (unreleased) ##
+
+*   Format lookup for partials is derived from the format in which the template is being rendered. Closes #5025 part 2 *Santiago Pastorino*
+
+*   Use the right format when a partial is missing. Closes #5025. *Santiago Pastorino*
+
+*   Default responder will now always use your overridden block in `respond_with` to render your response. *Prem Sichanugrist*
+
+*   check_box helper with :disabled => true will generate a disabled hidden field to conform with the HTML convention where disabled fields are not submitted with the form.
+    This is a behavior change, previously the hidden tag had a value of the disabled checkbox.
+    *Tadas Tamosauskas*
+
 ## Rails 3.2.1 (January 26, 2012) ##
 
 *   Documentation improvements.

data/README.rdoc

@@ -218,7 +218,7 @@ A short rundown of some of the major features:
 
       def show
         # the output of the method will be cached as
-        # ActionController::Base.page_cache_directory + "/weblog/show/n.html"
+        # ActionController::Base.page_cache_directory + "/weblog/show.html"
         # and the web server will pick it up without even hitting Rails
       end
 

data/lib/action_controller/caching/actions.rb

@@ -102,8 +102,10 @@ module ActionController #:nodoc:
       end
 
       def _save_fragment(name, options)
-        content = response_body
-        content = content.join if content.is_a?(Array)
+        content = ""
+        response_body.each do |parts|
+          content << parts
+        end
 
         if caching_allowed?
           write_fragment(name, content, options)

data/lib/action_controller/metal/force_ssl.rb

@@ -29,6 +29,7 @@ module ActionController
           if !request.ssl? && !Rails.env.development?
             redirect_options = {:protocol => 'https://', :status => :moved_permanently}
             redirect_options.merge!(:host => host) if host
+            redirect_options.merge!(:params => request.query_parameters)
             redirect_to redirect_options
           end
         end

data/lib/action_controller/metal/mime_responds.rb

@@ -191,8 +191,9 @@ module ActionController #:nodoc:
     def respond_to(*mimes, &block)
       raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?
 
-      if response = retrieve_response_from_mimes(mimes, &block)
-        response.call(nil)
+      if collector = retrieve_collector_from_mimes(mimes, &block)
+        response = collector.response
+        response ? response.call : default_render({})
       end
     end
 
@@ -232,10 +233,18 @@ module ActionController #:nodoc:
       raise "In order to use respond_with, first you need to declare the formats your " <<
             "controller responds to in the class level" if self.class.mimes_for_respond_to.empty?
 
-      if response = retrieve_response_from_mimes(&block)
+      if collector = retrieve_collector_from_mimes(&block)
         options = resources.size == 1 ? {} : resources.extract_options!
-        options.merge!(:default_response => response)
-        (options.delete(:responder) || self.class.responder).call(self, resources, options)
+
+        if defined_response = collector.response
+          if action = options.delete(:action)
+            render :action => action
+          else
+            defined_response.call
+          end
+        else
+          (options.delete(:responder) || self.class.responder).call(self, resources, options)
+        end
       end
     end
 
@@ -263,15 +272,16 @@ module ActionController #:nodoc:
     # Collects mimes and return the response for the negotiated format. Returns
     # nil if :not_acceptable was sent to the client.
     #
-    def retrieve_response_from_mimes(mimes=nil, &block) #:nodoc:
+    def retrieve_collector_from_mimes(mimes=nil, &block) #:nodoc:
       mimes ||= collect_mimes_from_class_level
-      collector = Collector.new(mimes) { |options| default_render(options || {}) }
+      collector = Collector.new(mimes)
       block.call(collector) if block_given?
+      format = collector.negotiate_format(request)
 
-      if format = request.negotiate_mime(collector.order)
+      if format
         self.content_type ||= format.to_s
-        lookup_context.freeze_formats([format.to_sym])
-        collector.response_for(format)
+        lookup_context.formats = [format.to_sym]
+        collector
       else
         head :not_acceptable
         nil
@@ -280,10 +290,10 @@ module ActionController #:nodoc:
 
     class Collector #:nodoc:
       include AbstractController::Collector
-      attr_accessor :order
+      attr_accessor :order, :format
 
-      def initialize(mimes, &block)
-        @order, @responses, @default_response = [], {}, block
+      def initialize(mimes)
+        @order, @responses = [], {}
         mimes.each { |mime| send(mime) }
       end
 
@@ -302,8 +312,12 @@ module ActionController #:nodoc:
         @responses[mime_type] ||= block
       end
 
-      def response_for(mime)
-        @responses[mime] || @responses[Mime::ALL] || @default_response
+      def response
+        @responses[format] || @responses[Mime::ALL]
+      end
+
+      def negotiate_format(request)
+        @format = request.negotiate_mime(order)
       end
     end
   end

data/lib/action_controller/metal/rendering.rb

@@ -14,7 +14,7 @@ module ActionController
     def render(*args) #:nodoc:
       raise ::AbstractController::DoubleRenderError if response_body
       super
-      self.content_type ||= Mime[formats.first].to_s
+      self.content_type ||= Mime[lookup_context.rendered_format].to_s
       response_body
     end
 

data/lib/action_controller/metal/responder.rb

@@ -129,7 +129,6 @@ module ActionController #:nodoc:
       @resources = resources
       @options = options
       @action = options.delete(:action)
-      @default_response = options.delete(:default_response)
     end
 
     delegate :head, :render, :redirect_to,   :to => :controller
@@ -226,7 +225,7 @@ module ActionController #:nodoc:
     # controller.
     #
     def default_render
-      @default_response.call(options)
+      controller.default_render(options)
     end
 
     # Display is just a shortcut to render a resource with the current format.
@@ -268,7 +267,7 @@ module ActionController #:nodoc:
     end
 
     def resource_errors
-      respond_to?("#{format}_resource_errors") ? send("#{format}_resource_errors") : resource.errors
+      respond_to?("#{format}_resource_errors", true) ? send("#{format}_resource_errors") : resource.errors
     end
 
     def json_resource_errors

data/lib/action_dispatch/http/mime_type.rb

@@ -82,6 +82,7 @@ module Mime
     class << self
 
       TRAILING_STAR_REGEXP = /(text|application)\/\*/
+      Q_SEPARATOR_REGEXP = /;\s*q=/
 
       def lookup(string)
         LOOKUP[string]
@@ -108,6 +109,7 @@ module Mime
 
       def parse(accept_header)
         if accept_header !~ /,/
+          accept_header = accept_header.split(Q_SEPARATOR_REGEXP).first
           if accept_header =~ TRAILING_STAR_REGEXP
             parse_data_with_trailing_star($1)
           else
@@ -117,7 +119,7 @@ module Mime
           # keep track of creation order to keep the subsequent sort stable
           list, index = [], 0
           accept_header.split(/,/).each do |header|
-            params, q = header.split(/;\s*q=/)
+            params, q = header.split(Q_SEPARATOR_REGEXP)
             if params.present?
               params.strip!
 

data/lib/action_dispatch/middleware/stack.rb

@@ -93,8 +93,9 @@ module ActionDispatch
     end
 
     def swap(target, *args, &block)
-      insert_before(target, *args, &block)
-      delete(target)
+      index = assert_index(target, :before)
+      insert(index, *args, &block)
+      middlewares.delete_at(index + 1)
     end
 
     def delete(target)

data/lib/action_dispatch/middleware/static.rb

@@ -11,14 +11,14 @@ module ActionDispatch
     def match?(path)
       path = path.dup
 
-      full_path = path.empty? ? @root : File.join(@root, ::Rack::Utils.unescape(path))
+      full_path = path.empty? ? @root : File.join(@root, escape_glob_chars(unescape_path(path)))
       paths = "#{full_path}#{ext}"
 
       matches = Dir[paths]
       match = matches.detect { |m| File.file?(m) }
       if match
         match.sub!(@compiled_root, '')
-        match
+        ::Rack::Utils.escape(match)
       end
     end
 
@@ -32,6 +32,14 @@ module ActionDispatch
         "{,#{ext},/index#{ext}}"
       end
     end
+
+    def unescape_path(path)
+      URI.parser.unescape(path)
+    end
+
+    def escape_glob_chars(path)
+      path.gsub(/[*?{}\[\]]/, "\\\\\\&")
+    end
   end
 
   class Static

data/lib/action_dispatch/routing/route_set.rb

@@ -31,6 +31,7 @@ module ActionDispatch
         end
 
         def prepare_params!(params)
+          normalize_controller!(params)
           merge_default_action!(params)
           split_glob_param!(params) if @glob_param
         end
@@ -66,6 +67,10 @@ module ActionDispatch
           controller.action(action).call(env)
         end
 
+        def normalize_controller!(params)
+          params[:controller] = params[:controller].underscore if params.key?(:controller)
+        end
+
         def merge_default_action!(params)
           params[:action] ||= 'index'
         end
@@ -262,8 +267,7 @@ module ActionDispatch
       def eval_block(block)
         if block.arity == 1
           raise "You are using the old router DSL which has been removed in Rails 3.1. " <<
-            "Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/ " <<
-            "or add the rails_legacy_mapper gem to your Gemfile"
+            "Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/"
         end
         mapper = Mapper.new(self)
         if default_scope
@@ -489,7 +493,7 @@ module ActionDispatch
         # if the current controller is "foo/bar/baz" and :controller => "baz/bat"
         # is specified, the controller becomes "foo/baz/bat"
         def use_relative_controller!
-          if !named_route && different_controller?
+          if !named_route && different_controller? && !controller.start_with?("/")
             old_parts = current_controller.split('/')
             size = controller.count("/") + 1
             parts = old_parts[0...-size] << controller
@@ -575,6 +579,7 @@ module ActionDispatch
 
         path_addition, params = generate(path_options, path_segments || {})
         path << path_addition
+        params.merge!(options[:params] || {})
 
         ActionDispatch::Http::URL.url_for(options.merge!({
           :path => path,

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/action_view/helpers/capture_helper.rb

@@ -194,7 +194,7 @@ module ActionView
       def flush_output_buffer #:nodoc:
         if output_buffer && !output_buffer.empty?
           response.body_parts << output_buffer
-          self.output_buffer = output_buffer[0,0]
+          self.output_buffer = output_buffer.respond_to?(:clone_empty) ? output_buffer.clone_empty : output_buffer[0, 0]
           nil
         end
       end

data/lib/action_view/helpers/form_helper.rb

@@ -1092,7 +1092,7 @@ module ActionView
         else
           add_default_name_and_id(options)
         end
-        hidden = tag("input", "name" => options["name"], "type" => "hidden", "value" => options['disabled'] && checked ? checked_value : unchecked_value)
+        hidden = unchecked_value ? tag("input", "name" => options["name"], "type" => "hidden", "value" => unchecked_value, "disabled" => options["disabled"]) : ""
         checkbox = tag("input", options)
         (hidden + checkbox).html_safe
       end

data/lib/action_view/helpers/form_options_helper.rb

@@ -616,13 +616,13 @@ module ActionView
       private
         def add_options(option_tags, options, value = nil)
           if options[:include_blank]
-            option_tags = "<option value=\"\">#{ERB::Util.html_escape(options[:include_blank]) if options[:include_blank].kind_of?(String)}</option>\n" + option_tags
+            option_tags = content_tag('option', options[:include_blank].kind_of?(String) ? options[:include_blank] : nil, :value => '') + "\n" + option_tags
           end
           if value.blank? && options[:prompt]
             prompt = options[:prompt].kind_of?(String) ? options[:prompt] : I18n.translate('helpers.select.prompt', :default => 'Please select')
-            option_tags = "<option value=\"\">#{ERB::Util.html_escape(prompt)}</option>\n" + option_tags
+            option_tags = content_tag('option', prompt, :value => '') + "\n" + option_tags
           end
-          option_tags.html_safe
+          option_tags
         end
 
         def select_content_tag(option_tags, options, html_options)

data/lib/action_view/lookup_context.rb

@@ -10,7 +10,7 @@ module ActionView
   # generate a key, given to view paths, used in the resolver cache lookup. Since
   # this key is generated just once during the request, it speeds up all cache accesses.
   class LookupContext #:nodoc:
-    attr_accessor :prefixes
+    attr_accessor :prefixes, :rendered_format
 
     mattr_accessor :fallbacks
     @@fallbacks = FallbackFileSystemResolver.instances
@@ -180,23 +180,15 @@ module ActionView
 
     def initialize(view_paths, details = {}, prefixes = [])
       @details, @details_key = {}, nil
-      @frozen_formats, @skip_default_locale = false, false
+      @skip_default_locale = false
       @cache = true
       @prefixes = prefixes
+      @rendered_format = nil
 
       self.view_paths = view_paths
       initialize_details(details)
     end
 
-    # Freeze the current formats in the lookup context. By freezing them, you
-    # that next template lookups are not going to modify the formats. The con
-    # use this, to ensure that formats won't be further modified (as it does
-    def freeze_formats(formats, unless_frozen=false) #:nodoc:
-      return if unless_frozen && @frozen_formats
-      self.formats = formats
-      @frozen_formats = true
-    end
-
     # Override formats= to expand ["*/*"] values and automatically
     # add :html as fallback to :js.
     def formats=(values)

data/lib/action_view/renderer/abstract_renderer.rb

@@ -1,7 +1,7 @@
 module ActionView
   class AbstractRenderer #:nodoc:
     delegate :find_template, :template_exists?, :with_fallbacks, :update_details,
-      :with_layout_format, :formats, :freeze_formats, :to => :@lookup_context
+      :with_layout_format, :formats, :to => :@lookup_context
 
     def initialize(lookup_context)
       @lookup_context = lookup_context

data/lib/action_view/renderer/template_renderer.rb

@@ -8,7 +8,8 @@ module ActionView
       @details = extract_details(options)
       extract_format(options[:file] || options[:template], @details)
       template = determine_template(options)
-      freeze_formats(template.formats, true)
+      @lookup_context.rendered_format ||= template.formats.first
+      @lookup_context.formats = template.formats
       render_template(template, options[:layout], options[:locals])
     end
 

data/lib/action_view/template/handlers/erb.rb

@@ -44,10 +44,6 @@ module ActionView
         class_attribute :erb_trim_mode
         self.erb_trim_mode = '-'
 
-        # Default format used by ERB.
-        class_attribute :default_format
-        self.default_format = Mime::HTML
-
         # Default implementation used.
         class_attribute :erb_implementation
         self.erb_implementation = Erubis

data/lib/action_view/template/handlers.rb

@@ -26,6 +26,7 @@ module ActionView #:nodoc:
       # return the rendered template as a string.
       def register_template_handler(extension, klass)
         @@template_handlers[extension.to_sym] = klass
+        @@template_extensions = nil
       end
 
       def template_handler_extensions

data/lib/sprockets/assets.rake

@@ -6,7 +6,11 @@ namespace :assets do
     groups = ENV['RAILS_GROUPS'] || 'assets'
     args   = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
     args << "--trace" if Rake.application.options.trace
-    fork ? ruby(*args) : Kernel.exec(FileUtils::RUBY, *args)
+    if $0 =~ /rake\.bat\Z/i
+      Kernel.exec $0, *args
+    else  
+      fork ? ruby(*args) : Kernel.exec(FileUtils::RUBY, *args)
+    end    
   end
 
   # We are currently running with no explicit bundler group

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 3
   - 2
-  - 1
-  version: 3.2.1
+  - 2
+  version: 3.2.2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-26 00:00:00 -08:00
-default_executable: 
+date: 2012-03-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -26,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 3
         - 2
-        - 1
-        version: 3.2.1
+        - 2
+        version: 3.2.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +41,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 3
         - 2
-        - 1
-        version: 3.2.1
+        - 2
+        version: 3.2.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -189,195 +188,194 @@ files:
 - CHANGELOG.md
 - README.rdoc
 - MIT-LICENSE
-- lib/sprockets/railtie.rb
-- lib/sprockets/compressors.rb
-- lib/sprockets/helpers.rb
-- lib/sprockets/bootstrap.rb
-- lib/sprockets/assets.rake
-- lib/sprockets/helpers/isolated_helper.rb
-- lib/sprockets/helpers/rails_helper.rb
-- lib/sprockets/static_compiler.rb
-- lib/action_view/locale/en.yml
-- lib/action_view/railtie.rb
-- lib/action_view/renderer/partial_renderer.rb
-- lib/action_view/renderer/streaming_template_renderer.rb
-- lib/action_view/renderer/abstract_renderer.rb
-- lib/action_view/renderer/renderer.rb
-- lib/action_view/renderer/template_renderer.rb
-- lib/action_view/test_case.rb
-- lib/action_view/testing/resolvers.rb
-- lib/action_view/template/text.rb
-- lib/action_view/template/handlers/erb.rb
-- lib/action_view/template/handlers/builder.rb
-- lib/action_view/template/handlers.rb
-- lib/action_view/template/resolver.rb
-- lib/action_view/template/error.rb
-- lib/action_view/context.rb
-- lib/action_view/flows.rb
-- lib/action_view/base.rb
-- lib/action_view/template.rb
-- lib/action_view/lookup_context.rb
-- lib/action_view/helpers.rb
-- lib/action_view/asset_paths.rb
-- lib/action_view/helpers/sanitize_helper.rb
-- lib/action_view/helpers/controller_helper.rb
-- lib/action_view/helpers/capture_helper.rb
-- lib/action_view/helpers/javascript_helper.rb
-- lib/action_view/helpers/tag_helper.rb
-- lib/action_view/helpers/form_helper.rb
-- lib/action_view/helpers/active_model_helper.rb
-- lib/action_view/helpers/debug_helper.rb
-- lib/action_view/helpers/form_options_helper.rb
-- lib/action_view/helpers/form_tag_helper.rb
-- lib/action_view/helpers/csrf_helper.rb
-- lib/action_view/helpers/cache_helper.rb
-- lib/action_view/helpers/date_helper.rb
-- lib/action_view/helpers/translation_helper.rb
-- lib/action_view/helpers/rendering_helper.rb
-- lib/action_view/helpers/record_tag_helper.rb
-- lib/action_view/helpers/asset_paths.rb
-- lib/action_view/helpers/asset_tag_helper.rb
-- lib/action_view/helpers/url_helper.rb
-- lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
-- lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
-- lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
-- lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
-- lib/action_view/helpers/text_helper.rb
-- lib/action_view/helpers/output_safety_helper.rb
-- lib/action_view/helpers/number_helper.rb
-- lib/action_view/helpers/atom_feed_helper.rb
-- lib/action_view/log_subscriber.rb
-- lib/action_view/path_set.rb
-- lib/action_view/buffers.rb
-- lib/action_view.rb
-- lib/action_pack.rb
-- lib/action_controller.rb
-- lib/action_dispatch.rb
-- lib/action_controller/railtie.rb
-- lib/action_controller/metal/instrumentation.rb
-- lib/action_controller/metal/head.rb
-- lib/action_controller/metal/request_forgery_protection.rb
+- lib/abstract_controller/asset_paths.rb
+- lib/abstract_controller/base.rb
+- lib/abstract_controller/callbacks.rb
+- lib/abstract_controller/collector.rb
+- lib/abstract_controller/helpers.rb
+- lib/abstract_controller/layouts.rb
+- lib/abstract_controller/logger.rb
+- lib/abstract_controller/railties/routes_helpers.rb
+- lib/abstract_controller/rendering.rb
+- lib/abstract_controller/translation.rb
+- lib/abstract_controller/url_for.rb
+- lib/abstract_controller/view_paths.rb
+- lib/abstract_controller.rb
+- lib/action_controller/base.rb
+- lib/action_controller/caching/actions.rb
+- lib/action_controller/caching/fragments.rb
+- lib/action_controller/caching/pages.rb
+- lib/action_controller/caching/sweeping.rb
+- lib/action_controller/caching.rb
+- lib/action_controller/deprecated/integration_test.rb
+- lib/action_controller/deprecated/performance_test.rb
+- lib/action_controller/deprecated.rb
+- lib/action_controller/log_subscriber.rb
 - lib/action_controller/metal/compatibility.rb
+- lib/action_controller/metal/conditional_get.rb
+- lib/action_controller/metal/cookies.rb
+- lib/action_controller/metal/data_streaming.rb
 - lib/action_controller/metal/exceptions.rb
+- lib/action_controller/metal/flash.rb
+- lib/action_controller/metal/force_ssl.rb
+- lib/action_controller/metal/head.rb
+- lib/action_controller/metal/helpers.rb
 - lib/action_controller/metal/hide_actions.rb
-- lib/action_controller/metal/cookies.rb
+- lib/action_controller/metal/http_authentication.rb
+- lib/action_controller/metal/implicit_render.rb
+- lib/action_controller/metal/instrumentation.rb
+- lib/action_controller/metal/mime_responds.rb
+- lib/action_controller/metal/params_wrapper.rb
+- lib/action_controller/metal/rack_delegation.rb
+- lib/action_controller/metal/redirecting.rb
 - lib/action_controller/metal/renderers.rb
-- lib/action_controller/metal/conditional_get.rb
 - lib/action_controller/metal/rendering.rb
+- lib/action_controller/metal/request_forgery_protection.rb
+- lib/action_controller/metal/rescue.rb
 - lib/action_controller/metal/responder.rb
-- lib/action_controller/metal/helpers.rb
-- lib/action_controller/metal/data_streaming.rb
-- lib/action_controller/metal/force_ssl.rb
+- lib/action_controller/metal/session_management.rb
 - lib/action_controller/metal/streaming.rb
 - lib/action_controller/metal/testing.rb
-- lib/action_controller/metal/mime_responds.rb
-- lib/action_controller/metal/rescue.rb
-- lib/action_controller/metal/implicit_render.rb
-- lib/action_controller/metal/redirecting.rb
-- lib/action_controller/metal/session_management.rb
-- lib/action_controller/metal/rack_delegation.rb
-- lib/action_controller/metal/flash.rb
-- lib/action_controller/metal/http_authentication.rb
-- lib/action_controller/metal/params_wrapper.rb
 - lib/action_controller/metal/url_for.rb
+- lib/action_controller/metal.rb
+- lib/action_controller/middleware.rb
+- lib/action_controller/railtie.rb
 - lib/action_controller/railties/paths.rb
+- lib/action_controller/record_identifier.rb
 - lib/action_controller/test_case.rb
-- lib/action_controller/middleware.rb
-- lib/action_controller/base.rb
-- lib/action_controller/deprecated/integration_test.rb
-- lib/action_controller/deprecated/performance_test.rb
-- lib/action_controller/metal.rb
 - lib/action_controller/vendor/html-scanner/html/document.rb
-- lib/action_controller/vendor/html-scanner/html/tokenizer.rb
-- lib/action_controller/vendor/html-scanner/html/selector.rb
-- lib/action_controller/vendor/html-scanner/html/sanitizer.rb
 - lib/action_controller/vendor/html-scanner/html/node.rb
+- lib/action_controller/vendor/html-scanner/html/sanitizer.rb
+- lib/action_controller/vendor/html-scanner/html/selector.rb
+- lib/action_controller/vendor/html-scanner/html/tokenizer.rb
 - lib/action_controller/vendor/html-scanner/html/version.rb
 - lib/action_controller/vendor/html-scanner.rb
-- lib/action_controller/caching/sweeping.rb
-- lib/action_controller/caching/fragments.rb
-- lib/action_controller/caching/actions.rb
-- lib/action_controller/caching/pages.rb
-- lib/action_controller/caching.rb
-- lib/action_controller/log_subscriber.rb
-- lib/action_controller/deprecated.rb
-- lib/action_controller/record_identifier.rb
-- lib/abstract_controller.rb
-- lib/action_pack/version.rb
-- lib/action_dispatch/railtie.rb
-- lib/action_dispatch/middleware/session/mem_cache_store.rb
-- lib/action_dispatch/middleware/session/cache_store.rb
-- lib/action_dispatch/middleware/session/abstract_store.rb
-- lib/action_dispatch/middleware/session/cookie_store.rb
-- lib/action_dispatch/middleware/reloader.rb
-- lib/action_dispatch/middleware/static.rb
-- lib/action_dispatch/middleware/head.rb
+- lib/action_controller.rb
+- lib/action_dispatch/http/cache.rb
+- lib/action_dispatch/http/filter_parameters.rb
+- lib/action_dispatch/http/headers.rb
+- lib/action_dispatch/http/mime_negotiation.rb
+- lib/action_dispatch/http/mime_type.rb
+- lib/action_dispatch/http/mime_types.rb
+- lib/action_dispatch/http/parameter_filter.rb
+- lib/action_dispatch/http/parameters.rb
+- lib/action_dispatch/http/rack_cache.rb
+- lib/action_dispatch/http/request.rb
+- lib/action_dispatch/http/response.rb
+- lib/action_dispatch/http/upload.rb
+- lib/action_dispatch/http/url.rb
+- lib/action_dispatch/middleware/best_standards_support.rb
 - lib/action_dispatch/middleware/body_proxy.rb
+- lib/action_dispatch/middleware/callbacks.rb
 - lib/action_dispatch/middleware/cookies.rb
-- lib/action_dispatch/middleware/stack.rb
+- lib/action_dispatch/middleware/debug_exceptions.rb
 - lib/action_dispatch/middleware/exception_wrapper.rb
-- lib/action_dispatch/middleware/params_parser.rb
-- lib/action_dispatch/middleware/callbacks.rb
-- lib/action_dispatch/middleware/show_exceptions.rb
-- lib/action_dispatch/middleware/rescue.rb
-- lib/action_dispatch/middleware/remote_ip.rb
-- lib/action_dispatch/middleware/best_standards_support.rb
 - lib/action_dispatch/middleware/flash.rb
+- lib/action_dispatch/middleware/head.rb
+- lib/action_dispatch/middleware/params_parser.rb
 - lib/action_dispatch/middleware/public_exceptions.rb
-- lib/action_dispatch/middleware/debug_exceptions.rb
+- lib/action_dispatch/middleware/reloader.rb
+- lib/action_dispatch/middleware/remote_ip.rb
 - lib/action_dispatch/middleware/request_id.rb
-- lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
-- lib/action_dispatch/middleware/templates/rescues/routing_error.erb
+- lib/action_dispatch/middleware/rescue.rb
+- lib/action_dispatch/middleware/session/abstract_store.rb
+- lib/action_dispatch/middleware/session/cache_store.rb
+- lib/action_dispatch/middleware/session/cookie_store.rb
+- lib/action_dispatch/middleware/session/mem_cache_store.rb
+- lib/action_dispatch/middleware/show_exceptions.rb
+- lib/action_dispatch/middleware/stack.rb
+- lib/action_dispatch/middleware/static.rb
+- lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
 - lib/action_dispatch/middleware/templates/rescues/_trace.erb
+- lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
 - lib/action_dispatch/middleware/templates/rescues/layout.erb
 - lib/action_dispatch/middleware/templates/rescues/missing_template.erb
-- lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
-- lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+- lib/action_dispatch/middleware/templates/rescues/routing_error.erb
 - lib/action_dispatch/middleware/templates/rescues/template_error.erb
-- lib/action_dispatch/routing/redirection.rb
-- lib/action_dispatch/routing/routes_proxy.rb
+- lib/action_dispatch/middleware/templates/rescues/unknown_action.erb
+- lib/action_dispatch/railtie.rb
+- lib/action_dispatch/routing/mapper.rb
 - lib/action_dispatch/routing/polymorphic_routes.rb
+- lib/action_dispatch/routing/redirection.rb
 - lib/action_dispatch/routing/route_set.rb
-- lib/action_dispatch/routing/mapper.rb
+- lib/action_dispatch/routing/routes_proxy.rb
 - lib/action_dispatch/routing/url_for.rb
-- lib/action_dispatch/testing/test_request.rb
-- lib/action_dispatch/testing/performance_test.rb
-- lib/action_dispatch/testing/assertions.rb
-- lib/action_dispatch/testing/test_response.rb
-- lib/action_dispatch/testing/assertions/tag.rb
-- lib/action_dispatch/testing/assertions/response.rb
+- lib/action_dispatch/routing.rb
 - lib/action_dispatch/testing/assertions/dom.rb
-- lib/action_dispatch/testing/assertions/selector.rb
+- lib/action_dispatch/testing/assertions/response.rb
 - lib/action_dispatch/testing/assertions/routing.rb
-- lib/action_dispatch/testing/test_process.rb
+- lib/action_dispatch/testing/assertions/selector.rb
+- lib/action_dispatch/testing/assertions/tag.rb
+- lib/action_dispatch/testing/assertions.rb
 - lib/action_dispatch/testing/integration.rb
-- lib/action_dispatch/http/request.rb
-- lib/action_dispatch/http/filter_parameters.rb
-- lib/action_dispatch/http/mime_types.rb
-- lib/action_dispatch/http/parameters.rb
-- lib/action_dispatch/http/url.rb
-- lib/action_dispatch/http/mime_type.rb
-- lib/action_dispatch/http/response.rb
-- lib/action_dispatch/http/mime_negotiation.rb
-- lib/action_dispatch/http/upload.rb
-- lib/action_dispatch/http/rack_cache.rb
-- lib/action_dispatch/http/cache.rb
-- lib/action_dispatch/http/headers.rb
-- lib/action_dispatch/http/parameter_filter.rb
-- lib/action_dispatch/routing.rb
-- lib/abstract_controller/collector.rb
-- lib/abstract_controller/railties/routes_helpers.rb
-- lib/abstract_controller/translation.rb
-- lib/abstract_controller/logger.rb
-- lib/abstract_controller/rendering.rb
-- lib/abstract_controller/base.rb
-- lib/abstract_controller/helpers.rb
-- lib/abstract_controller/callbacks.rb
-- lib/abstract_controller/asset_paths.rb
-- lib/abstract_controller/view_paths.rb
-- lib/abstract_controller/url_for.rb
-- lib/abstract_controller/layouts.rb
-has_rdoc: true
+- lib/action_dispatch/testing/performance_test.rb
+- lib/action_dispatch/testing/test_process.rb
+- lib/action_dispatch/testing/test_request.rb
+- lib/action_dispatch/testing/test_response.rb
+- lib/action_dispatch.rb
+- lib/action_pack/version.rb
+- lib/action_pack.rb
+- lib/action_view/asset_paths.rb
+- lib/action_view/base.rb
+- lib/action_view/buffers.rb
+- lib/action_view/context.rb
+- lib/action_view/flows.rb
+- lib/action_view/helpers/active_model_helper.rb
+- lib/action_view/helpers/asset_paths.rb
+- lib/action_view/helpers/asset_tag_helper.rb
+- lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
+- lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
+- lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+- lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+- lib/action_view/helpers/atom_feed_helper.rb
+- lib/action_view/helpers/cache_helper.rb
+- lib/action_view/helpers/capture_helper.rb
+- lib/action_view/helpers/controller_helper.rb
+- lib/action_view/helpers/csrf_helper.rb
+- lib/action_view/helpers/date_helper.rb
+- lib/action_view/helpers/debug_helper.rb
+- lib/action_view/helpers/form_helper.rb
+- lib/action_view/helpers/form_options_helper.rb
+- lib/action_view/helpers/form_tag_helper.rb
+- lib/action_view/helpers/javascript_helper.rb
+- lib/action_view/helpers/number_helper.rb
+- lib/action_view/helpers/output_safety_helper.rb
+- lib/action_view/helpers/record_tag_helper.rb
+- lib/action_view/helpers/rendering_helper.rb
+- lib/action_view/helpers/sanitize_helper.rb
+- lib/action_view/helpers/tag_helper.rb
+- lib/action_view/helpers/text_helper.rb
+- lib/action_view/helpers/translation_helper.rb
+- lib/action_view/helpers/url_helper.rb
+- lib/action_view/helpers.rb
+- lib/action_view/locale/en.yml
+- lib/action_view/log_subscriber.rb
+- lib/action_view/lookup_context.rb
+- lib/action_view/path_set.rb
+- lib/action_view/railtie.rb
+- lib/action_view/renderer/abstract_renderer.rb
+- lib/action_view/renderer/partial_renderer.rb
+- lib/action_view/renderer/renderer.rb
+- lib/action_view/renderer/streaming_template_renderer.rb
+- lib/action_view/renderer/template_renderer.rb
+- lib/action_view/template/error.rb
+- lib/action_view/template/handlers/builder.rb
+- lib/action_view/template/handlers/erb.rb
+- lib/action_view/template/handlers.rb
+- lib/action_view/template/resolver.rb
+- lib/action_view/template/text.rb
+- lib/action_view/template.rb
+- lib/action_view/test_case.rb
+- lib/action_view/testing/resolvers.rb
+- lib/action_view.rb
+- lib/sprockets/assets.rake
+- lib/sprockets/bootstrap.rb
+- lib/sprockets/compressors.rb
+- lib/sprockets/helpers/isolated_helper.rb
+- lib/sprockets/helpers/rails_helper.rb
+- lib/sprockets/helpers.rb
+- lib/sprockets/railtie.rb
+- lib/sprockets/static_compiler.rb
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -409,7 +407,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).