glorify 0.3.2 → 0.4.0

data/.travis.yml

@@ -1,14 +1,11 @@
 ---
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
   - ruby-head
-  - jruby-18mode
   - jruby-19mode
   - jruby-head
-  - rbx-18mode
   - rbx-19mode
 notifications:
   recipients:

data/README.md

@@ -4,12 +4,17 @@
 
 Sinatra helper to parse markdown with syntax highlighting like the pros
 
-Renders markdown via redcarpet with syntax highlighting thanks to
-[pygments.rb](https://github.com/tmm1/pygments.rb).
+Renders markdown via [rdoc-rouge](https://github.com/zzak/rdoc-rouge), an
+[RDoc](https://github.com/rdoc/rdoc) and
+[Rouge](https://github.com/jayferd/rouge) bridge.
 
 Able to use fenced code blocks like github, and includes a default pygments
 stylesheet.
 
+## Requirements
+
+Ruby 1.9.2 or greater, also supports JRuby and Rubinius when using 1.9 modes.
+
 ## Installation
 
 ```bash
@@ -28,8 +33,8 @@ gem 'glorify'
 
 Sinatra::Glorify comes with a tilt template for rendering markdown.
 
-This allows you to override the default markdown renderer and use `redcarpet`
-with `pygments.rb` to highlight any code blocks within your view.
+This allows you to override the default markdown renderer and use `rdoc-rouge`
+to highlight any code blocks within your view.
 
 In order to do this, you will need to prefer the template class.
 

data/glorify.gemspec

@@ -9,14 +9,13 @@ Gem::Specification.new do |s|
   s.email       = ["zachary@zacharyscott.net"]
   s.homepage    = "http://zacharyscott.net/glorify/"
   s.summary     = %q{Sinatra helper to parse markdown with syntax highlighting like the pros}
-  s.description = %q{Renders markdown via redcarpet with syntax highlighting thanks to pygments.rb. Able to use fenced code blocks like github, and includes a default pygments stylesheet.}
+  s.description = %q{Renders markdown via rdoc-rouge, an RDoc and Rouge bridge. Able to use fenced code blocks like github, and includes a default pygments stylesheet.}
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "sinatra"
-  s.add_runtime_dependency "redcarpet", "~> 2.0"
-  s.add_runtime_dependency "pygments.rb"
+  s.add_runtime_dependency "rdoc-rouge"
   s.add_runtime_dependency "nokogiri"
 
   s.add_development_dependency "minitest"

data/lib/glorify.rb

@@ -1,6 +1,5 @@
 require "sinatra/base"
 require "glorify/css"
-require "glorify/extensions"
 require "glorify/version"
 require "glorify/renderer"
 require "glorify/template"
@@ -17,12 +16,9 @@ module Sinatra
   module Glorify
     # Sinatra extension setup to configure the application.
     #
-    # Uses +settings.glorify_extensions+ for the Sinatra::Glorify::Renderer
-    #
     # Also, registers the Sinatra::Glorify::Helpers and provides the pygments
     # stylesheet route using Sinatra::Glorify::Helpers.glorify_css.
     def self.registered(app)
-      app.set :glorify_extensions, Glorify::EXTENSIONS
       app.helpers Glorify::Helpers
 
       app.get '/pygments.css' do

data/lib/glorify/helpers.rb

@@ -62,8 +62,7 @@ module Sinatra
       # For modular applications you must add <code>register
       # Sinatra::Helpers</code> to your application.
       def glorify text
-        Redcarpet::Markdown.new(Glorify::Renderer.new,
-                                Glorify::EXTENSIONS).render(text)
+        Glorify::Renderer.render(text.force_encoding('UTF-8'))
       end
     end
   end

data/lib/glorify/renderer.rb

@@ -1,14 +1,7 @@
-require "redcarpet"
-require "pygments.rb"
+require "rdoc/rouge"
 
 module Sinatra
   module Glorify
-    class Renderer < Redcarpet::Render::HTML # :nodoc:
-
-      def block_code(code, lang) # :nodoc:
-        Pygments.highlight(code, :lexer => lang, :options => {:encoding => "utf-8"})
-      end
-
-    end
+    class Renderer < RDoc::Rouge::Renderer; end # :nodoc:
   end
 end

data/lib/glorify/template.rb

@@ -1,4 +1,3 @@
-require 'redcarpet' unless defined? Redcarpet
 require 'tilt/template'
 
 module Sinatra
@@ -6,8 +5,7 @@ module Sinatra
     # Sinatra::Glorify comes with a tilt template for rendering markdown.
     #
     # This allows you to override the default markdown renderer and use
-    # +redcarpet+ with +pygments.rb+ to highlight any code blocks within your
-    # view.
+    # +rdoc-rouge+ to highlight any code blocks within your view.
     #
     # In order to do this, you will need to prefer the template class.
     #
@@ -22,13 +20,12 @@ module Sinatra
     #     end
     class Template < Tilt::Template
       def prepare # :nodoc:
-        @engine = Redcarpet::Markdown.new(Glorify::Renderer.new,
-                                          Glorify::EXTENSIONS)
+        @engine = Glorify::Renderer
         @output = nil
       end
 
       def evaluate(scope, locals, &block) # :nodoc:
-        @output ||= @engine.render(data)
+        @output ||= @engine.render(data.force_encoding('UTF-8'))
       end
     end
   end

data/lib/glorify/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Glorify
     # Current version of Sinatra::Glorify
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

data/spec/glorify_spec.rb

@@ -1,8 +1,4 @@
-begin 
-  require_relative 'spec_helper'
-rescue NameError
-  require File.expand_path('../spec_helper', __FILE__)
-end
+require_relative 'spec_helper'
 
 describe Sinatra::Glorify do
 
@@ -11,7 +7,7 @@ describe Sinatra::Glorify do
       Tilt.prefer Sinatra::Glorify::Template
       get('/') { markdown :header }
     end
-    expected = "<h1>a sip of glory</h1>"
+    expected = "<h1 id=\"label-a+sip+of+glory\">a sip of glory<span><a href=\"#label-a+sip+of+glory\">&para;</a> <a href=\"#documentation\">&uarr;</a></span></h1>"
     get('/')
     assert ok?
     assert_equal expected, body
@@ -22,7 +18,7 @@ describe Sinatra::Glorify do
       Tilt.prefer Sinatra::Glorify::Template
       get('/') { markdown :blocks }
     end
-    expected = "<p><code>puts &quot;Hello, world!&quot;</code></p>"
+    expected = "<pre class=\"highlight text\">&quot;Hello, world!&quot;</pre>"
     get('/')
     assert ok?
     assert_equal expected, body
@@ -37,7 +33,7 @@ describe Sinatra::Glorify do
     end
     get('/')
     assert ok?
-    refute_empty Nokogiri::HTML(body).search("//div[@class = 'highlight']/pre")
+    refute_empty Nokogiri::HTML(body).search("pre.highlight")
   end
 
   it "should parse with a helper" do
@@ -52,7 +48,7 @@ describe Sinatra::Glorify do
     end
     get('/')
     assert ok?
-    refute_empty Nokogiri::HTML(body).search("//div[@class = 'highlight']/pre")
+    refute_empty Nokogiri::HTML(body).search("pre.highlight")
   end
 
   it "should include a valid css helper for pygments" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glorify
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -30,23 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rdoc-rouge
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -157,8 +141,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.0.0
-description: Renders markdown via redcarpet with syntax highlighting thanks to pygments.rb.
-  Able to use fenced code blocks like github, and includes a default pygments stylesheet.
+description: Renders markdown via rdoc-rouge, an RDoc and Rouge bridge. Able to use
+  fenced code blocks like github, and includes a default pygments stylesheet.
 email:
 - zachary@zacharyscott.net
 executables: []
@@ -174,7 +158,6 @@ files:
 - glorify.gemspec
 - lib/glorify.rb
 - lib/glorify/css.rb
-- lib/glorify/extensions.rb
 - lib/glorify/helpers.rb
 - lib/glorify/renderer.rb
 - lib/glorify/template.rb
@@ -200,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3769292332255854767
+      hash: 1006836911274585602
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3769292332255854767
+      hash: 1006836911274585602
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/glorify/extensions.rb

@@ -1,12 +0,0 @@
-module Sinatra
-  module Glorify
-    # Helper for Sinatra::Glorify::Renderer default options.
-    #
-    # Configure in your application through +settings.glorify_extensions+
-    EXTENSIONS = { :filter_html => true,
-                   :autolink => true,
-                   :no_intra_emphasis => true,
-                   :fenced_code_blocks => true
-                 }
-  end
-end