gollum 4.1.0 → 4.1.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/HISTORY.md +1 -1
  3. data/gollum.gemspec +3 -3
  4. data/lib/gollum.rb +1 -1
  5. data/lib/gollum/app.rb +2 -1
  6. data/lib/gollum/helpers.rb +1 -1
  7. metadata +40 -40
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 553d5d852ae4e6dedfbe979f1918fc601dfd7d51
4
- data.tar.gz: 312cb841cf55423cdd11db5e23a775449f5283d7
3
+ metadata.gz: f375c255ecca6091d89214edb70b1cc3dfc6f439
4
+ data.tar.gz: 5bca52ec4dcbf71d3e09eb804cd7338336db0733
5
5
  SHA512:
6
- metadata.gz: 7f66b32c3386b8856889d67a573d65a9d15f041908336c769af2481dbe06e9942b65010b543a7ff2e4a3192afe8115a6a8a1c1b8f648a8b1ff437593d89f1f42
7
- data.tar.gz: 36434afe0a04bb7249bbcb48b65dd3f8cdec56a543ad8cb86af63c3a0550327c5e268296921d79f1f2155dcf9c263912f8e37aec9d5f8a696d1d15bf3197be39
6
+ metadata.gz: bceb69f59c8450b035a7b5e0050fa9275b714c6b929c92faced4d47a93e024aba32a8c281ff2a0ac1481e061caafd69b0daf7f2b52bb94f0c6a61e08b8aa8269
7
+ data.tar.gz: 593ed2b132b3ffa74b8ea4a9d4d23dfe80a8891b27cecdbdd4323b2bec13469f0676c31d8024e672b1055476f9e636e129222e8f2493b315826b9bf0ebdae9e0
data/HISTORY.md CHANGED
@@ -1,4 +1,4 @@
1
- # 4.1.0 /2016-03-09
1
+ # 4.1.0 /2017-03-09
2
2
 
3
3
  * Added file deletion functionality to file view
4
4
  * Various performance improvements
data/gollum.gemspec CHANGED
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
5
5
  s.required_ruby_version = '>= 1.9'
6
6
 
7
7
  s.name = 'gollum'
8
- s.version = '4.1.0'
9
- s.date = '2017-03-09'
8
+ s.version = '4.1.1'
9
+ s.date = '2017-04-17'
10
10
  s.rubyforge_project = 'gollum'
11
11
  s.license = 'MIT'
12
12
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
29
29
  s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.4'
30
30
  s.add_dependency 'mustache', ['>= 0.99.5', '< 1.0.0']
31
31
  s.add_dependency 'useragent', '~> 0.16.2'
32
- s.add_dependency 'gemojione', '~> 2'
32
+ s.add_dependency 'gemojione', '~> 3.2'
33
33
 
34
34
  s.add_development_dependency 'rack-test', '~> 0.6.2'
35
35
  s.add_development_dependency 'shoulda', '~> 3.5.0'
data/lib/gollum.rb CHANGED
@@ -16,7 +16,7 @@ require File.expand_path('../gollum/uri_encode_component', __FILE__)
16
16
  $KCODE = 'U' if RUBY_VERSION[0, 3] == '1.8'
17
17
 
18
18
  module Gollum
19
- VERSION = '4.1.0'
19
+ VERSION = '4.1.1'
20
20
 
21
21
  def self.assets_path
22
22
  ::File.expand_path('gollum/public', ::File.dirname(__FILE__))
data/lib/gollum/app.rb CHANGED
@@ -348,7 +348,7 @@ module Precious
348
348
  wiki.write_page(name, format, params[:content], commit_message, path)
349
349
 
350
350
  page_dir = settings.wiki_options[:page_file_dir].to_s
351
- redirect to("/#{clean_url(::File.join(page_dir, path, encodeURIComponent(name)))}")
351
+ redirect to("/#{clean_url(::File.join(encodeURIComponent(page_dir), encodeURIComponent(path), encodeURIComponent(name)))}")
352
352
  rescue Gollum::DuplicatePageError => e
353
353
  @message = "Duplicate page: #{e.message}"
354
354
  mustache :error
@@ -464,6 +464,7 @@ module Precious
464
464
  @name = name
465
465
  @content = page.formatted_data
466
466
  @version = version
467
+ @bar_side = wikip.wiki.bar_side
467
468
  mustache :page
468
469
  elsif file = wikip.wiki.file("#{file_path}", version, true)
469
470
  show_file(file)
data/lib/gollum/helpers.rb CHANGED
@@ -4,7 +4,7 @@ require 'gemojione'
4
4
  module Precious
5
5
  module Helpers
6
6
 
7
- EMOJI_PATHNAME = Pathname.new(Gemojione.index.images_path).freeze
7
+ EMOJI_PATHNAME = Pathname.new(Gemojione.images_path).freeze
8
8
 
9
9
  # Extract the path string that Gollum::Wiki expects
10
10
  def extract_path(file_path)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gollum
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0
4
+ version: 4.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Preston-Werner
@@ -9,206 +9,206 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-03-09 00:00:00.000000000 Z
12
+ date: 2017-04-17 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: gollum-lib
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ~>
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
20
  version: '4.0'
21
- - - '>='
21
+ - - ">="
22
22
  - !ruby/object:Gem::Version
23
23
  version: 4.0.1
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
27
27
  requirements:
28
- - - ~>
28
+ - - "~>"
29
29
  - !ruby/object:Gem::Version
30
30
  version: '4.0'
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: 4.0.1
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: kramdown
36
36
  requirement: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 1.9.0
41
41
  type: :runtime
42
42
  prerelease: false
43
43
  version_requirements: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: 1.9.0
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: sinatra
50
50
  requirement: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '1.4'
55
- - - '>='
55
+ - - ">="
56
56
  - !ruby/object:Gem::Version
57
57
  version: 1.4.4
58
58
  type: :runtime
59
59
  prerelease: false
60
60
  version_requirements: !ruby/object:Gem::Requirement
61
61
  requirements:
62
- - - ~>
62
+ - - "~>"
63
63
  - !ruby/object:Gem::Version
64
64
  version: '1.4'
65
- - - '>='
65
+ - - ">="
66
66
  - !ruby/object:Gem::Version
67
67
  version: 1.4.4
68
68
  - !ruby/object:Gem::Dependency
69
69
  name: mustache
70
70
  requirement: !ruby/object:Gem::Requirement
71
71
  requirements:
72
- - - '>='
72
+ - - ">="
73
73
  - !ruby/object:Gem::Version
74
74
  version: 0.99.5
75
- - - <
75
+ - - "<"
76
76
  - !ruby/object:Gem::Version
77
77
  version: 1.0.0
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
- - - '>='
82
+ - - ">="
83
83
  - !ruby/object:Gem::Version
84
84
  version: 0.99.5
85
- - - <
85
+ - - "<"
86
86
  - !ruby/object:Gem::Version
87
87
  version: 1.0.0
88
88
  - !ruby/object:Gem::Dependency
89
89
  name: useragent
90
90
  requirement: !ruby/object:Gem::Requirement
91
91
  requirements:
92
- - - ~>
92
+ - - "~>"
93
93
  - !ruby/object:Gem::Version
94
94
  version: 0.16.2
95
95
  type: :runtime
96
96
  prerelease: false
97
97
  version_requirements: !ruby/object:Gem::Requirement
98
98
  requirements:
99
- - - ~>
99
+ - - "~>"
100
100
  - !ruby/object:Gem::Version
101
101
  version: 0.16.2
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: gemojione
104
104
  requirement: !ruby/object:Gem::Requirement
105
105
  requirements:
106
- - - ~>
106
+ - - "~>"
107
107
  - !ruby/object:Gem::Version
108
- version: '2'
108
+ version: '3.2'
109
109
  type: :runtime
110
110
  prerelease: false
111
111
  version_requirements: !ruby/object:Gem::Requirement
112
112
  requirements:
113
- - - ~>
113
+ - - "~>"
114
114
  - !ruby/object:Gem::Version
115
- version: '2'
115
+ version: '3.2'
116
116
  - !ruby/object:Gem::Dependency
117
117
  name: rack-test
118
118
  requirement: !ruby/object:Gem::Requirement
119
119
  requirements:
120
- - - ~>
120
+ - - "~>"
121
121
  - !ruby/object:Gem::Version
122
122
  version: 0.6.2
123
123
  type: :development
124
124
  prerelease: false
125
125
  version_requirements: !ruby/object:Gem::Requirement
126
126
  requirements:
127
- - - ~>
127
+ - - "~>"
128
128
  - !ruby/object:Gem::Version
129
129
  version: 0.6.2
130
130
  - !ruby/object:Gem::Dependency
131
131
  name: shoulda
132
132
  requirement: !ruby/object:Gem::Requirement
133
133
  requirements:
134
- - - ~>
134
+ - - "~>"
135
135
  - !ruby/object:Gem::Version
136
136
  version: 3.5.0
137
137
  type: :development
138
138
  prerelease: false
139
139
  version_requirements: !ruby/object:Gem::Requirement
140
140
  requirements:
141
- - - ~>
141
+ - - "~>"
142
142
  - !ruby/object:Gem::Version
143
143
  version: 3.5.0
144
144
  - !ruby/object:Gem::Dependency
145
145
  name: minitest-reporters
146
146
  requirement: !ruby/object:Gem::Requirement
147
147
  requirements:
148
- - - ~>
148
+ - - "~>"
149
149
  - !ruby/object:Gem::Version
150
150
  version: 0.14.16
151
151
  type: :development
152
152
  prerelease: false
153
153
  version_requirements: !ruby/object:Gem::Requirement
154
154
  requirements:
155
- - - ~>
155
+ - - "~>"
156
156
  - !ruby/object:Gem::Version
157
157
  version: 0.14.16
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: twitter_cldr
160
160
  requirement: !ruby/object:Gem::Requirement
161
161
  requirements:
162
- - - ~>
162
+ - - "~>"
163
163
  - !ruby/object:Gem::Version
164
164
  version: 3.2.0
165
165
  type: :development
166
166
  prerelease: false
167
167
  version_requirements: !ruby/object:Gem::Requirement
168
168
  requirements:
169
- - - ~>
169
+ - - "~>"
170
170
  - !ruby/object:Gem::Version
171
171
  version: 3.2.0
172
172
  - !ruby/object:Gem::Dependency
173
173
  name: mocha
174
174
  requirement: !ruby/object:Gem::Requirement
175
175
  requirements:
176
- - - ~>
176
+ - - "~>"
177
177
  - !ruby/object:Gem::Version
178
178
  version: 1.1.0
179
179
  type: :development
180
180
  prerelease: false
181
181
  version_requirements: !ruby/object:Gem::Requirement
182
182
  requirements:
183
- - - ~>
183
+ - - "~>"
184
184
  - !ruby/object:Gem::Version
185
185
  version: 1.1.0
186
186
  - !ruby/object:Gem::Dependency
187
187
  name: test-unit
188
188
  requirement: !ruby/object:Gem::Requirement
189
189
  requirements:
190
- - - ~>
190
+ - - "~>"
191
191
  - !ruby/object:Gem::Version
192
192
  version: 3.1.0
193
193
  type: :development
194
194
  prerelease: false
195
195
  version_requirements: !ruby/object:Gem::Requirement
196
196
  requirements:
197
- - - ~>
197
+ - - "~>"
198
198
  - !ruby/object:Gem::Version
199
199
  version: 3.1.0
200
200
  - !ruby/object:Gem::Dependency
201
201
  name: webrick
202
202
  requirement: !ruby/object:Gem::Requirement
203
203
  requirements:
204
- - - ~>
204
+ - - "~>"
205
205
  - !ruby/object:Gem::Version
206
206
  version: 1.3.1
207
207
  type: :development
208
208
  prerelease: false
209
209
  version_requirements: !ruby/object:Gem::Requirement
210
210
  requirements:
211
- - - ~>
211
+ - - "~>"
212
212
  - !ruby/object:Gem::Version
213
213
  version: 1.3.1
214
214
  description: A simple, Git-powered wiki with a sweet API and local frontend.
@@ -1267,22 +1267,22 @@ licenses:
1267
1267
  metadata: {}
1268
1268
  post_install_message:
1269
1269
  rdoc_options:
1270
- - --charset=UTF-8
1270
+ - "--charset=UTF-8"
1271
1271
  require_paths:
1272
1272
  - lib
1273
1273
  required_ruby_version: !ruby/object:Gem::Requirement
1274
1274
  requirements:
1275
- - - '>='
1275
+ - - ">="
1276
1276
  - !ruby/object:Gem::Version
1277
1277
  version: '1.9'
1278
1278
  required_rubygems_version: !ruby/object:Gem::Requirement
1279
1279
  requirements:
1280
- - - '>='
1280
+ - - ">="
1281
1281
  - !ruby/object:Gem::Version
1282
1282
  version: '0'
1283
1283
  requirements: []
1284
1284
  rubyforge_project: gollum
1285
- rubygems_version: 2.2.2
1285
+ rubygems_version: 2.6.11
1286
1286
  signing_key:
1287
1287
  specification_version: 2
1288
1288
  summary: A simple, Git-powered wiki.