Skip to content

Commit fe0091a

Browse files
author
Nuo Yan
committed
switch from 'syntax' to 'coderay'
1 parent 53b5a3e commit fe0091a

4 files changed

Lines changed: 5 additions & 9 deletions

File tree

‎chef-server-api/Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec = Gem::Specification.new do |s|
3636
"haml",
3737
"ruby-openid",
3838
"json",
39-
"syntax",].each { |g| s.add_dependency g}
39+
"coderay",].each { |g| s.add_dependency g}
4040

4141
s.require_path = 'lib'
4242
s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{config,lib,spec,app,public,stubs}/**/*")

‎chef-server-webui/app/helpers/application_helper.rb‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,8 @@ def append_tree(name, html, node, count, parent, override)
115115
end
116116

117117
def syntax_highlight(code)
118-
converter = Syntax::Convertors::HTML.for_syntax "ruby"
119-
if File.exists?(code)
120-
converter.convert(File.read(code), false)
121-
else
122-
converter.convert(code, false)
123-
end
118+
tokens = File.exists?(code) ? CodeRay.scan_file(code, :ruby) : CodeRay.scan(code, :ruby)
119+
CodeRay.encode_tokens(tokens, :span)
124120
end
125121

126122
def get_file(uri)

‎chef-server-webui/lib/chef-server-webui.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
require 'chef/role'
99
require 'chef/webui_user'
1010

11-
require 'syntax/convertors/html'
11+
require 'coderay'
1212

1313
Merb::Plugins.add_rakefiles "chef-server-webui/merbtasks", "chef-server-webui/slicetasks", "chef-server-webui/spectasks"
1414

‎chef-server/chef-server.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
4141
s.add_dependency(%q<haml>, [">= 0"])
4242
s.add_dependency(%q<ruby-openid>, [">= 0"])
4343
s.add_dependency(%q<json>, [">= 0"])
44-
s.add_dependency(%q<syntax>, [">= 0"])
44+
s.add_dependency(%q<coderay>, [">= 0"])
4545
end
4646
else
4747
s.add_dependency(%q<stomp>, [">= 0"])

0 commit comments

Comments
 (0)