pagehub-markdown 0.1.3 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 56b56c658c3c84a4e2aeb30d61c51d9d7a31b7cf
+  data.tar.gz: bf8cd37f12f181b00cd54870bfd8b5f1909945c3
+SHA512:
+  metadata.gz: 37d90d0c5c9e6e9ea77275196e6a8551a8b060a9859d4f71078df472c55b6e9e3adb39a61fe201413ee0ff25ebeb9799e5784e82921c33e0a66ef53bba74a00c
+  data.tar.gz: 4fd843a037d26d38e9bfa5453d4d6a83003018932b7cfd02a8f771d8e603fb2b32a0056ffab183f1fd1d124e0e5e9f95be62555b5e0251d705c31d8e07f430f3

data/lib/pagehub-markdown.rb

@@ -1,5 +1,5 @@
 require 'redcarpet'
-require 'albino'
+require 'pygments'
 
 require 'pagehub-markdown/markdown'
 require 'pagehub-markdown/processors/embedder'

data/lib/pagehub-markdown/markdown.rb

@@ -33,13 +33,22 @@ module PageHub
       # PageHubOptions, RendererOptions, and RendererExtensions
       # for accepted values
       def configure(ph_options = {}, options = {}, extensions = {})
-        @@options  = PageHubOptions.merge(ph_options)
+        @@options  ||= PageHubOptions.dup
+        @@options.merge!(ph_options)
 
         @@renderer = Redcarpet::Markdown.new(
           HTMLWithAlbino.new(RendererOptions.merge(options)),
           RendererExtensions.merge(extensions))
       end
 
+      def reset_config()
+        @@options = PageHubOptions.dup
+      end
+
+      def options
+        @@options
+      end
+
       def render!(str)
         configure
 
@@ -47,10 +56,7 @@ module PageHub
 
         # escape any JavaScript snippets
         if @@options[:escape_scripts]
-          str.gsub!(/\<script(.*)\>/i) {
-            mutated = true
-            "&lt;script#{$1}&gt;"
-          }
+          str.gsub!(%r{<([^>]*)script[^>]*>}, "&lt;\\1script&gt;")
         end
 
         str = @@renderer.render(str)
@@ -61,7 +67,9 @@ module PageHub
       end
 
       def render(str)
-        o = str.dup; render!(o); o
+        str.dup.tap do |md|
+          render!(md)
+        end
       end
 
       def mutate!(str)
@@ -80,7 +88,8 @@ module PageHub
     @@options   = { }
 
     PageHubOptions = {
-      escape_scripts:   true
+      escape_scripts:   true,
+      plain_errors:     true
     }
 
     RendererOptions = {
@@ -112,10 +121,11 @@ module PageHub
       def block_code(code, language)
         begin
           # TODO: try to figure out whether @language is valid
-          out = Albino.colorize(code, language)
+          out = Pygments.highlight(code, { lexer: language.to_s, encoding: 'utf-8' })
         rescue Exception => e
-          out = ""
           # return "-- INVALID CODE BLOCK, MAKE SURE YOU'VE SURROUNDED CODE WITH ```"
+          puts "[warn] pagehub-markdown: unable to highlight code block for language #{language}. Reason: #{e.message}"
+          out = ""
         end
 
         # just render the code as plain text if the language is invalid

data/lib/pagehub-markdown/processors/embedder.rb

@@ -9,7 +9,6 @@ module Markdown
   # and allows for content extraction from HTML pages
   # so it can be neatly embedded in another page.
   module Embedder
-
     class EmbeddingError    < RuntimeError; end
     class InvalidSizeError  < EmbeddingError; end
     class InvalidTypeError  < EmbeddingError; end
@@ -54,9 +53,12 @@ module Markdown
           # reject if the host is banned
           return "" if FilteredHosts.include?(uri.host)
 
-          Net::HTTP.start(uri.host, uri.port) do |http|
-            http.open_timeout = Timeout
-            http.read_timeout = Timeout
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.open_timeout = Timeout
+          http.read_timeout = Timeout
+          http.use_ssl      = (uri.scheme == 'https')
+
+          http.start do
 
             # get the content type and length
             ctype = ""
@@ -92,7 +94,7 @@ module Markdown
           raise e
         rescue Exception => e
           # mask as a generic EmbeddingError
-          raise EmbeddingError.new e.message
+          raise EmbeddingError.new "generic: #{e.class}##{e.message}"
         end
 
         ""
@@ -183,7 +185,7 @@ module Markdown
           }
         end
 
-        node
+        node.to_s
       end
 
     end
@@ -204,18 +206,19 @@ module Markdown
         node.xpath('div[@id="breadcrumbs"]').remove
         node.xpath('div[@id="bottom"]').remove
         stamp(node, uri, 'pagehub')
-        node
+        node.to_s
       end
     end
 
     register_processor(GithubWikiProcessor.new)
     register_processor(PageHubProcessor.new)
 
+    MATCH = /^\B\[\![include|embed]\s?(.*)\!\]\((.*)\)/
   end # Embedder module
 
   add_processor :pre_render, lambda {|str|
     # Embed remote references, if any
-    str.gsub!(/^\B\[\!include\s?(.*)\!\]\((.*)\)/) {
+    str.gsub!(Embedder::MATCH) {
       content = ""
 
       uri = $2
@@ -227,6 +230,15 @@ module Markdown
 
       begin
         content = Embedder.get_resource(uri, source, args)
+        content.gsub!(Embedder::MATCH) {
+          source, uri = ($1 || '').split.first, $2
+
+          s = "[See this indirectly embedded resource"
+          s << source.empty? ? '' : " from '#{source}'"
+          s << ": #{uri}]"
+          s << "(#{uri})"
+          s
+        }
       rescue Embedder::InvalidSizeError => e
         content << "**Embedding error**: the file you tried to embed is too big - #{e.message.to_i} bytes."
         content << " (**Source**: [#{$2}](#{$2}))\n\n"

data/lib/pagehub-markdown/processors/toc_generator.rb

@@ -1,6 +1,7 @@
 module PageHub
 module Markdown
   module ToC
+    FENCED_CODE_BLOCKS = /```[^`]+```/xm
 
     # Builds a tree of headings from a given block of Markdown
     # text, the returned list can be turned into HTML using
@@ -24,7 +25,7 @@ module Markdown
       headings  = []
       current   = []
       toc_index = 0
-      content.scan(pattern).each { |l, t|
+      content.gsub(FENCED_CODE_BLOCKS, '').scan(pattern).each { |l, t|
         level,title = formatter.call(l, t)
 
         if level <= threshold
@@ -73,7 +74,7 @@ module Markdown
       def to_html()
         html = ""
         html << "<li>"
-        html << "<a href=\"\#toc_#{index}\">" << title << "</a>"
+        html << "<a href=\"\##{header_anchor(title)}\">" << title << "</a>"
 
         if children.any? then
           html << "<ol>"
@@ -83,6 +84,12 @@ module Markdown
 
         html << "</li>"
       end
+
+      private
+
+      def header_anchor(title)
+        CGI.escapeHTML(title.downcase.gsub(/\s+/, '-'))
+      end
     end
   end
 

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: pagehub-markdown
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Ahmad Amireh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
-  name: albino
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.6.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.6.3.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A bunch of extensions added to the Markdown renderer usable as pure Markdown
@@ -99,33 +88,33 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/pagehub-markdown.rb
-- lib/pagehub-markdown/processors/toc_generator.rb
-- lib/pagehub-markdown/processors/pagehub_options.rb
-- lib/pagehub-markdown/processors/embedder.rb
 - lib/pagehub-markdown/markdown.rb
 - lib/pagehub-markdown/mutators/date_injector.rb
+- lib/pagehub-markdown/processors/embedder.rb
+- lib/pagehub-markdown/processors/pagehub_options.rb
+- lib/pagehub-markdown/processors/toc_generator.rb
 homepage: https://github.com/amireh/pagehub-markdown
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PageHub's extensions of GitHub's Redcarpet Markdown renderer.
 test_files: []
+has_rdoc: