actionpack 2.3.2 → 2.3.3

data/test/template/prototype_helper_test.rb

@@ -130,7 +130,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
   end
 
   def test_form_remote_tag_with_method
-    assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\"><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div>),
+    assert_dom_equal %(<form action=\"http://www.example.com/fast\" method=\"post\" onsubmit=\"new Ajax.Updater('glass_of_beer', 'http://www.example.com/fast', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\"><div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div>),
       form_remote_tag(:update => "glass_of_beer", :url => { :action => :fast  }, :html => { :method => :put })
   end
 
@@ -158,7 +158,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     @record.save
     remote_form_for(@record) {}
 
-    expected = %(<form action='#{author_path(@record)}' id='edit_author_1' method='post' onsubmit="new Ajax.Request('#{author_path(@record)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_author'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
+    expected = %(<form action='#{author_path(@record)}' id='edit_author_1' method='post' onsubmit="new Ajax.Request('#{author_path(@record)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_author'><div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div></form>)
     assert_dom_equal expected, output_buffer
   end
 
@@ -174,7 +174,7 @@ class PrototypeHelperTest < PrototypeHelperBaseTest
     @article.save
     remote_form_for([@author, @article]) {}
 
-    expected = %(<form action='#{author_article_path(@author, @article)}' id='edit_article_1' method='post' onsubmit="new Ajax.Request('#{author_article_path(@author, @article)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_article'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
+    expected = %(<form action='#{author_article_path(@author, @article)}' id='edit_article_1' method='post' onsubmit="new Ajax.Request('#{author_article_path(@author, @article)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_article'><div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div></form>)
     assert_dom_equal expected, output_buffer
   end
 
@@ -327,28 +327,28 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
   def test_remove
     assert_equal 'Element.remove("foo");',
       @generator.remove('foo')
-    assert_equal '["foo", "bar", "baz"].each(Element.remove);',
+    assert_equal '["foo","bar","baz"].each(Element.remove);',
       @generator.remove('foo', 'bar', 'baz')
   end
 
   def test_show
     assert_equal 'Element.show("foo");',
       @generator.show('foo')
-    assert_equal '["foo", "bar", "baz"].each(Element.show);',
+    assert_equal '["foo","bar","baz"].each(Element.show);',
       @generator.show('foo', 'bar', 'baz')
   end
 
   def test_hide
     assert_equal 'Element.hide("foo");',
       @generator.hide('foo')
-    assert_equal '["foo", "bar", "baz"].each(Element.hide);',
+    assert_equal '["foo","bar","baz"].each(Element.hide);',
       @generator.hide('foo', 'bar', 'baz')
   end
 
   def test_toggle
     assert_equal 'Element.toggle("foo");',
       @generator.toggle('foo')
-    assert_equal '["foo", "bar", "baz"].each(Element.toggle);',
+    assert_equal '["foo","bar","baz"].each(Element.toggle);',
       @generator.toggle('foo', 'bar', 'baz')
   end
 
@@ -385,7 +385,7 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     assert_equal <<-EOS.chomp, @generator.to_s
 Element.insert("element", { top: "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E" });
 Element.insert("element", { bottom: "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E" });
-["foo", "bar"].each(Element.remove);
+["foo","bar"].each(Element.remove);
 Element.update("baz", "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E");
     EOS
   end
@@ -554,8 +554,8 @@ return (value.className == "welcome");
     end
 
     assert_equal <<-EOS.strip, @generator.to_s
-var a = [1, 2, 3].zip([4, 5, 6], [7, 8, 9]);
-var b = [1, 2, 3].zip([4, 5, 6], [7, 8, 9], function(array) {
+var a = [1, 2, 3].zip([4,5,6], [7,8,9]);
+var b = [1, 2, 3].zip([4,5,6], [7,8,9], function(array) {
 return array.reverse();
 });
     EOS
@@ -606,7 +606,7 @@ return value.reverse();
 
   def test_literal
     literal = @generator.literal("function() {}")
-    assert_equal "function() {}", literal.to_json
+    assert_equal "function() {}", ActiveSupport::JSON.encode(literal)
     assert_equal "", @generator.to_s
   end
 

data/test/template/template_test.rb

@@ -0,0 +1,32 @@
+require 'abstract_unit'
+
+class TemplateTest < Test::Unit::TestCase
+  def test_template_path_parsing
+    with_options :base_path => nil, :name => 'abc', :locale => nil, :format => 'html', :extension => 'erb' do |t|
+      t.assert_parses_template_path 'abc.en.html.erb',        :locale => 'en'
+      t.assert_parses_template_path 'abc.en.plain.html.erb',  :locale => 'en', :format => 'plain.html'
+      t.assert_parses_template_path 'abc.html.erb'
+      t.assert_parses_template_path 'abc.plain.html.erb',     :format => 'plain.html'
+      t.assert_parses_template_path 'abc.erb',                :format => nil
+      t.assert_parses_template_path 'abc.html',               :extension => nil
+      
+      t.assert_parses_template_path '_abc.html.erb',          :name => '_abc'
+      
+      t.assert_parses_template_path 'test/abc.html.erb',      :base_path => 'test'
+      t.assert_parses_template_path './test/abc.html.erb',    :base_path => './test'
+      t.assert_parses_template_path '../test/abc.html.erb',   :base_path => '../test'
+      
+      t.assert_parses_template_path 'abc',                    :extension => nil, :format => nil, :name => nil
+      t.assert_parses_template_path 'abc.xxx',                :extension => nil, :format => 'xxx', :name => 'abc'
+      t.assert_parses_template_path 'abc.html.xxx',           :extension => nil, :format => 'xxx', :name => 'abc'
+    end
+  end
+
+  private
+  def assert_parses_template_path(path, parse_results)
+    template = ActionView::Template.new(path, '')
+    parse_results.each_pair do |k, v|
+      assert_block(%Q{Expected template to parse #{k.inspect} from "#{path}" as #{v.inspect}, but got #{template.send(k).inspect}}) { v == template.send(k) }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire: action_controller
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -05:00
+date: 2009-07-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
     version: 
 description: Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.
 email: david@loudthinking.com
@@ -51,6 +61,7 @@ files:
 - lib/action_controller/caching/actions.rb
 - lib/action_controller/caching/fragments.rb
 - lib/action_controller/caching/pages.rb
+- lib/action_controller/caching/sweeper.rb
 - lib/action_controller/caching/sweeping.rb
 - lib/action_controller/caching.rb
 - lib/action_controller/cgi_ext
@@ -84,7 +95,6 @@ files:
 - lib/action_controller/rescue.rb
 - lib/action_controller/resources.rb
 - lib/action_controller/response.rb
-- lib/action_controller/rewindable_input.rb
 - lib/action_controller/routing
 - lib/action_controller/routing/builder.rb
 - lib/action_controller/routing/optimisations.rb
@@ -126,65 +136,6 @@ files:
 - 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/vendor/rack-1.0
-- lib/action_controller/vendor/rack-1.0/rack
-- lib/action_controller/vendor/rack-1.0/rack/adapter
-- lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb
-- lib/action_controller/vendor/rack-1.0/rack/auth
-- lib/action_controller/vendor/rack-1.0/rack/auth/abstract
-- lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb
-- lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb
-- lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb
-- lib/action_controller/vendor/rack-1.0/rack/auth/digest
-- lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb
-- lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb
-- lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb
-- lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb
-- lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb
-- lib/action_controller/vendor/rack-1.0/rack/builder.rb
-- lib/action_controller/vendor/rack-1.0/rack/cascade.rb
-- lib/action_controller/vendor/rack-1.0/rack/chunked.rb
-- lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb
-- lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb
-- lib/action_controller/vendor/rack-1.0/rack/content_length.rb
-- lib/action_controller/vendor/rack-1.0/rack/content_type.rb
-- lib/action_controller/vendor/rack-1.0/rack/deflater.rb
-- lib/action_controller/vendor/rack-1.0/rack/directory.rb
-- lib/action_controller/vendor/rack-1.0/rack/file.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler
-- lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb
-- lib/action_controller/vendor/rack-1.0/rack/handler.rb
-- lib/action_controller/vendor/rack-1.0/rack/head.rb
-- lib/action_controller/vendor/rack-1.0/rack/lint.rb
-- lib/action_controller/vendor/rack-1.0/rack/lobster.rb
-- lib/action_controller/vendor/rack-1.0/rack/lock.rb
-- lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb
-- lib/action_controller/vendor/rack-1.0/rack/mime.rb
-- lib/action_controller/vendor/rack-1.0/rack/mock.rb
-- lib/action_controller/vendor/rack-1.0/rack/recursive.rb
-- lib/action_controller/vendor/rack-1.0/rack/reloader.rb
-- lib/action_controller/vendor/rack-1.0/rack/request.rb
-- lib/action_controller/vendor/rack-1.0/rack/response.rb
-- lib/action_controller/vendor/rack-1.0/rack/session
-- lib/action_controller/vendor/rack-1.0/rack/session/abstract
-- lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb
-- lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb
-- lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb
-- lib/action_controller/vendor/rack-1.0/rack/session/pool.rb
-- lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb
-- lib/action_controller/vendor/rack-1.0/rack/showstatus.rb
-- lib/action_controller/vendor/rack-1.0/rack/static.rb
-- lib/action_controller/vendor/rack-1.0/rack/urlmap.rb
-- lib/action_controller/vendor/rack-1.0/rack/utils.rb
-- lib/action_controller/vendor/rack-1.0/rack.rb
 - lib/action_controller/verification.rb
 - lib/action_controller.rb
 - lib/action_pack
@@ -267,6 +218,7 @@ files:
 - test/controller/deprecation
 - test/controller/deprecation/deprecated_base_methods_test.rb
 - test/controller/dispatcher_test.rb
+- test/controller/failsafe_test.rb
 - test/controller/fake_controllers.rb
 - test/controller/fake_models.rb
 - test/controller/filter_params_test.rb
@@ -294,11 +246,13 @@ files:
 - test/controller/rack_test.rb
 - test/controller/record_identifier_test.rb
 - test/controller/redirect_test.rb
+- test/controller/reloader_test.rb
 - test/controller/render_test.rb
 - test/controller/request
 - test/controller/request/json_params_parsing_test.rb
 - test/controller/request/multipart_params_parsing_test.rb
 - test/controller/request/query_string_parsing_test.rb
+- test/controller/request/test_request_test.rb
 - test/controller/request/url_encoded_params_parsing_test.rb
 - test/controller/request/xml_params_parsing_test.rb
 - test/controller/request_forgery_protection_test.rb
@@ -343,6 +297,8 @@ files:
 - test/fixtures/developers/_developer.erb
 - test/fixtures/developers.yml
 - test/fixtures/developers_projects.yml
+- test/fixtures/failsafe
+- test/fixtures/failsafe/500.html
 - test/fixtures/fun
 - test/fixtures/fun/games
 - test/fixtures/fun/games/_game.erb
@@ -582,6 +538,7 @@ files:
 - test/template/sanitize_helper_test.rb
 - test/template/scriptaculous_helper_test.rb
 - test/template/tag_helper_test.rb
+- test/template/template_test.rb
 - test/template/test_test.rb
 - test/template/text_helper_test.rb
 - test/template/translation_helper_test.rb

data/lib/action_controller/rewindable_input.rb

@@ -1,28 +0,0 @@
-module ActionController
-  class RewindableInput
-    class RewindableIO < ActiveSupport::BasicObject
-      def initialize(io)
-        @io = io
-        @rewindable = io.is_a?(::StringIO)
-      end
-
-      def method_missing(method, *args, &block)
-        unless @rewindable
-          @io = ::StringIO.new(@io.read)
-          @rewindable = true
-        end
-
-        @io.__send__(method, *args, &block)
-      end
-    end
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      env['rack.input'] = RewindableIO.new(env['rack.input'])
-      @app.call(env)
-    end
-  end
-end

data/lib/action_controller/vendor/rack-1.0/rack.rb

@@ -1,89 +0,0 @@
-# Copyright (C) 2007, 2008, 2009 Christian Neukirchen <purl.org/net/chneukirchen>
-#
-# Rack is freely distributable under the terms of an MIT-style license.
-# See COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-$:.unshift(File.expand_path(File.dirname(__FILE__)))
-
-
-# The Rack main module, serving as a namespace for all core Rack
-# modules and classes.
-#
-# All modules meant for use in your application are <tt>autoload</tt>ed here,
-# so it should be enough just to <tt>require rack.rb</tt> in your code.
-
-module Rack
-  # The Rack protocol version number implemented.
-  VERSION = [0,1]
-
-  # Return the Rack protocol version as a dotted string.
-  def self.version
-    VERSION.join(".")
-  end
-
-  # Return the Rack release as a dotted string.
-  def self.release
-    "1.0 bundled"
-  end
-
-  autoload :Builder, "rack/builder"
-  autoload :Cascade, "rack/cascade"
-  autoload :Chunked, "rack/chunked"
-  autoload :CommonLogger, "rack/commonlogger"
-  autoload :ConditionalGet, "rack/conditionalget"
-  autoload :ContentLength, "rack/content_length"
-  autoload :ContentType, "rack/content_type"
-  autoload :File, "rack/file"
-  autoload :Deflater, "rack/deflater"
-  autoload :Directory, "rack/directory"
-  autoload :ForwardRequest, "rack/recursive"
-  autoload :Handler, "rack/handler"
-  autoload :Head, "rack/head"
-  autoload :Lint, "rack/lint"
-  autoload :Lock, "rack/lock"
-  autoload :MethodOverride, "rack/methodoverride"
-  autoload :Mime, "rack/mime"
-  autoload :Recursive, "rack/recursive"
-  autoload :Reloader, "rack/reloader"
-  autoload :ShowExceptions, "rack/showexceptions"
-  autoload :ShowStatus, "rack/showstatus"
-  autoload :Static, "rack/static"
-  autoload :URLMap, "rack/urlmap"
-  autoload :Utils, "rack/utils"
-
-  autoload :MockRequest, "rack/mock"
-  autoload :MockResponse, "rack/mock"
-
-  autoload :Request, "rack/request"
-  autoload :Response, "rack/response"
-
-  module Auth
-    autoload :Basic, "rack/auth/basic"
-    autoload :AbstractRequest, "rack/auth/abstract/request"
-    autoload :AbstractHandler, "rack/auth/abstract/handler"
-    autoload :OpenID, "rack/auth/openid"
-    module Digest
-      autoload :MD5, "rack/auth/digest/md5"
-      autoload :Nonce, "rack/auth/digest/nonce"
-      autoload :Params, "rack/auth/digest/params"
-      autoload :Request, "rack/auth/digest/request"
-    end
-  end
-
-  module Session
-    autoload :Cookie, "rack/session/cookie"
-    autoload :Pool, "rack/session/pool"
-    autoload :Memcache, "rack/session/memcache"
-  end
-
-  # *Adapters* connect Rack with third party web frameworks.
-  #
-  # Rack includes an adapter for Camping, see README for other
-  # frameworks supporting Rack in their code bases.
-  #
-  # Refer to the submodules for framework-specific calling details.
-
-  module Adapter
-    autoload :Camping, "rack/adapter/camping"
-  end
-end

data/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb

@@ -1,22 +0,0 @@
-module Rack
-  module Adapter
-    class Camping
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        env["PATH_INFO"] ||= ""
-        env["SCRIPT_NAME"] ||= ""
-        controller = @app.run(env['rack.input'], env)
-        h = controller.headers
-        h.each_pair do |k,v|
-          if v.kind_of? URI
-            h[k] = v.to_s
-          end
-        end
-        [controller.status, controller.headers, [controller.body.to_s]]
-      end
-    end
-  end
-end

data/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb

@@ -1,37 +0,0 @@
-module Rack
-  module Auth
-    # Rack::Auth::AbstractHandler implements common authentication functionality.
-    #
-    # +realm+ should be set for all handlers.
-
-    class AbstractHandler
-
-      attr_accessor :realm
-
-      def initialize(app, realm=nil, &authenticator)
-        @app, @realm, @authenticator = app, realm, authenticator
-      end
-
-
-      private
-
-      def unauthorized(www_authenticate = challenge)
-        return [ 401,
-          { 'Content-Type' => 'text/plain',
-            'Content-Length' => '0',
-            'WWW-Authenticate' => www_authenticate.to_s },
-          []
-        ]
-      end
-
-      def bad_request
-        return [ 400,
-          { 'Content-Type' => 'text/plain',
-            'Content-Length' => '0' },
-          []
-        ]
-      end
-
-    end
-  end
-end