jekyll-titles-from-headings 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84b1cda340e7783f0500f07bf11623b19b416ffb
-  data.tar.gz: f6dfc3e35d9f73b9e6c2f54305277382f082205b
+  metadata.gz: 367e754467d30e9b6ef62d13fb7c1f0030d7c165
+  data.tar.gz: 0e0f69aad2c526cc74cf5a32318879b05013e35e
 SHA512:
-  metadata.gz: 8fcd40fa5b965ea1ff04572f493f47de8a67ba61b4096feb8ebecef6b0be01b7b968bbcf628b1c5806eeeec69aac508dfc19eca14651d7687cb7c13ba0ec2578
-  data.tar.gz: 689a0d575e1cfe1ffa95fea8d15a35112c7b79c205b394ef0e5bdaefbf5ea5b75893af44ee83e5703a1d7b76fb879aba541134ec58967eeff5bafb2b6ccc3175
+  metadata.gz: d44d0aa1fdb4dc000ba159948723e4314014d67917be7a131066ce99d079452f8e40963d0cd33d95295fee28345333f6b8f099b92c39375ccb139e6285935c9f
+  data.tar.gz: 8f03486d52cb21770c8cb0314f090ab4096f1da54c8904fffe51933d5e406a3eda80cc91180d451c3f73adfcc27203348ec0f229a891157cd2a9ce9495bbf304

data/lib/jekyll-titles-from-headings.rb

@@ -2,4 +2,6 @@ require "jekyll"
 require "jekyll-titles-from-headings/generator"
 
 module JekyllTitlesFromHeadings
+  autoload :Context, "jekyll-titles-from-headings/context"
+  autoload :Filters, "jekyll-titles-from-headings/filters"
 end

data/lib/jekyll-titles-from-headings/context.rb

@@ -0,0 +1,13 @@
+module JekyllTitlesFromHeadings
+  class Context
+    attr_reader :site
+
+    def initialize(site)
+      @site = site
+    end
+
+    def registers
+      { :site => site }
+    end
+  end
+end

data/lib/jekyll-titles-from-headings/filters.rb

@@ -0,0 +1,11 @@
+module JekyllTitlesFromHeadings
+  class Filters
+    include Jekyll::Filters
+    include Liquid::StandardFilters
+
+    def initialize(site)
+      @site    = site
+      @context = JekyllTitlesFromHeadings::Context.new(site)
+    end
+  end
+end

data/lib/jekyll-titles-from-headings/generator.rb

@@ -2,8 +2,23 @@ module JekyllTitlesFromHeadings
   class Generator < Jekyll::Generator
     attr_accessor :site
 
-    TITLE_REGEX = %r!\A\s*\#{1,3} (.*)\n$!
+    TITLE_REGEX =
+      %r!
+        \A\s*                   # Beginning and whitespace
+          (?:                   # either
+            \#{1,3}\s+(.*)      # atx-style header
+            |                   # or
+            (.*)\r?\n[-=]+\s*   # Setex-style header
+          )$                    # end of line
+      !x
     CONVERTER_CLASS = Jekyll::Converters::Markdown
+    STRIP_MARKUP_FILTERS = %i[
+      markdownify strip_html normalize_whitespace
+    ].freeze
+
+    # Regex to strip extra markup still present after markdownify
+    # (footnotes at the moment).
+    EXTRA_MARKUP_REGEX = %r!\[\^[^\]]*\]!
 
     safe true
     priority :lowest
@@ -40,9 +55,21 @@ module JekyllTitlesFromHeadings
     def title_for(document)
       return document.data["title"] if title?(document)
       matches = document.content.match(TITLE_REGEX)
-      matches[1] if matches
+      strip_markup(matches[1] || matches[2]) if matches
     rescue ArgumentError => e
       raise e unless e.to_s.start_with?("invalid byte sequence in UTF-8")
     end
+
+    private
+
+    def strip_markup(string)
+      STRIP_MARKUP_FILTERS.reduce(string) do |memo, method|
+        filters.public_send(method, memo)
+      end.gsub(EXTRA_MARKUP_REGEX, "")
+    end
+
+    def filters
+      @filters ||= JekyllTitlesFromHeadings::Filters.new(site)
+    end
   end
 end

data/lib/jekyll-titles-from-headings/version.rb

@@ -1,3 +1,3 @@
 module JekyllTitlesFromHeadings
-  VERSION = "0.1.5".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-titles-from-headings
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -62,6 +62,8 @@ files:
 - LICENSE.md
 - README.md
 - lib/jekyll-titles-from-headings.rb
+- lib/jekyll-titles-from-headings/context.rb
+- lib/jekyll-titles-from-headings/filters.rb
 - lib/jekyll-titles-from-headings/generator.rb
 - lib/jekyll-titles-from-headings/version.rb
 homepage: https://github.com/benbalter/jekyll-titles-from-headings