spud_blog 0.7.4 → 0.7.5

data/app/models/spud_post_category_sweeper.rb

@@ -15,26 +15,26 @@ class SpudPostCategorySweeper < ActionController::Caching::Sweeper
   def expire_cache_for(record)
     if Spud::Blog.config.enable_action_caching
       SpudPost.find_each do |p|
-        if p.is_news
+        if p.is_news && Spud::Blog.config.news_enabled
           expire_action news_post_url(p.url_name)
-        else
+        elsif Spud::Blog.config.blog_enabled
           expire_action blog_post_url(p.url_name)
         end
       end
-      expire_action news_url
-      expire_action blog_url
+      expire_action news_url if Spud::Blog.config.news_enabled
+      expire_action blog_url if Spud::Blog.config.blog_enabled
       expire_action spud_blog_sitemap_url
     end
     if Spud::Blog.config.enable_full_page_caching
       SpudPost.find_each do |p|
-        if p.is_news
+        if p.is_news && Spud::Blog.config.news_enabled
           expire_page news_post_path(p.url_name)
-        else
+        elsif Spud::Blog.config.blog_enabled
           expire_page blog_post_path(p.url_name)
         end
       end
-      expire_page news_path
-      expire_page blog_path
+      expire_page news_path if Spud::Blog.config.news_enabled
+      expire_page blog_path if Spud::Blog.config.blog_enabled
       expire_page spud_blog_sitemap_path(:format => :xml)
     end
   end

data/app/models/spud_post_sweeper.rb

@@ -2,7 +2,11 @@ class SpudPostSweeper < ActionController::Caching::Sweeper
   
   observe SpudPost
 
-  def after_save(record)
+  def after_create(record)
+    expire_cache_for(record)
+  end
+
+  def before_update(record)
     expire_cache_for(record)
   end
 
@@ -37,7 +41,6 @@ class SpudPostSweeper < ActionController::Caching::Sweeper
         expire_page blog_post_path(record.url_name)
       end
     end
-
     expire_page spud_sitemap_path(:format => :xml)
   end
 

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.7.4"
+	  VERSION = "0.7.5"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70207980310320 !ruby/object:Gem::Requirement
+  requirement: &70287430407040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70207980310320
+  version_requirements: *70287430407040
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70207980309820 !ruby/object:Gem::Requirement
+  requirement: &70287430406340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70207980309820
+  version_requirements: *70287430406340
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
-  requirement: &70207980309360 !ruby/object:Gem::Requirement
+  requirement: &70287430404940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70207980309360
+  version_requirements: *70287430404940
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70207980325340 !ruby/object:Gem::Requirement
+  requirement: &70287430400680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207980325340
+  version_requirements: *70287430400680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70207980324880 !ruby/object:Gem::Requirement
+  requirement: &70287430392240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207980324880
+  version_requirements: *70287430392240
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70207980324460 !ruby/object:Gem::Requirement
+  requirement: &70287430390220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207980324460
+  version_requirements: *70287430390220
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70207980323960 !ruby/object:Gem::Requirement
+  requirement: &70287430388980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70207980323960
+  version_requirements: *70287430388980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70207980323460 !ruby/object:Gem::Requirement
+  requirement: &70287430387680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70207980323460
+  version_requirements: *70287430387680
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70207980323000 !ruby/object:Gem::Requirement
+  requirement: &70287430386520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,7 +109,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70207980323000
+  version_requirements: *70287430386520
 description: Spud blogging/news and rss engine.
 email:
 - greg@westlakedesign.com
@@ -214,7 +214,6 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -236,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3201644603181069855
+      hash: 1816796039144768112
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -245,10 +244,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3201644603181069855
+      hash: 1816796039144768112
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Spud Blog Engine.
@@ -275,7 +274,6 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html

data/test/dummy/log/development.log

@@ -1,36 +0,0 @@
-Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
-Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
-Mysql2::Error: Table 'spud_blog_development.spud_users' doesn't exist: SHOW FULL FIELDS FROM `spud_users`
-   (153.8ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (287.7ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
-   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-Migrating to CreateSpudPosts (20120125180945)
-   (163.8ms)  CREATE TABLE `spud_posts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `title` varchar(255), `content` text, `comments_enabled` tinyint(1) DEFAULT 0, `visible` tinyint(1) DEFAULT 1, `published_at` datetime, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (225.6ms)  CREATE INDEX `index_spud_posts_on_spud_user_id` ON `spud_posts` (`spud_user_id`)
-   (178.6ms)  CREATE INDEX `index_spud_posts_on_visible` ON `spud_posts` (`visible`)
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125180945')
-Migrating to CreateSpudPostCategories (20120125181022)
-   (214.2ms)  CREATE TABLE `spud_post_categories` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (209.6ms)  CREATE TABLE `spud_post_categories_posts` (`spud_post_id` int(11), `spud_post_category_id` int(11)) ENGINE=InnoDB
-   (182.2ms)  CREATE INDEX `index_spud_post_categories_posts_on_spud_post_category_id` ON `spud_post_categories_posts` (`spud_post_category_id`)
-   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125181022')
-Migrating to CreateSpudPostComments (20120125181359)
-   (171.4ms)  CREATE TABLE `spud_post_comments` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_post_id` int(11), `author` varchar(255), `content` text, `approved` tinyint(1) DEFAULT 0, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (237.9ms)  CREATE INDEX `index_spud_post_comments_on_spud_post_id` ON `spud_post_comments` (`spud_post_id`)
-   (227.0ms)  CREATE INDEX `index_spud_post_comments_on_approved` ON `spud_post_comments` (`approved`)
-   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120125181359')
-Migrating to AddUrlToSpudPosts (20120127143054)
-   (239.3ms)  ALTER TABLE `spud_posts` ADD `url_name` varchar(255)
-   (234.5ms)  CREATE INDEX `index_spud_posts_on_url_name` ON `spud_posts` (`url_name`)
-   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120127143054')
-Migrating to AddUrlToSpudPostCategories (20120127144942)
-   (196.9ms)  ALTER TABLE `spud_post_categories` ADD `parent_id` int(11) DEFAULT 0
-   (220.7ms)  ALTER TABLE `spud_post_categories` ADD `url_name` varchar(255)
-   (179.0ms)  CREATE INDEX `index_spud_post_categories_on_parent_id` ON `spud_post_categories` (`parent_id`)
-   (178.4ms)  CREATE INDEX `index_spud_post_categories_on_url_name` ON `spud_post_categories` (`url_name`)
-   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120127144942')
-Migrating to AddIsNewsToSpudPosts (20120210165540)
-   (207.1ms)  ALTER TABLE `spud_posts` ADD `is_news` tinyint(1) DEFAULT 0
-   (212.3ms)  CREATE INDEX `index_spud_posts_on_is_news` ON `spud_posts` (`is_news`)
-   (0.8ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120210165540')
-   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations`