actionpack 3.0.0.rc → 3.0.0.rc2

data/lib/action_view/log_subscriber.rb

@@ -7,7 +7,7 @@ module ActionView
       message = "Rendered #{from_rails_root(event.payload[:identifier])}"
       message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
       message << (" (%.1fms)" % event.duration)
-      info(message)        
+      info(message)
     end
     alias :render_partial :render_template
     alias :render_collection :render_template

data/lib/action_view/render/layouts.rb

@@ -47,11 +47,15 @@ module ActionView
     #     Hello David
     #   </html>
     #
-    def _layout_for(name = nil, &block) #:nodoc:
-      if !block || name
-        @_content_for[name || :layout].html_safe
+    def _layout_for(*args, &block) #:nodoc:
+      name = args.first
+
+      if name.is_a?(Symbol)
+        @_content_for[name].html_safe
+      elsif block
+        capture(*args, &block)
       else
-        capture(&block)
+        @_content_for[:layout].html_safe
       end
     end
 

data/lib/action_view/render/partials.rb

@@ -56,7 +56,7 @@ module ActionView
   # you're following its conventions for RecordIdentifier#partial_path. Examples:
   #
   #  # @account is an Account instance, so it uses the RecordIdentifier to replace
-  #  # <%= render :partial => "accounts/account", :locals => { :account => @buyer } %>
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @account} %>
   #  <%= render :partial => @account %>
   #
   #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace

data/lib/action_view/template/handler.rb

@@ -35,7 +35,7 @@ module ActionView
       end
     end
   end
-  
+
   TemplateHandlers = Template::Handlers
   TemplateHandler = Template::Handler
 end

data/lib/action_view/template/handlers.rb

@@ -18,7 +18,7 @@ module ActionView #:nodoc:
 
       @@template_handlers = {}
       @@default_template_handlers = nil
-    
+
       def self.extensions
         @@template_extensions ||= @@template_handlers.keys
       end

data/lib/action_view/template/resolver.rb

@@ -69,6 +69,9 @@ module ActionView
         query << '{' << ext.map {|e| e && ".#{e}" }.join(',') << ',}'
       end
 
+      query.gsub!(/\{\.html,/, "{.html,.text.html,")
+      query.gsub!(/\{\.text,/, "{.text,.text.plain,")
+
       Dir[query].reject { |p| File.directory?(p) }.map do |p|
         handler, format = extract_handler_and_format(p, formats)
 
@@ -87,6 +90,18 @@ module ActionView
       pieces.shift
 
       handler  = Template.handler_class_for_extension(pieces.pop)
+
+      if pieces.last == "html" && pieces[-2] == "text"
+        correct_path = path.gsub(/\.text\.html/, ".html")
+        ActiveSupport::Deprecation.warn "The file `#{path}` uses the deprecated format `text.html`. Please rename it to #{correct_path}", caller
+      end
+
+      if pieces.last == "plain" && pieces[-2] == "text"
+        correct_path = path.gsub(/\.text\.plain/, ".text")
+        pieces.pop
+        ActiveSupport::Deprecation.warn "The file `#{path}` uses the deprecated format `text.plain`. Please rename it to #{correct_path}", caller
+      end
+
       format   = pieces.last && Mime[pieces.last] && pieces.pop.to_sym
       format ||= handler.default_format if handler.respond_to?(:default_format)
       format ||= default_formats

data/lib/action_view/test_case.rb

@@ -44,7 +44,7 @@ module ActionView
       include ActionView::Helpers
 
       attr_accessor :controller, :output_buffer, :rendered
-      
+
       module ClassMethods
         def tests(helper_class)
           self.helper_class = helper_class

data/lib/action_view/testing/resolvers.rb

@@ -38,6 +38,6 @@ module ActionView #:nodoc:
       [ActionView::Template.new("Template generated by Null Resolver", path, handler, :virtual_path => path, :format => format)]
     end
   end
-  
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 7712042
+  hash: 977940607
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - rc
-  version: 3.0.0.rc
+  - rc2
+  version: 3.0.0.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -05:00
+date: 2010-08-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7712042
+        hash: 977940607
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,13 +44,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7712042
+        hash: 977940607
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -125,12 +125,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
         - 0
         - 6
-        - 9
-        version: 0.6.9
+        - 12
+        version: 0.6.12
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -141,12 +141,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 61
         segments: 
         - 0
         - 3
-        - 22
-        version: 0.3.22
+        - 23
+        version: 0.3.23
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -198,6 +198,7 @@ files:
 - lib/action_controller/deprecated/dispatcher.rb
 - lib/action_controller/deprecated/integration_test.rb
 - lib/action_controller/deprecated/performance_test.rb
+- lib/action_controller/deprecated/url_writer.rb
 - lib/action_controller/deprecated.rb
 - lib/action_controller/log_subscriber.rb
 - lib/action_controller/metal/compatibility.rb
@@ -248,6 +249,7 @@ files:
 - 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/callbacks.rb
 - lib/action_dispatch/middleware/cookies.rb
 - lib/action_dispatch/middleware/flash.rb