olelo 0.9.13 → 0.9.14

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: fa782b9e3ea47992610cfa33f1bddaacace33dd0
4
+ data.tar.gz: 9120ed9f7337dabe28f14d678b1cbf67f97057d7
5
+ SHA512:
6
+ metadata.gz: 881647481ee59f6ba41cc9d246517098033a1ff92ea9fb54931d9af6a373aa84f2c76ccd40df73aabde4dd274b0b11d5093b374bbd5f96231446ceb5f94824bf
7
+ data.tar.gz: fb868fbed460dfdad246636d524bcdc411f7f972221b77edb6110833dba490e7e109bb120e4b0b36f0d3fa4cbdb18550a9706729278c85dca0678dfb614bc661
data/.travis.yml CHANGED
@@ -1,7 +1,7 @@
1
1
  language: ruby
2
2
  rvm:
3
- - 1.9.2
4
3
  - 1.9.3
4
+ - 2.0.0
5
5
  - ruby-head
6
6
  - rbx-19mode
7
7
  matrix:
data/Gemfile CHANGED
@@ -1,3 +1,3 @@
1
- source :rubygems
1
+ source 'https://rubygems.org/'
2
2
  gemspec
3
3
 
data/README.creole CHANGED
@@ -3,7 +3,7 @@
3
3
  [[http://rubygems.org/gems/olelo|{{https://badge.fury.io/rb/olelo.png|Gem}}]]
4
4
  [[https://travis-ci.org/minad/olelo|{{https://secure.travis-ci.org/minad/olelo.png?branch=master|Build Status}}]]
5
5
  [[https://gemnasium.com/minad/olelo|{{https://gemnasium.com/minad/olelo.png?travis|Dependency Status}}]]
6
- [[https://codeclimate.com/github/minad/olelo|{{https://codeclimate.com/badge.png|Code Climate}}]]
6
+ [[https://codeclimate.com/github/minad/olelo|{{https://codeclimate.com/github/minad/moneta.png|Code Climate}}]]
7
7
 
8
8
  Ōlelo is a wiki that stores pages in a [[http://git-scm.org/|Git]] repository, supports many markup styles and has an extensible, hackable architecture!
9
9
  If you want to see a demo installation go to http://www.gitwiki.org/.
data/config.ru CHANGED
@@ -86,12 +86,14 @@ use Rack::Static, urls: ['/static'], root: app_path
86
86
 
87
87
  use Rack::Session::Cookie, key: 'olelo.session', secret: Olelo::Config['rack.session_secret']
88
88
 
89
+ if Olelo::Config['production']
90
+ require 'rack/protection'
91
+ use Rack::Protection
92
+ end
93
+
89
94
  #require 'rack/perftools_profiler'
90
95
  #use Rack::PerftoolsProfiler
91
96
 
92
- use Olelo::Middleware::DegradeMimeType
93
- use Olelo::Middleware::UAHeader
94
-
95
97
  class LoggerOutput
96
98
  def initialize(logger); @logger = logger; end
97
99
  def write(text); @logger << text; end
data/lib/olelo.rb CHANGED
@@ -32,7 +32,5 @@ require 'olelo/initializer'
32
32
  require 'olelo/application'
33
33
  require 'olelo/version'
34
34
 
35
- require 'olelo/middleware/degrade_mime_type'
36
- require 'olelo/middleware/ua_header'
37
35
  require 'olelo/middleware/force_encoding'
38
36
  require 'olelo/middleware/static_cache'
@@ -37,7 +37,7 @@ module Olelo
37
37
  User.current ||= User.anonymous(request)
38
38
  end
39
39
 
40
- response['Content-Type'] = 'application/xhtml+xml;charset=utf-8'
40
+ response['Content-Type'] = 'text/html;charset=utf-8'
41
41
  end
42
42
 
43
43
  # Executed after each request
@@ -1,7 +1,4 @@
1
1
  class Module
2
- # HACK: private_constant was introduced in 1.9.3
3
- def private_constant(*args); end unless respond_to?(:private_constant)
4
-
5
2
  # Generate accessor method with question mark
6
3
  #
7
4
  # @param [String, Symbol...] attrs Attributes to generate setter for
data/lib/olelo/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Olelo
2
- VERSION = '0.9.13'
2
+ VERSION = '0.9.14'
3
3
  end
data/olelo.gemspec CHANGED
@@ -23,14 +23,15 @@ Gem::Specification.new do |s|
23
23
  s.add_runtime_dependency('creole', ['~> 0.5.0'])
24
24
  s.add_runtime_dependency('evaluator', ['~> 0.1.6'])
25
25
  s.add_runtime_dependency('mimemagic', ['~> 0.2.0'])
26
- s.add_runtime_dependency('multi_json', ['~> 1.6.0'])
27
- s.add_runtime_dependency('nokogiri', ['~> 1.5.5'])
26
+ s.add_runtime_dependency('multi_json', ['~> 1.7.3'])
27
+ s.add_runtime_dependency('nokogiri', ['~> 1.6.0'])
28
28
  s.add_runtime_dependency('rack', ['~> 1.5.0'])
29
- s.add_runtime_dependency('redcarpet', ['~> 2.2.2'])
30
- s.add_runtime_dependency('rugged', ['~> 0.17.0.b7'])
31
- s.add_runtime_dependency('slim', ['~> 2.0.0.pre.5'])
29
+ s.add_runtime_dependency('redcarpet', ['~> 3.0.0'])
30
+ s.add_runtime_dependency('rugged', ['~> 0.19.0'])
31
+ s.add_runtime_dependency('slim', ['~> 2.0.0'])
32
32
  s.add_runtime_dependency('moneta', ['~> 0.7.0'])
33
- s.add_runtime_dependency('rouge', ['~> 0.2.13'])
33
+ s.add_runtime_dependency('rouge', ['~> 0.3.6'])
34
+ s.add_runtime_dependency('rack-protection', ['~> 1.5.0'])
34
35
 
35
36
  s.add_development_dependency('bacon', ['~> 1.1.0'])
36
37
  s.add_development_dependency('rack-test', ['~> 0.6.2'])
@@ -44,7 +44,6 @@ table#subpages
44
44
  a.action-delete href=build_path(child, action: :delete) title=:delete.t = :delete.t
45
45
  = pagination(@page, @page_count, @page_nr, aspect: 'subpages')
46
46
 
47
- __END__
48
47
  @@ locale.yml
49
48
  cs:
50
49
  actions: 'Akce'
@@ -3,5 +3,5 @@ dependencies 'utils/assets'
3
3
  export_scripts '*.js'
4
4
 
5
5
  Application.hook :head do
6
- %{<script src="http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript"/>}
6
+ %{<script src="http://d1n0x3qji82z53.cloudfront.net/src-min-noconflict/ace.js" type="text/javascript"></script>}
7
7
  end
@@ -6,11 +6,11 @@ RECAPTCHA_PRIVATE = Config['recaptcha.private']
6
6
 
7
7
  class ::Olelo::Application
8
8
  hook :head do
9
- %{<script type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js"/>
9
+ %{<script type="text/javascript" src="http://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
10
10
  <script type="text/javascript">
11
11
  $(function() {
12
12
  Recaptcha.create('#{RECAPTCHA_PUBLIC}',
13
- 'recaptcha', {
13
+ 'recaptcha_field', {
14
14
  theme: 'clean',
15
15
  callback: Recaptcha.focus_response_field
16
16
  });
@@ -21,7 +21,7 @@ class ::Olelo::Application
21
21
  %w(edit attributes upload).each do |action|
22
22
  before "#{action}_buttons" do
23
23
  if flash[:show_captcha] && action?(action)
24
- %{<br/><div id="recaptcha"></div><br/>}
24
+ %{<br/><div id="recaptcha_field"></div><br/>}
25
25
  end
26
26
  end
27
27
 
@@ -21,7 +21,7 @@ class RuggedRepository < Repository
21
21
  end
22
22
 
23
23
  def save
24
- Rugged::Blob.create(@git, @content)
24
+ @git.write(@content, :blob)
25
25
  end
26
26
  end
27
27
 
@@ -152,19 +152,13 @@ class RuggedRepository < Repository
152
152
 
153
153
  user = User.current
154
154
  author = {email: user.email, name: user.name, time: Time.now }
155
- commit = Rugged::Commit.create(@git,
156
- author: author,
157
- message: comment,
158
- committer: author,
159
- parents: [@head],
160
- tree: @tree.save)
161
-
162
- raise 'Concurrent transactions' if @head != current_head
163
- if current_head
164
- @git.head.target = commit
165
- else
166
- Rugged::Reference.create(@git, "refs/heads/master", commit)
167
- end
155
+ Rugged::Commit.create(@git,
156
+ author: author,
157
+ message: comment,
158
+ committer: author,
159
+ parents: [@head],
160
+ tree: @tree.save,
161
+ update_ref: 'HEAD')
168
162
  end
169
163
 
170
164
  private
@@ -177,7 +171,7 @@ class RuggedRepository < Repository
177
171
  def initialize(config)
178
172
  @git = Rugged::Repository.new(config[:path])
179
173
  Olelo.logger.info "Opening git repository: #{config[:path]}"
180
- rescue Rugged::OSError
174
+ rescue IOError
181
175
  Olelo.logger.info "Creating git repository: #{config[:path]}"
182
176
  FileUtils.mkpath(config[:path])
183
177
  @git = Rugged::Repository.init_at(config[:path], config[:bare])
@@ -419,14 +413,14 @@ class RuggedRepository < Repository
419
413
  def oid_by_path(commit, path)
420
414
  return commit.tree_oid if path.blank?
421
415
  commit.tree.path(path)[:oid]
422
- rescue Rugged::IndexerError
416
+ rescue Rugged::Error
423
417
  nil
424
418
  end
425
419
 
426
420
  def object_by_path(commit, path)
427
421
  return commit.tree if path.blank?
428
422
  @git.lookup(commit.tree.path(path)[:oid])
429
- rescue Rugged::IndexerError
423
+ rescue Rugged::Error
430
424
  nil
431
425
  end
432
426
 
data/plugins/tags/html.rb CHANGED
@@ -1,42 +1,42 @@
1
1
  description 'Safe html tags'
2
2
 
3
3
  HTML_TAGS = [
4
- [:a, {optional: %w(href title)}],
5
- [:img, {autoclose: true, optional: %w(src alt title)}],
6
- [:br, {autoclose: true}],
7
- [:i],
8
- [:u],
9
- [:b],
10
- [:pre],
11
- [:kbd],
4
+ [:a, {optional: %w(href title id)}],
5
+ [:img, {autoclose: true, optional: %w(src alt title id)}],
6
+ [:br, {autoclose: true, optional: %w(id)}],
7
+ [:i, {optional: %w(id)}],
8
+ [:u, {optional: %w(id)}],
9
+ [:b, {optional: %w(id)}],
10
+ [:pre, {optional: %w(id)}],
11
+ [:kbd, {optional: %w(id)}],
12
12
  # provided by syntax highlighter
13
13
  # [:code, optional: %w(lang)]
14
- [:cite],
15
- [:strong],
16
- [:em],
17
- [:ins],
18
- [:sup],
19
- [:sub],
20
- [:del],
21
- [:table],
22
- [:tr],
23
- [:td, {optional: %w(colspan rowspan)}],
24
- [:th],
25
- [:ol, {optional: %w(start)}],
26
- [:ul],
27
- [:li],
28
- [:p],
29
- [:h1],
30
- [:h2],
31
- [:h3],
32
- [:h4],
33
- [:h5],
34
- [:h6],
35
- [:blockquote, {optional: %w(cite)}],
36
- [:div, {optional: %w(style)}],
37
- [:span, {optional: %w(style)}],
38
- [:video, {optional: %w(autoplay controls height width loop preload src poster)}],
39
- [:audio, {optional: %w(autoplay controls loop preload src)}]
14
+ [:cite, {optional: %w(id)}],
15
+ [:strong, {optional: %w(id)}],
16
+ [:em, {optional: %w(id)}],
17
+ [:ins, {optional: %w(id)}],
18
+ [:sup, {optional: %w(id)}],
19
+ [:sub, {optional: %w(id)}],
20
+ [:del, {optional: %w(id)}],
21
+ [:table, {optional: %w(id)}],
22
+ [:tr, {optional: %w(id)}],
23
+ [:td, {optional: %w(colspan rowspan id)}],
24
+ [:th, {optional: %w(id)}],
25
+ [:ol, {optional: %w(start id)}],
26
+ [:ul, {optional: %w(id)}],
27
+ [:li, {optional: %w(id)}],
28
+ [:p, {optional: %w(id)}],
29
+ [:h1, {optional: %w(id)}],
30
+ [:h2, {optional: %w(id)}],
31
+ [:h3, {optional: %w(id)}],
32
+ [:h4, {optional: %w(id)}],
33
+ [:h5, {optional: %w(id)}],
34
+ [:h6, {optional: %w(id)}],
35
+ [:blockquote, {optional: %w(cite id)}],
36
+ [:div, {optional: %w(style id)}],
37
+ [:span, {optional: %w(style id)}],
38
+ [:video, {optional: %w(autoplay controls height width loop preload src poster id)}],
39
+ [:audio, {optional: %w(autoplay controls loop preload src id)}]
40
40
  ]
41
41
 
42
42
  HTML_TAGS.each do |name, options|
data/test/request_test.rb CHANGED
@@ -69,8 +69,6 @@ describe 'requests' do
69
69
  use Rack::Session::Pool
70
70
  use Rack::MethodOverride
71
71
  use Olelo::Middleware::ForceEncoding
72
- use Olelo::Middleware::DegradeMimeType
73
- use Olelo::Middleware::UAHeader
74
72
  #use Rack::RelativeRedirect
75
73
  run Olelo::Application.new
76
74
  end
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: olelo
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.13
5
- prerelease:
4
+ version: 0.9.14
6
5
  platform: ruby
7
6
  authors:
8
7
  - Daniel Mendler
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-02-12 00:00:00.000000000 Z
11
+ date: 2013-07-15 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: RedCloth
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: creole
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - ~>
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - ~>
44
39
  - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: evaluator
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - ~>
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - ~>
60
53
  - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: mimemagic
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - ~>
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - ~>
76
67
  - !ruby/object:Gem::Version
@@ -78,39 +69,34 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: multi_json
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
73
  - - ~>
84
74
  - !ruby/object:Gem::Version
85
- version: 1.6.0
75
+ version: 1.7.3
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
80
  - - ~>
92
81
  - !ruby/object:Gem::Version
93
- version: 1.6.0
82
+ version: 1.7.3
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: nokogiri
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - ~>
100
88
  - !ruby/object:Gem::Version
101
- version: 1.5.5
89
+ version: 1.6.0
102
90
  type: :runtime
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - ~>
108
95
  - !ruby/object:Gem::Version
109
- version: 1.5.5
96
+ version: 1.6.0
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: rack
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
101
  - - ~>
116
102
  - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
118
104
  type: :runtime
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
108
  - - ~>
124
109
  - !ruby/object:Gem::Version
@@ -126,55 +111,48 @@ dependencies:
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: redcarpet
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
115
  - - ~>
132
116
  - !ruby/object:Gem::Version
133
- version: 2.2.2
117
+ version: 3.0.0
134
118
  type: :runtime
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
122
  - - ~>
140
123
  - !ruby/object:Gem::Version
141
- version: 2.2.2
124
+ version: 3.0.0
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: rugged
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
129
  - - ~>
148
130
  - !ruby/object:Gem::Version
149
- version: 0.17.0.b7
131
+ version: 0.19.0
150
132
  type: :runtime
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
136
  - - ~>
156
137
  - !ruby/object:Gem::Version
157
- version: 0.17.0.b7
138
+ version: 0.19.0
158
139
  - !ruby/object:Gem::Dependency
159
140
  name: slim
160
141
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
142
  requirements:
163
143
  - - ~>
164
144
  - !ruby/object:Gem::Version
165
- version: 2.0.0.pre.5
145
+ version: 2.0.0
166
146
  type: :runtime
167
147
  prerelease: false
168
148
  version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
149
  requirements:
171
150
  - - ~>
172
151
  - !ruby/object:Gem::Version
173
- version: 2.0.0.pre.5
152
+ version: 2.0.0
174
153
  - !ruby/object:Gem::Dependency
175
154
  name: moneta
176
155
  requirement: !ruby/object:Gem::Requirement
177
- none: false
178
156
  requirements:
179
157
  - - ~>
180
158
  - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
182
160
  type: :runtime
183
161
  prerelease: false
184
162
  version_requirements: !ruby/object:Gem::Requirement
185
- none: false
186
163
  requirements:
187
164
  - - ~>
188
165
  - !ruby/object:Gem::Version
@@ -190,23 +167,34 @@ dependencies:
190
167
  - !ruby/object:Gem::Dependency
191
168
  name: rouge
192
169
  requirement: !ruby/object:Gem::Requirement
193
- none: false
194
170
  requirements:
195
171
  - - ~>
196
172
  - !ruby/object:Gem::Version
197
- version: 0.2.13
173
+ version: 0.3.6
198
174
  type: :runtime
199
175
  prerelease: false
200
176
  version_requirements: !ruby/object:Gem::Requirement
201
- none: false
202
177
  requirements:
203
178
  - - ~>
204
179
  - !ruby/object:Gem::Version
205
- version: 0.2.13
180
+ version: 0.3.6
181
+ - !ruby/object:Gem::Dependency
182
+ name: rack-protection
183
+ requirement: !ruby/object:Gem::Requirement
184
+ requirements:
185
+ - - ~>
186
+ - !ruby/object:Gem::Version
187
+ version: 1.5.0
188
+ type: :runtime
189
+ prerelease: false
190
+ version_requirements: !ruby/object:Gem::Requirement
191
+ requirements:
192
+ - - ~>
193
+ - !ruby/object:Gem::Version
194
+ version: 1.5.0
206
195
  - !ruby/object:Gem::Dependency
207
196
  name: bacon
208
197
  requirement: !ruby/object:Gem::Requirement
209
- none: false
210
198
  requirements:
211
199
  - - ~>
212
200
  - !ruby/object:Gem::Version
@@ -214,7 +202,6 @@ dependencies:
214
202
  type: :development
215
203
  prerelease: false
216
204
  version_requirements: !ruby/object:Gem::Requirement
217
- none: false
218
205
  requirements:
219
206
  - - ~>
220
207
  - !ruby/object:Gem::Version
@@ -222,7 +209,6 @@ dependencies:
222
209
  - !ruby/object:Gem::Dependency
223
210
  name: rack-test
224
211
  requirement: !ruby/object:Gem::Requirement
225
- none: false
226
212
  requirements:
227
213
  - - ~>
228
214
  - !ruby/object:Gem::Version
@@ -230,7 +216,6 @@ dependencies:
230
216
  type: :development
231
217
  prerelease: false
232
218
  version_requirements: !ruby/object:Gem::Requirement
233
- none: false
234
219
  requirements:
235
220
  - - ~>
236
221
  - !ruby/object:Gem::Version
@@ -238,23 +223,20 @@ dependencies:
238
223
  - !ruby/object:Gem::Dependency
239
224
  name: rake
240
225
  requirement: !ruby/object:Gem::Requirement
241
- none: false
242
226
  requirements:
243
- - - ! '>='
227
+ - - '>='
244
228
  - !ruby/object:Gem::Version
245
229
  version: 0.8.7
246
230
  type: :development
247
231
  prerelease: false
248
232
  version_requirements: !ruby/object:Gem::Requirement
249
- none: false
250
233
  requirements:
251
- - - ! '>='
234
+ - - '>='
252
235
  - !ruby/object:Gem::Version
253
236
  version: 0.8.7
254
237
  - !ruby/object:Gem::Dependency
255
238
  name: sass
256
239
  requirement: !ruby/object:Gem::Requirement
257
- none: false
258
240
  requirements:
259
241
  - - ~>
260
242
  - !ruby/object:Gem::Version
@@ -262,7 +244,6 @@ dependencies:
262
244
  type: :development
263
245
  prerelease: false
264
246
  version_requirements: !ruby/object:Gem::Requirement
265
- none: false
266
247
  requirements:
267
248
  - - ~>
268
249
  - !ruby/object:Gem::Version
@@ -302,10 +283,8 @@ files:
302
283
  - lib/olelo/locale.rb
303
284
  - lib/olelo/locale.yml
304
285
  - lib/olelo/menu.rb
305
- - lib/olelo/middleware/degrade_mime_type.rb
306
286
  - lib/olelo/middleware/force_encoding.rb
307
287
  - lib/olelo/middleware/static_cache.rb
308
- - lib/olelo/middleware/ua_header.rb
309
288
  - lib/olelo/page.rb
310
289
  - lib/olelo/patch.rb
311
290
  - lib/olelo/plugin.rb
@@ -561,26 +540,25 @@ files:
561
540
  - test/util_test.rb
562
541
  homepage: http://gitwiki.org/
563
542
  licenses: []
543
+ metadata: {}
564
544
  post_install_message:
565
545
  rdoc_options: []
566
546
  require_paths:
567
547
  - lib
568
548
  required_ruby_version: !ruby/object:Gem::Requirement
569
- none: false
570
549
  requirements:
571
- - - ! '>='
550
+ - - '>='
572
551
  - !ruby/object:Gem::Version
573
552
  version: 1.9.2
574
553
  required_rubygems_version: !ruby/object:Gem::Requirement
575
- none: false
576
554
  requirements:
577
- - - ! '>='
555
+ - - '>='
578
556
  - !ruby/object:Gem::Version
579
557
  version: '0'
580
558
  requirements: []
581
559
  rubyforge_project: olelo
582
- rubygems_version: 1.8.24
560
+ rubygems_version: 2.0.3
583
561
  signing_key:
584
- specification_version: 3
562
+ specification_version: 4
585
563
  summary: Olelo is a git-based wiki.
586
564
  test_files: []
@@ -1,20 +0,0 @@
1
- module Olelo
2
- module Middleware
3
- class DegradeMimeType
4
- def initialize(app)
5
- @app = app
6
- end
7
-
8
- def call(env)
9
- status, header, body = @app.call(env)
10
- if header['Content-Type'] && header['Content-Type'] =~ %r{\Aapplication/xhtml\+xml(;?.*)\Z}
11
- charset = $1
12
- if env['HTTP_ACCEPT'].to_s !~ %r{application/xhtml\+xml}
13
- header['Content-Type'] = "text/html#{charset}"
14
- end
15
- end
16
- [status, header, body]
17
- end
18
- end
19
- end
20
- end
@@ -1,16 +0,0 @@
1
- # From ActionPack
2
- module Olelo
3
- module Middleware
4
- class UAHeader
5
- def initialize(app)
6
- @app = app
7
- end
8
-
9
- def call(env)
10
- status, headers, body = @app.call(env)
11
- headers['X-UA-Compatible'] = 'IE=Edge,chrome=1'
12
- [status, headers, body]
13
- end
14
- end
15
- end
16
- end