spud_blog 0.9.3 → 0.9.4

data/app/controllers/blog_controller.rb

@@ -23,10 +23,14 @@ class BlogController < ApplicationController
 
   def index
     page = 1
-    if params[:page].blank? == false && params[:page].to_i > 1
+    if params[:page].blank? == false
       page = params[:page].to_i
-      if(page.to_s != params[:page] && page > 1)
-        redirect_to blog_path(:page => page),:status => :moved_permanently and return
+      if page.to_s != params[:page].to_s
+        if(page > 1)
+          redirect_to blog_path(:page => page),:status => :moved_permanently and return
+        else
+          redirect_to blog_path(:page => nil),:status => :moved_permanently and return
+        end
       end
     end
 
@@ -51,11 +55,23 @@ class BlogController < ApplicationController
   end
 
   def category
+    page = 1
+    if params[:page].blank? == false
+      page = params[:page].to_i
+      if page.to_s != params[:page].to_s
+        if(page > 1)
+          redirect_to blog_category_path(:page => page),:status => :moved_permanently and return
+        else
+          redirect_to blog_category_path(:page => nil),:status => :moved_permanently and return
+        end
+      end
+    end
+
     if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
       if Spud::Core.config.multisite_mode_enabled
-        @posts = @post_category.posts_with_children.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+        @posts = @post_category.posts_with_children.public_blog_posts(page, Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
       else
-        @posts = @post_category.posts_with_children.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+        @posts = @post_category.posts_with_children.public_blog_posts(page, Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
       end
     else
       redirect_to blog_path

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.9.3"
+	  VERSION = "0.9.4"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_blog
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -304,7 +304,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - Readme.markdown
-- test/dummy/log/development.log
 - test/fixtures/spud_post_sites.yml
 - test/unit/spud_post_site_test.rb
 homepage: http://github.com/davydotcom/spud_blog
@@ -321,7 +320,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 642274226547155954
+      hash: -4333841071858548276
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -330,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 642274226547155954
+      hash: -4333841071858548276
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -338,6 +337,5 @@ signing_key:
 specification_version: 3
 summary: Spud Blog Engine.
 test_files:
-- test/dummy/log/development.log
 - test/fixtures/spud_post_sites.yml
 - test/unit/spud_post_site_test.rb

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`