content-pipeline 1.3.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 991fd8e8b431cb824d231a1b1fe560d787265c85
-  data.tar.gz: 6fe340c02196d5f801c2f2e192ddc05949f1430b
+  metadata.gz: bba12870b71565c1fea769e7d42efdc24e6c81c6
+  data.tar.gz: 5790bc5e711b6fd67ab6bfa5b2d0db3a902c8331
 SHA512:
-  metadata.gz: a1e6a1ed2fe1fdc8166f000b9e77f700bdfa554d0b2abcdbfbb398d40acfa5c2731eac8da6e2bd96dbc3afbe5557b0585fc901ddfb9aecbe931de0d84b5c679e
-  data.tar.gz: c5525d697339e39b0aa98d7f0d963ef02fceed5109dd9958a92331b55ded6591202b46a403a397aa2fb2465c5ee7183ee97aaa8a223b18690632e73c9a000b03
+  metadata.gz: 5412086ab63a43647abcf2a0f8da42718dd6ab735957b890a3c851def70531398a8edaa72489177536a6581d1befc2a5622a0d0c8fded8615f218302b8ffecd5
+  data.tar.gz: 3d4b8f9616ad5f9ffea5f369f17e657722587cb0d2c15ca3bb84527fe242760671cec73eec751355cb481d93b0e4f0c4c742a5e023605bfdad8f6b0995ee042b

data/Readme.md

@@ -1,6 +1,6 @@
 # Content Pipeline.
 
-[![Build Status](https://travis-ci.org/envygeeks/content-pipeline.png?branch=master)](https://travis-ci.org/envygeeks/content-pipeline) [![Coverage Status](https://coveralls.io/repos/envygeeks/content-pipeline/badge.png)](https://coveralls.io/r/envygeeks/content-pipeline) [![Code Climate](https://codeclimate.com/github/envygeeks/content-pipeline.png)](https://codeclimate.com/github/envygeeks/content-pipeline) [![Dependency Status](https://gemnasium.com/envygeeks/content-pipeline.png)](https://gemnasium.com/envygeeks/content-pipeline)
+[![Build Status](https://travis-ci.org/envygeeks/ruby-content-pipeline.png?branch=master)](https://travis-ci.org/envygeeks/ruby-content-pipeline) [![Coverage Status](https://coveralls.io/repos/envygeeks/content-pipeline/badge.png)](https://coveralls.io/r/envygeeks/content-pipeline) [![Code Climate](https://codeclimate.com/github/envygeeks/content-pipeline.png)](https://codeclimate.com/github/envygeeks/content-pipeline) [![Dependency Status](https://gemnasium.com/envygeeks/content-pipeline.png)](https://gemnasium.com/envygeeks/content-pipeline)
 
 
 Content pipeline is like `html-pipeline` except it's less restrictive.
@@ -81,7 +81,7 @@ Options:
 *You should not need to adjust any of your "\`\`\`" because the `Markdown` filter will automatically convert those to `~~~` if you choose Kramdown.  This is not done because one way is
 better than the other, it's done so that people can remain agnostic.*
 
-### Content::Pipeline::Filters::CodeHighlight
+### Content::Pipeline::Filters::Code
 
 The code highlight filter allows you to highlight code, with or without Pygments.  If Pygments is supported it will require it and syntax highlight, otherwise it will simply wrap your code in the normal code style and not syntax highlight it.  You will still have the line numbers, just not the fancy syntax highlight.
 

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

@@ -0,0 +1,51 @@
+unless jruby?
+  require "pygments"
+end
+
+class Content::Pipeline::Filters::Code < Content::Pipeline::Filter
+  add_filter({
+    :highlight => :nokogiri
+  })
+
+  Matcher = /<pre>(.+)<\/pre>/m
+  Templates = {
+    :numb => %Q{<span class="line-number">%s</span>\n},
+    :line => '<span class="line">%s</span>',
+    :wrap => <<-HTML,
+      <figure class="highlight">
+        <pre>
+          <code class="%s">
+            %s
+          </code>
+        </pre>
+      </figure>
+    HTML
+  }
+
+  def initialize(*args)
+    super(
+      *args
+    )
+  end
+
+  private
+  def highlight
+    @str = @str.to_nokogiri_fragment
+    @str.search("pre > code").each do |node|
+      lang = node[:class] || node.parent[:lang] || \
+        @opts[:default] || "ruby"
+
+      node.parent.replace(
+        Templates[:wrap] % [
+          lang, pygments(node.inner_text, lang)
+        ]
+      )
+    end
+  end
+
+  private
+  def pygments(str, lang)
+    return str if jruby? || !Pygments::Lexer[lang]
+    Pygments::Lexer[lang].highlight(str) =~ Matcher ? $1 : str
+  end
+end

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

@@ -11,23 +11,25 @@ class Content::Pipeline::Filters::Gemoji < Content::Pipeline::Filter
 
   def initialize(*args)
     super(*args)
-    # I should make this an addon.
-    @opts[:asset_path] ||= "/assets"
+    @opts[:asset_path] ||= \
+      "/assets"
   end
 
   private
   def gemoji
     @str = @str.to_nokogiri_fragment
-    [:xpath, :search].each do |t|
-      @str.send(t, "text()").each do |n|
-        parse_node(n)
-      end
+    @str.xpath(".//child::text()").each do |n|
+      parse_node(
+        n
+      )
     end
   end
 
   def parse_node(node)
     return node if node.ancestors.any? do |n|
-      n.node_name == "code" || n.node_name == "pre"
+      ["pre", "code"].include?(
+        n.node_name
+      )
     end
 
     node.replace(node.to_html.gsub(EmojiPattern) do
@@ -37,10 +39,14 @@ class Content::Pipeline::Filters::Gemoji < Content::Pipeline::Filter
       if ! @opts[:tag] && ! @opts[:tag].is_a?(Proc)
         if @opts[:as_liquid_asset]
           then EmojiLiquidTag % [ep, en]
-          else EmojiTag % [ep, en]
+          else EmojiTag % [
+            ep, en
+          ]
         end
       else
-        @opts[:tag].call(ep, en)
+        @opts[:tag].call(
+          ep, en
+        )
       end
     end)
   end

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

@@ -0,0 +1,15 @@
+class Content::Pipeline::Filters::Https < Content::Pipeline::Filter
+  HttpRegexp = /\A(\/\/|http:\/\/)/
+  add_filter({
+    :https => :nokogiri
+  })
+
+  def https
+    @str = @str.to_nokogiri_fragment
+    @str.xpath(".//a").select { |v| v[:href] =~ HttpRegexp }.each do |v|
+      v[:href] = v[:href].gsub(
+        HttpRegexp, "https://"
+      )
+    end
+  end
+end

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

@@ -72,7 +72,7 @@ class Content::Pipeline::Filters::Markdown < Content::Pipeline::Filter
       @str = @str.to_nokogiri_fragment
       private_methods(false).keep_if { |m| m =~ /\Astrip_/ }.each do |m|
         unless m == :strip_html
-          send(m)
+          then send(m)
         end
       end
     end
@@ -80,15 +80,21 @@ class Content::Pipeline::Filters::Markdown < Content::Pipeline::Filter
 
   private
   def strip_links
-    @str.search("a").each do |n|
-      n.replace(n[:href])
+    @str.xpath(".//a").each do |n|
+      n.replace(
+        n[
+          :href
+        ]
+      )
     end
   end
 
   private
   def strip_image
-    @str.search("img").each do |n|
-      n.parent.children.count == 1 ? n.parent.remove : n.remove
+    @str.xpath(".//img").each do |n|
+      if n.parent.children.count == 1
+        then n.parent.remove else n.remove
+      end
     end
   end
 
@@ -99,7 +105,8 @@ class Content::Pipeline::Filters::Markdown < Content::Pipeline::Filter
 
   private
   def normalize_kramdown(str)
-    str.gsub(/<pre><code class="language-([A-Za-z0-9]+)">/, \
-      '<pre lang="\\1"><code>')
+    str.gsub(
+      /<pre><code class="language-([A-Za-z0-9]+)">/, '<pre lang="\\1"><code>'
+    )
   end
 end

data/lib/content/pipeline/version.rb

@@ -1,5 +1,5 @@
 module Content
   class Pipeline
-    VERSION = "1.3.6"
+    VERSION = "2.0.0"
   end
 end

data/lib/content/pipeline.rb

@@ -35,10 +35,9 @@ module Content
     private
     def to_opt(cls)
       cls = cls.name.split(/::/).last
-
-      [
-        cls.downcase,
-        underscore_cls(cls) ].uniq.map(&:to_sym)
+      [cls.downcase, underscore_cls(cls) ].uniq.map(
+        &:to_sym
+      )
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: content-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-24 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: envygeeks-coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3.0'
 description: A less restrictive version of html-pipeline for content.
 email: envygeeks@gmail.com
 executables: []
@@ -94,8 +94,9 @@ files:
 - lib/content/pipeline/core_extensions/hash_ext.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/code.rb
 - lib/content/pipeline/filters/gemoji.rb
+- lib/content/pipeline/filters/https.rb
 - lib/content/pipeline/filters/markdown.rb
 - lib/content/pipeline/jekyll/converter.rb
 - lib/content/pipeline/version.rb
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Adds a pipeline for your content.

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

@@ -1,80 +0,0 @@
-require "pygments" unless jruby?
-
-class Content::Pipeline::Filters::CodeHighlight < Content::Pipeline::Filter
-  add_filter({
-    :highlight => :nokogiri
-  })
-
-  Matcher = /<pre>(.+)<\/pre>/m
-  Templates = {
-    :numb => %Q{<span class="line-number">%s</span>\n},
-    :line => '<span class="line">%s</span>',
-    :wrap => <<-HTML,
-      <figure class="code">
-        <div class="highlight">
-          <table>
-            <tbody>
-              <tr>
-                %s
-                <td class="code">
-                  <pre><code class="%s">%s</code></pre>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </figure>
-    HTML
-
-    :gutter => <<-HTML
-      <td class="gutter">
-        <pre>%s</pre>
-      </td>
-    HTML
-  }
-
-  def initialize(*args)
-    super(*args)
-    @opts[:gutter] = true if @opts[:gutter].nil?
-  end
-
-  private
-  def highlight
-    @str = @str.to_nokogiri_fragment
-    @str.search("pre>code").each do |node|
-      lang = node[:class] || node.parent[:lang] || @opts[:default] || "ruby"
-      node.parent.replace(
-        Templates[:wrap] % wrap(pygments(node.inner_text, lang), lang)
-      )
-    end
-  end
-
-  private
-  def wrap(str, lang)
-    lines, numbs = "", ""
-
-    str.each_line.with_index(1) do |l, n|
-      lines+= Templates[:line] % l
-
-      if @opts[:gutter]
-        numbs+= Templates[:numb] % n
-      end
-    end
-
-    if ! @opts[:gutter]
-      [
-        numbs, lang, lines
-      ]
-    else
-      [
-        Templates[:gutter] % numbs, lang, lines
-      ]
-    end
-  end
-
-  private
-  def pygments(str, lang)
-    return str if jruby? || ! Pygments::Lexer[lang]
-    Pygments::Lexer[lang].highlight(str) =~ Matcher ? $1 : str
-  end
-end