add support for Rails 3.2+ sending custom mime types

nesquena · Jul 9, 2012 · b49fe6a · b49fe6a
1 parent a1c4164
commit b49fe6a
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 1 deletion.
diff --git a/fixtures/ashared/views_rails_3/posts/show.rabl_test_v1.rabl b/fixtures/ashared/views_rails_3/posts/show.rabl_test_v1.rabl
@@ -0,0 +1,7 @@
+object @post
+
+attribute :title => :title_v1
+
+child :user do
+  extends "users/show"
+end
diff --git a/fixtures/ashared/views_rails_3/users/show.rabl_test_v1.rabl b/fixtures/ashared/views_rails_3/users/show.rabl_test_v1.rabl
@@ -0,0 +1,3 @@
+object @user => :person
+
+attribute :username => :username_v1
diff --git a/fixtures/rails3_2/app/controllers/posts_controller.rb b/fixtures/rails3_2/app/controllers/posts_controller.rb
@@ -1,5 +1,5 @@
 class PostsController < ApplicationController
-  respond_to :json, :xml, :html
+  respond_to :json, :xml, :html, :rabl_test_v1
 
   def index
     @posts = Post.all(:order => "id ASC")

diff --git a/fixtures/rails3_2/config/initializers/mime_types.rb b/fixtures/rails3_2/config/initializers/mime_types.rb
@@ -3,3 +3,5 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
+
+Mime::Type.register 'application/vnd.rabl-test_v1+json', :rabl_test_v1
diff --git a/lib/rabl/partials.rb b/lib/rabl/partials.rb
@@ -71,6 +71,10 @@ def fetch_rails_source(file, options={})
           if ActionPack::VERSION::MAJOR == 3 && ActionPack::VERSION::MINOR < 2
             context_scope.lookup_context.find(file, [], partial)
           else # Rails 3.2 and higher
+            # pull format directly from rails unless it is html
+            rendered_format = context_scope.lookup_context.rendered_format
+            source_format = rendered_format unless rendered_format == :html
+
             context_scope.lookup_context.find(file, [], partial, [], {:formats => [source_format]})
           end }
         template = lookup_proc.call(false) rescue lookup_proc.call(true)

diff --git a/test/integration/rails3_2/posts_controller_test.rb b/test/integration/rails3_2/posts_controller_test.rb
@@ -154,6 +154,15 @@
     asserts(:body).includes { "<html>" }
   end # show action, html
 
+  context "mime_type" do
+    setup do
+      get "/posts/#{@post1.id}", format: :rabl_test_v1
+    end
+
+    asserts("contains post title") { json_output['post']['title_v1'] }.equals { @post1.title }
+    asserts("contains username") { json_output['post']['user']['username_v1'] }.equals { @post1.user.username }
+  end
+
   context "caching" do
     helper(:cache_hit) do |key|
       Rails.cache.read(ActiveSupport::Cache.expand_cache_key(key, :rabl))