postmarkdown 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d1259762f115e6a4e14f0332a811e0021535cbc
-  data.tar.gz: 75c1cf02cdd1949f674fd295664e6aa723cc3854
+  metadata.gz: 39584271054fe1a1f30ce61cde326c8c068c9f81
+  data.tar.gz: b4cd96a67850bda71f46f55d1b0650942e6affa4
 SHA512:
-  metadata.gz: 314879f2b718f06915f50e76a4f01d8ee2913ee6a94c6f787a37edca586aa1c7d0404f6f545690014bf51d482abc5c6d198d35eef30087afb2935a01a585b73f
-  data.tar.gz: 7850455b8b7522e47eb06c6a34f3ab2f5b5f76292f500f7021a484f5ee6d67aa7837d54443b8ffee97142d59f1d8cc19e6f2b4f13f0f0e671f1ab4492a4063a7
+  metadata.gz: febf77d5f33061acf85b890173af01111b9fd92eb72e53ae9c201a5a882fa04060be035f45fb8d7ac0b736c949d4bc4e2f465208a1f0b16f90d94c5ace87259d
+  data.tar.gz: 675831ce290bc902294d845041d4ce51268f39dd3ad4b10b26bac2753c317012cd0f24ce9323d85c8df2a348cc78bb06278a8f3f6e3cbac8c9a25d5e25c6bf5b

data/README.markdown

@@ -86,6 +86,42 @@ Postmarkdown comes with minimal built-in theme for your convenience.
 
     Postmarkdown::Config.options[:layout] = 'postmarkdown'
 
+## Syntax Highlighting
+
+Postmarkdown supports fenced code blocks which allows you to add syntax
+highlighting with an optional language identifier. For example, to
+syntax highlight Ruby code:
+
+    ```ruby
+    require 'some_gem'
+    class RubyClass
+      def some_method
+        puts "string"
+      end
+    end
+    ```
+
+This will add CSS classes to the HTML, but you still need to a
+stylesheet to visually highlight the code. Postmarkdown ships with a
+GitHub-like set of styles.
+
+In your `app/assets/stylesheets/application.css`, include the CSS file:
+
+```css
+/*
+ *= require postmarkdown/syntax/github
+ */
+```
+
+Or if you're using SCSS:
+
+```scss
+@import "postmarkdown/syntax/github";
+```
+
+Postmarkdown adds highlighting to your code using [Rouge](https://github.com/jayferd/rouge).
+See the [demo page](http://rouge.jayferd.us/demo) for supported languages and styles.
+
 ## Customizing Routes
 
 By default Postmarkdown will setup all routes to go through the `/posts/*` path. For example:

data/app/helpers/post_helper.rb

@@ -15,6 +15,6 @@ module PostHelper
   end
 
   def post_content_html(post)
-    RDiscount.new(render(:inline => post.content)).to_html.html_safe
+    Postmarkdown::MarkdownRenderer.new.render(render(:inline => post.content)).html_safe
   end
 end

data/app/views/layouts/postmarkdown.html.haml

@@ -3,6 +3,7 @@
   %head
     %title= Postmarkdown::Util.app_name
     = stylesheet_link_tag 'postmarkdown/postmarkdown'
+    = stylesheet_link_tag 'postmarkdown/syntax/github'
     = yield :head
   %body
     %header#header

data/lib/postmarkdown/engine.rb

@@ -2,7 +2,8 @@ module Postmarkdown
   require 'postmarkdown'
   require 'rails'
   require 'gravtastic'
-  require 'rdiscount'
+  require 'redcarpet'
+  require 'rouge'
   require 'nokogiri'
   require 'action_view'
   require 'haml'

data/lib/postmarkdown/markdown_renderer.rb

@@ -0,0 +1,17 @@
+require 'rouge/plugins/redcarpet'
+
+module Postmarkdown
+  class MarkdownRenderer
+    class HTMLWithRouge < Redcarpet::Render::HTML
+      include Rouge::Plugins::Redcarpet
+    end
+
+    def initialize
+      @markdown = ::Redcarpet::Markdown.new(HTMLWithRouge, :fenced_code_blocks => true)
+    end
+
+    def render(text)
+      @markdown.render(text)
+    end
+  end
+end

data/lib/postmarkdown/version.rb

@@ -1,3 +1,3 @@
 module Postmarkdown
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/postmarkdown.rb

@@ -3,3 +3,4 @@ require 'postmarkdown/config'
 require 'postmarkdown/routes'
 require 'postmarkdown/railtie'
 require 'postmarkdown/util'
+require 'postmarkdown/markdown_renderer'

data/postmarkdown.gemspec

@@ -25,8 +25,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'haml', ['>= 3.1', '< 5']
   s.add_dependency 'gravtastic'
   s.add_dependency 'nokogiri'
-  s.add_dependency 'rdiscount'
+  s.add_dependency 'redcarpet'
   s.add_dependency 'kaminari'
+  s.add_dependency 'rouge'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rspec-rails', '~> 2.8'

data/spec/integrations/posts_spec.rb

@@ -139,7 +139,14 @@ describe 'Post views', :type => :request do
     end
 
     it 'should preserve whitespace on code blocks' do
-      page.source.should match '<pre><code>First line of code.&#x000A;  Second line of code.&#x000A;</code></pre>'
+      code_block = Nokogiri::HTML(page.source).at('pre')
+      code_block.text.should eq "example = ->\n  alert 'Example'"
+    end
+
+    it 'should highlight code blocks' do
+      code_block = Nokogiri::HTML(page.source).at('pre')
+      span_classes = code_block.css('span').map { |span| span[:class] }
+      span_classes.should include 'nx', 'o', 's'
     end
 
     it 'should allow calling Rails helpers via ERB tags' do

data/spec/internal/app/posts/2011-05-01-full-metadata.markdown

@@ -9,7 +9,9 @@ First paragraph of content.
 
 Second paragraph of content.
 
-    First line of code.
-      Second line of code.
+``` coffeescript
+example = ->
+  alert 'Example'
+```
 
 <%= content_tag :p, "Paragraph created by Rails helper" %>

data/vendor/assets/stylesheets/postmarkdown/syntax/github.css

@@ -0,0 +1,61 @@
+.hll { background-color: #ffffcc }
+.c { color: #999988; font-style: italic } /* Comment */
+.err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.k { color: #000000; font-weight: normal } /* Keyword */
+.o { color: #000000; font-weight: normal } /* Operator */
+.cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.cp { color: #999999; font-weight: normal; font-style: italic } /* Comment.Preproc */
+.c1 { color: #999988; font-style: italic } /* Comment.Single */
+.cs { color: #999999; font-weight: normal; font-style: italic } /* Comment.Special */
+.gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.ge { color: #000000; font-style: italic } /* Generic.Emph */
+.gr { color: #aa0000 } /* Generic.Error */
+.gh { color: #999999 } /* Generic.Heading */
+.gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.go { color: #888888 } /* Generic.Output */
+.gp { color: #555555 } /* Generic.Prompt */
+.gs { font-weight: normal } /* Generic.Strong */
+.gu { color: #aaaaaa } /* Generic.Subheading */
+.gt { color: #aa0000 } /* Generic.Traceback */
+.kc { color: #000000; font-weight: normal } /* Keyword.Constant */
+.kd { color: #000000; font-weight: normal } /* Keyword.Declaration */
+.kn { color: #000000; font-weight: normal } /* Keyword.Namespace */
+.kp { color: #000000; font-weight: normal } /* Keyword.Pseudo */
+.kr { color: #000000; font-weight: normal } /* Keyword.Reserved */
+.kt { color: #445588; font-weight: normal } /* Keyword.Type */
+.m { color: #009999 } /* Literal.Number */
+.s { color: #d01040 } /* Literal.String */
+.na { color: #008080 } /* Name.Attribute */
+.nb { color: #0086B3 } /* Name.Builtin */
+.nc { color: #445588; font-weight: normal } /* Name.Class */
+.no { color: #008080 } /* Name.Constant */
+.nd { color: #3c5d5d; font-weight: normal } /* Name.Decorator */
+.ni { color: #800080 } /* Name.Entity */
+.ne { color: #990000; font-weight: normal } /* Name.Exception */
+.nf { color: #990000; font-weight: normal } /* Name.Function */
+.nl { color: #990000; font-weight: normal } /* Name.Label */
+.nn { color: #555555 } /* Name.Namespace */
+.nt { color: #000080 } /* Name.Tag */
+.nv { color: #008080 } /* Name.Variable */
+.ow { color: #000000; font-weight: normal } /* Operator.Word */
+.w { color: #bbbbbb } /* Text.Whitespace */
+.mf { color: #009999 } /* Literal.Number.Float */
+.mh { color: #009999 } /* Literal.Number.Hex */
+.mi { color: #009999 } /* Literal.Number.Integer */
+.mo { color: #009999 } /* Literal.Number.Oct */
+.sb { color: #d01040 } /* Literal.String.Backtick */
+.sc { color: #d01040 } /* Literal.String.Char */
+.sd { color: #d01040 } /* Literal.String.Doc */
+.s2 { color: #d01040 } /* Literal.String.Double */
+.se { color: #d01040 } /* Literal.String.Escape */
+.sh { color: #d01040 } /* Literal.String.Heredoc */
+.si { color: #d01040 } /* Literal.String.Interpol */
+.sx { color: #d01040 } /* Literal.String.Other */
+.sr { color: #009926 } /* Literal.String.Regex */
+.s1 { color: #d01040 } /* Literal.String.Single */
+.ss { color: #990073 } /* Literal.String.Symbol */
+.bp { color: #999999 } /* Name.Builtin.Pseudo */
+.vc { color: #008080 } /* Name.Variable.Class */
+.vg { color: #008080 } /* Name.Variable.Global */
+.vi { color: #008080 } /* Name.Variable.Instance */
+.il { color: #009999 } /* Literal.Number.Integer.Long */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmarkdown
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jason Weathered
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,7 @@ files:
 - lib/postmarkdown.rb
 - lib/postmarkdown/config.rb
 - lib/postmarkdown/engine.rb
+- lib/postmarkdown/markdown_renderer.rb
 - lib/postmarkdown/railtie.rb
 - lib/postmarkdown/routes.rb
 - lib/postmarkdown/util.rb
@@ -273,6 +288,7 @@ files:
 - spec/support/data/posts/2015-02-13-custom-title.markdown
 - spec/support/data/posts/missing-date-from-filename.markdown
 - vendor/assets/stylesheets/postmarkdown/postmarkdown.css
+- vendor/assets/stylesheets/postmarkdown/syntax/github.css
 homepage: ''
 licenses:
 - MIT