spud_blog 0.8.8 → 0.8.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/app/controllers/blog_controller.rb +4 -2
  2. data/app/controllers/news_controller.rb +4 -2
  3. data/app/models/spud_post.rb +1 -0
  4. data/app/views/spud/admin/news_posts/index.html.erb +1 -1
  5. data/lib/spud_blog/version.rb +1 -1
  6. metadata +21 -21
data/app/controllers/blog_controller.rb CHANGED
@@ -6,12 +6,14 @@ class BlogController < ApplicationController
6
6
  caches_action :show, :index,
7
7
  :expires => Spud::Blog.config.action_caching_duration,
8
8
  :if => Proc.new{ |c|
9
- Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1)
9
+ Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1) && (SpudPost.where(:is_news => false).future_posts.count == 0)
10
10
  }
11
11
 
12
12
  after_filter :only => [:show, :index] do |c|
13
13
  if Spud::Blog.enable_full_page_caching && !(c.params[:page] && c.params[:page].to_i > 1)
14
- c.cache_page(nil, nil, false)
14
+ if (SpudPost.where(:is_news => false).future_posts.count == 0)
15
+ c.cache_page(nil, nil, false)
16
+ end
15
17
  end
16
18
  end
17
19
 
data/app/controllers/news_controller.rb CHANGED
@@ -6,12 +6,14 @@ class NewsController < ApplicationController
6
6
  caches_action :show, :index,
7
7
  :expires => Spud::Blog.config.action_caching_duration,
8
8
  :if => Proc.new{ |c|
9
- Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1)
9
+ Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1) && (SpudPost.where(:is_news => true).future_posts.count == 0)
10
10
  }
11
11
 
12
12
  after_filter :only => [:show, :index] do |c|
13
13
  if Spud::Blog.enable_full_page_caching && !(c.params[:page] && c.params[:page].to_i > 1)
14
- c.cache_page(nil, nil, false)
14
+ if (SpudPost.where(:is_news => true).future_posts.count == 0)
15
+ c.cache_page(nil, nil, false)
16
+ end
15
17
  end
16
18
  end
17
19
 
data/app/models/spud_post.rb CHANGED
@@ -10,6 +10,7 @@ class SpudPost < ActiveRecord::Base
10
10
  has_many :spud_permalinks,:as => :attachment
11
11
 
12
12
  scope :publicly, where('visible = true AND published_at <= ?', Time.now.utc).order('published_at desc')
13
+ scope :future_posts, where('visible = true AND published_at > ?', Time.now.utc)
13
14
  validates_presence_of :title, :content, :published_at, :spud_user_id, :url_name
14
15
  validates_uniqueness_of :url_name
15
16
  before_validation :set_url_name
data/app/views/spud/admin/news_posts/index.html.erb CHANGED
@@ -17,7 +17,7 @@
17
17
  <tr>
18
18
 
19
19
  <td>
20
- <%= link_to edit_spud_admin_news_path(post) do %>
20
+ <%= link_to edit_spud_admin_news_post_path(post) do %>
21
21
  <%=post.title%>
22
22
  <%if !post.visible%>
23
23
  <span class="badge">Draft</span>
data/lib/spud_blog/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spud
2
2
  module Blog
3
- VERSION = "0.8.8"
3
+ VERSION = "0.8.11"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spud_blog
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.8
4
+ version: 0.8.11
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-05-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70330527319860 !ruby/object:Gem::Requirement
16
+ requirement: &70099588378700 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70330527319860
24
+ version_requirements: *70099588378700
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: spud_core
27
- requirement: &70330527319340 !ruby/object:Gem::Requirement
27
+ requirement: &70099588378180 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
35
35
  version: 0.9.0
36
36
  type: :runtime
37
37
  prerelease: false
38
- version_requirements: *70330527319340
38
+ version_requirements: *70099588378180
39
39
  - !ruby/object:Gem::Dependency
40
40
  name: spud_permalinks
41
- requirement: &70330527313740 !ruby/object:Gem::Requirement
41
+ requirement: &70099588377460 !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
44
  - - ~>
@@ -46,10 +46,10 @@ dependencies:
46
46
  version: 0.0.1
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *70330527313740
49
+ version_requirements: *70099588377460
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: mysql2
52
- requirement: &70330527313100 !ruby/object:Gem::Requirement
52
+ requirement: &70099588377020 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
57
57
  version: '0'
58
58
  type: :development
59
59
  prerelease: false
60
- version_requirements: *70330527313100
60
+ version_requirements: *70099588377020
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: rspec
63
- requirement: &70330527312380 !ruby/object:Gem::Requirement
63
+ requirement: &70099588376440 !ruby/object:Gem::Requirement
64
64
  none: false
65
65
  requirements:
66
66
  - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
68
68
  version: '0'
69
69
  type: :development
70
70
  prerelease: false
71
- version_requirements: *70330527312380
71
+ version_requirements: *70099588376440
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: rspec-rails
74
- requirement: &70330527311760 !ruby/object:Gem::Requirement
74
+ requirement: &70099588372700 !ruby/object:Gem::Requirement
75
75
  none: false
76
76
  requirements:
77
77
  - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
79
79
  version: '0'
80
80
  type: :development
81
81
  prerelease: false
82
- version_requirements: *70330527311760
82
+ version_requirements: *70099588372700
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: factory_girl
85
- requirement: &70330527310940 !ruby/object:Gem::Requirement
85
+ requirement: &70099588371480 !ruby/object:Gem::Requirement
86
86
  none: false
87
87
  requirements:
88
88
  - - =
@@ -90,10 +90,10 @@ dependencies:
90
90
  version: 2.5.0
91
91
  type: :development
92
92
  prerelease: false
93
- version_requirements: *70330527310940
93
+ version_requirements: *70099588371480
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: mocha
96
- requirement: &70330527310200 !ruby/object:Gem::Requirement
96
+ requirement: &70099588370680 !ruby/object:Gem::Requirement
97
97
  none: false
98
98
  requirements:
99
99
  - - =
@@ -101,10 +101,10 @@ dependencies:
101
101
  version: 0.10.3
102
102
  type: :development
103
103
  prerelease: false
104
- version_requirements: *70330527310200
104
+ version_requirements: *70099588370680
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: database_cleaner
107
- requirement: &70330527309480 !ruby/object:Gem::Requirement
107
+ requirement: &70099588370020 !ruby/object:Gem::Requirement
108
108
  none: false
109
109
  requirements:
110
110
  - - =
@@ -112,7 +112,7 @@ dependencies:
112
112
  version: 0.7.1
113
113
  type: :development
114
114
  prerelease: false
115
- version_requirements: *70330527309480
115
+ version_requirements: *70099588370020
116
116
  description: Spud blogging/news and rss engine.
117
117
  email:
118
118
  - greg@westlakedesign.com
@@ -240,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
240
240
  version: '0'
241
241
  segments:
242
242
  - 0
243
- hash: -3292979416074427203
243
+ hash: -1742732038736838628
244
244
  required_rubygems_version: !ruby/object:Gem::Requirement
245
245
  none: false
246
246
  requirements:
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
249
249
  version: '0'
250
250
  segments:
251
251
  - 0
252
- hash: -3292979416074427203
252
+ hash: -1742732038736838628
253
253
  requirements: []
254
254
  rubyforge_project:
255
255
  rubygems_version: 1.8.15