Changeset 6152

Timestamp:

02/15/07 16:25:46 (2 years ago)

Author:

rick

Message:

Add Mime::Type convenience methods to check the current mime type. [Rick]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/mime_type.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/session_management.rb (modified) (1 diff)
• trunk/actionpack/test/controller/mime_type_test.rb (modified) (2 diffs)
• trunk/actionpack/test/template/form_tag_helper_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add Mime::Type convenience methods to check the current mime type. [Rick]
+
+  request.format.html? # => true if Mime::HTML
+  request.format.jpg?  # => true if Mime::JPG
+
+  # ActionController sample usage:
+  # the session will be disabled for non html/ajax requests
+  session :off, :if => Proc.new { |req| !(req.format.html? || req.format.js?) }
-
-* Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id.  [Stefan Kaes]

trunk/actionpack/lib/action_controller/mime_type.rb

@@ -140 +140 @@
-      (@synonyms + [ self ]).any? { |synonym| synonym.to_s == mime_type.to_s } if mime_type
-    end
+    
+    private
+      def method_missing(method, *args)
+        if method.to_s =~ /(\w+)\?$/
+          mime_type = $1.downcase.to_sym
+          mime_type == @symbol || (mime_type == :html && @symbol == :all)
+        else
+          super
+        end
+      end
-  end
-end

trunk/actionpack/lib/action_controller/session_management.rb

@@ -61 +61 @@
-      #   session :off, :only => :foo,
-      #           :if => Proc.new { |req| req.parameters[:ws] }
+      #
+      #   # the session will be disabled for non html/ajax requests
+      #   session :off, 
+      #     :if => Proc.new { |req| !(req.format.html? || req.format.js?) }
-      #
-      # All session options described for ActionController::Base.process_cgi

trunk/actionpack/test/controller/mime_type_test.rb

@@ -2 +2 @@
-
-class MimeTypeTest < Test::Unit::TestCase
-PNG   = Mime::Type.new("image/png")
-PLAIN = Mime::Type.new("text/plain")
+Type.register "image/png", :png
+Type.register "text/plain", :plain
-
-  def test_parse_single
@@ -31 +31 @@
-    Mime.send :remove_const, :GIF
-  end
+  
+  def test_type_convenience_methods
+    types = [:html, :xml, :png, :plain, :yaml]
+    types.each do |type|
+      mime = Mime.const_get(type.to_s.upcase)
+      assert mime.send("#{type}?"), "Mime::#{type.to_s.upcase} is not #{type}?"
+      (types - [type]).each { |t| assert !mime.send("#{t}?"), "Mime::#{t.to_s.upcase} is #{t}?" }
+    end
+  end
+  
+  def test_mime_all_is_html
+    assert Mime::ALL.all?,  "Mime::ALL is not all?"
+    assert Mime::ALL.html?, "Mime::ALL is not html?"
+  end
-end

trunk/actionpack/test/template/form_tag_helper_test.rb

@@ -133 +133 @@
-  def test_submit_tag
-    assert_dom_equal(
-this.form.onsubmit() : true
+(this.form.onsubmit() ? this.form.submit() : false) : this.form.submit()
-      submit_tag("Save", :disable_with => "Saving...", :onclick => "alert('hello!')")
-    )