File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -20,9 +20,7 @@ Gem::Specification.new do |s|
2020 s . require_paths = [ "lib" ]
2121 s . add_dependency "actionpack" , '>= 2.3.0'
2222 s . add_dependency "rabl"
23- if RUBY_VERSION =~ /9/
24- s . add_dependency "jbuilder"
25- end
2623 s . add_dependency "json"
2724 s . add_development_dependency "rspec"
25+ s . add_development_dependency "jbuilder"
2826end
Original file line number Diff line number Diff line change 33require 'action_controller'
44require 'gon/helpers'
55require 'gon/rabl'
6- if RUBY_VERSION =~ /9/
6+ if RUBY_VERSION =~ /9/ && defined? ( Jbuilder )
77 require 'gon/jbuilder'
88end
99
@@ -73,7 +73,11 @@ def rabl(view_path, options = {})
7373 end
7474
7575 def jbuilder ( view_path , options = { } )
76- raise NoMethodError . new ( 'You can use Jbuilder support only in 1.9+' ) if RUBY_VERSION !~ /9/
76+ if RUBY_VERSION !~ /9/
77+ raise NoMethodError . new ( 'You can use Jbuilder support only in 1.9+' )
78+ elsif !defined? ( Gon ::Jbuilder )
79+ raise NoMethodError . new ( 'You should define Jbuilder in your Gemfile' )
80+ end
7781
7882 jbuilder_data = Gon ::Jbuilder . parse_jbuilder ( view_path , options [ :controller ] ||
7983 @request_env [ 'action_controller.instance' ] ||
You can’t perform that action at this time.
0 commit comments