responders_backport 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+# Version 0.1.2
+
+Changes from InheritedResources v1.0 branch:
+*  Handle some edge cases in respond_to.
+*  Fix mime negotiation if no specific format is requested.
+
 # Version 0.1.1
 
 * attr_reader :response added.

data/lib/responders_backport/respond_to.rb

@@ -136,17 +136,14 @@ module ActionController #:nodoc:
       def negotiate_mime
         @mime_type_priority.each do |priority|
           if priority == Mime::ALL
-            return @order.first
+            return @order.find { |m| m != Mime::ALL } || Mime::SET.first
+          elsif @order.include?(Mime::ALL)
+            return @mime_type_priority.find { |m| m != Mime::ALL } || Mime::SET.first
           elsif @order.include?(priority)
             return priority
           end
         end
 
-        if @order.include?(Mime::ALL)
-          return Mime::SET.first if @mime_type_priority.first == Mime::ALL
-          return @mime_type_priority.first
-        end
-
         nil
       end
     end

data/lib/responders_backport/version.rb

@@ -1,3 +1,3 @@
 module RespondersBackport
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/test/respond_to_test.rb

@@ -55,6 +55,15 @@ end
 class SuperProjectsController < ProjectsController
 end
 
+class NonInheritedResourcesController < ActionController::Base
+  def index
+    respond_to do |format|
+      format.xml { render :text => 'Render XML' }
+      format.any { render :text => 'Render HTML' }
+    end
+  end
+end
+
 class RespondToFunctionalTest < ActionController::TestCase
   tests ProjectsController
 
@@ -153,3 +162,13 @@ class RespondToFunctionalTest < ActionController::TestCase
     assert_equal 'Render HTML', @response.body.strip
   end
 end
+
+class RespondToFunctionalStandardControllerTest < ActionController::TestCase
+  tests NonInheritedResourcesController
+  
+  def test_respond_with_no_specific_format
+    @request.accept = 'application/xml,application/xhtml+xml,text/html'
+    get :index
+    assert_equal 'Render HTML', @response.body.strip
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - "George Guimar\xC3\xA3es"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -03:00
+date: 2010-03-16 00:00:00 -03:00
 default_executable: 
 dependencies: []