actionpack 1.0.1 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,29 @@
+*1.1.0*
+
+* Added search through session to clear out association caches at the end of each request. This makes it possible to place Active Record objects
+  in the session without worrying about stale data in the associations (the main object is still subject to caching, naturally) #347 [Tobias Luetke]
+
+* Added more informative exception when using helper :some_helper and the helper requires another file that fails, you'll get an
+  error message tells you what file actually failed to load, rather than falling back on assuming it was the helper file itself #346 [dblack]
+
+* Added use of *_before_type_cast for all input and text fields. This is helpful for getting "100,000" back on a integer-based 
+  validation where the value would normally be "100".
+
+* Added Request#port_string to get something like ":8080" back on 8080 and "" on 80 (or 443 with https).
+
+* Added Request#domain (returns string) and Request#subdomains (returns array).
+
+* Added POST support for the breakpoint retries, so form processing that raises an exception can be retried with the original request [Florian Gross]
+
+* Fixed regression with Base#reset_session that wouldn't use the the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net]
+
+* Fixed error rendering of rxml documents to not just swallow the exception and return 0 (still not guessing the right line, but hey)
+
+* Fixed that textilize and markdown would instantiate their engines even on empty strings. This also fixes #333 [Ulysses]
+
+* Fixed UrlHelper#link_to_unless so it doesn't care if the id is a string or fixnum [zenspider]
+
+
 *1.0.1*
 
 * Fixed a bug that would cause an ApplicationController to require itself three times and hence cause filters to be run three times [evl]

data/lib/action_controller.rb

@@ -32,6 +32,7 @@ require 'action_controller/benchmarking'
 require 'action_controller/filters'
 require 'action_controller/layout'
 require 'action_controller/flash'
+require 'action_controller/session'
 require 'action_controller/dependencies'
 require 'action_controller/scaffolding'
 require 'action_controller/helpers'
@@ -48,6 +49,7 @@ ActionController::Base.class_eval do
   include ActionController::Scaffolding
   include ActionController::Helpers
   include ActionController::Cookies
+  include ActionController::Session
 end
 
 require 'action_view'

data/lib/action_controller/base.rb

@@ -431,7 +431,7 @@ module ActionController #:nodoc:
       # http://www.mnot.net/cache_docs/ for an overview of web caching and
       # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
       # for the Cache-Control header spec.
-      def send_file(path, options = {})
+      def send_file(path, options = {}) #:doc:
         raise MissingFile unless File.file?(path) and File.readable?(path)
 
         options[:length]   ||= File.size(path)
@@ -483,7 +483,7 @@ module ActionController #:nodoc:
       #   send_data image.data, :type => image.content_type, :disposition => 'inline'
       #
       # See +send_file+ for more information on HTTP Content-* headers and caching.
-      def send_data(data, options = {})
+      def send_data(data, options = {}) #:doc:
         logger.info "Sending data #{options[:filename]}" unless logger.nil?
         send_file_headers! options.merge(:length => data.size)
         render_text data

data/lib/action_controller/cgi_process.rb

@@ -92,7 +92,7 @@ module ActionController #:nodoc:
 
     private
       def new_session
-        CGI::Session.new(@cgi, DEFAULT_SESSION_OPTIONS.merge(@session_options).merge("new_session" => true))
+        CGI::Session.new(@cgi, session_options_with_string_keys.merge("new_session" => true))
       end
       
       def session_options_with_string_keys

data/lib/action_controller/helpers.rb

@@ -55,8 +55,13 @@ module ActionController #:nodoc:
             class_name = Inflector.camelize(file_name)
             begin
               require_dependency(file_name)
-            rescue LoadError
-              raise LoadError, "Missing helper file helpers/#{file_name}.rb"
+            rescue LoadError => load_error
+              requiree = / -- (.*?)(\.rb)?$/.match(load_error).to_a[1]
+              if requiree == file_name
+                raise LoadError, "Missing helper file helpers/#{file_name}.rb"
+              else
+                raise LoadError, "Can't load file: #{requiree}"
+              end
             end
             raise ArgumentError, "Missing #{class_name} module in helpers/#{file_name}.rb" unless Object.const_defined?(class_name)
             add_template_helper(Object.const_get(class_name))

data/lib/action_controller/layout.rb

@@ -114,6 +114,15 @@ module ActionController #:nodoc:
     # If you have a layout that by default is applied to all the actions of a controller, you still have the option to rendering
     # a given action without a layout. Just use the method <tt>render_without_layout</tt>, which works just like Base.render --
     # it just doesn't apply any layouts.
+    #
+    # == Automatic layout assignment
+    #
+    # If there is a template in <tt>app/views/layouts/</tt> with the same name as the current controller then it will be automatically
+    # set as that controller's layout unless explicitly told otherwise. Say you have a WeblogController, for example. If a template named 
+    # <tt>app/views/layouts/weblog.rhtml</tt> or <tt>app/views/layouts/weblog.rxml</tt> exists then it will be automatically set as
+    # the layout for your WeblogController. You can create a layout with the name <tt>application.rhtml</tt> or <tt>application.rxml</tt>
+    # and this will be set as the default controller if there is no layout with the same name as the current controller and there is 
+    # no layout explicitly assigned with the +layout+ method. Setting a layout explicity will always override the automatic behaviour. 
     module ClassMethods
       # If a layout is specified, all actions rendered through render and render_action will have their result assigned 
       # to <tt>@content_for_layout</tt>, which can then be used by the layout to insert their contents with

data/lib/action_controller/request.rb

@@ -50,6 +50,20 @@ module ActionController
       return env['REMOTE_ADDR']
     end
 
+    # Returns the domain part of a host, such as rubyonrails.org in "www.rubyonrails.org". You can specify
+    # a different <tt>tld_length</tt>, such as 2 to catch rubyonrails.co.uk in "www.rubyonrails.co.uk".
+    def domain(tld_length = 1)
+      host.split(".").last(1 + tld_length).join(".")
+    end
+
+    # Returns all the subdomains as an array, so ["dev", "www"] would be returned for "dev.www.rubyonrails.org".
+    # You can specify a different <tt>tld_length</tt>, such as 2 to catch ["www"] instead of ["www", "rubyonrails"]
+    # in "www.rubyonrails.co.uk".
+    def subdomains(tld_length = 1)
+      parts = host.split(".")
+      parts - parts.last(1 + tld_length)
+    end
+
     def request_uri
       env["REQUEST_URI"]
     end
@@ -70,14 +84,13 @@ module ActionController
       env["SERVER_PORT"].to_i
     end
 
+    # Returns a string like ":8080" if the port is not 80 or 443 while on https.
+    def port_string
+      (protocol == "http://" && port == 80) || (protocol == "https://" && port == 443) ? "" : ":#{port}"
+    end
+
     def host_with_port
-      if env['HTTP_HOST']
-        env['HTTP_HOST']
-      elsif (protocol == "http://" && port == 80) || (protocol == "https://" && port == 443)
-        host
-      else
-        host + ":#{port}"
-      end
+      env['HTTP_HOST'] || host + port_string
     end
 
     #--

data/lib/action_controller/session.rb

@@ -0,0 +1,14 @@
+module ActionController #:nodoc:
+  module Session #:nodoc:
+    def self.append_features(base) #:nodoc:
+      super #:nodoc:
+      base.after_filter(:clear_persistant_model_associations)
+    end
+
+    private
+      def clear_persistant_model_associations #:doc:
+        session = @session.instance_variable_get("@data")
+        session.each { |key, obj| obj.clear_association_cache if obj.respond_to?(:clear_association_cache) } if session
+      end
+  end
+end

data/lib/action_controller/templates/rescues/_request_and_response.rhtml

@@ -1,4 +1,15 @@
-<% if defined?(Breakpoint) then %><a href="?BP-RETRY=1">Retry with Breakpoint</a><% end %>
+<% if defined?(Breakpoint) %>
+  <br /><br />
+  <%= form_tag({}, "method" => @request.method) %>
+    <input type="hidden" name="BP-RETRY" value="1" />
+
+    <% for key, value in @request.params %>
+      <input type="hidden" name="<%= key %>" value="<%= value %>" />
+    <% end %>
+
+    <input type="submit" value="Retry with Breakpoint" />
+  </form>
+<% end %>
 
 <%
   request_parameters_without_action = @request.parameters.clone

data/lib/action_controller/test_process.rb

@@ -37,6 +37,10 @@ module ActionController #:nodoc:
       @cookies.freeze
     end
 
+    def port=(number)
+      @env["SERVER_PORT"] = number.to_i
+    end
+
     def action=(action_name)
       @query_parameters.update({ "action" => action_name })
       @parameters = nil

data/lib/action_view/helpers/active_record_helper.rb

@@ -132,7 +132,6 @@ module ActionView
       end
 
       alias_method :tag_without_error_wrapping, :tag
-
       def tag(name, options)
         if object.respond_to?("errors") && object.errors.respond_to?("on")
           error_wrapping(tag_without_error_wrapping(name, options), object.errors.on(@method_name))
@@ -142,7 +141,6 @@ module ActionView
       end
 
       alias_method :content_tag_without_error_wrapping, :content_tag
-
       def content_tag(name, value, options)
         if object.respond_to?("errors") && object.errors.respond_to?("on")
           error_wrapping(content_tag_without_error_wrapping(name, value, options), object.errors.on(@method_name))

data/lib/action_view/helpers/form_helper.rb

@@ -135,15 +135,15 @@ module ActionView
         html_options.merge!({ "size" => options["maxlength"]}) if options["maxlength"] && !options["size"]
         html_options.delete("size") if field_type == "hidden"
         html_options.merge!({ "type" =>  field_type})
-        html_options.merge!({ "value" => value.to_s }) unless options["value"]
+        html_options.merge!({ "value" => value_before_type_cast }) unless options["value"]
         add_default_name_and_id(html_options)
         tag("input", html_options)
       end
 
       def to_radio_button_tag(tag_value, options={})
         html_options = DEFAULT_FIELD_OPTIONS.merge(options)
-        html_options.merge!({"checked"=>"checked"}) if value == tag_value
-        html_options.merge!({"type"=>"radio", "value"=>tag_value.to_s})
+        html_options.merge!({ "checked" => "checked" }) if value == tag_value
+        html_options.merge!({ "type" => "radio", "value"=> tag_value.to_s })
                        
         add_default_name_and_id(html_options)
         tag("input", html_options)
@@ -152,11 +152,11 @@ module ActionView
       def to_text_area_tag(options = {})
         options = DEFAULT_TEXT_AREA_OPTIONS.merge(options)
         add_default_name_and_id(options)
-        content_tag("textarea", html_escape(value), options)
+        content_tag("textarea", html_escape(value_before_type_cast), options)
       end
 
       def to_check_box_tag(options = {}, checked_value = "1", unchecked_value = "0")
-        options.merge!({"checked" => "checked"}) if !value.nil? && ((value.is_a?(TrueClass) || value.is_a?(FalseClass)) ? value : value.to_i > 0)
+        options.merge!({ "checked" => "checked" }) if !value.nil? && ((value.is_a?(TrueClass) || value.is_a?(FalseClass)) ? value : value.to_i > 0)
         options.merge!({ "type" => "checkbox", "value" => checked_value })
         add_default_name_and_id(options)
         tag("input", options) << tag("input", ({ "name" => options['name'], "type" => "hidden", "value" => unchecked_value }))
@@ -191,6 +191,14 @@ module ActionView
         object.send(@method_name) unless object.nil?
       end
 
+      def value_before_type_cast
+        unless object.nil?
+          object.respond_to?(@method_name + "_before_type_cast") ? 
+            object.send(@method_name + "_before_type_cast") :
+            object.send(@method_name)
+        end
+      end
+
       private
         def add_default_name_and_id(options)
           options['name'] = tag_name unless options.has_key? "name"

data/lib/action_view/helpers/tag_helper.rb

@@ -1,4 +1,5 @@
 require 'cgi'
+require 'erb'
 
 module ActionView
   module Helpers

data/lib/action_view/helpers/text_helper.rb

@@ -69,7 +69,7 @@ module ActionView
         # Returns the text with all the Textile codes turned into HTML-tags. 
         # <i>This method is only available if RedCloth can be required</i>.
         def textilize(text)
-          RedCloth.new(text).to_html
+          text.empty? ? "" : RedCloth.new(text).to_html
         end
 
         # Returns the text with all the Textile codes turned into HTML-tags, but without the regular bounding <p> tag. 
@@ -90,7 +90,7 @@ module ActionView
         # Returns the text with all the Markdown codes turned into HTML-tags. 
         # <i>This method is only available if BlueCloth can be required</i>.
         def markdown(text)
-          BlueCloth.new(text).to_html
+          text.empty? ? "" : BlueCloth.new(text).to_html
         end
       rescue LoadError
         # We can't really help what's not there

data/lib/action_view/helpers/url_helper.rb

@@ -96,9 +96,9 @@ module ActionView
         def destination_equal_to_current(options)
           params_without_location = @params.reject { |key, value| %w( controller action id ).include?(key) }
 
-          options[:action] == @params['action'] &&
-            options[:id] == @params['id'] &&
-            options[:controller] == @params['controller'] &&
+          options[:action].to_s == @params['action'].to_s &&
+            options[:id].to_s == @params['id'].to_s &&
+            options[:controller].to_s == @params['controller'].to_s &&
             (options.has_key?(:params) ? params_without_location == options[:params] : true) 
         end
 
@@ -120,4 +120,4 @@ module ActionView
         end
     end
   end
-end
+end

data/lib/action_view/template_error.rb

@@ -49,14 +49,13 @@ module ActionView
     end
   
     def line_number
-      begin
-        @original_exception.backtrace.join.scan(/\((?:erb)\):([0-9]*)/).first.first.to_i
-      rescue
-        begin
-          original_exception.message.scan(/\((?:eval)\):([0-9]*)/).first.first.to_i
-        rescue
-          1
-        end
+      trace = @original_exception.backtrace.join
+      if trace.include?("erb):")
+        trace.scan(/\((?:erb)\):([0-9]*)/).first.first.to_i
+      elsif trace.include?("eval):")
+        trace.scan(/\((?:eval)\):([0-9]*)/).first.first.to_i
+      else
+        1
       end
     end
   

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '1.0.1' + PKG_BUILD
+PKG_VERSION   = '1.1.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"

data/test/controller/helper_test.rb

@@ -70,6 +70,12 @@ class HelperTest < Test::Unit::TestCase
     assert_raise(LoadError) { @controller_class.helper :missing }
   end
 
+  def test_declare_missing_file_from_helper
+    require 'broken_helper'
+    rescue LoadError => e
+      assert_nil /\bbroken_helper\b/.match(e.to_s)[1]
+  end
+
   def test_helper_block
     assert_nothing_raised {
       @controller_class.helper { def block_helper_method; end }
@@ -107,4 +113,4 @@ class HelperTest < Test::Unit::TestCase
       self.class.const_set('TestHelper', helper_module)
       $VERBOSE = old_verbose
     end
-end
+end

data/test/controller/request_test.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class RequestTest < Test::Unit::TestCase
+  def setup
+    @request = ActionController::TestRequest.new
+  end
+
+  def test_domains
+    @request.host = "www.rubyonrails.org"
+    assert_equal "rubyonrails.org", @request.domain
+
+    @request.host = "www.rubyonrails.co.uk"
+    assert_equal "rubyonrails.co.uk", @request.domain(2)
+  end
+
+  def test_subdomains
+    @request.host = "www.rubyonrails.org"
+    assert_equal %w( www ), @request.subdomains
+
+    @request.host = "www.rubyonrails.co.uk"
+    assert_equal %w( www ), @request.subdomains(2)
+
+    @request.host = "dev.www.rubyonrails.co.uk"
+    assert_equal %w( dev www ), @request.subdomains(2)
+  end
+  
+  def test_port_string
+    @request.port = 80
+    assert_equal "", @request.port_string
+
+    @request.port = 8080
+    assert_equal ":8080", @request.port_string
+  end
+
+  def test_host_with_port
+    @request.env['HTTP_HOST'] = "rubyonrails.org:8080"
+    assert_equal "rubyonrails.org:8080", @request.host_with_port
+    @request.env['HTTP_HOST'] = nil
+    
+    @request.host = "rubyonrails.org"
+    @request.port = 80
+    assert_equal "rubyonrails.org", @request.host_with_port
+    
+    @request.host = "rubyonrails.org"
+    @request.port = 81
+    assert_equal "rubyonrails.org:81", @request.host_with_port
+  end
+end

data/test/template/active_record_helper_test.rb

@@ -14,6 +14,11 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::UrlHelper
 
   Post   = Struct.new("Post", :title, :author_name, :body, :secret, :written_on)
+  Post.class_eval do
+    alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast)
+    alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
+    alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
+  end
   Column = Struct.new("Column", :type, :name, :human_name)
 
   def setup

data/test/template/form_helper_test.rb

@@ -6,7 +6,12 @@ class FormHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::FormHelper
 
   old_verbose, $VERBOSE = $VERBOSE, nil
-  Post = Struct.new("Post", :title, :author_name, :body, :secret, :written_on)
+  Post = Struct.new("Post", :title, :author_name, :body, :secret, :written_on, :cost)
+  Post.class_eval do
+    alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast)
+    alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
+    alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
+  end
   $VERBOSE = old_verbose
 
   def setup

data/test/template/url_helper_test.rb

@@ -43,6 +43,9 @@ class UrlHelperTest < Test::Unit::TestCase
     @params = { "controller" => "weblog", "action" => "show"}
     assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog")
     assert "<a href=\"http://www.world.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
+
+    @params = { "controller" => "weblog", "action" => "show", "id" => "1"}
+    assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog", :id => 1)
   end
 
   def test_mail_to
@@ -58,4 +61,4 @@ class UrlHelperTest < Test::Unit::TestCase
       assert "<a href=\"http://www.world.com\">Hello</a>", 
         link_to("Hello", {:action => 'myaction'}, nil)
   end
-end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2004-12-17
+  version: 1.1.0
+date: 2004-12-23
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib
@@ -53,6 +53,7 @@ files:
   - lib/action_controller/response.rb
   - lib/action_controller/scaffolding.rb
   - lib/action_controller/session
+  - lib/action_controller/session.rb
   - lib/action_controller/support
   - lib/action_controller/templates
   - lib/action_controller/test_process.rb
@@ -116,6 +117,7 @@ files:
   - test/controller/layout_test.rb
   - test/controller/redirect_test.rb
   - test/controller/render_test.rb
+  - test/controller/request_test.rb
   - test/controller/send_file_test.rb
   - test/controller/url_test.rb
   - test/fixtures/helpers