lib/gon.rb in gon-2.0.4 vs lib/gon.rb in gon-2.0.5

@@ -1,11 +1,11 @@
 gem 'blankslate'
 require 'action_view'
 require 'action_controller'
 require 'gon/helpers'
 require 'gon/rabl'
-if RUBY_VERSION =~ /9/
+if RUBY_VERSION =~ /9/ && defined?(Jbuilder)
   require 'gon/jbuilder'
 end
 
 module Gon
   class << self
@@ -71,10 +71,14 @@
         set_variable('rabl', rabl_data)
       end
     end
 
     def jbuilder(view_path, options = {})
-      raise NoMethodError.new('You can use Jbuilder support only in 1.9+') if RUBY_VERSION !~ /9/
+      if RUBY_VERSION !~ /9/
+        raise NoMethodError.new('You can use Jbuilder support only in 1.9+') 
+      elsif !defined?(Gon::Jbuilder)
+        raise NoMethodError.new('You should define Jbuilder in your Gemfile') 
+      end
 
       jbuilder_data = Gon::Jbuilder.parse_jbuilder(view_path, options[:controller] || 
                                                   @request_env['action_controller.instance'] || 
                                                   @request_env['action_controller.rescue.response'].
                                                     instance_variable_get('@template').