retter 0.2.3 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. data/lib/retter/generator/skel/Gemfile +1 -1
  2. data/lib/retter/markdown/code_ray_renderer.rb +11 -0
  3. data/lib/retter/markdown/pygments_renderer.rb +17 -0
  4. data/lib/retter/markdown.rb +2 -18
  5. data/lib/retter/monkey/rubypython.rb +11 -0
  6. data/lib/retter/page/feed.rb +1 -1
  7. data/lib/retter/version.rb +1 -1
  8. data/retter.gemspec +22 -22
  9. metadata +71 -68
data/lib/retter/generator/skel/Gemfile CHANGED
@@ -1,5 +1,5 @@
1
1
  source :rubygems
2
2
 
3
- gem 'retter', '~> 0.2.3'
3
+ gem 'retter', '~> <%= Retter::VERSION %>'
4
4
  gem 'rack'
5
5
  gem 'thin' # for heroku
data/lib/retter/markdown/code_ray_renderer.rb ADDED
@@ -0,0 +1,11 @@
1
+ require 'coderay'
2
+
3
+ module Retter
4
+ module Markdown
5
+ class CodeRayRenderer < Redcarpet::Render::HTML
6
+ def block_code(code, lang)
7
+ CodeRay.scan(code, lang ? lang.intern : :plain).div
8
+ end
9
+ end
10
+ end
11
+ end
data/lib/retter/markdown/pygments_renderer.rb ADDED
@@ -0,0 +1,17 @@
1
+ require 'retter/monkey/rubypython'
2
+ require 'pygments'
3
+ require 'set'
4
+
5
+ module Retter
6
+ module Markdown
7
+ class PygmentsRenderer < Redcarpet::Render::HTML
8
+ LANGUAGES = Set.new(Pygments.lexers.map {|_, l| l[:aliases] }.flatten)
9
+
10
+ def block_code(code, lang)
11
+ lang = LANGUAGES.include?(lang) ? lang : 'text'
12
+
13
+ Pygments.highlight(code, lexer: lang, formatter: 'html', options: {encoding: 'utf-8'})
14
+ end
15
+ end
16
+ end
17
+ end
data/lib/retter/markdown.rb CHANGED
@@ -1,27 +1,11 @@
1
1
  # coding: utf-8
2
2
 
3
3
  require 'redcarpet'
4
- require 'pygments'
5
- require 'coderay'
6
- require 'set'
7
4
 
8
5
  module Retter
9
6
  module Markdown
10
- class CodeRayRenderer < Redcarpet::Render::HTML
11
- def block_code(code, lang)
12
- CodeRay.scan(code, lang ? lang.intern : :plain).div
13
- end
14
- end
15
-
16
- class PygmentsRenderer < Redcarpet::Render::HTML
17
- LANGUAGES = Set.new(Pygments.lexers.map {|_, l| l[:aliases] }.flatten)
18
-
19
- def block_code(code, lang)
20
- lang = LANGUAGES.include?(lang) ? lang : 'text'
21
-
22
- Pygments.highlight(code, lexer: lang, formatter: 'html', options: {encoding: 'utf-8'})
23
- end
24
- end
7
+ autoload :CodeRayRenderer, 'retter/markdown/code_ray_renderer'
8
+ autoload :PygmentsRenderer, 'retter/markdown/pygments_renderer'
25
9
 
26
10
  extend Configurable
27
11
 
data/lib/retter/monkey/rubypython.rb ADDED
@@ -0,0 +1,11 @@
1
+ require 'rubypython'
2
+
3
+ if RubyPython::VERSION <= '0.5.3'
4
+ # Monkey patching for https://github.com/tmm1/pygments.rb/issues/10
5
+ class RubyPython::PythonExec
6
+ # Run a Python command-line command.
7
+ def run_command(command)
8
+ %x("#{@python} -c #{command}").chomp if @python
9
+ end
10
+ end
11
+ end
data/lib/retter/page/feed.rb CHANGED
@@ -36,7 +36,7 @@ module Retter
36
36
  xml.rdf:RDF, :xmlns => 'http://purl.org/rss/1.0/',
37
37
  :'xmlns:rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
38
38
  :'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
39
- :'xmlns:content' => 'xmlns:content="http://purl.org/rss/1.0/modules/content/',
39
+ :'xmlns:content' => 'http://purl.org/rss/1.0/modules/content/',
40
40
  :'xml:lang' => 'ja' do
41
41
  xml.channel :'rdf:about' => config.url do
42
42
  xml.title config.title
data/lib/retter/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Retter
2
- VERSION = '0.2.3'
2
+ VERSION = '0.2.4'
3
3
  end
data/retter.gemspec CHANGED
@@ -18,29 +18,29 @@ Gem::Specification.new do |gem|
18
18
 
19
19
  gem.required_ruby_version = '>= 1.9.1'
20
20
 
21
- gem.add_runtime_dependency 'thor', ['>= 0.15.2']
22
- gem.add_runtime_dependency 'builder', ['>= 3.0.0']
23
- gem.add_runtime_dependency 'redcarpet', ['>= 2.1.1']
24
- gem.add_runtime_dependency 'coderay', ['>= 1.0.7']
25
- gem.add_runtime_dependency 'pygments.rb', ['>= 0.2.13']
26
- gem.add_runtime_dependency 'nokogiri', ['>= 1.5.3']
27
- gem.add_runtime_dependency 'launchy', ['>= 2.1.0']
28
- gem.add_runtime_dependency 'haml', ['>= 3.1.6']
29
- gem.add_runtime_dependency 'tilt', ['>= 1.3.3']
30
- gem.add_runtime_dependency 'bundler', ['>= 1.1.4']
31
- gem.add_runtime_dependency 'grit', ['>= 2.5.0']
32
- gem.add_runtime_dependency 'chronic', ['>= 0.6.7']
33
- gem.add_runtime_dependency 'activesupport', ['>= 3.2.5']
21
+ gem.add_runtime_dependency 'thor', ['~> 0.16.0']
22
+ gem.add_runtime_dependency 'builder', ['~> 3.1.3']
23
+ gem.add_runtime_dependency 'redcarpet', ['~> 2.1.1']
24
+ gem.add_runtime_dependency 'coderay', ['~> 1.0.7']
25
+ gem.add_runtime_dependency 'pygments.rb', ['~> 0.2.13']
26
+ gem.add_runtime_dependency 'nokogiri', ['~> 1.5.5']
27
+ gem.add_runtime_dependency 'launchy', ['~> 2.1.2']
28
+ gem.add_runtime_dependency 'haml', ['~> 3.1.7']
29
+ gem.add_runtime_dependency 'tilt', ['~> 1.3.3']
30
+ gem.add_runtime_dependency 'bundler', ['~> 1.2.1']
31
+ gem.add_runtime_dependency 'grit', ['~> 2.5.0']
32
+ gem.add_runtime_dependency 'chronic', ['~> 0.8.0']
33
+ gem.add_runtime_dependency 'activesupport', ['~> 3.2.8']
34
34
 
35
35
  # XXX for ActiveSupport dependencies
36
- gem.add_runtime_dependency 'rack', ['>= 1.4.1']
37
- gem.add_runtime_dependency 'i18n', ['>= 0.6.0']
36
+ gem.add_runtime_dependency 'rack', ['~> 1.4.1']
37
+ gem.add_runtime_dependency 'i18n', ['~> 0.6.1']
38
38
 
39
- gem.add_development_dependency 'rake', ['>= 0.9.2']
40
- gem.add_development_dependency 'ir_b', ['>= 1.5.0']
41
- gem.add_development_dependency 'tapp', ['>= 1.3.1']
42
- gem.add_development_dependency 'rspec', ['>= 2.10.0']
43
- gem.add_development_dependency 'fuubar', ['>= 1.0.0']
44
- gem.add_development_dependency 'simplecov', ['>= 0.6.4']
45
- gem.add_development_dependency 'delorean', ['>= 2.0.0']
39
+ gem.add_development_dependency 'rake', ['~> 0.9.2']
40
+ gem.add_development_dependency 'ir_b', ['~> 1.5.0']
41
+ gem.add_development_dependency 'tapp', ['~> 1.4.0']
42
+ gem.add_development_dependency 'rspec', ['~> 2.11.0']
43
+ gem.add_development_dependency 'fuubar', ['~> 1.0.0']
44
+ gem.add_development_dependency 'simplecov', ['~> 0.6.4']
45
+ gem.add_development_dependency 'delorean', ['~> 2.0.0']
46
46
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: retter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.3
4
+ version: 0.2.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,46 +10,46 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-07-18 00:00:00.000000000 Z
13
+ date: 2012-09-25 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: thor
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
- - - ! '>='
20
+ - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.15.2
22
+ version: 0.16.0
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  none: false
27
27
  requirements:
28
- - - ! '>='
28
+ - - ~>
29
29
  - !ruby/object:Gem::Version
30
- version: 0.15.2
30
+ version: 0.16.0
31
31
  - !ruby/object:Gem::Dependency
32
32
  name: builder
33
33
  requirement: !ruby/object:Gem::Requirement
34
34
  none: false
35
35
  requirements:
36
- - - ! '>='
36
+ - - ~>
37
37
  - !ruby/object:Gem::Version
38
- version: 3.0.0
38
+ version: 3.1.3
39
39
  type: :runtime
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
- - - ! '>='
44
+ - - ~>
45
45
  - !ruby/object:Gem::Version
46
- version: 3.0.0
46
+ version: 3.1.3
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: redcarpet
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
- - - ! '>='
52
+ - - ~>
53
53
  - !ruby/object:Gem::Version
54
54
  version: 2.1.1
55
55
  type: :runtime
@@ -57,7 +57,7 @@ dependencies:
57
57
  version_requirements: !ruby/object:Gem::Requirement
58
58
  none: false
59
59
  requirements:
60
- - - ! '>='
60
+ - - ~>
61
61
  - !ruby/object:Gem::Version
62
62
  version: 2.1.1
63
63
  - !ruby/object:Gem::Dependency
@@ -65,7 +65,7 @@ dependencies:
65
65
  requirement: !ruby/object:Gem::Requirement
66
66
  none: false
67
67
  requirements:
68
- - - ! '>='
68
+ - - ~>
69
69
  - !ruby/object:Gem::Version
70
70
  version: 1.0.7
71
71
  type: :runtime
@@ -73,7 +73,7 @@ dependencies:
73
73
  version_requirements: !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
76
- - - ! '>='
76
+ - - ~>
77
77
  - !ruby/object:Gem::Version
78
78
  version: 1.0.7
79
79
  - !ruby/object:Gem::Dependency
@@ -81,7 +81,7 @@ dependencies:
81
81
  requirement: !ruby/object:Gem::Requirement
82
82
  none: false
83
83
  requirements:
84
- - - ! '>='
84
+ - - ~>
85
85
  - !ruby/object:Gem::Version
86
86
  version: 0.2.13
87
87
  type: :runtime
@@ -89,7 +89,7 @@ dependencies:
89
89
  version_requirements: !ruby/object:Gem::Requirement
90
90
  none: false
91
91
  requirements:
92
- - - ! '>='
92
+ - - ~>
93
93
  - !ruby/object:Gem::Version
94
94
  version: 0.2.13
95
95
  - !ruby/object:Gem::Dependency
@@ -97,55 +97,55 @@ dependencies:
97
97
  requirement: !ruby/object:Gem::Requirement
98
98
  none: false
99
99
  requirements:
100
- - - ! '>='
100
+ - - ~>
101
101
  - !ruby/object:Gem::Version
102
- version: 1.5.3
102
+ version: 1.5.5
103
103
  type: :runtime
104
104
  prerelease: false
105
105
  version_requirements: !ruby/object:Gem::Requirement
106
106
  none: false
107
107
  requirements:
108
- - - ! '>='
108
+ - - ~>
109
109
  - !ruby/object:Gem::Version
110
- version: 1.5.3
110
+ version: 1.5.5
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: launchy
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  none: false
115
115
  requirements:
116
- - - ! '>='
116
+ - - ~>
117
117
  - !ruby/object:Gem::Version
118
- version: 2.1.0
118
+ version: 2.1.2
119
119
  type: :runtime
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  none: false
123
123
  requirements:
124
- - - ! '>='
124
+ - - ~>
125
125
  - !ruby/object:Gem::Version
126
- version: 2.1.0
126
+ version: 2.1.2
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: haml
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  none: false
131
131
  requirements:
132
- - - ! '>='
132
+ - - ~>
133
133
  - !ruby/object:Gem::Version
134
- version: 3.1.6
134
+ version: 3.1.7
135
135
  type: :runtime
136
136
  prerelease: false
137
137
  version_requirements: !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
- - - ! '>='
140
+ - - ~>
141
141
  - !ruby/object:Gem::Version
142
- version: 3.1.6
142
+ version: 3.1.7
143
143
  - !ruby/object:Gem::Dependency
144
144
  name: tilt
145
145
  requirement: !ruby/object:Gem::Requirement
146
146
  none: false
147
147
  requirements:
148
- - - ! '>='
148
+ - - ~>
149
149
  - !ruby/object:Gem::Version
150
150
  version: 1.3.3
151
151
  type: :runtime
@@ -153,7 +153,7 @@ dependencies:
153
153
  version_requirements: !ruby/object:Gem::Requirement
154
154
  none: false
155
155
  requirements:
156
- - - ! '>='
156
+ - - ~>
157
157
  - !ruby/object:Gem::Version
158
158
  version: 1.3.3
159
159
  - !ruby/object:Gem::Dependency
@@ -161,23 +161,23 @@ dependencies:
161
161
  requirement: !ruby/object:Gem::Requirement
162
162
  none: false
163
163
  requirements:
164
- - - ! '>='
164
+ - - ~>
165
165
  - !ruby/object:Gem::Version
166
- version: 1.1.4
166
+ version: 1.2.1
167
167
  type: :runtime
168
168
  prerelease: false
169
169
  version_requirements: !ruby/object:Gem::Requirement
170
170
  none: false
171
171
  requirements:
172
- - - ! '>='
172
+ - - ~>
173
173
  - !ruby/object:Gem::Version
174
- version: 1.1.4
174
+ version: 1.2.1
175
175
  - !ruby/object:Gem::Dependency
176
176
  name: grit
177
177
  requirement: !ruby/object:Gem::Requirement
178
178
  none: false
179
179
  requirements:
180
- - - ! '>='
180
+ - - ~>
181
181
  - !ruby/object:Gem::Version
182
182
  version: 2.5.0
183
183
  type: :runtime
@@ -185,7 +185,7 @@ dependencies:
185
185
  version_requirements: !ruby/object:Gem::Requirement
186
186
  none: false
187
187
  requirements:
188
- - - ! '>='
188
+ - - ~>
189
189
  - !ruby/object:Gem::Version
190
190
  version: 2.5.0
191
191
  - !ruby/object:Gem::Dependency
@@ -193,39 +193,39 @@ dependencies:
193
193
  requirement: !ruby/object:Gem::Requirement
194
194
  none: false
195
195
  requirements:
196
- - - ! '>='
196
+ - - ~>
197
197
  - !ruby/object:Gem::Version
198
- version: 0.6.7
198
+ version: 0.8.0
199
199
  type: :runtime
200
200
  prerelease: false
201
201
  version_requirements: !ruby/object:Gem::Requirement
202
202
  none: false
203
203
  requirements:
204
- - - ! '>='
204
+ - - ~>
205
205
  - !ruby/object:Gem::Version
206
- version: 0.6.7
206
+ version: 0.8.0
207
207
  - !ruby/object:Gem::Dependency
208
208
  name: activesupport
209
209
  requirement: !ruby/object:Gem::Requirement
210
210
  none: false
211
211
  requirements:
212
- - - ! '>='
212
+ - - ~>
213
213
  - !ruby/object:Gem::Version
214
- version: 3.2.5
214
+ version: 3.2.8
215
215
  type: :runtime
216
216
  prerelease: false
217
217
  version_requirements: !ruby/object:Gem::Requirement
218
218
  none: false
219
219
  requirements:
220
- - - ! '>='
220
+ - - ~>
221
221
  - !ruby/object:Gem::Version
222
- version: 3.2.5
222
+ version: 3.2.8
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: rack
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
- - - ! '>='
228
+ - - ~>
229
229
  - !ruby/object:Gem::Version
230
230
  version: 1.4.1
231
231
  type: :runtime
@@ -233,7 +233,7 @@ dependencies:
233
233
  version_requirements: !ruby/object:Gem::Requirement
234
234
  none: false
235
235
  requirements:
236
- - - ! '>='
236
+ - - ~>
237
237
  - !ruby/object:Gem::Version
238
238
  version: 1.4.1
239
239
  - !ruby/object:Gem::Dependency
@@ -241,23 +241,23 @@ dependencies:
241
241
  requirement: !ruby/object:Gem::Requirement
242
242
  none: false
243
243
  requirements:
244
- - - ! '>='
244
+ - - ~>
245
245
  - !ruby/object:Gem::Version
246
- version: 0.6.0
246
+ version: 0.6.1
247
247
  type: :runtime
248
248
  prerelease: false
249
249
  version_requirements: !ruby/object:Gem::Requirement
250
250
  none: false
251
251
  requirements:
252
- - - ! '>='
252
+ - - ~>
253
253
  - !ruby/object:Gem::Version
254
- version: 0.6.0
254
+ version: 0.6.1
255
255
  - !ruby/object:Gem::Dependency
256
256
  name: rake
257
257
  requirement: !ruby/object:Gem::Requirement
258
258
  none: false
259
259
  requirements:
260
- - - ! '>='
260
+ - - ~>
261
261
  - !ruby/object:Gem::Version
262
262
  version: 0.9.2
263
263
  type: :development
@@ -265,7 +265,7 @@ dependencies:
265
265
  version_requirements: !ruby/object:Gem::Requirement
266
266
  none: false
267
267
  requirements:
268
- - - ! '>='
268
+ - - ~>
269
269
  - !ruby/object:Gem::Version
270
270
  version: 0.9.2
271
271
  - !ruby/object:Gem::Dependency
@@ -273,7 +273,7 @@ dependencies:
273
273
  requirement: !ruby/object:Gem::Requirement
274
274
  none: false
275
275
  requirements:
276
- - - ! '>='
276
+ - - ~>
277
277
  - !ruby/object:Gem::Version
278
278
  version: 1.5.0
279
279
  type: :development
@@ -281,7 +281,7 @@ dependencies:
281
281
  version_requirements: !ruby/object:Gem::Requirement
282
282
  none: false
283
283
  requirements:
284
- - - ! '>='
284
+ - - ~>
285
285
  - !ruby/object:Gem::Version
286
286
  version: 1.5.0
287
287
  - !ruby/object:Gem::Dependency
@@ -289,39 +289,39 @@ dependencies:
289
289
  requirement: !ruby/object:Gem::Requirement
290
290
  none: false
291
291
  requirements:
292
- - - ! '>='
292
+ - - ~>
293
293
  - !ruby/object:Gem::Version
294
- version: 1.3.1
294
+ version: 1.4.0
295
295
  type: :development
296
296
  prerelease: false
297
297
  version_requirements: !ruby/object:Gem::Requirement
298
298
  none: false
299
299
  requirements:
300
- - - ! '>='
300
+ - - ~>
301
301
  - !ruby/object:Gem::Version
302
- version: 1.3.1
302
+ version: 1.4.0
303
303
  - !ruby/object:Gem::Dependency
304
304
  name: rspec
305
305
  requirement: !ruby/object:Gem::Requirement
306
306
  none: false
307
307
  requirements:
308
- - - ! '>='
308
+ - - ~>
309
309
  - !ruby/object:Gem::Version
310
- version: 2.10.0
310
+ version: 2.11.0
311
311
  type: :development
312
312
  prerelease: false
313
313
  version_requirements: !ruby/object:Gem::Requirement
314
314
  none: false
315
315
  requirements:
316
- - - ! '>='
316
+ - - ~>
317
317
  - !ruby/object:Gem::Version
318
- version: 2.10.0
318
+ version: 2.11.0
319
319
  - !ruby/object:Gem::Dependency
320
320
  name: fuubar
321
321
  requirement: !ruby/object:Gem::Requirement
322
322
  none: false
323
323
  requirements:
324
- - - ! '>='
324
+ - - ~>
325
325
  - !ruby/object:Gem::Version
326
326
  version: 1.0.0
327
327
  type: :development
@@ -329,7 +329,7 @@ dependencies:
329
329
  version_requirements: !ruby/object:Gem::Requirement
330
330
  none: false
331
331
  requirements:
332
- - - ! '>='
332
+ - - ~>
333
333
  - !ruby/object:Gem::Version
334
334
  version: 1.0.0
335
335
  - !ruby/object:Gem::Dependency
@@ -337,7 +337,7 @@ dependencies:
337
337
  requirement: !ruby/object:Gem::Requirement
338
338
  none: false
339
339
  requirements:
340
- - - ! '>='
340
+ - - ~>
341
341
  - !ruby/object:Gem::Version
342
342
  version: 0.6.4
343
343
  type: :development
@@ -345,7 +345,7 @@ dependencies:
345
345
  version_requirements: !ruby/object:Gem::Requirement
346
346
  none: false
347
347
  requirements:
348
- - - ! '>='
348
+ - - ~>
349
349
  - !ruby/object:Gem::Version
350
350
  version: 0.6.4
351
351
  - !ruby/object:Gem::Dependency
@@ -353,7 +353,7 @@ dependencies:
353
353
  requirement: !ruby/object:Gem::Requirement
354
354
  none: false
355
355
  requirements:
356
- - - ! '>='
356
+ - - ~>
357
357
  - !ruby/object:Gem::Version
358
358
  version: 2.0.0
359
359
  type: :development
@@ -361,7 +361,7 @@ dependencies:
361
361
  version_requirements: !ruby/object:Gem::Requirement
362
362
  none: false
363
363
  requirements:
364
- - - ! '>='
364
+ - - ~>
365
365
  - !ruby/object:Gem::Version
366
366
  version: 2.0.0
367
367
  description: Flyweight diary workflow. ruby-1.9.2 or later is required.
@@ -415,6 +415,9 @@ files:
415
415
  - lib/retter/generator/skel/stylesheets/retter.css
416
416
  - lib/retter/generator/skel/tmp/cache/.gitkeep
417
417
  - lib/retter/markdown.rb
418
+ - lib/retter/markdown/code_ray_renderer.rb
419
+ - lib/retter/markdown/pygments_renderer.rb
420
+ - lib/retter/monkey/rubypython.rb
418
421
  - lib/retter/page.rb
419
422
  - lib/retter/page/article.rb
420
423
  - lib/retter/page/base.rb