gollum-lib 4.2.7 → 4.2.9

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: d9fa26393ab89a52cf67f9ce4a90a672c4e4bc1c
4
- data.tar.gz: 0be75ca56cc42973d94fb9a6b5b162e79bb1ac1f
2
+ SHA256:
3
+ metadata.gz: 82a59909659fcbbb623b4a73e0e26b81bda0623493c29f2309af97b65e620efc
4
+ data.tar.gz: ee0b3de24b3a83162b51359b6300e0445972166155d9b831a626fe2b673d02b9
5
5
  SHA512:
6
- metadata.gz: 0f80b60b4f74ef80c85f50ca3ea685115b24a7d593dd003c7d2869ac8e07f8b7683dc503fc8ef65a2a99b18de0c7d8384dadd07ad9f6b19768159e924283b608
7
- data.tar.gz: aad30d6e5447af82e074f8381e8fb42401b1bee2e2b879f0f9f30938563e5569acf229746dfc65333200d1504e38d0fd3a784738a853ae1d80d67bfbe27a54e0
6
+ metadata.gz: b2ef540db0db730bed4ee964382b815a411a9e3dedf2526fddd57fa3e23eeb26da28fa1222b25a4b5ccb098e71ee3c725bfceb2f30580f6eaf4f82094de62f41
7
+ data.tar.gz: ce12a740f5e144e64923364c953293f73772d0542571f9b5affb7cfbff460f92f0f2dfe1cb82bb0150dbbab44a90e91635c98fee304ab040141aeb9961c09bec
data/gemspec.rb CHANGED
@@ -8,7 +8,7 @@ def specification(version, default_adapter, platform = nil)
8
8
  s.name = 'gollum-lib'
9
9
  s.version = version
10
10
  s.platform = platform if platform
11
- s.date = '2017-07-31'
11
+ s.date = '2018-09-17'
12
12
  s.rubyforge_project = 'gollum-lib'
13
13
  s.license = 'MIT'
14
14
 
@@ -35,6 +35,7 @@ def specification(version, default_adapter, platform = nil)
35
35
  s.add_dependency 'sanitize', '~> 2.1'
36
36
  s.add_dependency 'github-markup', '~> 1.6'
37
37
  s.add_dependency 'gemojione', '~> 3.2'
38
+ s.add_dependency 'twitter-text', '1.14.7'
38
39
 
39
40
  s.add_development_dependency 'org-ruby', '~> 0.9.9'
40
41
  s.add_development_dependency 'kramdown', '~> 1.6.0'
@@ -10,12 +10,13 @@ module Gollum
10
10
  # set pages to wiki.pages + wiki.files and show_all to true
11
11
  def initialize(pages, options = {})
12
12
  @pages = pages
13
+ @wiki = @pages.first ? @pages.first.wiki : nil
13
14
  @show_all = options[:show_all] || false
14
15
  @checked = options[:collapse_tree] ? '' : "checked"
15
16
  end
16
17
 
17
18
  def enclose_tree(string)
18
- %Q(<ol class="tree">\n) + string + %Q(</ol>)
19
+ sanitize_html(%Q(<ol class="tree">\n) + string + %Q(</ol>))
19
20
  end
20
21
 
21
22
  def new_page(page)
@@ -96,7 +97,7 @@ module Gollum
96
97
  </li>
97
98
  HTML
98
99
 
99
- return enclose_tree html
100
+ return enclose_tree(html)
100
101
  end
101
102
 
102
103
  sorted_folders = []
@@ -153,8 +154,11 @@ module Gollum
153
154
  changed = false
154
155
  end
155
156
 
156
- # return the completed html
157
- enclose_tree html
157
+ enclose_tree(html)
158
158
  end # end render_files
159
+
160
+ def sanitize_html(data)
161
+ @wiki ? @wiki.sanitizer.clean(data) : data
162
+ end
159
163
  end # end FileView class
160
164
  end # end Gollum module
@@ -495,7 +495,9 @@ module Gollum
495
495
  end
496
496
 
497
497
  if subpageblob
498
- instance_variable_set("@#{subpagename}", subpageblob.page(@wiki, @version) )
498
+ subpage = subpageblob.page(@wiki, @version)
499
+ subpage.parent_page = self
500
+ instance_variable_set("@#{subpagename}", subpage)
499
501
  break
500
502
  end
501
503
 
@@ -1,5 +1,5 @@
1
1
  module Gollum
2
2
  module Lib
3
- VERSION = '4.2.7'
3
+ VERSION = '4.2.9'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gollum-lib
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.7
4
+ version: 4.2.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Preston-Werner
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-07-31 00:00:00.000000000 Z
12
+ date: 2018-09-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: gollum-grit_adapter
@@ -115,6 +115,20 @@ dependencies:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: '3.2'
118
+ - !ruby/object:Gem::Dependency
119
+ name: twitter-text
120
+ requirement: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - '='
123
+ - !ruby/object:Gem::Version
124
+ version: 1.14.7
125
+ type: :runtime
126
+ prerelease: false
127
+ version_requirements: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - '='
130
+ - !ruby/object:Gem::Version
131
+ version: 1.14.7
118
132
  - !ruby/object:Gem::Dependency
119
133
  name: org-ruby
120
134
  requirement: !ruby/object:Gem::Requirement
@@ -440,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
440
454
  version: '0'
441
455
  requirements: []
442
456
  rubyforge_project: gollum-lib
443
- rubygems_version: 2.6.11
457
+ rubygems_version: 2.7.7
444
458
  signing_key:
445
459
  specification_version: 2
446
460
  summary: A simple, Git-powered wiki.