gollum-lib 4.2.7-java → 4.2.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4bcb9c222ef3f965f9306306b9a494e0545658f8
-  data.tar.gz: 0be75ca56cc42973d94fb9a6b5b162e79bb1ac1f
+SHA256:
+  metadata.gz: 1c6e3aae1f59d596341d8747f277fd7cb7248e6da4fbc29c49340c69e2839bd5
+  data.tar.gz: ee0b3de24b3a83162b51359b6300e0445972166155d9b831a626fe2b673d02b9
 SHA512:
-  metadata.gz: 003352607114a5b2d455a65a2294669df4379662e71da0de50ea170d7c4d1768c0da33b676d4df6c6293f5fb0b4ebb7f5509135aa3b2806f43744d18ba814239
-  data.tar.gz: aad30d6e5447af82e074f8381e8fb42401b1bee2e2b879f0f9f30938563e5569acf229746dfc65333200d1504e38d0fd3a784738a853ae1d80d67bfbe27a54e0
+  metadata.gz: 6d673c7d93f2ccc0483d142b3540a25210a9e9548af118ee24987cf8f463fe48987287667cd5eab8105ac9edb1c38bf887cc6004005af2e3a74dd754a1cf7aa1
+  data.tar.gz: ce12a740f5e144e64923364c953293f73772d0542571f9b5affb7cfbff460f92f0f2dfe1cb82bb0150dbbab44a90e91635c98fee304ab040141aeb9961c09bec

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              = '2017-07-31'
+    s.date              = '2018-09-17'
     s.rubyforge_project = 'gollum-lib'
     s.license           = 'MIT'
 
@@ -35,6 +35,7 @@ def specification(version, default_adapter, platform = nil)
     s.add_dependency 'sanitize', '~> 2.1'
     s.add_dependency 'github-markup', '~> 1.6'
     s.add_dependency 'gemojione', '~> 3.2'
+    s.add_dependency 'twitter-text', '1.14.7'
 
     s.add_development_dependency 'org-ruby', '~> 0.9.9'
     s.add_development_dependency 'kramdown', '~> 1.6.0'

data/lib/gollum-lib/file_view.rb

@@ -10,12 +10,13 @@ module Gollum
     # set pages to wiki.pages + wiki.files and show_all to true
     def initialize(pages, options = {})
       @pages    = pages
+      @wiki     = @pages.first ? @pages.first.wiki : nil
       @show_all = options[:show_all] || false
       @checked  = options[:collapse_tree] ? '' : "checked"
     end
 
     def enclose_tree(string)
-      %Q(<ol class="tree">\n) + string + %Q(</ol>)
+      sanitize_html(%Q(<ol class="tree">\n) + string + %Q(</ol>))
     end
 
     def new_page(page)
@@ -96,7 +97,7 @@ module Gollum
         </li>
         HTML
 
-        return enclose_tree html
+        return enclose_tree(html)
       end
 
       sorted_folders = []
@@ -153,8 +154,11 @@ module Gollum
         changed = false
       end
 
-      # return the completed html
-      enclose_tree html
+      enclose_tree(html)
     end # end render_files
+
+    def sanitize_html(data)
+      @wiki ? @wiki.sanitizer.clean(data) : data
+    end
   end # end FileView class
 end # end Gollum module

data/lib/gollum-lib/page.rb

@@ -495,7 +495,9 @@ module Gollum
           end
           
           if subpageblob
-            instance_variable_set("@#{subpagename}", subpageblob.page(@wiki, @version) )
+            subpage =  subpageblob.page(@wiki, @version)
+            subpage.parent_page = self
+            instance_variable_set("@#{subpagename}", subpage)
             break
           end
 

data/lib/gollum-lib/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   module Lib
-    VERSION = '4.2.7'
+    VERSION = '4.2.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gollum-lib
 version: !ruby/object:Gem::Version
-  version: 4.2.7
+  version: 4.2.9
 platform: java
 authors:
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum-rjgit_adapter
@@ -115,6 +115,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: twitter-text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.14.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.14.7
 - !ruby/object:Gem::Dependency
   name: org-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -440,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gollum-lib
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 2
 summary: A simple, Git-powered wiki.