ultra_markdown 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4125a1f8d90f578085ef8fbeef52b37b0421ef1f
-  data.tar.gz: 5539b14866e62dfe07b4424b41884bd95facd531
+  metadata.gz: f69e6503267240867df9aa5a6e1f206390345091
+  data.tar.gz: 71c9669f07e15d2cfc58bd74d759f1d3f6f35200
 SHA512:
-  metadata.gz: ee7275d563a0c4d542eace4f0b10fcd39158767dc0a41283c50a59ebc93ae73813fa1cec26a7be347a3ee41e9891efca6437f2fbaec3cc27dba9eabef47d2745
-  data.tar.gz: 721fe5ad5787815212db489669e48a1acbdfdbc70e0685439173e4842acc5b64546e244cc5043770cc60dd39dc6cd8c02ce16c43456081122e05330565b2cafa
+  metadata.gz: 97414d6b6dc77972280b3e9fe99f5527811606f620d8afaedf2c48f9e835a94245f6da7c9a0f8d8ab2e15bfd3d05f6fce258e7cca27f3a0c24ec4ae14a590e30
+  data.tar.gz: 6b6c0ebc85874a87dd64553c6dfc979ca9c05bbf948d31d7c21ac8850188ae948971355c7122bcce6702417482e96b998c4ee8e65766732e52d5f3eb84f95dd8

data/CHANGELOG

@@ -0,0 +1 @@
+0.4 use rouge to replace pygments

data/README.md

@@ -6,8 +6,10 @@ Markdown Parser for various purposes
 
 Add this line to your application's Gemfile:
 
+    gem 'rogue', :github => "logdown/rouge", :branch => "wrapper_tag"
     gem 'ultra_markdown'
 
+
 And then execute:
 
     $ bundle

data/lib/ultra_markdown/filter/code_block.rb

@@ -95,14 +95,22 @@ module UltraMarkdown
         end
       end
     
-    
-    
       def block_code(code, language)
-        Pygments.highlight(code, :lexer => language)
-      rescue => e
-        return Pygments.highlight(code, :lexer => nil)
+        lexer = Rouge::Lexer.find(language)
+        if lexer
+          formatter = ::Rouge::Formatters::HTML.new(:wrap => true, :css_class => 'highlight', :wrapper_tag => "div" )
+          formatter.format(lexer.lex(code))
+        else
+          render_plain(code)
+        end
       end
     
+      def render_plain(code)
+        lexer = Rouge::Lexer.find("text")
+         formatter = ::Rouge::Formatters::HTML.new(:wrap => true, :css_class => 'highlight', :wrapper_tag => "div" )
+        formatter.format(lexer.lex(code))
+      end
+
       def codespan(code)
         return "" if !code
     

data/lib/ultra_markdown/markdown_processor.rb

@@ -3,11 +3,15 @@ require 'rails'
 require 'rails_autolink'
 require 'redcarpet'
 require 'singleton'
+require 'rouge'
+require 'rouge/plugins/redcarpet'
 
 
 module Redcarpet
   module Render
     class HTMLwithSyntaxHighlight < HTML
+      
+      include Rouge::Plugins::Redcarpet
 
       def initialize(extensions={})
         @syntax_converter = UltraMarkdown::SyntaxConverter.new({:is_rss => is_rss})

data/lib/ultra_markdown/version.rb

@@ -1,3 +1,3 @@
 module UltraMarkdown
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/ultra_markdown.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'nokogiri'
-  spec.add_dependency 'pygments.rb'
+
+
+  spec.add_dependency 'rouge'
   spec.add_dependency 'redcarpet'
   spec.add_dependency 'airbrake'
   spec.add_dependency 'rails_autolink'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultra_markdown
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - tonilin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md