From 1477a6c8aaecbde1f2b5903cccb267d632212ee4 Mon Sep 17 00:00:00 2001
From: gitlabhq <m@gitlabhq.com>
Date: Fri, 21 Oct 2011 15:35:42 +0300
Subject: [PATCH] moved from albino -> pygments.rb
---
Gemfile | 2 +-
Gemfile.lock | 15 +++++++--------
app/models/snippet.rb | 3 +--
app/views/projects/_tree_file.html.haml | 1 +
app/views/projects/empty.html.erb | 7 ++++---
config/initializers/grit_ext.rb | 2 +-
lib/utils.rb | 8 ++++++--
7 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/Gemfile b/Gemfile
index 523793e7ca567..77a00659ac7b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'therubyracer'
gem 'faker'
gem 'seed-fu', :git => 'git://github.com/mbleigh/seed-fu.git'
gem "inifile"
-gem "albino", :git => "git://github.com/gitlabhq/albino.git"
+gem "pygments.rb", "0.2.3"
gem "kaminari"
gem "thin"
gem "git"
diff --git a/Gemfile.lock b/Gemfile.lock
index 2aa894aa87f87..5ba3445975275 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,13 +4,6 @@ GIT
specs:
annotate (2.4.1.beta1)
-GIT
- remote: git://github.com/gitlabhq/albino.git
- revision: 118380924969f3a856659f86ea1f40c1ba7bfcb1
- specs:
- albino (1.3.3)
- posix-spawn (>= 0.3.6)
-
GIT
remote: git://github.com/gitlabhq/grit.git
revision: ff015074ef35bd94cba943f9c0f98e161ab5851c
@@ -72,6 +65,7 @@ GEM
ZenTest (= 4.5)
awesome_print (0.4.0)
bcrypt-ruby (3.0.1)
+ blankslate (2.1.2.4)
builder (3.0.0)
capybara (1.0.1)
mime-types (>= 1.16)
@@ -138,6 +132,8 @@ GEM
orm_adapter (0.0.5)
polyglot (0.3.2)
posix-spawn (0.3.6)
+ pygments.rb (0.2.3)
+ rubypython (>= 0.5.1)
rack (1.3.2)
rack-cache (1.0.3)
rack (>= 0.4)
@@ -189,6 +185,9 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
+ rubypython (0.5.1)
+ blankslate (>= 2.1.2.3)
+ ffi (~> 1.0.7)
rubyzip (0.9.4)
sass (3.1.7)
sass-rails (3.1.1)
@@ -242,7 +241,6 @@ PLATFORMS
DEPENDENCIES
acts_as_list
- albino!
annotate!
autotest
autotest-rails
@@ -260,6 +258,7 @@ DEPENDENCIES
jquery-rails
kaminari
launchy
+ pygments.rb (= 0.2.3)
rails (= 3.1.0)
rails-footnotes (>= 3.7.5.rc4)
rspec-rails
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 119b69a4525c8..95d6a07d545e5 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -32,8 +32,7 @@ def self.content_types
end
def colorize
- ft = handle_file_type(file_name)
- Albino.colorize(content, ft, :html, 'utf-8', "linenos=True")
+ system_colorize(content, file_name)
end
end
# == Schema Information
diff --git a/app/views/projects/_tree_file.html.haml b/app/views/projects/_tree_file.html.haml
index ae95d4831759c..41a2287aa8c7e 100644
--- a/app/views/projects/_tree_file.html.haml
+++ b/app/views/projects/_tree_file.html.haml
@@ -1,3 +1,4 @@
+:css
.view_file
.view_file_header
%strong
diff --git a/app/views/projects/empty.html.erb b/app/views/projects/empty.html.erb
index a89174715508f..4c60facde8cee 100644
--- a/app/views/projects/empty.html.erb
+++ b/app/views/projects/empty.html.erb
@@ -1,3 +1,4 @@
+<% bash_lexer = Pygments::Lexer[:bash] %>
<div class="">
<div class="git-empty">
<h2>Git global setup:</h2>
@@ -6,7 +7,7 @@ git config --global user.name "#{current_user.name}"
git config --global user.email "#{current_user.email}"
eos
%>
- <%= raw Albino.colorize(setup_str, :bash) %>
+ <%= raw bash_lexer.highlight(setup_str) %>
<br />
<br />
<h2>Next steps:</h2>
@@ -21,7 +22,7 @@ git remote add origin #{@project.url_to_repo}
git push -u origin master
eos
%>
- <%= raw Albino.colorize(repo_setup_str, :bash) %>
+ <%= raw bash_lexer.highlight(repo_setup_str) %>
<br /><br />
<h2>Existing Git Repo?</h2>
@@ -31,7 +32,7 @@ git remote add origin #{@project.url_to_repo}
git push -u origin master
eos
%>
- <%= raw Albino.colorize(exist_repo_setup_str, :bash) %>
+ <%= raw bash_lexer.highlight(exist_repo_setup_str) %>
<br /><br />
<h2>Remove this project?</h2>
diff --git a/config/initializers/grit_ext.rb b/config/initializers/grit_ext.rb
index 8f1329a660c51..4bd71003532d4 100644
--- a/config/initializers/grit_ext.rb
+++ b/config/initializers/grit_ext.rb
@@ -1,5 +1,5 @@
require 'grit'
-require 'albino'
+require 'pygments'
require "utils"
Grit::Blob.class_eval do
diff --git a/lib/utils.rb b/lib/utils.rb
index 40bf26735c2aa..e57121a3e2a80 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -18,8 +18,12 @@ def text?
module Colorize
def colorize
- ft = handle_file_type(name, mime_type)
- Albino.colorize(data, ft, :html, 'utf-8', "linenos=True")
+ system_colorize(data, name)
+ end
+
+ def system_colorize(data, file_name)
+ ft = handle_file_type(file_name)
+ Pygments.highlight(data, :lexer => ft, :options => { :encoding => 'utf-8', :linenos => 'True' })
end
def handle_file_type(file_name, mime_type = nil)
--
GitLab