inherited_resources 1.0.4 → 1.0.5

data/lib/inherited_resources/legacy/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/inherited_resources/version.rb

@@ -1,3 +1,3 @@
 module InheritedResources
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.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

data/test/test_helper.rb

@@ -17,6 +17,8 @@ require 'mocha'
 ENV["RAILS_ENV"] = "test"
 RAILS_ROOT = "anywhere"
 
+gem 'responders', '~> 0.4.0'
+
 gem 'activesupport', '= 2.3.5'
 require 'active_support'
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 +01:00
+date: 2010-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: responders
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 3
         version: 0.4.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: has_scope
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 2
         version: 0.4.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.
 email: jose.valim@gmail.com
 executables: []
@@ -75,18 +88,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: inherited_resources
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.