gollum-lib 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2bc81f80db1d1d27d7bbf98ee2c7de3b78da25a4e068b506914889a59b78a9
-  data.tar.gz: 59b0439f772973507254aaa566e134984c5c1761f7242b4c09c9ef3fe9e34aab
+  metadata.gz: 694f921b2852f541dadb62d440d8b9dccdf3a387c8017980e9aad575a89b598c
+  data.tar.gz: 6819382931ebd534d6b698bb733f251b4b7df7c1bc6475dd8130aadf75402971
 SHA512:
-  metadata.gz: 88d75e9d5f4cfa16dda0a8cd67dd6988a0894d19ad97a1d354cd3a7d96cf5bec6a0e350b48db91c796a2d2d5f43db79e6d021ae89f6af4442c1c5c36217dd8c5
-  data.tar.gz: 9ab4e40babd84d9baa3041e7212431fb05a95855dd428964e4d5467ebebd75b2405a1a7fbbb038a5ab8ca0ae14401f172eaf2f6f0e6fd8f510358e7b0f5cbb3c
+  metadata.gz: 3f6e4e928067b7044f2f415911d2ddace84d352dc5e18d17f5dd096bc98daf40acae64de86934ffd9ae20dca4a5a486bd58c74613b66fe7299bfec8a4c8bd236
+  data.tar.gz: 2a82c3024a8c0365089e588be77e0efcc73a8406d9882095788e8937f3e281249007b6c7f4dee9c754ae244d19d2394243b856536c4abf63d5af535911fd83b8

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-08-03'
+    s.date              = '2020-09-23'
     s.date              = '2017-04-13'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'

data/lib/gollum-lib/blob_entry.rb

@@ -78,12 +78,22 @@ module Gollum
     # Returns a normalized String directory name, or nil if no directory
     # is given.
     def self.normalize_dir(dir)
-      return '' if dir =~ /^.:\/$/
-      if dir
-        dir = ::File.expand_path(dir, '/')
-        dir = dir[2..-1] if dir =~ /^[a-zA-Z]:\// # expand_path may add d:/ on windows
-        dir = '' if dir == '/'
-      end
+      return unless dir
+
+      dir = dir.dup
+
+      # Remove '.' and '..' path segments
+      dir.gsub!(%r{(\A|/)\.{1,2}(/|\z)}, '/')
+
+      # Remove repeated slashes
+      dir.gsub!(%r{//+}, '/')
+
+      # Remove Windows drive letters, trailing slashes, and keep one leading slash
+      dir.sub!(%r{\A([a-z]:)?/*(.*?)/*\z}i, '/\2')
+
+      # Return empty string for paths that point to the toplevel
+      return '' if dir == '/'
+
       dir
     end
   end

data/lib/gollum-lib/file.rb

@@ -171,7 +171,7 @@ module Gollum
       return false if @blob.is_symlink && !FS_SUPPORT_SYMLINKS
 
       # This will try to resolve symbolic links, as well
-      pathname = Pathname.new(::File.expand_path(::File.join(@wiki.repo.path, '..', @path)))
+      pathname = Pathname.new(::File.join(@wiki.repo.path, '..', BlobEntry.normalize_dir(@path)))
       if pathname.symlink?
         source   = ::File.readlink(pathname.to_path)
         realpath = ::File.join(::File.dirname(pathname.to_path), source)

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

@@ -14,7 +14,7 @@ class Gollum::Filter::YAML < Gollum::Filter
         @markup.metadata.merge!(frontmatter) if frontmatter.respond_to?(:keys) && frontmatter.respond_to?(:values)
       rescue ::Psych::SyntaxError, ::Psych::DisallowedClass, ::Psych::BadAlias => error
         @markup.metadata['errors'] ||= []
-        @markup.metadata['errors'] << "Failed to load YAML frontmater: #{error.message}"
+        @markup.metadata['errors'] << "Failed to load YAML frontmatter: #{error.message}"
       end
       ''
     end

data/lib/gollum-lib/markups.rb

@@ -56,7 +56,7 @@ end
 module Gollum
   class Markup
     if gem_exists?('pandoc-ruby')
-      GitHub::Markup::Markdown::MARKDOWN_GEMS.delete('kramdown')
+      GitHub::Markup::Markdown::MARKDOWN_GEMS.clear
       GitHub::Markup::Markdown::MARKDOWN_GEMS['pandoc-ruby'] = proc { |content|
           PandocRuby.convert(content, :from => 'markdown-tex_math_dollars-raw_tex', :to => :html, :filter => 'pandoc-citeproc')
       }

data/lib/gollum-lib/page.rb

@@ -360,7 +360,7 @@ module Gollum
     def initialize(wiki, name, data, version, parent_page = nil)
       @wiki           = wiki 
       @path           = name
-      @blob           = OpenStruct.new(:name => name, :data => data, :is_symlink => false)
+      @blob           = OpenStruct.new(:name => name, :data => wiki.normalize(data), :is_symlink => false)
       @version        = version
       @formatted_data = nil
       @doc            = nil
@@ -368,5 +368,6 @@ module Gollum
       @historical     = false
     end
   end
+  
 
 end

data/lib/gollum-lib/version.rb

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

metadata

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