comfy_blog 0.1.0 → 0.1.1

data/Gemfile

@@ -1,10 +1,12 @@
 source 'http://rubygems.org'
 
 gem 'rails',          '>=3.1.0'
-gem 'will_paginate',  '~>3.0.2'
-gem 'rails_autolink', '~>1.0.4'
+gem 'rails_autolink', '>=1.0.4'
 gem 'jquery-rails',   '>=1.0.0'
 
+# gem 'will_paginate',  '>=3.0.2'
+# gem 'kaminari',       '>=0.0.0'
+
 group :test do
   gem 'sqlite3'
   gem 'jeweler'

data/README.md

@@ -50,6 +50,7 @@ Since ComfyBlog is an engine, it allows you to completely overwrite views. It's
 create `app/views/blog/posts/index.html.erb` (could be HAML or whatever you want) and structure
 it in any way you want. There's also `show.html.erb` and `_post.html.erb` available.
     
+Pagination is done using either [WillPaginate](https://github.com/mislav/will_paginate) or [Kaminari](https://github.com/amatsuda/kaminari). Add either in your Gemfile.
 You can control number of posts per page by adjusting this config:
     
     config.posts_per_page = 10

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/app/controllers/admin/blog/posts_controller.rb

@@ -4,7 +4,13 @@ class Admin::Blog::PostsController < Admin::Blog::BaseController
   before_filter :load_post,  :only => [:edit, :update, :destroy]
   
   def index
-    @posts = Blog::Post.paginate :page => params[:page]
+    @posts = if defined? WillPaginate
+      Blog::Post.paginate :page => params[:page]
+    elsif defined? Kaminari
+      Blog::Post.page params[:page]
+    else
+      Blog::Post.all
+    end
   end
   
   def new

data/app/controllers/blog/posts_controller.rb

@@ -16,7 +16,13 @@ class Blog::PostsController < ApplicationController
     
     respond_to do |f|
       f.html do
-        @posts = scope.paginate :per_page => ComfyBlog.config.posts_per_page, :page => params[:page]
+        @posts = if defined? WillPaginate
+          scope.paginate :per_page => ComfyBlog.config.posts_per_page, :page => params[:page]
+        elsif defined? Kaminari
+          scope.page(params[:page]).per(ComfyBlog.config.posts_per_page)
+        else
+          scope
+        end
       end
       f.rss do
         @posts = scope.limit(ComfyBlog.config.posts_per_page)

data/app/views/admin/blog/posts/index.html.erb

@@ -8,4 +8,8 @@
   <% end %>
 </ul>
 
-<%= will_paginate @posts %>
+<% if defined?(WillPaginate) %>
+  <%= will_paginate @posts %>
+<% elsif defined?(Kaminari)%>
+  <%= paginate @posts %>
+<% end %>

data/app/views/blog/posts/index.html.erb

@@ -2,4 +2,8 @@
   <%= render :partial => 'post', :object => post %>
 <% end %>
 
-<%= will_paginate @posts, :previous_label => '« Older Posts', :next_label => 'Newer Posts »', :page_links => false %>
+<% if defined?(WillPaginate) %>
+  <%= will_paginate @posts, :previous_label => '« Older Posts', :next_label => 'Newer Posts »', :page_links => false %>
+<% elsif defined?(Kaminari) %>
+  <%= paginate @posts %>
+<% end %>

data/comfy_blog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfy_blog"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc."]
-  s.date = "2012-01-20"
+  s.date = "2012-01-30"
   s.description = ""
   s.email = "oleg@twg.ca"
   s.extra_rdoc_files = [
@@ -121,19 +121,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.2"])
-      s.add_runtime_dependency(%q<rails_autolink>, ["~> 1.0.4"])
+      s.add_runtime_dependency(%q<rails_autolink>, [">= 1.0.4"])
       s.add_runtime_dependency(%q<jquery-rails>, [">= 1.0.0"])
     else
       s.add_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_dependency(%q<will_paginate>, ["~> 3.0.2"])
-      s.add_dependency(%q<rails_autolink>, ["~> 1.0.4"])
+      s.add_dependency(%q<rails_autolink>, [">= 1.0.4"])
       s.add_dependency(%q<jquery-rails>, [">= 1.0.0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.1.0"])
-    s.add_dependency(%q<will_paginate>, ["~> 3.0.2"])
-    s.add_dependency(%q<rails_autolink>, ["~> 1.0.4"])
+    s.add_dependency(%q<rails_autolink>, [">= 1.0.4"])
     s.add_dependency(%q<jquery-rails>, [">= 1.0.0"])
   end
 end

data/test/functional/admin/blog/posts_controller_test.rb

@@ -10,10 +10,12 @@ class Admin::Blog::PostsControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_pagination
-    get :index, :page => 99
-    assert_response :success
-    assert assigns(:posts)
-    assert_equal 0, assigns(:posts).size
+    if defined?(WillPaginate) || defined?(Kaminari)
+      get :index, :page => 99
+      assert_response :success
+      assert assigns(:posts)
+      assert_equal 0, assigns(:posts).size
+    end
   end
   
   def test_get_new

data/test/functional/blog/posts_controller_test.rb

@@ -26,9 +26,11 @@ class Blog::PostsControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_pagination
-    get :index, :page => 99
-    assert_response :success
-    assert_equal 0, assigns(:posts).size
+    if defined?(WillPaginate) || defined?(Kaminari)
+      get :index, :page => 99
+      assert_response :success
+      assert_equal 0, assigns(:posts).size
+    end
   end
   
   def test_get_index_for_tagged

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000Z
+date: 2012-01-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70292918028660 !ruby/object:Gem::Requirement
+  requirement: &70142022204480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,32 +22,21 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70292918028660
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: &70292918028060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70292918028060
+  version_requirements: *70142022204480
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70292918027460 !ruby/object:Gem::Requirement
+  requirement: &70142022203220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70292918027460
+  version_requirements: *70142022203220
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70292918026880 !ruby/object:Gem::Requirement
+  requirement: &70142022201680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70292918026880
+  version_requirements: *70142022201680
 description: ''
 email: oleg@twg.ca
 executables: []
@@ -171,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4279942090542155642
+      hash: -3227396926195768290
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: