tb_blog 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f325ca99ab25f5cc0a57406fb9bbf500cce4239
-  data.tar.gz: 3c3fd4d5d46142937d20e6744199434688c9df08
+  metadata.gz: 250051e40ce087fa0ce2207cfd3f452bb2b6c6dc
+  data.tar.gz: 8eb90c01fff8917f672846f2e16c1b62f559e842
 SHA512:
-  metadata.gz: f57c1d89d0c55595738aba1c43a9ff748b37a810c8a97b17f266c7a0c65c54df5b9b9acfcbb62c8454f931f50e3574e57231868e086b3dde34443e3ebc448995
-  data.tar.gz: 6877f6e20b3e7a5ed815fc412c16838e108d1a97db23207914fffbc3e5abf59843b6cb4aa533877168466eb7236decfc61a5b6b8e6cbc60650d9fc698823ba29
+  metadata.gz: 6290aab7f3741c21640a533c408aaddf096e975a7104e674c7f96906e22482fad28030952bdeb98696df1e7e9dbd876d1d584609e16f1bb08cdec84d3d4ad369
+  data.tar.gz: a269a9c499629f36a1df5d7a88d1f1c01a52c17cf21e4e0b5f24af6c3473f2b0a044787c60bdd3927a9d2218bd7d82f2c28ba2496c5efd550e999406216f3dc2

data/app/controllers/posts_controller.rb

@@ -4,10 +4,11 @@ class PostsController < ApplicationController
 	respond_to :html, :json, :rss
 
   before_action :load_blog
+  before_action :load_page_number, :only => [:index, :archive, :category]
   before_action :find_post, :only => [:show, :create_comment]
 
   def index
-    @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).ordered.paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
+    @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).ordered.paginate(:page => @page_number, :per_page => Spud::Blog.config.posts_per_page)
     if params[:search]
       @posts = @posts.search(params[:search])
     end
@@ -32,19 +33,8 @@ class PostsController < 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 post_category_path(:page => page),:status => :moved_permanently and return
-        else
-          redirect_to post_category_path(:page => nil),:status => :moved_permanently and return
-        end
-      end
-    end
     if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
-      @posts = @post_category.posts.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(:page => page, :per_page => Spud::Blog.config.posts_per_page)
+      @posts = @post_category.posts.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(:page => @page_number, :per_page => Spud::Blog.config.posts_per_page)
     else
       redirect_to posts_path
       return
@@ -55,7 +45,7 @@ class PostsController < ApplicationController
   end
 
   def archive
-    @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(:page => get_page_number, :per_page => Spud::Blog.config.posts_per_page)
+    @posts = SpudPost.for_user(current_user).visible.for_blog(params[:blog_key]).from_archive(params[:archive_date]).paginate(:page => @page_number, :per_page => Spud::Blog.config.posts_per_page)
     respond_with @posts do |format|
       format.html { render view_for_action 'index' }
     end
@@ -107,7 +97,7 @@ private
     params.require(:spud_post_comment).permit(:author, :content)
   end
 
-  def get_page_number
+  def load_page_number
     page = 1
     if params[:page].present?
       page = params[:page].to_i
@@ -119,7 +109,7 @@ private
         end
       end
     end
-    return page
+    @page_number = page
   end
 
   def load_blog

data/lib/generators/spud/blog/views_generator.rb

@@ -6,13 +6,13 @@ class Spud::Blog::ViewsGenerator < ::Rails::Generators::Base
 
   def install
     if Spud::Blog.config.blog_enabled
-      copy_file 'blog/_comment_form.html.erb', 'app/views/blog/_comment_form.html.erb'
-      copy_file 'blog/index.html.erb', 'app/views/blog/index.html.erb'
-      copy_file 'blog/show.html.erb', 'app/views/blog/show.html.erb'
+      copy_file 'posts/_comment_form.html.erb', 'app/views/blog/_comment_form.html.erb'
+      copy_file 'posts/index.html.erb', 'app/views/blog/index.html.erb'
+      copy_file 'posts/show.html.erb', 'app/views/blog/show.html.erb'
     end
     if Spud::Blog.config.news_enabled
-      copy_file 'news/index.html.erb', 'app/views/news/index.html.erb'
-      copy_file 'news/show.html.erb', 'app/views/news/show.html.erb'
+      copy_file 'posts/index.html.erb', 'app/views/news/index.html.erb'
+      copy_file 'posts/show.html.erb', 'app/views/news/show.html.erb'
     end
   end
 end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "1.3.0"
+	  VERSION = "1.3.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_blog
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Twice Baked Blog Engine.