gitlab-gollum-lib 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d1e89df23d5b7a258b00d69e86eb4ea8a9edd48
-  data.tar.gz: 92e6f7887877af968960285029ba78f5b33ab4e5
+  metadata.gz: 857716d6a1f16207ab19e636ad813203a3fbb114
+  data.tar.gz: fc61538a081a5613cc9f4ac7a32a8d92def82017
 SHA512:
-  metadata.gz: 0745e0a570ab21679e7493668b83a379fe6593d57e718b4b302157af26466bff8e0994fa1cf76c165849434eb01feffb5e0332e8f22bc09b6d87974370fc8173
-  data.tar.gz: 76ccd375190893d4d480d225f93fdd21287797126a3b2f25b0ea8db83fc1e7c1d6177c29d02bf97e2ec46dc78390e696311c8c461e14bdcfb8c446c5a4f53905
+  metadata.gz: fc11dbb64bd056a4e8f4abb27b564c1acd467bf5f8b9a6948fa396206b4a768e01401fb7f6dcf5ed53734d998b05405c1f292a59c8e248dc8fcb39ac8d4d1e10
+  data.tar.gz: ab6744fb685b1fdd58f15f780b3551a2171cc8eb0c127425a26194f4e6745b71442f41d26abeb9c93fe64149cfdd2b5c9da6af29c8bb948ad63d185afaeee7df

data/CHANGELOG

@@ -0,0 +1,2 @@
+v1.1.0
+  - Removed pygments.rb dependency

data/README.md

@@ -314,53 +314,6 @@ table of contents at the top of all your wiki pages if it is enabled:
 Gollum::Wiki.new("my-gollum-repo.git", {:universal_toc => true})
 ```
 
-## SYNTAX HIGHLIGHTING
-
-In page files you can get automatic syntax highlighting for a wide range of
-languages (courtesy of [Pygments](http://pygments.org/) - must install
-separately) by using the following syntax:
-
-    ```ruby
-      def foo
-        puts 'bar'
-      end
-    ```
-
-The block must start with three backticks, at the beginning of a line or
-indented with any number of spaces or tabs.
-After that comes the name of the language that is contained by the
-block. The language must be one of the `short name` lexer strings supported by
-Pygments. See the [list of lexers](http://pygments.org/docs/lexers/) for valid
-options.
-
-The block contents should be indented at the same level than the opening backticks.
-If the block contents are indented with an additional two spaces or one tab,
-then that whitespace will be ignored (this makes the blocks easier to read in plaintext).
-
-The block must end with three backticks indented at the same level than the opening
-backticks.
-
-### GITHUB SYNTAX HIGHLIGHTING
-
-As an extra feature, you can syntax highlight a file from your repository, allowing
-you keep some of your sample code in the main repository. The code-snippet is
-updated when the wiki is rebuilt. You include github code like this:
-
-    ```html:github:gollum/gollum-lib/master/test/file_view/1_file.txt```
-
-This will make the builder look at the **gollum user**, in the **gollum-lib project**,
-in the **master branch**, at path **test/file_view/1_file.txt**. It will be
-rewritten to:
-
-    ```html
-    <ol class="tree">
-      <li class="file"><a href="0">0</a></li>
-    </ol>
-    ```
-
-Which will be parsed as HTML code during the Pygments run, and thereby coloured
-appropriately.
-
 ## MATHEMATICAL EQUATIONS
 
 Start gollum with the `--mathjax` flag. Read more about [MathJax](http://docs.mathjax.org/en/latest/index.html) on the web. Gollum uses the `TeX-AMS-MML_HTMLorMML` config with the `autoload-all` extension.

data/VERSION

@@ -0,0 +1 @@
+1.1.0

data/gollum-lib.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency('gitlab-grit', '~> 2.6.1')
-  s.add_dependency('gitlab-pygments.rb', '~> 0.5.4')
   s.add_dependency('github-markup', ['>= 0.7.5', '< 1.0.0'])
   s.add_dependency('github-markdown', '~> 0.5.3')
   s.add_dependency('sanitize', '~> 2.0.3')
@@ -43,8 +42,9 @@ Gem::Specification.new do |s|
 
   # = MANIFEST =
   s.files = %w[
+    VERSION
     Gemfile
-    HISTORY.md
+    CHANGELOG
     LICENSE
     README.md
     Rakefile

data/lib/gollum-lib/markup.rb

@@ -1,15 +1,11 @@
 # ~*~ encoding: utf-8 ~*~
 require 'digest/sha1'
 require 'cgi'
-require 'pygments'
 require 'base64'
 
 require File.expand_path '../helpers', __FILE__
 require File.expand_path '../remote_code', __FILE__
 
-# initialize Pygments
-Pygments.start
-
 module Gollum
 
   class Markup
@@ -580,13 +576,7 @@ module Gollum
       highlighted = []
       blocks.each do |lang, code|
         encoding ||= 'utf-8'
-        begin
-          # must set startinline to true for php to be highlighted without <?
-          # http://pygments.org/docs/lexers/
-          hl_code = Pygments.highlight(code, :lexer => lang, :options => {:encoding => encoding.to_s, :startinline => true})
-        rescue
-          hl_code = code
-        end
+        hl_code = code
         highlighted << hl_code
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-gollum-lib
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-grit
@@ -25,20 +25,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
-- !ruby/object:Gem::Dependency
-  name: gitlab-pygments.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
@@ -263,8 +249,9 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
+- VERSION
 - Gemfile
-- HISTORY.md
+- CHANGELOG
 - LICENSE
 - README.md
 - Rakefile
@@ -308,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gollum-lib
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.

data/HISTORY.md

@@ -1,3 +0,0 @@
-# v0.0.1 / 2013-03-19
-
-* First release, extrated from https://github.com/gollum/gollum