gollum-lib 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49c63e5f17326f8cd276fef19bfc1b789a6ea1eb84ab34254c437041f082965
-  data.tar.gz: 32c68ea6732fa95cce77de649ffe63af6a36783445c92151aabd7aaec8cd4ceb
+  metadata.gz: 4a2bc81f80db1d1d27d7bbf98ee2c7de3b78da25a4e068b506914889a59b78a9
+  data.tar.gz: 59b0439f772973507254aaa566e134984c5c1761f7242b4c09c9ef3fe9e34aab
 SHA512:
-  metadata.gz: 84a069e897db4f494c01d7acf82c5818c29de323f7ba70c1824a9554be1521e94038836c889f27e3b04ea014c04c6916970f7a1a454c3793adfa14442b394bd9
-  data.tar.gz: 13818f84f30dd46bb983602e163e5a2ea1eeaa21bff10b4a835bfbbb014c200ccca4c84cbb24354d77ab015b50979d339c5ad4bc1496b9b57bedc2577325e71d
+  metadata.gz: 88d75e9d5f4cfa16dda0a8cd67dd6988a0894d19ad97a1d354cd3a7d96cf5bec6a0e350b48db91c796a2d2d5f43db79e6d021ae89f6af4442c1c5c36217dd8c5
+  data.tar.gz: 9ab4e40babd84d9baa3041e7212431fb05a95855dd428964e4d5467ebebd75b2405a1a7fbbb038a5ab8ca0ae14401f172eaf2f6f0e6fd8f510358e7b0f5cbb3c

data/Rakefile

@@ -75,6 +75,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test' << '.'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
+  test.warning = false
 end
 
 desc "Generate RCov test coverage and open in your browser"

data/gemspec.rb

@@ -8,7 +8,7 @@ def specification(version, default_adapter, platform = nil)
     s.name              = 'gollum-lib'
     s.version           = version
     s.platform          = platform if platform
-    s.date              = '2020-04-29'
+    s.date              = '2020-08-03'
     s.date              = '2017-04-13'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'

data/lib/gollum-lib/filter/tags.rb

@@ -230,6 +230,7 @@ class Gollum::Filter::Tags < Gollum::Filter
     else
       name = page ? path_to_link_text(link) : link
     end
+
     link = page ? page.escaped_url_path : ERB::Util.url_encode(link).force_encoding('utf-8')
     generate_link(link, name, extra, presence)
   end

data/lib/gollum-lib/helpers.rb

@@ -16,7 +16,7 @@ module Gollum
     # '/opt/local/bin/ruby.ext' -> 'ruby'
     def path_to_link_text(str)
       return nil unless str
-      ::File.basename(str, ::File.extname(str))
+      ::File.basename(str, Page.valid_extension?(str) ? ::File.extname(str) : '')
     end
 
   end

data/lib/gollum-lib/macro.rb

@@ -25,6 +25,10 @@ module Gollum
       "<p class=\"gollum-error\">#{s}</p>"
     end
 
+    def active_page
+      return @page.parent_page || @page
+    end
+
     # The special class we reserve for only the finest of screwups.  The
     # underscore is to make sure nobody can define a real, callable macro
     # with the same name, because that would be... exciting.

data/lib/gollum-lib/macro/series.rb

@@ -3,7 +3,7 @@ module Gollum
 
     class Series < Gollum::Macro
       def render(series_prefix = "")
-      	raise "This page's name does not match the prefix '#{series_prefix}'" unless @page.name =~ /^#{series_prefix}/
+      	raise "This page's name does not match the prefix '#{series_prefix}'" unless active_page.name =~ /^#{series_prefix}/
       	render_links(*find_series(series_prefix))
       end
 
@@ -21,7 +21,7 @@ module Gollum
       	dir = @wiki.pages.select {|page| ::File.dirname(page.path) == ::File.dirname(@page.path)}
       	dir.select! {|page| page.name =~ /\A#{series_prefix}/ } unless series_prefix.empty?
       	dir.sort_by! {|page| page.name}
-      	self_index = dir.find_index {|page| page.name == @page.name}
+      	self_index = dir.find_index {|page| page.name == active_page.name}
       	if self_index > 0
           return dir[self_index-1], dir[self_index+1]
       	else

data/lib/gollum-lib/markups.rb

@@ -58,7 +58,7 @@ module Gollum
     if gem_exists?('pandoc-ruby')
       GitHub::Markup::Markdown::MARKDOWN_GEMS.delete('kramdown')
       GitHub::Markup::Markdown::MARKDOWN_GEMS['pandoc-ruby'] = proc { |content|
-          PandocRuby.convert(content, :from => :markdown, :to => :html, :filter => 'pandoc-citeproc')
+          PandocRuby.convert(content, :from => 'markdown-tex_math_dollars-raw_tex', :to => :html, :filter => 'pandoc-citeproc')
       }
     else
       GitHub::Markup::Markdown::MARKDOWN_GEMS['kramdown'] = proc { |content|
@@ -85,7 +85,8 @@ module Gollum
              :extensions => ['rest', 'rst'])
     register(:asciidoc, "AsciiDoc",
              :skip_filters => [:Tags],
-             :enabled => MarkupRegisterUtils::gem_exists?("asciidoctor"))
+             :enabled => MarkupRegisterUtils::gem_exists?("asciidoctor"),
+             :extensions => ['adoc','asciidoc'])
     register(:mediawiki, "MediaWiki",
              :enabled => MarkupRegisterUtils::gem_exists?("wikicloth"),
              :extensions => ['mediawiki','wiki'], :reverse_links => true)

data/lib/gollum-lib/page.rb

@@ -277,7 +277,7 @@ module Gollum
     #
     # Returns the String extension (no leading period).
     def self.format_to_ext(format)
-      format == :markdown ? "md" : format.to_s
+      Gollum::Markup.formats[format] ? Gollum::Markup.formats[format][:extensions].first : nil
     end
 
     # The underlying wiki repo.

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '5.0.4'
+    VERSION = '5.0.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Tom Preston-Werner