actionpack 3.2.0.rc1 → 3.2.0.rc2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Add font_path helper method *Santiago Pastorino*
+
+*   Depends on rack ~> 1.4.0 *Santiago Pastorino*
+
+*   Add :gzip option to `caches_page`. The default option can be configured globally using `page_cache_compression` *Andrey Sitnik*
+
 *   The ShowExceptions middleware now accepts a exceptions application that is responsible to render an exception when the application fails. The application is invoked with a copy of the exception in `env["action_dispatch.exception"]` and with the PATH_INFO rewritten to the status code. *José Valim*
 
 *   Add `button_tag` support to ActionView::Helpers::FormBuilder.

data/lib/abstract_controller/layouts.rb

@@ -241,6 +241,7 @@ module AbstractController
       #   the template name
       # false::  There is no layout
       # true::   raise an ArgumentError
+      # nil::    Force default layout behavior with inheritance
       #
       # ==== Parameters
       # * <tt>layout</tt> - The layout to use.
@@ -254,7 +255,7 @@ module AbstractController
         conditions.each {|k, v| conditions[k] = Array(v).map {|a| a.to_s} }
         self._layout_conditions = conditions
 
-        @_layout = layout || false # Converts nil to false
+        @_layout = layout
         _write_layout_method
       end
 

data/lib/abstract_controller/rendering.rb

@@ -35,7 +35,7 @@ module AbstractController
     include AbstractController::ViewPaths
 
     included do
-      config_accessor :protected_instance_variables, :instance_reader => false
+      class_attribute :protected_instance_variables
       self.protected_instance_variables = []
     end
 
@@ -59,12 +59,6 @@ module AbstractController
 
     attr_internal_writer :view_context_class
 
-    # Explicitly define protected_instance_variables so it can be
-    # inherited and overwritten by other modules if needed.
-    def protected_instance_variables
-      config.protected_instance_variables
-    end
-
     def view_context_class
       @_view_context_class ||= self.class.view_context_class
     end

data/lib/action_controller/caching/pages.rb

@@ -16,7 +16,7 @@ module ActionController #:nodoc:
     #     caches_page :show, :new
     #   end
     #
-    # This will generate cache files such as <tt>weblog/show/5.html</tt> and <tt>weblog/new.html</tt>, which match the URLs used 
+    # This will generate cache files such as <tt>weblog/show/5.html</tt> and <tt>weblog/new.html</tt>, which match the URLs used
     # that would normally trigger dynamic page generation. Page caching works by configuring a web server to first check for the
     # existence of files on disk, and to serve them directly when found, without passing the request through to Action Pack.
     # This is much faster than handling the full dynamic request in the usual way.
@@ -38,23 +38,25 @@ module ActionController #:nodoc:
       extend ActiveSupport::Concern
 
       included do
-        ##
-        # :singleton-method:
         # The cache directory should be the document root for the web server and is set using <tt>Base.page_cache_directory = "/document/root"</tt>.
         # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>Rails.root + "/public"</tt>). Changing
         # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
         # web server to look in the new location for cached files.
-        config_accessor :page_cache_directory
+        class_attribute :page_cache_directory
         self.page_cache_directory ||= ''
 
-        ##
-        # :singleton-method:
         # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
         # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
         # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
         # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
-        config_accessor :page_cache_extension
+        class_attribute :page_cache_extension
         self.page_cache_extension ||= '.html'
+
+        # The compression used for gzip. If false (default), the page is not compressed.
+        # If can be a symbol showing the ZLib compression method, for example, :best_compression
+        # or :best_speed or an integer configuring the compression level.
+        class_attribute :page_cache_compression
+        self.page_cache_compression ||= false
       end
 
       module ClassMethods
@@ -66,24 +68,31 @@ module ActionController #:nodoc:
 
           instrument_page_cache :expire_page, path do
             File.delete(path) if File.exist?(path)
+            File.delete(path + '.gz') if File.exist?(path + '.gz')
           end
         end
 
         # Manually cache the +content+ in the key determined by +path+. Example:
         #   cache_page "I'm the cached content", "/lists/show"
-        def cache_page(content, path, extension = nil)
+        def cache_page(content, path, extension = nil, gzip = Zlib::BEST_COMPRESSION)
           return unless perform_caching
           path = page_cache_path(path, extension)
 
           instrument_page_cache :write_page, path do
             FileUtils.makedirs(File.dirname(path))
             File.open(path, "wb+") { |f| f.write(content) }
+            if gzip
+              Zlib::GzipWriter.open(path + '.gz', gzip) { |f| f.write(content) }
+            end
           end
         end
 
-        # Caches the +actions+ using the page-caching approach that'll store the cache in a path within the page_cache_directory that
+        # Caches the +actions+ using the page-caching approach that'll store
+        # the cache in a path within the page_cache_directory that
         # matches the triggering url.
         #
+        # You can also pass a :gzip option to override the class configuration one.
+        #
         # Usage:
         #
         #   # cache the index action
@@ -91,10 +100,28 @@ module ActionController #:nodoc:
         #
         #   # cache the index action except for JSON requests
         #   caches_page :index, :if => Proc.new { |c| !c.request.format.json? }
+        #
+        #   # don't gzip images
+        #   caches_page :image, :gzip => false
         def caches_page(*actions)
           return unless perform_caching
           options = actions.extract_options!
-          after_filter({:only => actions}.merge(options)) { |c| c.cache_page }
+
+          gzip_level = options.fetch(:gzip, page_cache_compression)
+          gzip_level = case gzip_level
+          when Symbol
+            Zlib.const_get(gzip_level.to_s.upcase)
+          when Fixnum
+            gzip_level
+          when false
+            nil
+          else
+            Zlib::BEST_COMPRESSION
+          end
+
+          after_filter({:only => actions}.merge(options)) do |c|
+            c.cache_page(nil, nil, gzip_level)
+          end
         end
 
         private
@@ -136,7 +163,7 @@ module ActionController #:nodoc:
       # Manually cache the +content+ in the key determined by +options+. If no content is provided, the contents of response.body is used.
       # If no options are provided, the url of the current request being handled is used. Example:
       #   cache_page "I'm the cached content", :controller => "lists", :action => "show"
-      def cache_page(content = nil, options = nil)
+      def cache_page(content = nil, options = nil, gzip = Zlib::BEST_COMPRESSION)
         return unless self.class.perform_caching && caching_allowed?
 
         path = case options
@@ -152,7 +179,7 @@ module ActionController #:nodoc:
           extension = ".#{type_symbol}"
         end
 
-        self.class.cache_page(content || response.body, path, extension)
+        self.class.cache_page(content || response.body, path, extension, gzip)
       end
 
     end

data/lib/action_controller/metal/helpers.rb

@@ -56,7 +56,7 @@ module ActionController
     include AbstractController::Helpers
 
     included do
-      config_accessor :helpers_path, :include_all_helpers
+      class_attribute :helpers_path, :include_all_helpers
       self.helpers_path ||= []
       self.include_all_helpers = true
     end

data/lib/action_controller/metal/http_authentication.rb

@@ -141,11 +141,11 @@ module ActionController
       end
 
       def decode_credentials(request)
-        ActiveSupport::Base64.decode64(request.authorization.split(' ', 2).last || '')
+        ::Base64.decode64(request.authorization.split(' ', 2).last || '')
       end
 
       def encode_credentials(user_name, password)
-        "Basic #{ActiveSupport::Base64.encode64s("#{user_name}:#{password}")}"
+        "Basic #{::Base64.strict_encode64("#{user_name}:#{password}")}"
       end
 
       def authentication_request(controller, realm)
@@ -286,7 +286,7 @@ module ActionController
         t = time.to_i
         hashed = [t, secret_key]
         digest = ::Digest::MD5.hexdigest(hashed.join(":"))
-        ActiveSupport::Base64.encode64("#{t}:#{digest}").gsub("\n", '')
+        ::Base64.encode64("#{t}:#{digest}").gsub("\n", '')
       end
 
       # Might want a shorter timeout depending on whether the request
@@ -295,7 +295,7 @@ module ActionController
       # allow a user to use new nonce without prompting user again for their
       # username and password.
       def validate_nonce(secret_key, request, value, seconds_to_timeout=5*60)
-        t = ActiveSupport::Base64.decode64(value).split(":").first.to_i
+        t = ::Base64.decode64(value).split(":").first.to_i
         nonce(secret_key, t) == value && (t - Time.now.to_i).abs <= seconds_to_timeout
       end
 

data/lib/action_dispatch/routing/mapper.rb

@@ -16,7 +16,7 @@ module ActionDispatch
           end
         end
 
-        attr_reader :app
+        attr_reader :app, :constraints
 
         def initialize(app, constraints, request)
           @app, @constraints, @request = app, constraints, request
@@ -1053,6 +1053,13 @@ module ActionDispatch
         #
         #   The above example will now change /posts/new to /posts/brand_new
         #
+        # [:path]
+        #   Allows you to change the path prefix for the resource.
+        #
+        #     resources :posts, :path => 'postings'
+        #
+        #   The resource and all segments will now route to /postings instead of /posts
+        #
         # [:only]
         #   Only generate routes for the given actions.
         #

data/lib/action_dispatch/routing/route_set.rb

@@ -356,7 +356,7 @@ module ActionDispatch
         conditions = build_conditions(conditions, valid_conditions, path.names.map { |x| x.to_sym })
 
         route = @set.add_route(app, path, conditions, defaults, name)
-        named_routes[name] = route if name && !named_routes[name]
+        named_routes[name] = route if name
         route
       end
 

data/lib/action_dispatch/routing/routes_proxy.rb

@@ -16,6 +16,10 @@ module ActionDispatch
         end
       end
 
+      def respond_to?(method, include_private = false)
+        super || routes.url_helpers.respond_to?(method)
+      end
+
       def method_missing(method, *args)
         if routes.url_helpers.respond_to?(method)
           self.class.class_eval <<-RUBY, __FILE__, __LINE__ + 1

data/lib/action_pack/version.rb

@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 2
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/lib/action_view/helpers/active_model_helper.rb

@@ -1,4 +1,3 @@
-require 'action_view/helpers/form_helper'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/object/blank'
@@ -47,9 +46,5 @@ module ActionView
         options['type'] != 'hidden'
       end
     end
-
-    class InstanceTag
-      include ActiveModelInstanceTag
-    end
   end
 end

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -306,6 +306,20 @@ module ActionView
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 
+      # Computes the path to a font asset in the public fonts directory.
+      # Full paths from the document root will be passed through.
+      #
+      # ==== Examples
+      #   font_path("font")                                           # => /fonts/font
+      #   font_path("font.ttf")                                       # => /fonts/font.ttf
+      #   font_path("dir/font.ttf")                                   # => /fonts/dir/font.ttf
+      #   font_path("/dir/font.ttf")                                  # => /dir/font.ttf
+      #   font_path("http://www.example.com/dir/font.ttf")            # => http://www.example.com/dir/font.ttf
+      def font_path(source)
+        asset_paths.compute_public_path(source, 'fonts')
+      end
+      alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route
+
       # Returns an html image tag for the +source+. The +source+ can be a full
       # path or a file that exists in your public images directory.
       #

data/lib/action_view/helpers/date_helper.rb

@@ -422,7 +422,7 @@ module ActionView
       end
 
       # Returns a select tag with options for each of the seconds 0 through 59 with the current second selected.
-      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.      
+      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'second' by default.
       #
       # ==== Examples
@@ -448,7 +448,7 @@ module ActionView
 
       # Returns a select tag with options for each of the minutes 0 through 59 with the current minute selected.
       # Also can return a select tag with options by <tt>minute_step</tt> from 0 through 59 with the 00 minute
-      # selected. The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer. 
+      # selected. The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'minute' by default.
       #
       # ==== Examples
@@ -473,7 +473,7 @@ module ActionView
       end
 
       # Returns a select tag with options for each of the hours 0 through 23 with the current hour selected.
-      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.      
+      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'hour' by default.
       #
       # ==== Examples
@@ -868,7 +868,7 @@ module ActionView
             tag_options = { :value => value }
             tag_options[:selected] = "selected" if selected == i
             text = options[:use_two_digit_numbers] ? sprintf("%02d", i) : value
-            text = options[:ampm] ? AMPM_TRANSLATION[i] : text            
+            text = options[:ampm] ? AMPM_TRANSLATION[i] : text
             select_options << content_tag(:option, text, tag_options)
           end
           (select_options.join("\n") + "\n").html_safe
@@ -974,7 +974,7 @@ module ActionView
         end
     end
 
-    class InstanceTag #:nodoc:
+    module DateHelperInstanceTag
       def to_date_select_tag(options = {}, html_options = {})
         datetime_selector(options, html_options).select_date.html_safe
       end
@@ -1030,6 +1030,10 @@ module ActionView
         end
     end
 
+    class InstanceTag #:nodoc:
+      include DateHelperInstanceTag
+    end
+
     class FormBuilder
       def date_select(method, options = {}, html_options = {})
         @template.date_select(@object_name, method, objectify_options(options), html_options)

data/lib/action_view/helpers/form_helper.rb

@@ -2,6 +2,7 @@ require 'cgi'
 require 'action_view/helpers/date_helper'
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/form_tag_helper'
+require 'action_view/helpers/active_model_helper'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/module/method_names'
@@ -963,7 +964,7 @@ module ActionView
     end
 
     class InstanceTag
-      include Helpers::TagHelper, Helpers::FormTagHelper
+      include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
 
       attr_reader :object, :method_name, :object_name
 

data/lib/action_view/helpers/form_options_helper.rb

@@ -584,7 +584,7 @@ module ActionView
         #   [nil, []]
         #   { nil => [] }
         #
-        if !choices.empty? && Array === choices.first.last
+        if !choices.empty? && choices.first.respond_to?(:last) && Array === choices.first.last
           option_tags = grouped_options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
         else
           option_tags = options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])

data/lib/action_view/helpers/form_tag_helper.rb

@@ -47,7 +47,7 @@ module ActionView
       #   <% end -%>
       #   # => <form action="/posts" method="post"><div><input type="submit" name="submit" value="Save" /></div></form>
       #
-      #  <%= form_tag('/posts', :remote => true) %>
+      #   <%= form_tag('/posts', :remote => true) %>
       #   # => <form action="/posts" method="post" data-remote="true">
       #
       #   form_tag('http://far.away.com/form', :authenticity_token => false)
@@ -393,21 +393,17 @@ module ActionView
       #   submit_tag "Save edits", :disabled => true
       #   # => <input disabled="disabled" name="commit" type="submit" value="Save edits" />
       #
-      #
       #   submit_tag "Complete sale", :disable_with => "Please wait..."
-      #   # => <input name="commit" data-disable-with="Please wait..."
-      #   #    type="submit" value="Complete sale" />
+      #   # => <input name="commit" data-disable-with="Please wait..." type="submit" value="Complete sale" />
       #
       #   submit_tag nil, :class => "form_submit"
       #   # => <input class="form_submit" name="commit" type="submit" />
       #
       #   submit_tag "Edit", :disable_with => "Editing...", :class => "edit_button"
-      #   # => <input class="edit_button" data-disable_with="Editing..."
-      #   #    name="commit" type="submit" value="Edit" />
+      #   # => <input class="edit_button" data-disable_with="Editing..." name="commit" type="submit" value="Edit" />
       #
       #   submit_tag "Save", :confirm => "Are you sure?"
-      #   # => <input name='commit' type='submit' value='Save'
-      #         data-confirm="Are you sure?" />
+      #   # => <input name='commit' type='submit' value='Save' data-confirm="Are you sure?" />
       #
       def submit_tag(value = "Save changes", options = {})
         options = options.stringify_keys
@@ -451,12 +447,11 @@ module ActionView
       #     content_tag(:strong, 'Ask me!')
       #   end
       #   # => <button name="button" type="button">
-      #          <strong>Ask me!</strong>
-      #        </button>
+      #   #     <strong>Ask me!</strong>
+      #   #    </button>
       #
       #   button_tag "Checkout", :disable_with => "Please wait..."
-      #   # => <button data-disable-with="Please wait..." name="button"
-      #                type="submit">Checkout</button>
+      #   # => <button data-disable-with="Please wait..." name="button" type="submit">Checkout</button>
       #
       def button_tag(content_or_options = nil, options = nil, &block)
         options = content_or_options if block_given? && content_or_options.is_a?(Hash)
@@ -582,7 +577,7 @@ module ActionView
       #
       # ==== Examples
       #   number_field_tag 'quantity', nil, :in => 1...10
-      #   => <input id="quantity" name="quantity" min="1" max="9" type="number" />
+      #   # => <input id="quantity" name="quantity" min="1" max="9" type="number" />
       def number_field_tag(name, value = nil, options = {})
         options = options.stringify_keys
         options["type"] ||= "number"

data/lib/action_view/helpers/number_helper.rb

@@ -33,22 +33,29 @@ module ActionView
       # in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:area_code</tt>  - Adds parentheses around the area code.
-      # * <tt>:delimiter</tt>  - Specifies the delimiter to use (defaults to "-").
-      # * <tt>:extension</tt>  - Specifies an extension to add to the end of the
-      #   generated number.
+      #
+      # * <tt>:area_code</tt>     - Adds parentheses around the area code.
+      # * <tt>:delimiter</tt>     - Specifies the delimiter to use (defaults to "-").
+      # * <tt>:extension</tt>     - Specifies an extension to add to the end of the
+      #                             generated number.
       # * <tt>:country_code</tt>  - Sets the country code for the phone number.
+      # * <tt>:raise</tt>         - If true, raises +InvalidNumberError+ when the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_to_phone(5551234)                                           # => 555-1234
+      #  number_to_phone("5551234")                                         # => 555-1234
       #  number_to_phone(1235551234)                                        # => 123-555-1234
       #  number_to_phone(1235551234, :area_code => true)                    # => (123) 555-1234
       #  number_to_phone(1235551234, :delimiter => " ")                     # => 123 555 1234
       #  number_to_phone(1235551234, :area_code => true, :extension => 555) # => (123) 555-1234 x 555
       #  number_to_phone(1235551234, :country_code => 1)                    # => +1-123-555-1234
+      #  number_to_phone("123a456")                                         # => 123a456
+      #
+      #  number_to_phone("1234a567", :raise => true)                        # => InvalidNumberError
       #
       #  number_to_phone(1235551234, :country_code => 1, :extension => 1343, :delimiter => ".")
-      #  => +1.123.555.1234 x 1343
+      #  # => +1.123.555.1234 x 1343
       def number_to_phone(number, options = {})
         return unless number
 
@@ -83,6 +90,7 @@ module ActionView
       # in the +options+ hash.
       #
       # ==== Options
+      #
       # * <tt>:locale</tt>           - Sets the locale to be used for formatting (defaults to current locale).
       # * <tt>:precision</tt>        - Sets the level of precision (defaults to 2).
       # * <tt>:unit</tt>             - Sets the denomination of the currency (defaults to "$").
@@ -95,12 +103,17 @@ module ActionView
       #                                an hyphen to the formatted number given by <tt>:format</tt>).
       #                                Accepts the same fields than <tt>:format</tt>, except
       #                                <tt>%n</tt> is here the absolute value of the number.
+      # * <tt>:raise</tt>            - If true, raises +InvalidNumberError+ when the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_to_currency(1234567890.50)                    # => $1,234,567,890.50
       #  number_to_currency(1234567890.506)                   # => $1,234,567,890.51
       #  number_to_currency(1234567890.506, :precision => 3)  # => $1,234,567,890.506
       #  number_to_currency(1234567890.506, :locale => :fr)   # => 1 234 567 890,51 €
+      #  number_to_currency("123a456")                        # => $123a456
+      #
+      #  number_to_currency("123a456", :raise => true)        # => InvalidNumberError
       #
       #  number_to_currency(-1234567890.50, :negative_format => "(%u%n)")
       #  # => ($1,234,567,890.50)
@@ -142,23 +155,33 @@ module ActionView
 
       end
 
-      # Formats a +number+ as a percentage string (e.g., 65%). You can customize the
-      # format in the +options+ hash.
+      # Formats a +number+ as a percentage string (e.g., 65%). You can customize the format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:locale</tt>     - Sets the locale to be used for formatting (defaults to current locale).
-      # * <tt>:precision</tt>  - Sets the precision of the number (defaults to 3).
-      # * <tt>:significant</tt>  - If +true+, precision will be the # of significant_digits. If +false+, the # of fractional digits (defaults to +false+)
-      # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
-      # * <tt>:strip_insignificant_zeros</tt>  - If +true+ removes insignificant zeros after the decimal separator (defaults to +false+)
+      #
+      # * <tt>:locale</tt>                      - Sets the locale to be used for formatting (defaults to current
+      #                                           locale).
+      # * <tt>:precision</tt>                   - Sets the precision of the number (defaults to 3).
+      # * <tt>:significant</tt>                 - If +true+, precision will be the # of significant_digits. If +false+,
+      #                                           the # of fractional digits (defaults to +false+).
+      # * <tt>:separator</tt>                   - Sets the separator between the fractional and integer digits (defaults
+      #                                           to ".").
+      # * <tt>:delimiter</tt>                   - Sets the thousands delimiter (defaults to "").
+      # * <tt>:strip_insignificant_zeros</tt>   - If +true+ removes insignificant zeros after the decimal separator
+      #                                           (defaults to +false+).
+      # * <tt>:raise</tt>                       - If true, raises +InvalidNumberError+ when the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_to_percentage(100)                                        # => 100.000%
+      #  number_to_percentage("98")                                       # => 98.000%
       #  number_to_percentage(100, :precision => 0)                       # => 100%
       #  number_to_percentage(1000, :delimiter => '.', :separator => ',') # => 1.000,000%
       #  number_to_percentage(302.24398923423, :precision => 5)           # => 302.24399%
       #  number_to_percentage(1000, :locale => :fr)                       # => 1 000,000%
+      #  number_to_percentage("98a")                                      # => 98a%
+      #
+      #  number_to_percentage("98a", :raise => true)                      # => InvalidNumberError
       def number_to_percentage(number, options = {})
         return unless number
 
@@ -185,19 +208,26 @@ module ActionView
       # customize the format in the +options+ hash.
       #
       # ==== Options
+      #
       # * <tt>:locale</tt>     - Sets the locale to be used for formatting (defaults to current locale).
       # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to ",").
       # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
+      # * <tt>:raise</tt>      - If true, raises +InvalidNumberError+ when the argument is invalid.
       #
       # ==== Examples
+      #
       #  number_with_delimiter(12345678)                        # => 12,345,678
+      #  number_with_delimiter("123456")                        # => 123,456
       #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
       #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
       #  number_with_delimiter(12345678, :delimiter => ",")     # => 12,345,678
       #  number_with_delimiter(12345678.05, :separator => " ")  # => 12,345,678 05
       #  number_with_delimiter(12345678.05, :locale => :fr)     # => 12 345 678,05
+      #  number_with_delimiter("112a")                          # => 112a
       #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
       #  # => 98 765 432,98
+      #
+      #  number_with_delimiter("112a", :raise => true)          # => raise InvalidNumberError
       def number_with_delimiter(number, options = {})
         options.symbolize_keys!
 
@@ -225,12 +255,15 @@ module ActionView
       # You can customize the format in the +options+ hash.
       #
       # ==== Options
-      # * <tt>:locale</tt>     - Sets the locale to be used for formatting (defaults to current locale).
-      # * <tt>:precision</tt>  - Sets the precision of the number (defaults to 3).
-      # * <tt>:significant</tt>  - If +true+, precision will be the # of significant_digits. If +false+, the # of fractional digits (defaults to +false+)
-      # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
-      # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
-      # * <tt>:strip_insignificant_zeros</tt>  - If +true+ removes insignificant zeros after the decimal separator (defaults to +false+)
+      # * <tt>:locale</tt>                     - Sets the locale to be used for formatting (defaults to current locale).
+      # * <tt>:precision</tt>                  - Sets the precision of the number (defaults to 3).
+      # * <tt>:significant</tt>                - If +true+, precision will be the # of significant_digits. If +false+,
+      #                                          the # of fractional digits (defaults to +false+).
+      # * <tt>:separator</tt>                  - Sets the separator between the fractional and integer digits (defaults
+      #                                          to ".").
+      # * <tt>:delimiter</tt>                  - Sets the thousands delimiter (defaults to "").
+      # * <tt>:strip_insignificant_zeros</tt>  - If +true+ removes insignificant zeros after the decimal separator
+      #                                          (defaults to +false+).
       #
       # ==== Examples
       #  number_with_precision(111.2345)                                            # => 111.235
@@ -241,8 +274,10 @@ module ActionView
       #  number_with_precision(111.2345, :precision => 1, :significant => true)     # => 100
       #  number_with_precision(13, :precision => 5, :significant => true)           # => 13.000
       #  number_with_precision(111.234, :locale => :fr)                             # => 111,234
+      #
       #  number_with_precision(13, :precision => 5, :significant => true, :strip_insignificant_zeros => true)
       #  # => 13
+      #
       #  number_with_precision(389.32314, :precision => 4, :significant => true)    # => 389.3
       #  number_with_precision(1111.2345, :precision => 2, :separator => ',', :delimiter => '.')
       #  # => 1.111,23

data/lib/action_view/renderer/template_renderer.rb

@@ -26,6 +26,8 @@ module ActionView
       elsif options.key?(:template)
         options[:template].respond_to?(:render) ?
           options[:template] : find_template(options[:template], options[:prefixes], false, keys, @details)
+      else
+        raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file or :text option."
       end
     end
 

data/lib/action_view/template.rb

@@ -173,6 +173,50 @@ module ActionView
       @inspect ||= defined?(Rails.root) ? identifier.sub("#{Rails.root}/", '') : identifier
     end
 
+    # This method is responsible for properly setting the encoding of the
+    # source. Until this point, we assume that the source is BINARY data.
+    # If no additional information is supplied, we assume the encoding is
+    # the same as <tt>Encoding.default_external</tt>.
+    #
+    # The user can also specify the encoding via a comment on the first
+    # line of the template (# encoding: NAME-OF-ENCODING). This will work
+    # with any template engine, as we process out the encoding comment
+    # before passing the source on to the template engine, leaving a
+    # blank line in its stead.
+    def encode!
+      return unless source.encoding_aware? && source.encoding == Encoding::BINARY
+
+      # Look for # encoding: *. If we find one, we'll encode the
+      # String in that encoding, otherwise, we'll use the
+      # default external encoding.
+      if source.sub!(/\A#{ENCODING_FLAG}/, '')
+        encoding = magic_encoding = $1
+      else
+        encoding = Encoding.default_external
+      end
+
+      # Tag the source with the default external encoding
+      # or the encoding specified in the file
+      source.force_encoding(encoding)
+
+      # If the user didn't specify an encoding, and the handler
+      # handles encodings, we simply pass the String as is to
+      # the handler (with the default_external tag)
+      if !magic_encoding && @handler.respond_to?(:handles_encoding?) && @handler.handles_encoding?
+        source
+      # Otherwise, if the String is valid in the encoding,
+      # encode immediately to default_internal. This means
+      # that if a handler doesn't handle encodings, it will
+      # always get Strings in the default_internal
+      elsif source.valid_encoding?
+        source.encode!
+      # Otherwise, since the String is invalid in the encoding
+      # specified, raise an exception
+      else
+        raise WrongEncodingError.new(source, encoding)
+      end
+    end
+
     protected
 
       # Compile a template. This method ensures a template is compiled
@@ -195,15 +239,7 @@ module ActionView
       end
 
       # Among other things, this method is responsible for properly setting
-      # the encoding of the source. Until this point, we assume that the
-      # source is BINARY data. If no additional information is supplied,
-      # we assume the encoding is the same as <tt>Encoding.default_external</tt>.
-      #
-      # The user can also specify the encoding via a comment on the first
-      # line of the template (# encoding: NAME-OF-ENCODING). This will work
-      # with any template engine, as we process out the encoding comment
-      # before passing the source on to the template engine, leaving a
-      # blank line in its stead.
+      # the encoding of the compiled template.
       #
       # If the template engine handles encodings, we send the encoded
       # String to the engine without further processing. This allows
@@ -215,40 +251,8 @@ module ActionView
       # In general, this means that templates will be UTF-8 inside of Rails,
       # regardless of the original source encoding.
       def compile(view, mod) #:nodoc:
+        encode!
         method_name = self.method_name
-
-        if source.encoding_aware?
-          # Look for # encoding: *. If we find one, we'll encode the
-          # String in that encoding, otherwise, we'll use the
-          # default external encoding.
-          if source.sub!(/\A#{ENCODING_FLAG}/, '')
-            encoding = magic_encoding = $1
-          else
-            encoding = Encoding.default_external
-          end
-
-          # Tag the source with the default external encoding
-          # or the encoding specified in the file
-          source.force_encoding(encoding)
-
-          # If the user didn't specify an encoding, and the handler
-          # handles encodings, we simply pass the String as is to
-          # the handler (with the default_external tag)
-          if !magic_encoding && @handler.respond_to?(:handles_encoding?) && @handler.handles_encoding?
-            source
-          # Otherwise, if the String is valid in the encoding,
-          # encode immediately to default_internal. This means
-          # that if a handler doesn't handle encodings, it will
-          # always get Strings in the default_internal
-          elsif source.valid_encoding?
-            source.encode!
-          # Otherwise, since the String is invalid in the encoding
-          # specified, raise an exception
-          else
-            raise WrongEncodingError.new(source, encoding)
-          end
-        end
-
         code = @handler.call(self)
 
         # Make sure that the resulting String to be evalled is in the
@@ -297,7 +301,11 @@ module ActionView
           raise e
         else
           assigns  = view.respond_to?(:assigns) ? view.assigns : {}
-          template = @virtual_path ? refresh(view) : self
+          template = self
+          unless template.source
+            template = refresh(view)
+            template.encode!
+          end
           raise Template::Error.new(template, assigns, e)
         end
       end

data/lib/action_view/template/error.rb

@@ -89,14 +89,10 @@ module ActionView
         line_counter = start_on_line
         return unless source_code = source_code[start_on_line..end_on_line]
 
-        extract = source_code.sum do |line|
+        source_code.sum do |line|
           line_counter += 1
           "#{indent}#{line_counter}: #{line}\n"
         end
-
-        extract.encode! if extract.respond_to?(:encode!)
-
-        extract
       end
 
       def sub_template_of(template_path)

data/lib/sprockets/helpers/rails_helper.rb

@@ -63,13 +63,18 @@ module Sprockets
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
-      def javascript_path(source)
+      def font_path(source)
         path_to_asset(source)
       end
+      alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route
+
+      def javascript_path(source)
+        path_to_asset(source, :ext => 'js')
+      end
       alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with an javascript_path named route
 
       def stylesheet_path(source)
-        path_to_asset(source)
+        path_to_asset(source, :ext => 'css')
       end
       alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route
 
@@ -114,11 +119,6 @@ module Sprockets
 
         class AssetNotPrecompiledError < StandardError; end
 
-        # Return the filesystem path for the source
-        def compute_source_path(source, ext)
-          asset_for(source, ext)
-        end
-
         def asset_for(source, ext)
           source = source.to_s
           return nil if is_uri?(source)

metadata

@@ -1,144 +1,195 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: actionpack
-version: !ruby/object:Gem::Version
-  version: 3.2.0.rc1
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 977940591
+  prerelease: true
+  segments: 
+  - 3
+  - 2
+  - 0
+  - rc2
+  version: 3.2.0.rc2
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-04 00:00:00 -02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2156023280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
-  type: :runtime
   prerelease: false
-  version_requirements: *2156023280
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: &2156021980 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 977940591
+        segments: 
+        - 3
+        - 2
+        - 0
+        - rc2
+        version: 3.2.0.rc2
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activemodel
   prerelease: false
-  version_requirements: *2156021980
-- !ruby/object:Gem::Dependency
-  name: rack-cache
-  requirement: &2156037660 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 977940591
+        segments: 
+        - 3
+        - 2
+        - 0
+        - rc2
+        version: 3.2.0.rc2
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack-cache
   prerelease: false
-  version_requirements: *2156037660
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: &2156037100 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: builder
   prerelease: false
-  version_requirements: *2156037100
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &2156036440 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156036440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &2156035940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.5
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156035940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &2156035260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
         version: 0.6.1
   type: :runtime
-  prerelease: false
-  version_requirements: *2156035260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: journey
-  requirement: &2156034700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 977940574
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc1
         version: 1.0.0.rc1
   type: :runtime
-  prerelease: false
-  version_requirements: *2156034700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: sprockets
-  requirement: &2156034160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
   type: :runtime
-  prerelease: false
-  version_requirements: *2156034160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: erubis
-  requirement: &2156033600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 7
+        - 0
         version: 2.7.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156033600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: tzinfo
-  requirement: &2156032980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 3
+        - 29
         version: 0.3.29
   type: :development
-  prerelease: false
-  version_requirements: *2156032980
-description: Web apps on Rails. Simple, battle-tested conventions for building and
-  testing MVC web applications. Works with any Rack-compatible server.
+  version_requirements: *id010
+description: Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.
 email: david@loudthinking.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG.md
 - README.rdoc
 - MIT-LICENSE
@@ -329,29 +380,43 @@ files:
 - lib/sprockets/helpers.rb
 - lib/sprockets/railtie.rb
 - lib/sprockets/static_compiler.rb
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-requirements:
+requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Web-flow and rendering framework putting the VC in MVC (part of Rails).
 test_files: []
+