schnitzelpress 0.1.0 → 0.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. data/CHANGES.md +11 -0
  2. data/lib/schnitzelpress/actions/blog.rb +19 -5
  3. data/lib/schnitzelpress/app.rb +6 -1
  4. data/lib/schnitzelpress/post.rb +6 -1
  5. data/lib/schnitzelpress/version.rb +1 -1
  6. data/lib/views/partials/_post.haml +1 -4
  7. metadata +65 -64
data/CHANGES.md ADDED
@@ -0,0 +1,11 @@
1
+ == 0.2.0 (unreleased)
2
+
3
+
4
+ == 0.1.1 (2012-02-26)
5
+
6
+ * Add improved caching of post views and post indices.
7
+ * Minor bugfixes.
8
+
9
+ == 0.1.0 (2012-02-25)
10
+
11
+ * Initial Release
data/lib/schnitzelpress/actions/blog.rb CHANGED
@@ -24,10 +24,11 @@ module SchnitzelPress
24
24
  total_count = Post.latest.count
25
25
  skipped_count = params[:page].to_i * 10
26
26
  @posts = Post.latest.skip(skipped_count).limit(10)
27
- displayed_count = @posts.count(true)
28
27
 
28
+ displayed_count = @posts.count(true)
29
29
  @show_previous_posts_button = total_count > skipped_count + displayed_count
30
- haml :index
30
+
31
+ render_posts
31
32
  end
32
33
 
33
34
  get '/blog.css' do
@@ -54,19 +55,19 @@ module SchnitzelPress
54
55
  get %r{^/(\d{4})/(\d{1,2})/(\d{1,2})/?$} do
55
56
  year, month, day = params[:captures]
56
57
  @posts = Post.latest.for_day(year.to_i, month.to_i, day.to_i)
57
- haml :index
58
+ render_posts
58
59
  end
59
60
 
60
61
  get %r{^/(\d{4})/(\d{1,2})/?$} do
61
62
  year, month = params[:captures]
62
63
  @posts = Post.latest.for_month(year.to_i, month.to_i)
63
- haml :index
64
+ render_posts
64
65
  end
65
66
 
66
67
  get %r{^/(\d{4})/?$} do
67
68
  year = params[:captures].first
68
69
  @posts = Post.latest.for_year(year.to_i)
69
- haml :index
70
+ render_posts
70
71
  end
71
72
 
72
73
  get '/:year/:month/:day/:slug/?' do |year, month, day, slug|
@@ -89,6 +90,9 @@ module SchnitzelPress
89
90
  if enforce_canonical_url && request.path != url_for(@post)
90
91
  redirect url_for(@post)
91
92
  else
93
+ fresh_when :last_modified => @post.updated_at, :etag => @post.to_etag
94
+ cache_for 60
95
+
92
96
  @show_description = @post.home_page?
93
97
  haml :post
94
98
  end
@@ -96,6 +100,16 @@ module SchnitzelPress
96
100
  halt 404
97
101
  end
98
102
  end
103
+
104
+ def render_posts
105
+ if freshest_post = @posts.where(:updated_at.ne => nil).desc(:updated_at).first
106
+ fresh_when :last_modified => freshest_post.updated_at,
107
+ :etag => freshest_post.to_etag
108
+ cache_for 60
109
+ end
110
+
111
+ haml :index
112
+ end
99
113
  end
100
114
  end
101
115
  end
data/lib/schnitzelpress/app.rb CHANGED
@@ -36,7 +36,12 @@ module SchnitzelPress
36
36
  end
37
37
 
38
38
  def cache_for(time)
39
- cache_control :public, :must_revalidate, :max_age => time.to_i
39
+ cache_control :public, :must_revalidate, :s_maxage => 2, :max_age => time.to_i
40
+ end
41
+
42
+ def fresh_when(options)
43
+ last_modified options[:last_modified]
44
+ etag options[:etag]
40
45
  end
41
46
 
42
47
  not_found do
data/lib/schnitzelpress/post.rb CHANGED
@@ -10,6 +10,7 @@ OEmbed::Providers.register(SoundCloudProvider)
10
10
  module SchnitzelPress
11
11
  class Post
12
12
  include Mongoid::Document
13
+ include Mongoid::Timestamps
13
14
  store_in :posts
14
15
 
15
16
  # basic data
@@ -122,7 +123,7 @@ module SchnitzelPress
122
123
  @@markdown ||= Redcarpet::Markdown.new(MarkdownRenderer,
123
124
  :autolink => true, :space_after_headers => true, :fenced_code_blocks => true)
124
125
 
125
- @@markdown.render(body)
126
+ @@markdown.render(body.to_s)
126
127
  end
127
128
 
128
129
  def post?
@@ -173,6 +174,10 @@ module SchnitzelPress
173
174
  end
174
175
  end
175
176
 
177
+ def to_etag
178
+ Digest::MD5.hexdigest("-#{id}-#{updated_at}-")
179
+ end
180
+
176
181
  def disqus?
177
182
  disqus && published?
178
183
  end
data/lib/schnitzelpress/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SchnitzelPress
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.1"
3
3
  end
data/lib/views/partials/_post.haml CHANGED
@@ -3,7 +3,7 @@
3
3
  - show_summary ||= post.summary.present?
4
4
  - show_body ||= complete || !show_summary
5
5
  - show_read_more ||= !complete && post.summary.present?
6
- - show_permalink ||= admin_logged_in? || (post.post? && !show_read_more)
6
+ - show_permalink ||= true
7
7
  - show_twitter ||= complete && post.post? && settings.twitter_id.present?
8
8
 
9
9
  %article.post{:class => [post.status, post.link_post? ? 'link' : 'article']}
@@ -29,9 +29,6 @@
29
29
  - if show_permalink
30
30
  %p.permalink
31
31
  %a{:href => url_for(post)}= post.published_at.try(:to_date) || "∞"
32
- - if admin_logged_in?
33
- ·
34
- %a{:href => "/admin/edit/#{post.id}"} edit
35
32
 
36
33
  - if show_twitter
37
34
  .social_media_buttons
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: schnitzelpress
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-25 00:00:00.000000000 Z
12
+ date: 2012-02-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rack
16
- requirement: &70364693327260 !ruby/object:Gem::Requirement
16
+ requirement: &70265418114300 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.4.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70364693327260
24
+ version_requirements: *70265418114300
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack-contrib
27
- requirement: &70364693326460 !ruby/object:Gem::Requirement
27
+ requirement: &70265418127500 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.1.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70364693326460
35
+ version_requirements: *70265418127500
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: sinatra
38
- requirement: &70364693325520 !ruby/object:Gem::Requirement
38
+ requirement: &70265418124000 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.3.2
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70364693325520
46
+ version_requirements: *70265418124000
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: activesupport
49
- requirement: &70364693325060 !ruby/object:Gem::Requirement
49
+ requirement: &70265418122120 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 3.2.0
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70364693325060
57
+ version_requirements: *70265418122120
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mongo
60
- requirement: &70364693324480 !ruby/object:Gem::Requirement
60
+ requirement: &70265418135720 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.5.2
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70364693324480
68
+ version_requirements: *70265418135720
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: mongoid
71
- requirement: &70364693324020 !ruby/object:Gem::Requirement
71
+ requirement: &70265418134180 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 2.4.0
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70364693324020
79
+ version_requirements: *70265418134180
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: bson_ext
82
- requirement: &70364693323560 !ruby/object:Gem::Requirement
82
+ requirement: &70265418129060 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 1.5.0
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70364693323560
90
+ version_requirements: *70265418129060
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: omniauth
93
- requirement: &70364693323060 !ruby/object:Gem::Requirement
93
+ requirement: &70265418144380 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 1.0.2
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70364693323060
101
+ version_requirements: *70265418144380
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: omniauth-browserid
104
- requirement: &70364693322580 !ruby/object:Gem::Requirement
104
+ requirement: &70265418143800 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 0.0.1
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70364693322580
112
+ version_requirements: *70265418143800
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: haml
115
- requirement: &70364693322120 !ruby/object:Gem::Requirement
115
+ requirement: &70265418142940 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 3.1.4
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70364693322120
123
+ version_requirements: *70265418142940
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: sass
126
- requirement: &70364693321660 !ruby/object:Gem::Requirement
126
+ requirement: &70265418142340 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 3.1.15
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70364693321660
134
+ version_requirements: *70265418142340
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: redcarpet
137
- requirement: &70364693318120 !ruby/object:Gem::Requirement
137
+ requirement: &70265418141720 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: 2.1.0
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *70364693318120
145
+ version_requirements: *70265418141720
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: coderay
148
- requirement: &70364693317660 !ruby/object:Gem::Requirement
148
+ requirement: &70265418140880 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: 1.0.5
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *70364693317660
156
+ version_requirements: *70265418140880
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: schnitzelstyle
159
- requirement: &70364693657720 !ruby/object:Gem::Requirement
159
+ requirement: &70265418139380 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ~>
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: 0.1.0
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *70364693657720
167
+ version_requirements: *70265418139380
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: i18n
170
- requirement: &70364693599120 !ruby/object:Gem::Requirement
170
+ requirement: &70265418164760 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ~>
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: 0.6.0
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *70364693599120
178
+ version_requirements: *70265418164760
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: tilt
181
- requirement: &70364693440740 !ruby/object:Gem::Requirement
181
+ requirement: &70265418163280 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 1.3.0
187
187
  type: :runtime
188
188
  prerelease: false
189
- version_requirements: *70364693440740
189
+ version_requirements: *70265418163280
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: ruby-oembed
192
- requirement: &70364693375580 !ruby/object:Gem::Requirement
192
+ requirement: &70265418161240 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ~>
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: 0.8.5
198
198
  type: :runtime
199
199
  prerelease: false
200
- version_requirements: *70364693375580
200
+ version_requirements: *70265418161240
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: thor
203
- requirement: &70364693362520 !ruby/object:Gem::Requirement
203
+ requirement: &70265418159260 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ~>
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: 0.14.6
209
209
  type: :runtime
210
210
  prerelease: false
211
- version_requirements: *70364693362520
211
+ version_requirements: *70265418159260
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: rake
214
- requirement: &70364693365380 !ruby/object:Gem::Requirement
214
+ requirement: &70265418244320 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ~>
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: 0.9.2.2
220
220
  type: :runtime
221
221
  prerelease: false
222
- version_requirements: *70364693365380
222
+ version_requirements: *70265418244320
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: pry
225
- requirement: &70364693367760 !ruby/object:Gem::Requirement
225
+ requirement: &70265418266380 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ~>
@@ -230,10 +230,10 @@ dependencies:
230
230
  version: 0.9.8
231
231
  type: :runtime
232
232
  prerelease: false
233
- version_requirements: *70364693367760
233
+ version_requirements: *70265418266380
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: chronic
236
- requirement: &70364693298160 !ruby/object:Gem::Requirement
236
+ requirement: &70265418265000 !ruby/object:Gem::Requirement
237
237
  none: false
238
238
  requirements:
239
239
  - - ~>
@@ -241,10 +241,10 @@ dependencies:
241
241
  version: 0.6.7
242
242
  type: :runtime
243
243
  prerelease: false
244
- version_requirements: *70364693298160
244
+ version_requirements: *70265418265000
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: rspec
247
- requirement: &70364693266620 !ruby/object:Gem::Requirement
247
+ requirement: &70265418262120 !ruby/object:Gem::Requirement
248
248
  none: false
249
249
  requirements:
250
250
  - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
252
252
  version: 2.8.0
253
253
  type: :development
254
254
  prerelease: false
255
- version_requirements: *70364693266620
255
+ version_requirements: *70265418262120
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: rspec-html-matchers
258
- requirement: &70364693176100 !ruby/object:Gem::Requirement
258
+ requirement: &70265418260560 !ruby/object:Gem::Requirement
259
259
  none: false
260
260
  requirements:
261
261
  - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
263
263
  version: '0'
264
264
  type: :development
265
265
  prerelease: false
266
- version_requirements: *70364693176100
266
+ version_requirements: *70265418260560
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: database_cleaner
269
- requirement: &70364693113140 !ruby/object:Gem::Requirement
269
+ requirement: &70265418274620 !ruby/object:Gem::Requirement
270
270
  none: false
271
271
  requirements:
272
272
  - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
274
274
  version: '0'
275
275
  type: :development
276
276
  prerelease: false
277
- version_requirements: *70364693113140
277
+ version_requirements: *70265418274620
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: factory_girl
280
- requirement: &70364692973700 !ruby/object:Gem::Requirement
280
+ requirement: &70265418272360 !ruby/object:Gem::Requirement
281
281
  none: false
282
282
  requirements:
283
283
  - - ~>
@@ -285,10 +285,10 @@ dependencies:
285
285
  version: 2.6.0
286
286
  type: :development
287
287
  prerelease: false
288
- version_requirements: *70364692973700
288
+ version_requirements: *70265418272360
289
289
  - !ruby/object:Gem::Dependency
290
290
  name: ffaker
291
- requirement: &70364692843020 !ruby/object:Gem::Requirement
291
+ requirement: &70265418269560 !ruby/object:Gem::Requirement
292
292
  none: false
293
293
  requirements:
294
294
  - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
296
296
  version: '0'
297
297
  type: :development
298
298
  prerelease: false
299
- version_requirements: *70364692843020
299
+ version_requirements: *70265418269560
300
300
  - !ruby/object:Gem::Dependency
301
301
  name: timecop
302
- requirement: &70364692622600 !ruby/object:Gem::Requirement
302
+ requirement: &70265418268740 !ruby/object:Gem::Requirement
303
303
  none: false
304
304
  requirements:
305
305
  - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
307
307
  version: '0'
308
308
  type: :development
309
309
  prerelease: false
310
- version_requirements: *70364692622600
310
+ version_requirements: *70265418268740
311
311
  - !ruby/object:Gem::Dependency
312
312
  name: shotgun
313
- requirement: &70364688380280 !ruby/object:Gem::Requirement
313
+ requirement: &70265418267640 !ruby/object:Gem::Requirement
314
314
  none: false
315
315
  requirements:
316
316
  - - ! '>='
@@ -318,10 +318,10 @@ dependencies:
318
318
  version: '0'
319
319
  type: :development
320
320
  prerelease: false
321
- version_requirements: *70364688380280
321
+ version_requirements: *70265418267640
322
322
  - !ruby/object:Gem::Dependency
323
323
  name: rack-test
324
- requirement: &70364679963760 !ruby/object:Gem::Requirement
324
+ requirement: &70265418282960 !ruby/object:Gem::Requirement
325
325
  none: false
326
326
  requirements:
327
327
  - - ! '>='
@@ -329,10 +329,10 @@ dependencies:
329
329
  version: '0'
330
330
  type: :development
331
331
  prerelease: false
332
- version_requirements: *70364679963760
332
+ version_requirements: *70265418282960
333
333
  - !ruby/object:Gem::Dependency
334
334
  name: watchr
335
- requirement: &70364679962400 !ruby/object:Gem::Requirement
335
+ requirement: &70265418281980 !ruby/object:Gem::Requirement
336
336
  none: false
337
337
  requirements:
338
338
  - - ! '>='
@@ -340,10 +340,10 @@ dependencies:
340
340
  version: '0'
341
341
  type: :development
342
342
  prerelease: false
343
- version_requirements: *70364679962400
343
+ version_requirements: *70265418281980
344
344
  - !ruby/object:Gem::Dependency
345
345
  name: awesome_print
346
- requirement: &70364679961520 !ruby/object:Gem::Requirement
346
+ requirement: &70265418280920 !ruby/object:Gem::Requirement
347
347
  none: false
348
348
  requirements:
349
349
  - - ! '>='
@@ -351,7 +351,7 @@ dependencies:
351
351
  version: '0'
352
352
  type: :development
353
353
  prerelease: false
354
- version_requirements: *70364679961520
354
+ version_requirements: *70265418280920
355
355
  description: A lean, mean blogging machine for hackers and fools.
356
356
  email:
357
357
  - hendrik@mans.de
@@ -364,6 +364,7 @@ files:
364
364
  - .rspec
365
365
  - .travis.yml
366
366
  - .watchr
367
+ - CHANGES.md
367
368
  - Gemfile
368
369
  - LICENSE
369
370
  - README.md