actionpack 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,12 @@
+*1.3.1* (January 18th, 2005)
+
+* Fixed a bug where cookies wouldn't be set if a symbol was used instead of a string as the key
+
+* Added assert_cookie_equal to assert the contents of a named cookie
+
+* Fixed bug in page caching that prevented it from working at all 
+
+
 *1.3.0* (January 17th, 2005)
 
 * Added an extensive caching module that offers three levels of granularity (page, action, fragment) and a variety of stores. 

data/lib/action_controller/assertions/action_pack_assertions.rb

@@ -60,6 +60,14 @@ module Test #:nodoc:
         msg = build_message(message, "<?> expected in session['?'] but was <?>", expected, key, response.session[key])
         assert_block(msg) { expected == response.session[key] }
       end
+
+      # -- cookie assertions ---------------------------------------------------
+
+      def assert_cookie_equal(expected = nil, key = nil, message = nil)
+        response = acquire_assertion_target
+        msg = build_message(message, "<?> expected in cookies['?'] but was <?>", expected, key, response.cookies[key.to_s].first)
+        assert_block(msg) { expected == response.cookies[key.to_s].first }
+      end
       
       # -- flash assertions ---------------------------------------------------
 

data/lib/action_controller/caching.rb

@@ -121,7 +121,7 @@ module ActionController #:nodoc:
 
       private
         def caching_allowed
-          !@request.method.post? && (@request.parameters.reject {|k, v| ['id', 'action', 'controller'].include?(k)}).empty?
+          !@request.post? && (@request.parameters.reject { |k, v| %w( id action controller ).include?(k) }).empty?
         end
     end
 

data/lib/action_controller/cookies.rb

@@ -48,7 +48,7 @@ module ActionController #:nodoc:
         options = options.inject({}) { |options, pair| options[pair.first.to_s] = pair.last; options }
         options["name"] = name.to_s
       else
-        options = { "name" => name, "value" => options }
+        options = { "name" => name.to_s, "value" => options }
       end
       
       set_cookie(options)

data/lib/action_controller/support/binding_of_caller.rb

@@ -2,7 +2,7 @@ begin
   require 'simplecc'
 rescue LoadError
   class Continuation #:nodoc:
-    def create(*args, &block)
+    def self.create(*args, &block)
       cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
       result ||= args
       return *[cc, *result]
@@ -36,7 +36,7 @@ class Binding #:nodoc:
   # If you don't do this an Exception will be raised. Because of
   # the way that Binding.of_caller is implemented it has to be
   # done this way.
-  def of_caller(&block)
+  def self.of_caller(&block)
     old_critical = Thread.critical
     Thread.critical = true
     count = 0

data/lib/action_controller/support/core_ext/string/inflections.rb

@@ -31,6 +31,10 @@ module ActiveSupport #:nodoc:
         def classify
           Inflector.classify(self)
         end
+        
+        def humanize
+          Inflector.humanize(self)
+        end
 
         def foreign_key(separate_class_name_and_id_with_underscore = true)
           Inflector.foreign_key(self, separate_class_name_and_id_with_underscore)

data/lib/action_controller/support/inflector.rb

@@ -27,6 +27,10 @@ module Inflector
     camel_cased_word.to_s.gsub(/([A-Z]+)([A-Z])/,'\1_\2').gsub(/([a-z])([A-Z])/,'\1_\2').downcase
   end
 
+  def humanize(lower_case_and_underscored_word)
+    lower_case_and_underscored_word.to_s.gsub(/_/, " ").capitalize
+  end
+
   def demodulize(class_name_in_module)
     class_name_in_module.to_s.gsub(/^.*::/, '')
   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.3.0' + PKG_BUILD
+PKG_VERSION   = '1.3.1' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 desc "Default Task"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: actionpack
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
-date: 2005-01-17
+  version: 1.3.1
+date: 2005-01-18
 summary: Web-flow and rendering framework putting the VC in MVC.
 require_paths: 
   - lib