actionpack 3.0.0.beta4 → 3.0.0.rc

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
+  hash: 7712042
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - beta4
-  version: 3.0.0.beta4
+  - rc
+  version: 3.0.0.rc
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,46 +16,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-07-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc
+        version: 3.0.0.rc
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc
+        version: 3.0.0.rc
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
@@ -66,9 +73,11 @@ dependencies:
   name: i18n
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 4
@@ -80,23 +89,27 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
+        - 2
         - 1
-        - 0
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 5
@@ -108,42 +121,48 @@ dependencies:
   name: rack-mount
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 6
-        - 3
-        version: 0.6.3
+        - 9
+        version: 0.6.9
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: tzinfo
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 3
-        - 16
-        version: 0.3.16
+        - 22
+        version: 0.3.22
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: erubis
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 2
         - 6
-        - 5
-        version: 2.6.5
+        - 6
+        version: 2.6.6
   type: :runtime
   version_requirements: *id009
 description: Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.
@@ -156,7 +175,7 @@ extra_rdoc_files: []
 
 files: 
 - CHANGELOG
-- README
+- README.rdoc
 - MIT-LICENSE
 - lib/abstract_controller/asset_paths.rb
 - lib/abstract_controller/base.rb
@@ -180,6 +199,7 @@ files:
 - 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
@@ -205,10 +225,7 @@ files:
 - lib/action_controller/metal/url_for.rb
 - lib/action_controller/metal.rb
 - lib/action_controller/middleware.rb
-- lib/action_controller/polymorphic_routes.rb
 - lib/action_controller/railtie.rb
-- lib/action_controller/railties/log_subscriber.rb
-- lib/action_controller/railties/url_helpers.rb
 - lib/action_controller/record_identifier.rb
 - lib/action_controller/test_case.rb
 - lib/action_controller/vendor/html-scanner/html/document.rb
@@ -225,6 +242,7 @@ files:
 - 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/request.rb
 - lib/action_dispatch/http/response.rb
@@ -254,12 +272,12 @@ files:
 - lib/action_dispatch/railtie.rb
 - lib/action_dispatch/routing/deprecated_mapper.rb
 - lib/action_dispatch/routing/mapper.rb
+- lib/action_dispatch/routing/polymorphic_routes.rb
 - lib/action_dispatch/routing/route.rb
 - lib/action_dispatch/routing/route_set.rb
 - lib/action_dispatch/routing/url_for.rb
 - lib/action_dispatch/routing.rb
 - lib/action_dispatch/testing/assertions/dom.rb
-- lib/action_dispatch/testing/assertions/model.rb
 - lib/action_dispatch/testing/assertions/response.rb
 - lib/action_dispatch/testing/assertions/routing.rb
 - lib/action_dispatch/testing/assertions/selector.rb
@@ -290,7 +308,6 @@ files:
 - lib/action_view/helpers/number_helper.rb
 - lib/action_view/helpers/prototype_helper.rb
 - lib/action_view/helpers/raw_output_helper.rb
-- lib/action_view/helpers/record_identification_helper.rb
 - lib/action_view/helpers/record_tag_helper.rb
 - lib/action_view/helpers/sanitize_helper.rb
 - lib/action_view/helpers/scriptaculous_helper.rb
@@ -300,10 +317,10 @@ files:
 - 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/paths.rb
 - lib/action_view/railtie.rb
-- lib/action_view/railties/log_subscriber.rb
 - lib/action_view/render/layouts.rb
 - lib/action_view/render/partials.rb
 - lib/action_view/render/rendering.rb
@@ -329,18 +346,22 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -349,7 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: actionpack
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).

data/lib/action_controller/polymorphic_routes.rb

@@ -1,182 +0,0 @@
-module ActionController
-  # Polymorphic URL helpers are methods for smart resolution to a named route call when
-  # given an Active Record model instance. They are to be used in combination with
-  # ActionController::Resources.
-  #
-  # These methods are useful when you want to generate correct URL or path to a RESTful
-  # resource without having to know the exact type of the record in question.
-  #
-  # Nested resources and/or namespaces are also supported, as illustrated in the example:
-  #
-  #   polymorphic_url([:admin, @article, @comment])
-  #
-  # results in:
-  #   
-  #   admin_article_comment_url(@article, @comment)
-  #
-  # == Usage within the framework
-  #
-  # Polymorphic URL helpers are used in a number of places throughout the Rails framework:
-  #
-  # * <tt>url_for</tt>, so you can use it with a record as the argument, e.g.
-  #   <tt>url_for(@article)</tt>;
-  # * ActionView::Helpers::FormHelper uses <tt>polymorphic_path</tt>, so you can write
-  #   <tt>form_for(@article)</tt> without having to specify <tt>:url</tt> parameter for the form
-  #   action;
-  # * <tt>redirect_to</tt> (which, in fact, uses <tt>url_for</tt>) so you can write
-  #   <tt>redirect_to(post)</tt> in your controllers;
-  # * ActionView::Helpers::AtomFeedHelper, so you don't have to explicitly specify URLs
-  #   for feed entries.
-  #
-  # == Prefixed polymorphic helpers
-  #
-  # In addition to <tt>polymorphic_url</tt> and <tt>polymorphic_path</tt> methods, a
-  # number of prefixed helpers are available as a shorthand to <tt>:action => "..."</tt>
-  # in options. Those are:
-  #
-  # * <tt>edit_polymorphic_url</tt>, <tt>edit_polymorphic_path</tt>
-  # * <tt>new_polymorphic_url</tt>, <tt>new_polymorphic_path</tt>
-  #
-  # Example usage:
-  #
-  #   edit_polymorphic_path(@post)              # => "/posts/1/edit"
-  #   polymorphic_path(@post, :format => :pdf)  # => "/posts/1.pdf"
-  module PolymorphicRoutes
-    # Constructs a call to a named RESTful route for the given record and returns the
-    # resulting URL string. For example:
-    #
-    #   # calls post_url(post)
-    #   polymorphic_url(post) # => "http://example.com/posts/1"
-    #   polymorphic_url([blog, post]) # => "http://example.com/blogs/1/posts/1"
-    #   polymorphic_url([:admin, blog, post]) # => "http://example.com/admin/blogs/1/posts/1"
-    #   polymorphic_url([user, :blog, post]) # => "http://example.com/users/1/blog/posts/1"
-    #   polymorphic_url(Comment) # => "http://example.com/comments"
-    #
-    # ==== Options
-    #
-    # * <tt>:action</tt> - Specifies the action prefix for the named route:
-    #   <tt>:new</tt> or <tt>:edit</tt>. Default is no prefix.
-    # * <tt>:routing_type</tt> - Allowed values are <tt>:path</tt> or <tt>:url</tt>.
-    #   Default is <tt>:url</tt>.
-    #
-    # ==== Examples
-    #
-    #   # an Article record
-    #   polymorphic_url(record)  # same as article_url(record)
-    #
-    #   # a Comment record
-    #   polymorphic_url(record)  # same as comment_url(record)
-    #
-    #   # it recognizes new records and maps to the collection
-    #   record = Comment.new
-    #   polymorphic_url(record)  # same as comments_url()
-    #
-    #   # the class of a record will also map to the collection
-    #   polymorphic_url(Comment) # same as comments_url()
-    #
-    def polymorphic_url(record_or_hash_or_array, options = {})
-      if record_or_hash_or_array.kind_of?(Array)
-        record_or_hash_or_array = record_or_hash_or_array.compact
-        record_or_hash_or_array = record_or_hash_or_array[0] if record_or_hash_or_array.size == 1
-      end
-
-      record = extract_record(record_or_hash_or_array)
-      record = record.to_model if record.respond_to?(:to_model)
-
-      args = case record_or_hash_or_array
-        when Hash;  [ record_or_hash_or_array ]
-        when Array; record_or_hash_or_array.dup
-        else        [ record_or_hash_or_array ]
-      end
-
-      inflection = if options[:action].to_s == "new"
-        args.pop
-        :singular
-      elsif (record.respond_to?(:persisted?) && !record.persisted?)
-        args.pop
-        :plural
-      elsif record.is_a?(Class)
-        args.pop
-        :plural
-      else
-        :singular
-      end
-
-      args.delete_if {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
-      named_route = build_named_route_call(record_or_hash_or_array, inflection, options)
-
-      url_options = options.except(:action, :routing_type)
-      unless url_options.empty?
-        args.last.kind_of?(Hash) ? args.last.merge!(url_options) : args << url_options
-      end
-
-      __send__(named_route, *args)
-    end
-
-    # Returns the path component of a URL for the given record. It uses
-    # <tt>polymorphic_url</tt> with <tt>:routing_type => :path</tt>.
-    def polymorphic_path(record_or_hash_or_array, options = {})
-      polymorphic_url(record_or_hash_or_array, options.merge(:routing_type => :path))
-    end
-
-    %w(edit new).each do |action|
-      module_eval <<-EOT, __FILE__, __LINE__ + 1
-        def #{action}_polymorphic_url(record_or_hash, options = {})         # def edit_polymorphic_url(record_or_hash, options = {})
-          polymorphic_url(                                                  #   polymorphic_url(
-            record_or_hash,                                                 #     record_or_hash,
-            options.merge(:action => "#{action}"))                          #     options.merge(:action => "edit"))
-        end                                                                 # end
-                                                                            #
-        def #{action}_polymorphic_path(record_or_hash, options = {})        # def edit_polymorphic_path(record_or_hash, options = {})
-          polymorphic_url(                                                  #   polymorphic_url(
-            record_or_hash,                                                 #     record_or_hash,
-            options.merge(:action => "#{action}", :routing_type => :path))  #     options.merge(:action => "edit", :routing_type => :path))
-        end                                                                 # end
-      EOT
-    end
-
-    private
-      def action_prefix(options)
-        options[:action] ? "#{options[:action]}_" : ''
-      end
-
-      def routing_type(options)
-        options[:routing_type] || :url
-      end
-
-      def build_named_route_call(records, inflection, options = {})
-        unless records.is_a?(Array)
-          record = extract_record(records)
-          route  = ''
-        else
-          record = records.pop
-          route = records.inject("") do |string, parent|
-            if parent.is_a?(Symbol) || parent.is_a?(String)
-              string << "#{parent}_"
-            else
-              string << RecordIdentifier.__send__("plural_class_name", parent).singularize
-              string << "_"
-            end
-          end
-        end
-
-        if record.is_a?(Symbol) || record.is_a?(String)
-          route << "#{record}_"
-        else
-          route << RecordIdentifier.__send__("plural_class_name", record)
-          route = route.singularize if inflection == :singular
-          route << "_"
-        end
-
-        action_prefix(options) + route + routing_type(options).to_s
-      end
-
-      def extract_record(record_or_hash_or_array)
-        case record_or_hash_or_array
-          when Array; record_or_hash_or_array.last
-          when Hash;  record_or_hash_or_array[:id]
-          else        record_or_hash_or_array
-        end
-      end
-  end
-end

data/lib/action_controller/railties/log_subscriber.rb

@@ -1,56 +0,0 @@
-require 'active_support/core_ext/object/blank'
-
-module ActionController
-  module Railties
-    class LogSubscriber < Rails::LogSubscriber
-      INTERNAL_PARAMS = %w(controller action format _method only_path)
-
-      def start_processing(event)
-        payload = event.payload
-        params  = payload[:params].except(*INTERNAL_PARAMS)
-
-        info "  Processing by #{payload[:controller]}##{payload[:action]} as #{payload[:formats].first.to_s.upcase}"
-        info "  Parameters: #{params.inspect}" unless params.empty?
-      end
-
-      def process_action(event)
-        payload   = event.payload
-        additions = ActionController::Base.log_process_action(payload)
-
-        message = "Completed #{payload[:status]} #{Rack::Utils::HTTP_STATUS_CODES[payload[:status]]} in %.0fms" % event.duration
-        message << " (#{additions.join(" | ")})" unless additions.blank?
-
-        info(message)
-      end
-
-      def send_file(event)
-        message = "Sent file %s"
-        message << " (%.1fms)"
-        info(message % [event.payload[:path], event.duration])
-      end
-
-      def redirect_to(event)
-        info "Redirected to #{event.payload[:location]}"
-      end
-
-      def send_data(event)
-        info("Sent data %s (%.1fms)" % [event.payload[:filename], event.duration])
-      end
-
-      %w(write_fragment read_fragment exist_fragment?
-         expire_fragment expire_page write_page).each do |method|
-        class_eval <<-METHOD, __FILE__, __LINE__ + 1
-          def #{method}(event)
-            key_or_path = event.payload[:key] || event.payload[:path]
-            human_name  = #{method.to_s.humanize.inspect}
-            info("\#{human_name} \#{key_or_path} (%.1fms)" % event.duration)
-          end
-        METHOD
-      end
-
-      def logger
-        ActionController::Base.logger
-      end
-    end
-  end
-end