Project linguist integration

Dmitriy Zaporozhets
1 parent 5b6019f3
Showing 5 changed files with 20 additions and 7 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/snippet.rb
app/models/tree.rb
config/initializers/gitlabhq/20_grit_ext.rb
@@ -19,7 +19,7 @@ gem &quot;therubyracer&quot;
 gem "faker"
 gem "seed-fu"
 gem "linguist", "~> 1.0.0", :git => "https://github.com/github/linguist.git"
-gem "pygments.rb", "0.2.7"
+gem "pygments.rb", "0.2.11"
 gem "thin"
 gem "unicorn"
 gem "git"
@@ -180,7 +180,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7)
       slop (>= 2.4.4, < 3)
-    pygments.rb (0.2.7)
+    pygments.rb (0.2.11)
       rubypython (~> 0.5.3)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.4.1)
@@ -342,7 +342,7 @@ DEPENDENCIES
   mysql2
   omniauth-ldap
   pry
-  pygments.rb (= 0.2.7)
+  pygments.rb (= 0.2.11)
   rails (= 3.2.1)
   rails-footnotes
   rake
 class Snippet < ActiveRecord::Base
-  include Utils::Colorize
+  include Linguist::BlobHelper
  
   belongs_to :project
   belongs_to :author, :class_name => "User"
@@ -38,8 +38,20 @@ class Snippet &lt; ActiveRecord::Base
     ]
   end
  
-  def colorize
-    system_colorize(content, file_name)
+  def data
+    content
+  end
+
+  def size
+    0
+  end
+
+  def name 
+    file_name
+  end
+
+  def mode 
+    nil
   end
  
   def expired?
 class Tree
-  include Utils::FileHelper
+   include Linguist::BlobHelper
   attr_accessor :path, :tree, :project, :ref
  
   delegate :contents,
 require 'grit'
+require 'pygments'
  
 Grit::Blob.class_eval do
   include Linguist::BlobHelper
...	...	@@ -19,7 +19,7 @@ gem "therubyracer"
19	19	gem "faker"
20	20	gem "seed-fu"
21	21	gem "linguist", "~> 1.0.0", :git => "https://github.com/github/linguist.git"
22		-gem "pygments.rb", "0.2.7"
	22	+gem "pygments.rb", "0.2.11"
23	23	gem "thin"
24	24	gem "unicorn"
25	25	gem "git"
...	...
...	...	@@ -180,7 +180,7 @@ GEM
180	180	coderay (~> 1.0.5)
181	181	method_source (~> 0.7)
182	182	slop (>= 2.4.4, < 3)
183		- pygments.rb (0.2.7)
	183	+ pygments.rb (0.2.11)
184	184	rubypython (~> 0.5.3)
185	185	pyu-ruby-sasl (0.0.3.3)
186	186	rack (1.4.1)
...	...	@@ -342,7 +342,7 @@ DEPENDENCIES
342	342	mysql2
343	343	omniauth-ldap
344	344	pry
345		- pygments.rb (= 0.2.7)
	345	+ pygments.rb (= 0.2.11)
346	346	rails (= 3.2.1)
347	347	rails-footnotes
348	348	rake
...	...
1	1	class Snippet < ActiveRecord::Base
2		- include Utils::Colorize
	2	+ include Linguist::BlobHelper
3	3
4	4	belongs_to :project
5	5	belongs_to :author, :class_name => "User"
...	...	@@ -38,8 +38,20 @@ class Snippet < ActiveRecord::Base
38	38	]
39	39	end
40	40
41		- def colorize
42		- system_colorize(content, file_name)
	41	+ def data
	42	+ content
	43	+ end
	44	+
	45	+ def size
	46	+ 0
	47	+ end
	48	+
	49	+ def name
	50	+ file_name
	51	+ end
	52	+
	53	+ def mode
	54	+ nil
43	55	end
44	56
45	57	def expired?
...	...
1	1	class Tree
2		- include Utils::FileHelper
	2	+ include Linguist::BlobHelper
3	3	attr_accessor :path, :tree, :project, :ref
4	4
5	5	delegate :contents,
...	...
1	1	require 'grit'
	2	+require 'pygments'
2	3
3	4	Grit::Blob.class_eval do
4	5	include Linguist::BlobHelper
...	...