actionpack 3.0.7 → 3.0.8.rc1

data/CHANGELOG

@@ -1,3 +1,7 @@
+*Rails 3.0.8 (unreleased)*
+
+* Fixed github issue #342 with asset paths and relative roots.
+
 *Rails 3.0.7 (April 18, 2011)*
 
 *No changes.

data/lib/abstract_controller/callbacks.rb

@@ -14,7 +14,7 @@ module AbstractController
     # Override AbstractController::Base's process_action to run the
     # process_action callbacks around the normal behavior.
     def process_action(method_name, *args)
-      run_callbacks(:process_action, method_name) do
+      run_callbacks(:process_action, action_name) do
         super
       end
     end

data/lib/action_controller/deprecated/base.rb

@@ -126,7 +126,7 @@ module ActionController
       # This was moved to a plugin
       def verify(*args)
         ActiveSupport::Deprecation.warn "verify was removed from Rails and is now available as a plugin. " \
-          "Please install it with `rails plugin install git://github.com/rails/verification.git`.", caller
+          "Please install it with `rails plugin install git://github.com/sikachu/verification.git`.", caller
       end
 
       def exempt_from_layout(*)

data/lib/action_controller/log_subscriber.rb

@@ -16,7 +16,11 @@ module ActionController
       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
+      status = payload[:status]
+      if status.nil? && payload[:exception].present?
+        status = Rack::Utils.status_code(ActionDispatch::ShowExceptions.rescue_responses[payload[:exception].first]) rescue nil 
+      end 
+      message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
       message << " (#{additions.join(" | ")})" unless additions.blank?
 
       info(message)

data/lib/action_controller/metal/implicit_render.rb

@@ -1,13 +1,9 @@
 module ActionController
   module ImplicitRender
-    def send_action(method, *args)
-      if respond_to?(method, true)
-        ret = super
-        default_render unless response_body
-        ret
-      else
-        default_render
-      end
+    def send_action(*)
+      ret = super
+      default_render unless response_body
+      ret
     end
 
     def default_render
@@ -15,8 +11,10 @@ module ActionController
     end
 
     def method_for_action(action_name)
-      super || if template_exists?(action_name.to_s, _prefix)
-        action_name.to_s
+      super || begin
+        if template_exists?(action_name.to_s, _prefix)
+          "default_render"
+        end
       end
     end
   end

data/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb

@@ -1,7 +1,7 @@
 <h1>
   <%=h @exception.class.to_s %>
   <% if @request.parameters['controller'] %>
-    in <%=h @request.parameters['controller'].classify.pluralize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
+    in <%=h @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
   <% end %>
 </h1>
 <pre><%=h @exception.message %></pre>

data/lib/action_pack/version.rb

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

data/lib/action_view/base.rb

@@ -165,8 +165,12 @@ module ActionView #:nodoc:
 
     # Specify whether RJS responses should be wrapped in a try/catch block
     # that alert()s the caught exception (and then re-raises it).
-    cattr_accessor :debug_rjs
+    cattr_reader :debug_rjs
     @@debug_rjs = false
+    def self.debug_rjs=(new_value)
+      ActiveSupport::Deprecation.warn("config.action_view.debug_rjs will be removed in 3.1, from 3.1 onwards you will need to install prototype-rails to continue to use RJS templates ")
+      @@debug_rjs = new_value
+    end
 
     # Specify the proc used to decorate input tags that refer to attributes with errors.
     cattr_accessor :field_error_proc

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -872,14 +872,14 @@ module ActionView
 
         def ensure_stylesheet_sources!(sources)
           sources.each do |source|
-            asset_file_path!(path_to_stylesheet(source))
+            asset_file_path!(compute_public_path(source, 'stylesheets', 'css', false))
           end
           return sources
         end
 
         def ensure_javascript_sources!(sources)
           sources.each do |source|
-            asset_file_path!(path_to_javascript(source))
+            asset_file_path!(compute_public_path(source, 'javascripts', 'js', false))
           end
           return sources
         end

data/lib/action_view/helpers/form_options_helper.rb

@@ -299,12 +299,12 @@ module ActionView
 
         container = container.to_a if Hash === container
         selected, disabled = extract_selected_and_disabled(selected).map do | r |
-           Array.wrap(r).map(&:to_s)
+           Array.wrap(r).map { |item| item.to_s }
         end
 
         container.map do |element|
           html_attributes = option_html_attributes(element)
-          text, value = option_text_and_value(element).map(&:to_s)
+          text, value = option_text_and_value(element).map { |item| item.to_s }
           selected_attribute = ' selected="selected"' if option_value_selected?(value, selected)
           disabled_attribute = ' disabled="disabled"' if disabled && option_value_selected?(value, disabled)
           %(<option value="#{html_escape(value)}"#{selected_attribute}#{disabled_attribute}#{html_attributes}>#{html_escape(text)}</option>)

data/lib/action_view/test_case.rb

@@ -182,6 +182,7 @@ module ActionView
         @request
         @routes
         @templates
+        @options
         @test_passed
         @view
         @view_context_class

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: actionpack
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 15424055
+  prerelease: 6
   segments: 
   - 3
   - 0
-  - 7
-  version: 3.0.7
+  - 8
+  - rc
+  - 1
+  version: 3.0.8.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-05-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -25,12 +27,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15424055
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        - 8
+        - rc
+        - 1
+        version: 3.0.8.rc1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,12 +45,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15424055
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        - 8
+        - rc
+        - 1
+        version: 3.0.8.rc1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -356,16 +362,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - none
 rubyforge_project: actionpack
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).