gollum-lib 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e55b2da402b839a9bda9dfc481c48105c35b42b2
-  data.tar.gz: bf742bac68979067adb0de6edd1bedcfe7371d4f
+  metadata.gz: 8969c11471157e64fc02195fbcfa8e60d78e8549
+  data.tar.gz: ab6523c0e5f9b67a49715ecf9562c4e172b5681a
 SHA512:
-  metadata.gz: be91eded9d83bc1fbab8f75530c750d82669e0fa1c122d11a43bf2fcc917337fd971bcac5962b3cd3323cdbabd3b4c4883b29aec5fc5d48c12c0d0f3f397a4ec
-  data.tar.gz: 5101203aa2c911cf2a89a06be8adbd4511700506d3473fae6797da2568f1310f7fbc9d0bc8bdc999fbb6f3224e515deb92d7b67357cadc48a3fa50a4dc2be104
+  metadata.gz: 432d11563ff70808bd9c5f4bad5fd5be79743eaab5c5236826bace51dc6063c3aa4d7d4b6aae6c4c02457246856cf05996f7144bac1a6d79c26b083f737528c6
+  data.tar.gz: e81299f51b76bbd66b5ee2ddd0f78aae10f35ad3236f71dd0cca05f883ed7e2f07054770673b160a8ce485f38a6bf951ed7ba124289e6166eb7fd4a09ef61420

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              = '2016-07-13'
+    s.date              = '2016-11-18'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
 
@@ -27,9 +27,10 @@ def specification(version, default_adapter, platform = nil)
     s.add_dependency *default_adapter
     s.add_dependency 'rouge', '~> 2.0'
     s.add_dependency 'nokogiri', '~> 1.6.4'
-    s.add_dependency 'stringex', '~> 2.5.1'
-    s.add_dependency 'sanitize', '~> 2.1.0'
-    s.add_dependency 'github-markup', '~> 1.4.0'
+    s.add_dependency 'stringex', '~> 2.6'
+    s.add_dependency 'sanitize', '~> 2.1'
+    s.add_dependency 'github-markup', '~> 1.4'
+    s.add_dependency 'gemojione', '~> 2.2'
 
     s.add_development_dependency 'org-ruby', '~> 0.9.9'
     s.add_development_dependency 'kramdown', '~> 1.6.0'
@@ -70,6 +71,7 @@ def specification(version, default_adapter, platform = nil)
     lib/gollum-lib/file_view.rb
     lib/gollum-lib/filter.rb
     lib/gollum-lib/filter/code.rb
+    lib/gollum-lib/filter/emoji.rb
     lib/gollum-lib/filter/macro.rb
     lib/gollum-lib/filter/metadata.rb
     lib/gollum-lib/filter/plain_text.rb

data/lib/gollum-lib.rb

@@ -16,6 +16,7 @@ end
 # external
 require 'github/markup'
 require 'sanitize'
+require 'gemojione'
 
 # internal
 require File.expand_path('../gollum-lib/git_access', __FILE__)
@@ -62,4 +63,3 @@ module Gollum
   class NoSuchPathError < StandardError; end
 
 end
-

data/lib/gollum-lib/file_view.rb

@@ -20,8 +20,12 @@ module Gollum
 
     def new_page(page)
       name = page.name
-      url  = url_for_page page
-      %Q(  <li class="file"><a href="#{url}"><span class="icon"></span>#{name}</a></li>)
+      url, valid_page  = url_for_page page
+      %Q(  <li class="file"><a href="#{url}"><span class="icon"></span>#{name}</a>#{valid_page ? "" : delete_file(url, valid_page)}</li>)
+    end
+
+    def delete_file(url, valid_page)
+      %Q(<form method="POST" action="/deleteFile/#{url}" onsubmit="return confirm('Do you really want to delete the file #{url}?');"><button type="submit" name="delete" value="true"></button></form>)
     end
 
     def new_folder(folder_path)
@@ -42,17 +46,19 @@ module Gollum
 
     def url_for_page(page)
       url = ''
+      valid_page_name = false
       if @show_all
         # Remove ext for valid pages.
         filename = page.filename
-        filename = Page::valid_page_name?(filename) ? filename.chomp(::File.extname(filename)) : filename
+        valid_page_name =  Page::valid_page_name?(filename)
+        filename = valid_page_name ? filename.chomp(::File.extname(filename)) : filename
 
         url = ::File.join(::File.dirname(page.path), filename)
       else
         url = ::File.join(::File.dirname(page.path), page.filename_stripped)
       end
       url = url[2..-1] if url[0, 2] == './'
-      url
+      return url, valid_page_name
     end
 
     def render_files

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

@@ -0,0 +1,39 @@
+# ~*~ encoding: utf-8 ~*~
+
+# Emoji
+#
+# Render emoji such as :smile:
+class Gollum::Filter::Emoji < Gollum::Filter
+
+  EXTRACT_PATTERN = %r{
+    (?<!\[{2})
+    :(?<name>[\w-]+):
+    (?!\]{^2})
+  }ix
+
+  PROCESS_PATTERN = %r{
+    =EEMMOOJJII=
+    (?<name>[\w-]+)
+    =IIJJOOMMEE=
+  }ix
+
+  def extract(data)
+    data.gsub! EXTRACT_PATTERN do
+      emoji_exists?($~[:name]) ? "=EEMMOOJJII=#{$~[:name]}=IIJJOOMMEE=" : $&
+    end
+    data
+  end
+
+  def process(data)
+    data.gsub! PROCESS_PATTERN, %q(<img src="/emoji/\k<name>" alt="\k<name>" class="emoji">)
+    data
+  end
+
+  private
+
+  def emoji_exists?(name)
+    @index ||= Gemojione::Index.new
+    !!@index.find_by_name(name)
+  end
+
+end

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

@@ -129,6 +129,10 @@ class Gollum::Filter::Tags < Gollum::Filter
       path = ::File.join @markup.wiki.base_path, file.path
     elsif name =~ /^https?:\/\/.+(jpg|png|gif|svg|bmp)$/i
       path = name
+    elsif name =~ /.+(jpg|png|gif|svg|bmp)$/i
+      # If is image, file not found and no link, then populate with empty String
+      # We can than add an image not found alt attribute for this later
+      path = ""
     end
 
     if path
@@ -167,8 +171,10 @@ class Gollum::Filter::Tags < Gollum::Filter
         end
       end
 
-      if (alt = opts['alt'])
+      if path != "" && (alt = opts['alt'])
         attrs << %{alt="#{alt}"}
+      elsif path == ""
+        attrs << %{alt="Image not found"}
       end
 
       attr_string = attrs.size > 0 ? attrs.join(' ') + ' ' : ''
@@ -212,7 +218,7 @@ class Gollum::Filter::Tags < Gollum::Filter
     if parts.size == 1
       url = parts[0].strip
     else
-      name, url = *parts.compact.map(&:strip)      
+      name, url = *parts.compact.map(&:strip)
     end
     accepted_protocols = @markup.wiki.sanitization.protocols['a']['href'].dup
     if accepted_protocols.include?(:relative)
@@ -230,7 +236,7 @@ class Gollum::Filter::Tags < Gollum::Filter
     else
       nil
     end
-    
+
   end
 
   # Attempt to process the tag as a file link tag.

data/lib/gollum-lib/markup.rb

@@ -99,7 +99,7 @@ module Gollum
       @format = format
       @name   = name
 
-      chain = [:Metadata, :PlainText, :TOC, :RemoteCode, :Code, :Sanitize, :WSD, :Tags, :Render]
+      chain = [:Metadata, :PlainText, :Emoji, :TOC, :RemoteCode, :Code, :Sanitize, :WSD, :Tags, :Render]
 
       filter_chain = chain.map do |r|
         Gollum::Filter.const_get(r).new(self)

data/lib/gollum-lib/page.rb

@@ -477,17 +477,31 @@ module Gollum
       
       map ||= @wiki.tree_map_for(@wiki.ref, true)
       valid_names = subpagenames.map(&:capitalize).join("|")
-      while entry = map.shift do
-        next unless entry.name =~ /^_(#{valid_names})/
-        sub_page_type = ::File.basename(entry.name.downcase.tr('_', ''), ::File.extname(entry.name))
-        next if instance_variable_get("@#{sub_page_type}")
-        ::Pathname.new(::File.join('.', ::File.dirname(self.path))).ascend do |dir|
-          if ::File.join(dir, entry.name) == ::File.join('.', ::Pathname.new(entry.path))
-            instance_variable_set("@#{sub_page_type}", entry.page(@wiki, @version) )
+      # From Ruby 2.2 onwards map.select! could be used
+      map = map.select{|entry| entry.name =~ /^_(#{valid_names})/ }
+      return if map.empty?
+
+      subpagenames.each do |subpagename|
+        dir = ::Pathname.new(self.path)
+        while dir = dir.parent do
+          subpageblob = map.find do |blob_entry|
+
+            filename = "_#{subpagename.to_s.capitalize}"
+            searchpath = dir == Pathname.new('.') ? Pathname.new(filename) : dir + filename
+            entrypath = ::Pathname.new(blob_entry.path)
+            # Ignore extentions
+            entrypath = entrypath.dirname + entrypath.basename(entrypath.extname)      
+            entrypath == searchpath
+          end
+          
+          if subpageblob
+            instance_variable_set("@#{subpagename}", subpageblob.page(@wiki, @version) )
             break
           end
+
+          break if dir == Pathname.new('.')
         end
-      end
+      end  
     end
 
     def inspect

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '4.2.1'
+    VERSION = '4.2.2'
   end
 end

data/lib/gollum-lib/wiki.rb

@@ -194,6 +194,7 @@ module Gollum
     #                            Default: false
     #           :collapse_tree - Start with collapsed file view. Default: false
     #           :css           - Include the custom.css file from the repo.
+    #           :emoji         - Parse and interpret emoji tags (e.g. :heart:).
     #           :h1_title      - Concatenate all h1's on a page to form the
     #                            page title.
     #           :index_page    - The default page to retrieve or create if the
@@ -240,6 +241,7 @@ module Gollum
       @show_all             = options.fetch :show_all, false
       @collapse_tree        = options.fetch :collapse_tree, false
       @css                  = options.fetch :css, false
+      @emoji                = options.fetch :emoji, false
       @h1_title             = options.fetch :h1_title, false
       @index_page           = options.fetch :index_page, 'Home'
       @bar_side             = options.fetch :sidebar, :right
@@ -248,7 +250,8 @@ module Gollum
       @allow_uploads        = options.fetch :allow_uploads, false
       @per_page_uploads     = options.fetch :per_page_uploads, false
       @filter_chain         = options.fetch :filter_chain,
-                                            [:Metadata, :PlainText, :TOC, :RemoteCode, :Code, :Macro, :Sanitize, :WSD, :PlantUML, :Tags, :Render]
+                                            [:Metadata, :PlainText, :TOC, :RemoteCode, :Code, :Macro, :Emoji, :Sanitize, :WSD, :PlantUML, :Tags, :Render]
+      @filter_chain.delete(:Emoji) unless options.fetch :emoji, false
     end
 
     # Public: check whether the wiki's git repo exists on the filesystem.
@@ -488,6 +491,43 @@ module Gollum
       multi_commit ? committer : committer.commit
     end
 
+    # Public: Delete a file.
+    #
+    # path   - The path to the file to delete
+    # commit - The commit Hash details:
+    #          :message   - The String commit message.
+    #          :name      - The String author full name.
+    #          :email     - The String email address.
+    #          :parent    - Optional Gollum::Git::Commit parent to this update.
+    #          :tree      - Optional String SHA of the tree to create the
+    #                       index from.
+    #          :committer - Optional Gollum::Committer instance.  If provided,
+    #                       assume that this operation is part of batch of
+    #                       updates and the commit happens later.
+    #
+    # Returns the String SHA1 of the newly written version, or the
+    # Gollum::Committer instance if this is part of a batch update.
+    def delete_file(path, commit)
+      dir      = ::File.dirname(path)
+      ext      = ::File.extname(path)
+      format   = ext.split('.').last || 'txt'
+      filename = ::File.basename(path, ext)
+
+      multi_commit = !!commit[:committer]
+      committer    = multi_commit ? commit[:committer] : Committer.new(self, commit)
+
+      committer.delete(path)
+
+      committer.after_commit do |index, _sha|
+        dir = '' if dir == '.'
+
+        @access.refresh
+        index.update_working_dir(dir, filename, format)
+      end
+
+      multi_commit ? committer : committer.commit
+    end
+
     # Public: Applies a reverse diff for a given page.  If only 1 SHA is given,
     # the reverse diff will be taken from its parent (^SHA...SHA).  If two SHAs
     # are given, the reverse diff is taken from SHA1...SHA2.
@@ -647,7 +687,7 @@ module Gollum
       options[:max_count] = 10 unless options[:max_count]
       @repo.log(@ref, nil, options)
     end
-    
+
     # Public: Refreshes just the cached Git reference data.  This should
     # be called after every Gollum update.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-grit_adapter
@@ -59,42 +59,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.1
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: gemojione
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -371,6 +385,7 @@ files:
 - lib/gollum-lib/file_view.rb
 - lib/gollum-lib/filter.rb
 - lib/gollum-lib/filter/code.rb
+- lib/gollum-lib/filter/emoji.rb
 - lib/gollum-lib/filter/macro.rb
 - lib/gollum-lib/filter/metadata.rb
 - lib/gollum-lib/filter/plain_text.rb