Skip to content

Commit a7bb2c1

Browse files
jtimbermanAJ Christensen
authored andcommitted
chef-474, switch from syntax gem to coderay for syntax highlighting
1 parent bb96eba commit a7bb2c1

5 files changed

Lines changed: 7 additions & 8 deletions

File tree

‎chef-server-slice/Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec = Gem::Specification.new do |s|
3131
%w{stomp stompserver ferret
3232
merb-core merb-haml merb-assets
3333
merb-helpers mongrel haml
34-
ruby-openid json syntax}.each { |gem| s.add_dependency gem }
34+
ruby-openid json coderay}.each { |gem| s.add_dependency gem }
3535

3636
s.require_path = 'lib'
3737
s.files = %w(LICENSE README.rdoc) + Dir.glob("{app,config,lib,public}/**/*")

‎chef-server-slice/app/helpers/cookbooks_helper.rb‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,17 @@
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
17-
#
1817

1918
module Merb
2019
module ChefServerSlice
2120
module CookbooksHelper
2221
def syntax_highlight(code)
23-
converter = Syntax::Convertors::HTML.for_syntax "ruby"
2422
if File.exists?(code)
25-
converter.convert(File.read(code), false)
23+
tokens = CodeRay.scan_file(code, :ruby)
2624
else
27-
converter.convert(code, false)
25+
tokens = CodeRay.scan(code, :ruby)
2826
end
27+
return CodeRay.encode_tokens(tokens, :span)
2928
end
3029
end
3130
end

‎chef-server-slice/app/views/cookbooks/show.html.haml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@
3737
- @cookbook.template_files.each do |f|
3838
.code
3939
%h4.head= link_to File.basename(f), "#"
40-
%pre.ruby= syntax_highlight(f)
40+
%pre.ruby= syntax_highlight(f)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
dependency 'chef', :immediate=>true unless defined?(Chef)
66
require 'chef/role'
77

8-
require 'syntax/convertors/html'
8+
require 'coderay'
99

1010
Merb::Plugins.add_rakefiles "chef-server-slice/merbtasks", "chef-server-slice/slicetasks", "chef-server-slice/spectasks"
1111

‎chef-server/lib/tasks/package.rake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
1616
%w{stomp stompserver ferret
1717
merb-core merb-haml merb-assets
1818
merb-helpers mongrel haml
19-
ruby-openid json syntax}.each { |gem| s.add_dependency gem }
19+
ruby-openid json coderay}.each { |gem| s.add_dependency gem }
2020

2121
s.bindir = "bin"
2222
s.executables = %w( chef-server chef-indexer )

0 commit comments

Comments
 (0)