content-pipeline 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c0d469321e4e6b79286994aa83543cd22a1240
-  data.tar.gz: 179a18c1fd8cc5768391d76e2f63533cf8da504c
+  metadata.gz: 99982146710eb42b199f6f0d9af72351654c2477
+  data.tar.gz: 93180e18ff0229a46cd1d21cc78ddf42b4d4e780
 SHA512:
-  metadata.gz: 4fa0edd425a2aba990865bbd7756af610e8ae64f777d757bb0a24f6c361ed5ee7520c0dcb3c263c83a0baf61be9125dd41eb0acbc5e0561aee1636eb3849882b
-  data.tar.gz: 08ebb13c9783c5b3f75c16541388d7238423a417f45e631eb7b53ceb71bd2180940a5bd0cadce0eebc5e72d66d8603e4eb7a577e1d1a0f97119752d174b66385
+  metadata.gz: 24cef63ca9907370b1f6809eef8464806e75a97df2370100681d33aac94245d31108623f9db673ed7353f6849468de1c8bbd98351df59c71a249c29b85877210
+  data.tar.gz: bf3541baf1aa6e64118515e75a3e17b2ec18acc2d5c5cdf3c35bdd1f3b00161c20b60bf32d3e498de548bee18632ccc9540e0949832bf35258760c0d3d459542

data/Gemfile

@@ -10,5 +10,6 @@ group :development do
   unless RbConfig::CONFIG["ruby_install_name"] == "jruby"
     gem "pygments.rb"
     gem "github-markdown"
+    gem "redcarpet"
   end
 end

data/lib/content/pipeline.rb

@@ -6,11 +6,6 @@ module Content
     require_relative "pipeline/filters"
     attr_reader :filters, :opts
 
-    # -------------------------------------------------------------------------
-    # @arg Array: The filters you would like to use or next:
-    # @arg Hash : Your "default options" that should be "global."
-    # -------------------------------------------------------------------------
-
     def initialize(filters = nil, opts = nil)
       if filters.is_a?(Hash) && opts.nil?
         opts = filters
@@ -23,11 +18,6 @@ module Content
       @opts, @filters = opts.freeze, [ filters ].flatten.freeze
     end
 
-    # -------------------------------------------------------------------------
-    # @arg String: The incomming string that will be modified.
-    # @arg Hash  : The secondary opts to override the "defaults".
-    # -------------------------------------------------------------------------
-
     def filter(out, opts = {})
       return out if out.nil? || out.empty? || @filters.empty?
 
@@ -42,10 +32,6 @@ module Content
     out
     end
 
-    # -------------------------------------------------------------------------
-    # @arg Object: An object (preferably a class or module.)
-    # -------------------------------------------------------------------------
-
     private
     def to_opt(cls)
       cls = cls.name.split(/::/).last
@@ -55,10 +41,6 @@ module Content
         underscore_cls(cls) ].uniq.map(&:to_sym)
     end
 
-    # -------------------------------------------------------------------------
-    # @arg String: The name of the class you wish to adjust.
-    # -------------------------------------------------------------------------
-
     private
     def underscore_cls(cls)
       (cls[0].downcase + cls[1..-1]).gsub(/([A-Z])/) do

data/lib/content/pipeline/core_extensions/object_ext.rb

@@ -6,8 +6,6 @@ module CoreExtensions
       RbConfig::CONFIG["ruby_install_name"] == "jruby"
     end
 
-    # -------------------------------------------------------------------------
-
     def to_nokogiri_fragment
       return self if self.is_a?(Nokogiri::HTML::DocumentFragment)
       Nokogiri::HTML.fragment(self.to_s)

data/lib/content/pipeline/filters.rb

@@ -10,16 +10,10 @@ class Content::Pipeline
     def_delegator "self.class.filters", :[]
     def_delegator "self.class", :filters
 
-    # -------------------------------------------------------------------------
-
     def initialize(str, opts = nil)
       @opts, @str = (opts || {}), str
     end
 
-    # -------------------------------------------------------------------------
-    # @arg Array: The next filter in the chain, to check the types.
-    # -------------------------------------------------------------------------
-
     def run(next_filter = nil)
       return @str unless size > 0
 
@@ -44,10 +38,6 @@ class Content::Pipeline
     class << self
       attr_reader :filters
 
-      # -----------------------------------------------------------------------
-      # @arg Hash: The filters and the type of input they prefer.
-      # -----------------------------------------------------------------------
-
       def add_filter(*filters)
         @filters ||= []
 
@@ -69,8 +59,6 @@ class Content::Pipeline
     end
   end
 
-  # ---------------------------------------------------------------------------
-
   module Filters
     require_relative "filters/markdown"
     DEFAULT_FILTERS = [ Markdown ].freeze

data/lib/content/pipeline/filters/code_highlight.rb

@@ -5,8 +5,6 @@ class Content::Pipeline::Filters::CodeHighlight < Content::Pipeline::Filter
     :highlight => :nokogiri
   })
 
-  # ---------------------------------------------------------------------------
-
   Matcher = /<pre>(.+)<\/pre>/m
   Templates = {
     :numb => %Q{<span class="line-number">%s</span>\n},
@@ -35,15 +33,11 @@ class Content::Pipeline::Filters::CodeHighlight < Content::Pipeline::Filter
     HTML
   }
 
-  # ---------------------------------------------------------------------------
-
   def initialize(*args)
     super(*args)
     @opts[:gutter] = true if @opts[:gutter].nil?
   end
 
-  # ---------------------------------------------------------------------------
-
   private
   def highlight
     @str = @str.to_nokogiri_fragment
@@ -53,11 +47,6 @@ class Content::Pipeline::Filters::CodeHighlight < Content::Pipeline::Filter
     end
   end
 
-  # ---------------------------------------------------------------------------
-  # @arg String: The "multi-line" string you wish to parse.
-  # @arg String: The "programming language" you wish to highlight as.
-  # ---------------------------------------------------------------------------
-
   private
   def wrap(str, lang)
     lines, numbs = "", ""
@@ -81,11 +70,6 @@ class Content::Pipeline::Filters::CodeHighlight < Content::Pipeline::Filter
     end
   end
 
-  # ---------------------------------------------------------------------------
-  # @arg String: The "multi-line" string you wish to highlight.
-  # @arg String: The lang you wish to use when highlighting the string.
-  # ---------------------------------------------------------------------------
-
   private
   def pygments(str, lang)
     return str if jruby? || ! Pygments::Lexer[lang]

data/lib/content/pipeline/filters/gemoji.rb

@@ -10,22 +10,12 @@ class Content::Pipeline::Filters::Gemoji < Content::Pipeline::Filter
     :gemoji => :nokogiri
   })
 
-  # ---------------------------------------------------------------------------
-  # This is a simple wrapper method around the default initialize.
-  # ---------------------------------------------------------------------------
-
   def initialize(*args)
     super(*args)
     # I should make this an addon.
     @opts[:asset_path] ||= "/assets"
   end
 
-  # ---------------------------------------------------------------------------
-  # Because of the way that Nokogiri behaves we need to go out of our
-  # way and ensure that we capture both text nodes in the root and
-  # text nodes in elements (such as paragraphs and shit like that...)
-  # ---------------------------------------------------------------------------
-
   private
   def gemoji
     @str = @str.to_nokogiri_fragment
@@ -36,10 +26,6 @@ class Content::Pipeline::Filters::Gemoji < Content::Pipeline::Filter
     end
   end
 
-  # ---------------------------------------------------------------------------
-  # @arg Nokogiri::XML::Text: The Text node you wish to parse.
-  # ---------------------------------------------------------------------------
-
   def parse_node(node)
     return node if node.ancestors.any? do |n|
       n.node_name == "code" || n.node_name == "pre"

data/lib/content/pipeline/filters/markdown.rb

@@ -20,11 +20,14 @@ class Content::Pipeline::Filters::Markdown < Content::Pipeline::Filter
     @type = @opts.fetch(:type, default)
     @str  = backtick(@str)
     @str  = case
+    when @type =~ /\Akramdown\Z/   then parse_kramdown
     when @type =~ /\Agithub|gfm\Z/ then parse_github
-    when @type =~ /\Akramdown\Z/ then parse_kramdown
+    when @type =~ /\Aredcarpet\Z/  then parse_redcarpet
     when @type =~ /\Amarkdown|md\Z/
-      begin parse_github; rescue LoadError
-        parse_kramdown
+      begin parse_redcarpet; rescue LoadError
+        begin parse_kramdown; rescue LoadError
+          parse_github
+        end
       end
     else
       # Actually needed now days.
@@ -32,6 +35,19 @@ class Content::Pipeline::Filters::Markdown < Content::Pipeline::Filter
     end
   end
 
+  private
+  def parse_redcarpet
+    require "redcarpet"
+    with = Redcarpet::Render::HTML
+    (@opts[:parser_opts] ||= {}).merge!({
+      :fenced_code_blocks => true
+    })
+
+    Redcarpet::Markdown.new(with, @opts[:parser_opts]).render(
+      @str
+    )
+  end
+
   private
   def parse_github
     require "github/markdown"
@@ -40,8 +56,12 @@ class Content::Pipeline::Filters::Markdown < Content::Pipeline::Filter
 
   private
   def parse_kramdown
+    (@opts[:parser_opts] ||= {}).merge!({
+      :enable_coderay => false
+    })
+
     require "kramdown"
-    str = Kramdown::Document.new(@str, :enable_coderay => false)
+    str = Kramdown::Document.new(@str, @opts[:parser_opts])
     normalize_kramdown(str.to_html).strip
   end
 

data/lib/content/pipeline/jekyll/converter.rb

@@ -2,26 +2,18 @@ require "content/pipeline"
 
 module Content::Pipeline::Jekyll
   class Converter < Jekyll::Converter
-    CONTENT_PIPELINE = Content::Pipeline.new
+    ContentPipeline = Content::Pipeline.new
 
     def matches(ext)
       ext =~ /\.(md|markdown)\Z/
     end
 
-    # -------------------------------------------------------------------------
-
     def output_ext(ext)
       ".html"
     end
 
-    # -------------------------------------------------------------------------
-    # It should be noted that MARKDOWN_CONVERTOR uses the default options
-    # provided by Content::Pipeline at:
-    #   https://github.com/envygeeks/content-pipeline
-    # -------------------------------------------------------------------------
-
     def convert(data)
-      CONTENT_PIPELINE.filter(data)
+      ContentPipeline.filter(data)
     end
   end
 end

data/lib/content/pipeline/version.rb

@@ -1,5 +1,5 @@
 module Content
   class Pipeline
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,126 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: content-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jordon Bedwell
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: envygeeks-coveralls
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: envygeeks-coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  prerelease: false
+        version: '1.0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: luna-rspec-formatters
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: luna-rspec-formatters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: A less restrictive version of html-pipeline for content.
 email: envygeeks@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Readme.md
+- Gemfile
 - License
 - Rakefile
-- Gemfile
+- Readme.md
 - lib/content/pipeline.rb
-- lib/content/pipeline/filters.rb
-- lib/content/pipeline/version.rb
-- lib/content/pipeline/core_extensions/object_ext.rb
 - lib/content/pipeline/core_extensions/hash_ext.rb
-- lib/content/pipeline/jekyll/converter.rb
+- lib/content/pipeline/core_extensions/object_ext.rb
+- lib/content/pipeline/filters.rb
 - lib/content/pipeline/filters/code_highlight.rb
 - lib/content/pipeline/filters/gemoji.rb
 - lib/content/pipeline/filters/markdown.rb
+- lib/content/pipeline/jekyll/converter.rb
+- lib/content/pipeline/version.rb
 homepage: https://github.com/envygeeks/content-pipeline
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.1
+signing_key: 
 specification_version: 4
 summary: Adds a pipeline for your content.
 test_files: []