Skip to content

Commit 0a7fe00

Browse files
committed
Remove dependency on jbuilder
1 parent b922bf5 commit 0a7fe00

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

gon.gemspec

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff 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"
2826
end

lib/gon.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'action_controller'
44
require 'gon/helpers'
55
require 'gon/rabl'
6-
if RUBY_VERSION =~ /9/
6+
if RUBY_VERSION =~ /9/ && defined?(Jbuilder)
77
require 'gon/jbuilder'
88
end
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'] ||

0 commit comments

Comments
 (0)