spud_blog 0.7.2 → 0.7.4

data/app/controllers/spud/admin/post_categories_controller.rb

@@ -53,8 +53,8 @@ class Spud::Admin::PostCategoriesController < Spud::Admin::ApplicationController
 	end
 
 	def expire_post_actions
-		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
 	end
 
 end

data/app/models/spud_post_sweeper.rb

@@ -14,24 +14,24 @@ class SpudPostSweeper < ActionController::Caching::Sweeper
 
   def expire_cache_for(record)
     if Spud::Blog.config.enable_action_caching
-      expire_action spud_blog_sitemap_url
-      if record.is_news
-        expire_action blog_url
+      expire_action spud_blog_sitemap_url if Spud::Blog.config.blog_enabled
+      if !record.is_news && Spud::Blog.config.blog_enabled
+        expire_action blog_url 
         expire_action blog_url(:format => :rss)
         expire_action blog_post_url(record.url_name)
-      else
+      elsif Spud::Blog.config.news_enabled
         expire_action news_url
         expire_action news_url(:format => :rss)
         expire_action news_post_url(record.url_name)
       end
     end
     if Spud::Blog.config.enable_full_page_caching 
-      expire_page spud_blog_sitemap_path(:format => :xml)
-      if record.is_news
+      expire_page spud_blog_sitemap_path(:format => :xml) if Spud::Blog.config.blog_enabled
+      if record.is_news && Spud::Blog.config.news_enabled
         expire_page news_path
         expire_page news_path(:format => :rss)
         expire_page news_post_path(record.url_name)
-      else
+      elsif Spud::Blog.config.blog_enabled
         expire_page blog_path
         expire_page blog_path(:format => :rss)
         expire_page blog_post_path(record.url_name)

data/lib/spud_blog/version.rb

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

data/test/dummy/config/application.rb

@@ -48,7 +48,10 @@ module Dummy
 
     # Enable the asset pipeline
     config.assets.enabled = true
-
+    config.generators do |g|
+      g.test_framework :rspec
+      g.integration_tool :rspec
+    end
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
   end

data/test/dummy/log/development.log

@@ -0,0 +1,36 @@
+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` 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70353019863080 !ruby/object:Gem::Requirement
+  requirement: &70207980310320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70353019863080
+  version_requirements: *70207980310320
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70353019861520 !ruby/object:Gem::Requirement
+  requirement: &70207980309820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70353019861520
+  version_requirements: *70207980309820
 - !ruby/object:Gem::Dependency
   name: spud_permalinks
-  requirement: &70353019860180 !ruby/object:Gem::Requirement
+  requirement: &70207980309360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70353019860180
+  version_requirements: *70207980309360
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70353019858880 !ruby/object:Gem::Requirement
+  requirement: &70207980325340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353019858880
+  version_requirements: *70207980325340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70353019845620 !ruby/object:Gem::Requirement
+  requirement: &70207980324880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353019845620
+  version_requirements: *70207980324880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70353019842820 !ruby/object:Gem::Requirement
+  requirement: &70207980324460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353019842820
+  version_requirements: *70207980324460
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70353019840720 !ruby/object:Gem::Requirement
+  requirement: &70207980323960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70353019840720
+  version_requirements: *70207980323960
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70353019839400 !ruby/object:Gem::Requirement
+  requirement: &70207980323460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70353019839400
+  version_requirements: *70207980323460
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70353019838600 !ruby/object:Gem::Requirement
+  requirement: &70207980323000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,7 +109,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70353019838600
+  version_requirements: *70207980323000
 description: Spud blogging/news and rss engine.
 email:
 - greg@westlakedesign.com
@@ -174,8 +174,6 @@ files:
 - app/views/spud/admin/posts/index.html.erb
 - app/views/spud/admin/posts/new.html.erb
 - app/views/spud/blog/sitemaps/show.xml.builder
-- config/application.rb
-- config/boot.rb
 - config/routes.rb
 - db/migrate/20120125180945_create_spud_posts.rb
 - db/migrate/20120125181022_create_spud_post_categories.rb
@@ -216,6 +214,7 @@ 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
@@ -237,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 249193733154310611
+      hash: 3201644603181069855
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -246,10 +245,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 249193733154310611
+      hash: 3201644603181069855
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Spud Blog Engine.
@@ -276,6 +275,7 @@ 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/config/application.rb

@@ -1,48 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
-
-module SpudTest
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-  end
-end

data/config/boot.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])