glorify 0.0.1 → 0.0.2

data/glorify.gemspec

@@ -5,7 +5,7 @@ require "glorify/version"
 Gem::Specification.new do |s|
   s.name        = "glorify"
   s.version     = Sinatra::Glorify::VERSION
-  s.authors     = ["Zachary Scott"]
+  s.authors     = ["Zachary Scott", "Jonathan Stott"]
   s.email       = ["zachary@zacharyscott.net"]
   s.homepage    = "http://github.com/zzak/glorify"
   s.summary     = %q{Sinatra helper to parse markdown with syntax highlighting like the pros}
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "sinatra"
-  s.add_runtime_dependency "redcarpet", "~> 1.0"
+  s.add_runtime_dependency "redcarpet", "~> 2.0"
   s.add_runtime_dependency "albino"
   s.add_runtime_dependency "nokogiri"
 end

data/lib/glorify.rb

@@ -1,19 +1,15 @@
 require "sinatra/base"
 require "glorify/version"
-require "redcarpet"
-require "albino"
-require "nokogiri"
-require "net/http"
+require "glorify/renderer"
 
 module Sinatra
   module Glorify
     module Helpers
       def glorify text
-       options = [:filter_html, :autolink,
-          :no_intraemphasis, :fenced_code, :gh_blockcode]  
-        highlighter(Redcarpet.new(text, *options).to_html)
-      end 
- 
+        rndr = Glorify::Renderer.new(:use_albino => settings.use_albino)
+        Redcarpet::Markdown.new(rndr, settings.glorify_extensions).render(text)
+      end
+
       def glorify_css
         <<-css
           .hll { background-color: #ffffcc }
@@ -78,42 +74,15 @@ module Sinatra
           .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
         css
       end
-
-      private
-      def highlighter html
-        doc = Nokogiri::HTML(html) 
-        doc.search("//pre[@lang]").each do |pre|  
-          pre.replace colorize(pre.text.rstrip, pre[:lang])
-        end 
-        doc.search('pre').each do |pre|
-          pre.children.each do |c|
-            c.parent = pre.parent
-          end
-          pre.remove 
-        end 
-        doc.search('div').each do |div|
-          if div['class'] == 'highlight'
-           div.replace(Nokogiri.make("<pre>#{div.to_html}</pre>"))
-          end
-        end 
-        doc.to_s 
-      end
-
-      def colorize(code, lang)
-        if(pygmentize?)
-          Albino.colorize(code, lang)
-        else
-          Net::HTTP.post_form(URI.parse('http://pygments.appspot.com/'),
-                              {'code'=>code, 'lang'=>lang}).body
-        end
-      end
-
-      def pygmentize?
-        system 'pygmentize -V'
-      end
     end
- 
+
     def self.registered(app)
+      app.set :use_albino, proc { system 'pygmentize -V' }
+      app.set :glorify_extensions, { :filter_html => true,
+                                     :autolink => true,
+                                     :no_intra_emphasis => true,
+                                     :fenced_code_blocks => true
+                                    }
       app.helpers Glorify::Helpers
       app.get '/pygments.css' do
         glorify_css

data/lib/glorify/renderer.rb

@@ -0,0 +1,25 @@
+require "redcarpet"
+require "albino"
+require "net/http"
+
+module Sinatra
+  module Glorify
+    class Renderer < Redcarpet::Render::HTML
+      attr_reader :use_albino
+
+      def initialize(options={})
+        @use_albino = options.fetch(:use_albino, true)
+        super
+      end
+
+      def block_code(code, lang)
+        if use_albino
+          Albino.colorize(code, lang)
+        else
+          Net::HTTP.post_form(URI.parse('http://pygments.appspot.com/'),
+                              {'code'=>code, 'lang'=>lang}).body
+        end
+      end
+    end
+  end
+end

data/lib/glorify/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Glorify
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: glorify
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Zachary Scott
+- Jonathan Stott
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-01-11 00:00:00 Z
+date: 2012-01-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -39,11 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
+        - 2
         - 0
-        version: "1.0"
+        version: "2.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -94,6 +95,7 @@ files:
 - example/subclassed_app.rb
 - glorify.gemspec
 - lib/glorify.rb
+- lib/glorify/renderer.rb
 - lib/glorify/version.rb
 homepage: http://github.com/zzak/glorify
 licenses: []