gust 0.1.2 → 0.2.0

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.2
+
+script: 'bundle exec rspec spec'

data/gust.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "gust"
-  s.version     = '0.1.2'
+  s.version     = '0.2.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jeff Kreeftmeijer"]
   s.email       = ["jeff@kreeftmeijer.nl"]
@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'rspec', ['~> 2.0']
-  s.add_dependency 'pygments.rb', ['~> 0.1.2']
-  s.add_dependency 'kramdown', ['~> 0.13.3']
-  s.add_dependency 'RedCloth', ['~> 4.2.7']
+  s.add_dependency 'pygments.rb', ['~> 0.1']
+  s.add_dependency 'redcarpet', ['~> 1.17']
+  s.add_dependency 'RedCloth', ['~> 4.2']
+  s.add_dependency 'nokogiri', ['~> 1.5']
 end

data/lib/gust.rb

@@ -1,19 +1,55 @@
 require 'pygments'
-require 'kramdown'
+require 'redcarpet'
 require 'RedCloth'
+require 'nokogiri'
 
 class Gust
+  extend Pygments
 
-  def self.parse(code, options = {})
-    return "<div class=\"highlight\"><pre>#{code}</pre></div>\n" unless options[:filename]
+  class << self
+
+    def parse(code, options = {})
+      return plain_text(code) unless options[:filename]
+
+      case options[:filename]
+        when /.*\.png$/ then image(options[:url])
+        when /.*\.markdown$/, /.*\.md$/ then markdown(code)
+        when /.*\.textile$/ then textile(code)
+        else highlight(code, options) rescue plain_text(code)
+      end
 
-    case options[:filename]
-      when /.*\.png$/ then "<div class=\"image\"><img src=\"#{options[:url]}\"/></div>\n"
-      when /.*\.markdown$/, /.*\.md$/ then "<div class=\"markup\">#{Kramdown::Document.new(code).to_html}</div>\n"
-      when /.*\.textile$/ then "<div class=\"markup\">#{RedCloth.new(code).to_html}</div>\n"
-      else Pygments.highlight(code, options) rescue "<div class=\"markup\">#{code}</div>\n"
     end
 
+    protected
+
+      def image(src)
+        "<div class=\"image\"><img src=\"#{src}\"/></div>\n"
+      end
+
+      def markdown(markup)
+        inline_highlight(
+          "<div class=\"markup\">" <<
+          Redcarpet.new(markup, :fenced_code, :gh_blockcode).to_html <<
+          "</div>"
+        ) << "\n"
+      end
+
+      def textile(markup)
+        "<div class=\"markup\">#{RedCloth.new(markup).to_html}</div>\n"
+      end
+
+      def plain_text(text)
+        "<div class=\"highlight\"><pre>#{text}</pre></div>\n"
+      end
+
+      def inline_highlight(html)
+        doc = Nokogiri::HTML(html)
+        doc.search("//pre[@lang]").each do |pre|
+          pre.replace highlight(pre.text.rstrip, :lexer => pre[:lang])
+        end
+        doc.xpath('//div[@class="markup"]').to_xml
+      end
+
   end
 
 end

data/spec/gust_spec.rb

@@ -23,7 +23,7 @@ describe Gust do
 
       subject { Gust.parse('foo', :filename => 'foo.bar') }
 
-      it { should == "<div class=\"markup\">foo</div>\n" }
+      it { should == "<div class=\"highlight\"><pre>foo</pre></div>\n" }
 
     end
 
@@ -41,13 +41,21 @@ describe Gust do
 
       it_should_behave_like 'a markdown file'
 
-    end
+      context 'with a Github inline code block' do
 
-    context 'with a markdown file that uses the (wrong) .md extension' do
+        subject { Gust.parse("``` ruby\nfoo\n```", :filename => 'foo.md') }
 
-      subject { Gust.parse('*foo*', :filename => 'foo.md') }
+        it { should == "<div class=\"markup\"><div class=\"highlight\"><pre><span class=\"n\">foo</span>\n</pre>\n</div>\n\n</div>\n" }
 
-      it_should_behave_like 'a markdown file'
+      end
+
+      context 'when using the (wrong) .md extension' do
+
+        subject { Gust.parse('*foo*', :filename => 'foo.md') }
+
+        it_should_behave_like 'a markdown file'
+
+      end
 
     end
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: gust
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -14,19 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 +02:00
+date: 2011-07-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :development
   version_requirements: *id001
@@ -34,44 +28,46 @@ dependencies:
   name: pygments.rb
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
+        version: "0.1"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: kramdown
+  name: redcarpet
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 13
-        - 3
-        version: 0.13.3
+        version: "1.17"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 4
-        - 2
-        - 7
-        version: 4.2.7
+        version: "4.2"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.5"
+  type: :runtime
+  version_requirements: *id005
 description: Syntax highlighting and Markdown/Textile parsing
 email: 
 - jeff@kreeftmeijer.nl
@@ -84,6 +80,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.markdown
 - gust.gemspec
@@ -99,23 +96,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: gust
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Syntax highlighting and Markdown/Textile parsing