actionpack 1.10.1 → 1.10.2

data/CHANGELOG

@@ -1,3 +1,12 @@
+*1.10.2* (October 26th, 2005)
+
+* Reset template variables after using render_to_string [skaes@web.de]
+
+* Expose the session model backing CGI::Session
+
+* Abbreviate RAILS_ROOT in traces
+
+
 *1.10.1* (October 19th, 2005)
 
 * Update error trace templates [Nicholas Seckar]

data/lib/action_controller/base.rb

@@ -4,6 +4,7 @@ require 'action_controller/routing'
 require 'action_controller/code_generation'
 require 'action_controller/url_rewriter'
 require 'drb'
+require 'set'
 
 module ActionController #:nodoc:
   class ActionControllerError < StandardError #:nodoc:
@@ -622,6 +623,8 @@ module ActionController #:nodoc:
       def render_to_string(options = nil) #:doc:
         result = render(options)
         erase_render_results
+        @variables_added = nil
+        @template.instance_variable_set("@assigns_added", nil)
         result
       end    
 
@@ -846,8 +849,7 @@ module ActionController #:nodoc:
       end
 
       def self.action_methods
-        #puts "action method: #{public_instance_methods.inspect}"
-        @action_methods ||= (public_instance_methods - hidden_actions).inject({}) { |h, k| h[k] = true; h }
+        @action_methods ||= Set.new(public_instance_methods - hidden_actions)
       end
 
       def add_variables_to_assigns

data/lib/action_controller/components.rb

@@ -50,9 +50,13 @@ module ActionController #:nodoc:
   
     private
       def component_response(options, reuse_response = true)
-        c = component_class(options)
-        c.after_filter {|c| flash.keep }
-        c.process(request_for_component(options), reuse_response ? @response : response_for_component)
+        begin
+          ActionController::Flash::FlashHash.avoid_sweep = true
+          Thread.current[:p] = component_class(options).process(request_for_component(options), reuse_response ? @response : response_for_component)
+        ensure
+          ActionController::Flash::FlashHash.avoid_sweep = false
+        end
+        Thread.current[:p]
       end
     
       def component_class(options)

data/lib/action_controller/flash.rb

@@ -43,6 +43,9 @@ module ActionController #:nodoc:
     end
     
     class FlashHash < Hash
+      @@avoid_sweep = false
+      cattr_accessor :avoid_sweep
+      
       def initialize #:nodoc:
         super
         @used = {}
@@ -99,6 +102,7 @@ module ActionController #:nodoc:
       #
       # This method is called automatically by filters, so you generally don't need to care about it.
       def sweep #:nodoc:
+        return if @@avoid_sweep
         keys.each do |k| 
           unless @used[k]
             use(k)

data/lib/action_controller/session/active_record_store.rb

@@ -5,6 +5,16 @@ require 'base64'
 
 class CGI
   class Session
+    # Return this session's underlying Session model. Useful for the DB-backed session stores.
+    def model
+      @dbman.model rescue nil
+    end
+
+    # Proxy missing methods to the underlying Session model.
+    def method_missing(method, *args, &block)
+      if model then model.send(method, *args, &block) else super end
+    end
+
     # A session store backed by an Active Record class.
     #
     # A default class is provided, but any object duck-typing to an Active
@@ -277,6 +287,11 @@ class CGI
         end
       end
 
+      # Access the underlying session model.
+      def model
+        @session
+      end
+
       # Restore session state.  The session model handles unmarshaling.
       def restore
         if @session

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

@@ -4,9 +4,14 @@
     ["Framework Trace", @exception.framework_backtrace],
     ["Full Trace", @exception.clean_backtrace]
   ]
+  if defined?(RAILS_ROOT)
+    traces.each { |name, trace| trace.map! { |p| p.gsub(/^#{RAILS_ROOT}/, '<b>#{RAILS_ROOT}</b>') } }
+  end
   names = traces.collect {|name, trace| name}
 %>
 
+<p><code>RAILS_ROOT: <%= RAILS_ROOT %></code></p>
+
 <div id="traces">
   <% names.each do |name| -%>
     <%

data/lib/action_pack/version.rb

@@ -2,7 +2,7 @@ module ActionPack
   module Version #:nodoc:
     MAJOR = 1
     MINOR = 10
-    TINY  = 1
+    TINY  = 2
     
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rakefile

@@ -62,7 +62,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.2.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.2.2' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'

data/test/controller/active_record_store_test.rb

@@ -53,7 +53,6 @@ module CommonActiveRecordStoreTests
       @new_session.close
     end
   end
-
 end
 
 class ActiveRecordStoreTest < Test::Unit::TestCase
@@ -73,13 +72,17 @@ class ActiveRecordStoreTest < Test::Unit::TestCase
     @new_session['foo'] = 'bar'
   end
 
+  def test_model_attribute
+    assert_kind_of CGI::Session::ActiveRecordStore::Session, @new_session.model
+    assert_equal @new_session.model.data, @new_session.data
+  end
+
   def teardown
     session_class.drop_table!
   end
 end
 
 class ColumnLimitTest < Test::Unit::TestCase
-
   def setup
     @session_class = CGI::Session::ActiveRecordStore::Session
     @session_class.create_table!
@@ -97,10 +100,8 @@ class ColumnLimitTest < Test::Unit::TestCase
     s.data
     assert_raises(ActionController::SessionOverflowError) { s.save }
   end
-
 end
 
-
 class DeprecatedActiveRecordStoreTest < ActiveRecordStoreTest
   def setup
     session_class.connection.execute 'create table old_sessions (id integer primary key, sessid text unique, data text)'
@@ -128,12 +129,17 @@ class SqlBypassActiveRecordStoreTest < ActiveRecordStoreTest
     end
     @session_class
   end
+
+  def test_model_attribute
+    assert_kind_of CGI::Session::ActiveRecordStore::SqlBypass, @new_session.model
+    assert_equal @new_session.model.data, @new_session.data
+  end
 end
 
 
 # End of safety net.
   rescue Object => e
-    $stderr.puts "Skipping CGI::Session::ActiveRecordStore tests: #{e}"    
+    $stderr.puts "Skipping CGI::Session::ActiveRecordStore tests: #{e}"
     #$stderr.puts "  #{e.backtrace.join("\n  ")}"
   end
 end

data/test/controller/base_test.rb

@@ -67,7 +67,11 @@ class ControllerInstanceTests < Test::Unit::TestCase
   end
 
   def test_action_methods
-    @empty_controllers.each {|c| assert_equal({}, c.send(:action_methods), "#{c.class.controller_path} should be empty!")}
-    @non_empty_controllers.each {|c| assert_equal({"public_action"=>true}, c.send(:action_methods), "#{c.class.controller_path} should not be empty!")}
+    @empty_controllers.each do |c|
+      assert_equal Set.new, c.send(:action_methods), "#{c.class.controller_path} should be empty!"
+    end
+    @non_empty_controllers.each do |c|
+      assert_equal Set.new('public_action'), c.send(:action_methods), "#{c.class.controller_path} should not be empty!"
+    end
   end
 end

data/test/controller/render_test.rb

@@ -89,6 +89,10 @@ class TestController < ActionController::Base
     ActionView::Base.local_assigns_support_string_keys = false
   end
 
+  def render_to_string_test
+    @foo = render_to_string :inline => "this is a test"
+  end
+
   def rescue_action(e) raise end
     
   private
@@ -209,6 +213,11 @@ class RenderTest < Test::Unit::TestCase
     assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", process_request.body
   end
 
+  def test_render_to_string_resets_assigns
+    @request.action = "render_to_string_test"
+    assert_equal "The value of foo is: ::this is a test::\n", process_request.body
+  end
+
   def test_nested_rendering
     @request.action = "hello_world"
     assert_equal "Living in a nested world", Fun::GamesController.process(@request, @response).body

data/test/fixtures/test/render_to_string_test.rhtml

@@ -0,0 +1 @@
+The value of foo is: ::<%= @foo %>::

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.10.1
-date: 2005-10-19
+  version: 1.10.2
+date: 2005-10-26 00:00:00 +02:00
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib
@@ -26,6 +26,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - David Heinemeier Hansson
 files: 
@@ -216,6 +218,7 @@ files:
   - test/fixtures/test/hello_xml_world.rxml
   - test/fixtures/test/list.rhtml
   - test/fixtures/test/potential_conflicts.rhtml
+  - test/fixtures/test/render_to_string_test.rhtml
   - test/fixtures/test/update_element_with_capture.rhtml
   - test/template/active_record_helper_test.rb
   - test/template/asset_tag_helper_test.rb
@@ -263,5 +266,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.2.1
+            version: 1.2.2
       version: