gollum-lib 5.0.1 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39ec11de1f3cda57ce83f2ee9280e4eda1d0f4e4a5cb61e8a4c63c57c06639c
-  data.tar.gz: ebd42559e9569648fd8d43afdccd2cc48f937f7a7f70029e8b47219f4eeb171c
+  metadata.gz: 694f921b2852f541dadb62d440d8b9dccdf3a387c8017980e9aad575a89b598c
+  data.tar.gz: 6819382931ebd534d6b698bb733f251b4b7df7c1bc6475dd8130aadf75402971
 SHA512:
-  metadata.gz: fa86da1e0ad83ddf4aa4e02f308947eeece40a1b9e3e1a638643e7f8d6dab231c0fa8d309ebfdf5c481df34e7fc7fa1cfe965a93ef8857d2975c9385d1681afd
-  data.tar.gz: 7bed95172bf1640b3026b45e5919720974f70baae2796918281d6a346e615ed1d5066fe1e007a3a2b93c2a195283012e4c35e05a7de5af31dd29f0cdd8dbbbf9
+  metadata.gz: 3f6e4e928067b7044f2f415911d2ddace84d352dc5e18d17f5dd096bc98daf40acae64de86934ffd9ae20dca4a5a486bd58c74613b66fe7299bfec8a4c8bd236
+  data.tar.gz: 2a82c3024a8c0365089e588be77e0efcc73a8406d9882095788e8937f3e281249007b6c7f4dee9c754ae244d19d2394243b856536c4abf63d5af535911fd83b8

data/HISTORY.md

@@ -1,3 +1,7 @@
+# v5.0.1
+
+Bugfix release: fix emoji when using base path. Thanks to @heavywatal.
+
 # v5.0
 
 For a detailed overview of changes in 5.0 and a guide to migrating your wiki, see https://github.com/gollum/gollum/wiki/5.0-release-notes

data/Rakefile

@@ -51,11 +51,11 @@ def gemspec_file
 end
 
 def gemspecs
-  [RUBY_PLATFORM == 'java' ? "#{name}_java.gemspec" : "#{name}.gemspec"]
+   ["#{name}.gemspec", "#{name}_java.gemspec"]
 end
 
 def gem_files
-  [RUBY_PLATFORM == 'java' ? "#{name}-#{version}-java.gem" : "#{name}-#{version}.gem"]
+ ["#{name}-#{version}.gem", "#{name}-#{version}-java.gem"]
 end
 
 def replace_header(head, header_name)
@@ -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-03-29'
+    s.date              = '2020-09-23'
     s.date              = '2017-04-13'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
@@ -66,7 +66,6 @@ def specification(version, default_adapter, platform = nil)
     LICENSE
     README.md
     Rakefile
-    adapter_dependencies.rb
     docs/sanitization.md
     gemspec.rb
     gollum-lib.gemspec

data/gollum-lib.gemspec

@@ -1,4 +1,10 @@
 require File.join(File.dirname(__FILE__), 'gemspec.rb')
-require File.join(File.dirname(__FILE__), 'adapter_dependencies.rb')
 require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
-Gem::Specification.new &specification(Gollum::Lib::VERSION, DEFAULT_ADAPTER_REQ)
+# This file needs to conditionally define the default adapter for MRI and Java, because this is the file that is included from the Gemfile.
+# In addition, the default Java adapter needs to be defined in gollum-lib_java.gemspec beause that file is used to *build* the Java gem.
+if RUBY_PLATFORM == 'java' then
+  default_adapter = ['gollum-rjgit_adapter', '~> 0.6']
+else
+  default_adapter = ['gollum-rugged_adapter', '~> 1.0']
+end
+Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter)

data/gollum-lib_java.gemspec

@@ -1,4 +1,4 @@
 require File.join(File.dirname(__FILE__), 'gemspec.rb')
-require File.join(File.dirname(__FILE__), 'adapter_dependencies.rb')
 require File.join(File.dirname(__FILE__), 'lib', 'gollum-lib', 'version.rb')
-Gem::Specification.new &specification(Gollum::Lib::VERSION, DEFAULT_ADAPTER_REQ, "java") 
+default_adapter = ['gollum-rjgit_adapter', '~> 0.6']
+Gem::Specification.new &specification(Gollum::Lib::VERSION, default_adapter, "java") 

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/committer.rb

@@ -54,7 +54,7 @@ module Gollum
       @actor ||= begin
         @options[:name]  = @wiki.default_committer_name if @options[:name].nil?
         @options[:email] = @wiki.default_committer_email if @options[:email].nil?
-        Gollum::Git::Actor.new(@options[:name], @options[:email])
+        Gollum::Git::Actor.new(@options[:name], @options[:email], @options[:time])
       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/emoji.rb

@@ -26,7 +26,8 @@ class Gollum::Filter::Emoji < Gollum::Filter
   end
 
   def process(data)
-    data.gsub! process_pattern, %q(<img src="/gollum/emoji/\k<name>" alt="\k<name>" class="emoji">)
+    src = ::File.join(@markup.wiki.base_path, '/gollum/emoji/\\k<name>')
+    data.gsub! process_pattern, %Q(<img src="#{src}" alt="\\k<name>" class="emoji">)
     data
   end
 

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/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/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

@@ -56,9 +56,9 @@ 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, :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.
@@ -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/redirects.rb

@@ -7,12 +7,12 @@ module Gollum
   module Redirects
         
     def stale?
-      @current_head != @wiki.repo.head.commit.sha
+      @current_head != get_head_sha
     end
 
     def init(wiki)
       @wiki = wiki
-      @current_head = @wiki.repo.head.commit.sha
+      @current_head = get_head_sha
     end
 
     def load
@@ -33,6 +33,10 @@ module Gollum
       @wiki.overwrite_file(REDIRECTS_FILE, self.to_yaml, {})
     end
     
+    def get_head_sha
+      @wiki.repo.head ? @wiki.repo.head.commit.sha : nil
+    end
+    
   end # Redirects Module
 
 end # Gollum Module

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '5.0.1'
+    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.1
+  version: 5.0.6
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -15,22 +15,16 @@ dependencies:
   name: gollum-rugged_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.99.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.99.4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.99.4
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.99.4
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -456,7 +450,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- adapter_dependencies.rb
 - docs/sanitization.md
 - gemspec.rb
 - gollum-lib.gemspec

data/adapter_dependencies.rb

@@ -1,7 +0,0 @@
-# Set the default git adapter for use in gollum-lib.gemspec and gollum-lib_java.gemspec
-
-if RUBY_PLATFORM == 'java' then
-  DEFAULT_ADAPTER_REQ = ['gollum-rjgit_adapter', '>= 0.5.1', '~> 0.5.1']
-else
-  DEFAULT_ADAPTER_REQ = ['gollum-rugged_adapter', '>= 0.99.4', '~> 0.99.4']
-end